Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler/Bepaal/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler/Bepaal/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler/Bepaal/Test.cls.xml	(revision 41647)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.StapelingBepaler.Bepaal.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: geeft palletten weer aan de hand van berekeninput">
+<Implementation><![CDATA[
+	#dim StapelingRepository As vhTest.Mock.APPS.TRANSP.Offerte.impl.DHL.StapelingRepository = ##class(vhTest.Mock.APPS.TRANSP.Offerte.impl.DHL.StapelingRepository).%New()
+	
+	#dim Stapeling As APPS.TRANSP.Offerte.impl.DHL.Data.Stapeling = ##class(vhTest.Utils.APPS.TRANSP.Offerte.impl.DHL.Data.Stapeling).GeefStapeling()
+	#dim StapelingList As %ListOfObjects = ##class(%ListOfObjects).%New()
+	Do StapelingList.Insert(Stapeling)
+	#dim StapelingIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(StapelingList)
+	
+	Do StapelingRepository.IndienMethodCall("ZoekViaReferentie", $$$ElkeWaarde).DanReturn(StapelingIterator)
+	
+	#dim StapelingBepaler As APPS.TRANSP.Offerte.impl.DHL.StapelingBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.StapelingBepaler).%New(StapelingRepository)
+	#dim BerekenInputDummy As APPS.TRANSP.OfferteService.dto.BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
+	
+	#dim Palletten As APPS.TRANSP.OfferteService.dto.Palletten = StapelingBepaler.Bepaal(BerekenInputDummy)
+	
+	Do $$$AssertEquals(Palletten.Count(),1)
+	#dim Pallet As APPS.TRANSP.OfferteService.dto.Pallet = Palletten.GetAt(1)
+	Do $$$AssertEquals(Pallet.GewichtInKG,100.000)
+	Do $$$AssertEquals(Pallet.Afmeting.Hoogte,220)
+	Do $$$AssertEquals(Pallet.Afmeting.Breedte,80)
+	Do $$$AssertEquals(Pallet.Afmeting.Lengte,70)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u -r37106 -r41647
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 37106)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 41647)
@@ -160,7 +160,7 @@
 <Implementation><![CDATA[
 	Set TransportduurRepositoryFake = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepository).%New()
 	Set TariefBepalerFake = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TariefBepaler).%New()
-	Set PallettenBepalerFake = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.PallettenBepaler).%New()
+	Set PallettenBepalerFake = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.StapelingBepaler).%New()
 	Do PallettenBepalerFake.ZetAantalPalletten(AantalPalletten)
 	Quit ##class(APPS.TRANSP.Offerte.impl.DHL.OfferteBerekenaar).%New(TransportduurRepositoryFake, TariefBepalerFake, PallettenBepalerFake)
 ]]></Implementation>
