Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TransportduurImporter/Test.cls.xml
===================================================================
diff -u -r34508 -r35203
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TransportduurImporter/Test.cls.xml	(.../Test.cls.xml)	(revision 34508)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TransportduurImporter/Test.cls.xml	(.../Test.cls.xml)	(revision 35203)
@@ -6,8 +6,14 @@
 <Method name="Test: Importeer een DHL bestand met transportduur gegevens">
 <Implementation><![CDATA[
 	#dim FileAPIFake As vhTest.Mock.TECH.File.FileAPI = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	
 	#dim TransportduurRepositorySpy As vhTest.Spy.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepository = ##class(vhTest.Spy.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepository).%New()
-	#dim TestValues As %List = $LB("Country	Postal code 5-digits	Monday	Tuesday	Wednesday	Thursday	Friday","DE	01067	3	4	1	2	5","DE	01069	3	3	3	3	3")
+	
+	set TestValues = ##class(%GlobalCharacterStream).%New()
+	do TestValues.WriteLine("Country	Postal code 5-digits	Monday	Tuesday	Wednesday	Thursday	Friday")
+	do TestValues.WriteLine("DE	01067	3	4	1	2	5")
+	do TestValues.WriteLine("DE	01069	3	3	3	3	3")
+	
 	#dim FileReaderStub As vhTest.Fake.TECH.File.FileReader = ##class(vhTest.Fake.TECH.File.FileReader).%New(TestValues)
 	#dim FileUtilsFake As vhTest.Fake.TECH.File.FileUtils = ##class(vhTest.Fake.TECH.File.FileUtils).%New()
 	Do FileAPIFake.IndienMethodCall("GeefFileReader",$$$ElkeWaarde).DanReturn(FileReaderStub)
@@ -35,7 +41,12 @@
 <Implementation><![CDATA[
 	#dim FileAPIFake As vhTest.Mock.TECH.File.FileAPI = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
 	#dim TransportduurRepositorySpy As vhTest.Spy.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepository = ##class(vhTest.Spy.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepository).%New()
-	#dim TestValues As %List = $LB("Country	Postal code 5-digits	Monday	Tuesday	Wednesday	Thursday	Friday","DE	01067	3	4	1	2	5","DE	01069	3	3	3	3	3")
+	
+	set TestValues = ##class(%GlobalCharacterStream).%New()
+	do TestValues.WriteLine("Country	Postal code 5-digits	Monday	Tuesday	Wednesday	Thursday	Friday")
+	do TestValues.WriteLine("DE	01067	3	4	1	2	5")
+	do TestValues.WriteLine("DE	01069	3	3	3	3	3")
+
 	#dim FileReaderStub As vhTest.Fake.TECH.File.FileReader = ##class(vhTest.Fake.TECH.File.FileReader).%New(TestValues)
 	#dim FileUtilsFake As vhTest.Fake.TECH.File.FileUtils = ##class(vhTest.Fake.TECH.File.FileUtils).%New()
 	Do FileUtilsFake.VoegToeFileInfo("DHL-DE.txt")
Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefImporter/ImportFile/Test.cls.xml
===================================================================
diff -u -r34442 -r35203
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefImporter/ImportFile/Test.cls.xml	(.../Test.cls.xml)	(revision 34442)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefImporter/ImportFile/Test.cls.xml	(.../Test.cls.xml)	(revision 35203)
@@ -6,41 +6,42 @@
 <Method name="Test: ">
 <Implementation><![CDATA[
 	#dim FileAPIFake As vhTest.Mock.TECH.File.FileAPI = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	#dim FileName As %String = "E:\DHL_Filename.txt"
 	
-	#dim Header As %String = "	Country	Key	100	200	300	400	500	600	700	800	900	1000	1250	1500	1750	2000	2250	2500	3000	3500	4000	4500	5000	5500	6000	6500	7000	7500	8000	8500	9000	9500	10000	10500	11000	11500	12000	12500	13000	13500	14000	14500	15000	15500	16000	16500	17000	17500	18000	18500	19000	19500	20000	20500	21000	21500	22000	22500	23000	FTL	"
-	#dim Lijn1 As %String = "	AT	AT10	 43,62 	 57,59 	 71,44 	 84,45 	 97,36 	 108,95 	 120,50 	 133,19 	 146,58 	 156,99 	 192,35 	 225,43 	 260,03 	 289,11 	 302,72 	 316,08 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	"
-	#dim Lijn2 As %String = "	AT	AT23	 45,40 	 59,74 	 73,97 	 87,34 	 100,59 	 112,51 	 124,41 	 137,42 	 151,12 	 161,82 	 198,24 	 231,99 	 267,60 	 297,35 	 310,59 	 323,60 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	"
-	#dim TestValues As %List = $LB(Header,Lijn1,Lijn2)
+	set TestValues = ##class(%GlobalCharacterStream).%New()
+	do TestValues.WriteLine("	Country	Key	100	200	300	400	500	600	700	800	900	1000	1250	1500	1750	2000	2250	2500	3000	3500	4000	4500	5000	5500	6000	6500	7000	7500	8000	8500	9000	9500	10000	10500	11000	11500	12000	12500	13000	13500	14000	14500	15000	15500	16000	16500	17000	17500	18000	18500	19000	19500	20000	20500	21000	21500	22000	22500	23000	FTL	")
+	do TestValues.WriteLine("	AT	AT10	 43,62 	 57,59 	 71,44 	 84,45 	 97,36 	 108,95 	 120,50 	 133,19 	 146,58 	 156,99 	 192,35 	 225,43 	 260,03 	 289,11 	 302,72 	 316,08 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	")
+	do TestValues.WriteLine("	AT	AT23	 45,40 	 59,74 	 73,97 	 87,34 	 100,59 	 112,51 	 124,41 	 137,42 	 151,12 	 161,82 	 198,24 	 231,99 	 267,60 	 297,35 	 310,59 	 323,60 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	 On Request 	")
 	
 	#dim FileReaderStub As vhTest.Fake.TECH.File.FileReader = ##class(vhTest.Fake.TECH.File.FileReader).%New(TestValues)
 	#dim FileUtilsFake As vhTest.Fake.TECH.File.FileUtils = ##class(vhTest.Fake.TECH.File.FileUtils).%New()
-	Do FileAPIFake.IndienMethodCall("GeefFileReader",$$$ElkeWaarde).DanReturn(FileReaderStub)
+	Do FileAPIFake.IndienMethodCall("GeefFileReader",FileName).DanReturn(FileReaderStub)
 	Do FileAPIFake.IndienMethodCall("GeefFileUtils").DanReturn(FileUtilsFake)
 
 	#dim TariefRepositorySpy As vhTest.Spy.APPS.TRANSP.Offerte.impl.DHL.TariefRepository = ##class(vhTest.Spy.APPS.TRANSP.Offerte.impl.DHL.TariefRepository).%New()
 
 	#dim TariefImporter As APPS.TRANSP.Offerte.impl.DHL.TariefImporter = ##class(APPS.TRANSP.Offerte.impl.DHL.TariefImporter).%New(FileAPIFake, TariefRepositorySpy)
-	#dim FileName As %String = ""
 	
 	Do TariefImporter.ImportFile(FileName)
 	
-	Do $$$AssertEquals(TariefRepositorySpy.GeefAantalToegevoegdeLijnen(),2)
-	
-	#dim Tarief1 As APPS.TRANSP.Offerte.impl.DHL.Tarief = TariefRepositorySpy.GeefToegevoegdeLijn(1)
-	Do $$$AssertEquals(Tarief1.Landcode,"AT")
-	Do $$$AssertEquals(Tarief1.Sleutel,"AT10")
-	Do $$$AssertEquals(Tarief1.TariefPerGewichtInKG.GetAt(100),"43.62")
-	Do $$$AssertEquals(Tarief1.TariefPerGewichtInKG.GetAt(600),"108.95")
-	Do $$$AssertEquals(Tarief1.TariefPerGewichtInKG.GetAt(2500),"316.08")
-	Do $$$AssertEquals(Tarief1.TariefPerGewichtInKG.GetAt(3000),"")
+	If $$$AssertEquals(TariefRepositorySpy.GeefAantalToegevoegdeLijnen(),2) {
 
-	#dim Tarief2 As APPS.TRANSP.Offerte.impl.DHL.Tarief = TariefRepositorySpy.GeefToegevoegdeLijn(2)
-	Do $$$AssertEquals(Tarief2.Landcode,"AT")
-	Do $$$AssertEquals(Tarief2.Sleutel,"AT23")
-	Do $$$AssertEquals(Tarief2.TariefPerGewichtInKG.GetAt(100),"45.40")
-	Do $$$AssertEquals(Tarief2.TariefPerGewichtInKG.GetAt(600),"112.51")
-	Do $$$AssertEquals(Tarief2.TariefPerGewichtInKG.GetAt(2500),"323.60")
-	Do $$$AssertEquals(Tarief2.TariefPerGewichtInKG.GetAt(3000),"")
+		#dim Tarief1 As APPS.TRANSP.Offerte.impl.DHL.Tarief = TariefRepositorySpy.GeefToegevoegdeLijn(1)
+		Do $$$AssertEquals(Tarief1.Landcode,"AT")
+		Do $$$AssertEquals(Tarief1.Sleutel,"AT10")
+		Do $$$AssertEquals(Tarief1.TariefPerGewichtInKG.GetAt(100),"43.62")
+		Do $$$AssertEquals(Tarief1.TariefPerGewichtInKG.GetAt(600),"108.95")
+		Do $$$AssertEquals(Tarief1.TariefPerGewichtInKG.GetAt(2500),"316.08")
+		Do $$$AssertEquals(Tarief1.TariefPerGewichtInKG.GetAt(3000),"")
+
+		#dim Tarief2 As APPS.TRANSP.Offerte.impl.DHL.Tarief = TariefRepositorySpy.GeefToegevoegdeLijn(2)
+		Do $$$AssertEquals(Tarief2.Landcode,"AT")
+		Do $$$AssertEquals(Tarief2.Sleutel,"AT23")
+		Do $$$AssertEquals(Tarief2.TariefPerGewichtInKG.GetAt(100),"45.40")
+		Do $$$AssertEquals(Tarief2.TariefPerGewichtInKG.GetAt(600),"112.51")
+		Do $$$AssertEquals(Tarief2.TariefPerGewichtInKG.GetAt(2500),"323.60")
+		Do $$$AssertEquals(Tarief2.TariefPerGewichtInKG.GetAt(3000),"")
+	}
 ]]></Implementation>
 </Method>
 </Class>