FishEye: Tag 41647 refers to a dead (removed) revision in file `vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler.cls.xml
===================================================================
diff -u -r41644 -r41647
--- vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler.cls.xml	(.../StapelingBepaler.cls.xml)	(revision 41644)
+++ vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler.cls.xml	(.../StapelingBepaler.cls.xml)	(revision 41647)
@@ -1,33 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.StapelingBepaler">
-<Description>
-Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
-Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
-<ProcedureBlock>1</ProcedureBlock>
-<Super>APPS.TRANSP.Offerte.impl.DHL.StapelingBepaler</Super>
+<Super>TECH.RegisteredObject</Super>
 
-<Method name="Bepaal">
-<FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
-<ReturnType>APPS.TRANSP.OfferteService.dto.Palletten</ReturnType>
-<Implementation><![CDATA[	Quit ""
-]]></Implementation>
-</Method>
+<Property name="AantalPalletten">
+<Type>%Integer</Type>
+<InitialExpression>1</InitialExpression>
+<Private>1</Private>
+</Property>
 
-<Method name="Bereken">
-<FormalSpec>CollisOpPallet:APPS.TRANSP.Stapeling.dto.CollisOpPallet</FormalSpec>
-<Implementation><![CDATA[]]></Implementation>
-</Method>
-
-<Method name="BerekenMetVastAantal">
-<FormalSpec>CollisOpPallet:APPS.TRANSP.Stapeling.dto.CollisOpPallet,AantalOpPallet:%Integer</FormalSpec>
-<Implementation><![CDATA[
+<Method name="ZetAantalPalletten">
+<FormalSpec>AantalPalletten:%Integer</FormalSpec>
+<Implementation><![CDATA[	Set ..AantalPalletten = AantalPalletten
 ]]></Implementation>
 </Method>
 
-<Method name="VerwijderOudeGegevens">
-<FormalSpec>Referentie:%String</FormalSpec>
+<Method name="Bepaal">
+<FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
+<ReturnType>APPS.TRANSP.OfferteService.dto.Palletten</ReturnType>
 <Implementation><![CDATA[
+	#dim Palletten As APPS.TRANSP.OfferteService.dto.Palletten = ##class(APPS.TRANSP.OfferteService.dto.Palletten).%New()
+	
+	#dim Teller As %Integer = 0
+	for Teller=1:1:..AantalPalletten 
+	{
+		#dim Pallet As APPS.TRANSP.OfferteService.dto.Pallet = ##class(APPS.TRANSP.OfferteService.dto.Pallet).%New()
+		Set Pallet.GewichtInKG = 100
+		Set Pallet.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(1,1,1)
+		Do Palletten.Insert(Pallet)
+	}
+	Quit Palletten
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler/Bereken/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler/Bereken/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler/Bereken/Test.cls.xml	(revision 41647)
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.StapelingBepaler.Bereken.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: schrijft optiboxbestand met referentie en groep als unieke sleutel">
+<Implementation><![CDATA[
+	#dim FileUtilsFake As vhTest.Fake.TECH.File.FileUtils = ##class(vhTest.Fake.TECH.File.FileUtils).%New()
+	#dim FileAPIFake As vhTest.Fake.TECH.File.FileAPI = ##class(vhTest.Fake.TECH.File.FileAPI).%New(FileUtilsFake)
+	#dim RequestWriter As vhTest.Mock.APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestWriter = ##class(vhTest.Mock.APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestWriter).%New(FileAPIFake)
+	Do RequestWriter.VerwachtMethodCall("WriteRequest","DummyReferentieDummyGroep", $$$ElkeWaarde).DanDoeNiks()
+	#dim StapelingBepaler As APPS.TRANSP.Offerte.impl.DHL.StapelingBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.StapelingBepaler).%New(,, RequestWriter)
+
+	#dim ColliOpPalletDummy As APPS.TRANSP.Stapeling.dto.CollisOpPallet = ##class(vhTest.Utils.APPS.TRANSP.Stapeling.dto.CollisOpPallet).GeefCollisOpPallet()
+	Set ColliOpPalletDummy.Referentie = "DummyReferentie"	
+	Set ColliOpPalletDummy.Groep = "DummyGroep"	
+	Do StapelingBepaler.Bereken(ColliOpPalletDummy)
+	
+	Do RequestWriter.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: schrijft optiboxbestand aan de hand van CollisOpPallet">
+<Implementation><![CDATA[
+	#dim FileUtilsFake As vhTest.Fake.TECH.File.FileUtils = ##class(vhTest.Fake.TECH.File.FileUtils).%New()
+	#dim FileAPIFake As vhTest.Fake.TECH.File.FileAPI = ##class(vhTest.Fake.TECH.File.FileAPI).%New(FileUtilsFake)
+	#dim RequestWriter As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestWriter = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestWriter).%New(FileAPIFake)
+
+	#dim StapelingBepaler As APPS.TRANSP.Offerte.impl.DHL.StapelingBepaler = ##class(APPS.TRANSP.Offerte.impl.DHL.StapelingBepaler).%New(,, RequestWriter)
+
+	#dim ColliOpPalletDummy As APPS.TRANSP.Stapeling.dto.CollisOpPallet = ##class(vhTest.Utils.APPS.TRANSP.Stapeling.dto.CollisOpPallet).GeefCollisOpPallet()
+	Set ColliOpPalletDummy.Referentie = "DummyReferentie"	
+	Set ColliOpPalletDummy.Groep = "DummyGroep"
+	Do StapelingBepaler.Bereken(ColliOpPalletDummy)
+	
+	#dim XMlStream As %Stream = FileAPIFake.GeefFileWriter().GeefInhoudBestandNaam(..GeefBestandVolledigNaam())
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<cubeiq>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<settings>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<setting id=""Default"" maxnumdecimals=""2"" maxblocksize=""128"" lengthunit=""mm"" volumeunit=""mm3"" weightunit=""kg"" companyname=""Van Hoecke"" drawasblockslimit=""1"" createpackageid=""False""></setting>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "</settings>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<containersettings>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<containersetting id=""Default"" settingsid=""Default"" loadingmargin=""0"" maxruntime=""600"" maxnonimproveiters=""300""></containersetting>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "</containersettings>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<containers>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<container bottomtotoploading=""True"" partialloadonfloor=""True"" id=""Stapelaar.EuroPallet"" containerid=""Stapelaar.EuroPallet"" containertype=""Rectangular"" depth=""1200.00"" width=""800.00"" height=""1500.00"" maxweight=""1200.00"" settingsid=""Default"" backtofront=""False"" bottomtotop=""True"" loadbottomfirst=""False"" loadinlayers=""True"" spreadblocks=""True"" mixedlayers=""True"" doorwidth=""9999999.00"" doorheight=""9999999.00"" valuemax=""999999999.00""></container>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<container bottomtotoploading=""True"" partialloadonfloor=""True"" id=""Stapelaar.WegwerpPallet"" containerid=""Stapelaar.WegwerpPallet"" containertype=""Rectangular"" depth=""1500.00"" width=""800.00"" height=""1500.00"" maxweight=""1200.00"" settingsid=""Default"" backtofront=""False"" bottomtotop=""True"" loadbottomfirst=""False"" loadinlayers=""True"" spreadblocks=""True"" mixedlayers=""True"" doorwidth=""9999999.00"" doorheight=""9999999.00"" valuemax=""999999999.00""></container>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "</containers>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<packages>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<package id=""Package.1"" packageid=""Package.1"" length=""700"" width=""300"" height=""163"" weight=""15.00"" turnable=""False"" sideupok=""False"" endupok=""True"" bottomonly=""False"" toponly=""False"" colour=""#255#0#0"" deletewithsolution=""True"" packagetype=""Box""></package>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "</packages>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<orientations>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<orientation packageid=""Package.1"" orientationnum=""1"" length=""700.00"" width=""300.00"" height=""163.00"" allowed=""true"" bottomonly=""False"" toponly=""False""></orientation>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<orientation packageid=""Package.1"" orientationnum=""2"" length=""300.00"" width=""700.00"" height=""163.00"" allowed=""true"" bottomonly=""False"" toponly=""False""></orientation>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<orientation packageid=""Package.1"" orientationnum=""3"" length=""300.00"" width=""163.00"" height=""700.00"" allowed=""False"" bottomonly=""False"" toponly=""False""></orientation>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<orientation packageid=""Package.1"" orientationnum=""4"" length=""163.00"" width=""300.00"" height=""700.00"" allowed=""False"" bottomonly=""False"" toponly=""False""></orientation>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<orientation packageid=""Package.1"" orientationnum=""5"" length=""163.00"" width=""700.00"" height=""300.00"" allowed=""False"" bottomonly=""False"" toponly=""False""></orientation>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<orientation packageid=""Package.1"" orientationnum=""6"" length=""700.00"" width=""163.00"" height=""300.00"" allowed=""False"" bottomonly=""False"" toponly=""False""></orientation>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "</orientations>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<solutions>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "</solutions>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<containerstoload>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<containertoload id=""Stapelaar.EuroPallet"" solutionid=""DummyReferentie;DummyGroep"" auto=""0"" containerid=""Stapelaar.EuroPallet"" containernum=""1"" sequence=""1""></containertoload>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<containertoload id=""Stapelaar.WegwerpPallet"" solutionid=""DummyReferentie;DummyGroep"" auto=""0"" containerid=""Stapelaar.WegwerpPallet"" containernum=""6"" sequence=""6""></containertoload>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "</containerstoload>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<packagestoload>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "<packagetoload id=""Packagetoload.1"" solutionid=""DummyReferentie;DummyGroep"" auto=""1"" packageid=""Package.1"" quantity=""2"" batch=""#0#100#0""></packagetoload>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "</packagestoload>"))
+	do $$$AssertTrue(##class(TECH.StreamUtils).IsTextInStream(XMlStream, "</cubeiq>"))
+]]></Implementation>
+</Method>
+
+<Method name="GeefBestandVolledigNaam">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim BestandPrefix As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("StapelaarBestandPrefix")
+	Quit ##class(TECH.Files).AppendFile(..GeefLocatie(), BestandPrefix _"DummyReferentieDummyGroep.xml")
+]]></Implementation>
+</Method>
+
+<Method name="GeefLocatie">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim BestandLocatie As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("OptiBoxBigPath")
+	Quit ##class(TECH.Files).AppendSubPath(BestandLocatie,"\cube-iq\InputFolder\")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
FishEye: Tag 41647 refers to a dead (removed) revision in file `vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler/Bepaal/Test.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 41647 refers to a dead (removed) revision in file `vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/PallettenBepaler/Bereken/Test.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?