Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml
===================================================================
diff -u -r33012 -r33016
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml	(.../Test.cls.xml)	(revision 33012)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml	(.../Test.cls.xml)	(revision 33016)
@@ -11,10 +11,9 @@
 	do OfferteServiceMock.VerwachtMethodCall("GeefProductVerpakkingDetails",OfferteId)
 	do OfferteServiceMock.IndienMethodCall("GeefLeverAdres",OfferteId).DanReturn(##class(APPS.TRANSP.dto.LeveringAdres).%New())
 	
-	set TransportOfferteServiceMock = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	do TransportOfferteServiceMock.IndienMethodCall("BerekenOfferte","UPS",$$$ElkeWaarde).DanDoeNiks()
+	set TransportOfferteServiceDummy = ##class(vhTest.Dummy.APPS.TRANSP.OfferteService).%New()
 
-	set InternationaleZending = ##class(WS.EC.Unishop.InternationaleZending.Service).%New(OfferteServiceMock, TransportOfferteServiceMock)
+	set InternationaleZending = ##class(WS.EC.Unishop.InternationaleZending.Service).%New(OfferteServiceMock, TransportOfferteServiceDummy)
 	Do InternationaleZending.GeefMogelijkeZendingDetails(OfferteId)
 	
 	Do OfferteServiceMock.Verifieer()
@@ -93,6 +92,42 @@
 	Do TransportOfferteServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: BerekenOfferte op APPS.TRANSP.OfferteService wordt opgeroepen met het gewenste lijst van details">
+<Implementation><![CDATA[
+	
+	#dim OfferteId As %Integer = 666
+
+	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	do OfferteServiceStub.IndienMethodCall("GeefLeverAdres",OfferteId).DanDoeNiks()
+	
+	set Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(40,50,60)
+	set Verpakking = ##class(APPS.VKP.Offerte.dto.Verpakking).%New(Afmeting, 25, 200)
+	set Verpakkingen = ##class(APPS.VKP.Offerte.dto.VerpakkingList).%New()
+	Do Verpakkingen.Insert(Verpakking)
+	
+	do OfferteServiceStub.IndienMethodCall("GeefProductVerpakkingDetails",OfferteId).DanReturn(Verpakkingen)
+
+	#dim TeVerzendItem As APPS.TRANSP.OfferteService.dto.TeverzendenItem = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItem).%New()
+	Set TeVerzendItem.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(40,50,60)
+	Set TeVerzendItem.Gewicht = 25
+	Set TeVerzendItem.WaardeGoederen = 200
+	
+	Set BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
+	Do BerekenInput.TeVerzendenItems.Insert(TeVerzendItem)
+	
+	set BerekenInputMatcher = ##class(Tools.Mock.ArgumentMatchers.DataTransferObjectMatcher).%New(BerekenInput)
+
+	set TransportOfferteServiceMock = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
+	do TransportOfferteServiceMock.VerwachtMethodCall("BerekenOfferte","UPS",BerekenInputMatcher)
+
+	set InternationaleZending = ##class(WS.EC.Unishop.InternationaleZending.Service).%New(OfferteServiceStub,TransportOfferteServiceMock)
+	
+	Do InternationaleZending.GeefMogelijkeZendingDetails(OfferteId)
+	
+	Do TransportOfferteServiceMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: WS/EC/Unishop/InternationaleZending/Service.cls.xml
===================================================================
diff -u -r33012 -r33016
--- WS/EC/Unishop/InternationaleZending/Service.cls.xml	(.../Service.cls.xml)	(revision 33012)
+++ WS/EC/Unishop/InternationaleZending/Service.cls.xml	(.../Service.cls.xml)	(revision 33016)
@@ -32,13 +32,37 @@
 	#dim Verpakkingen As APPS.VKP.Offerte.dto.VerpakkingList = ..OfferteService.GeefProductVerpakkingDetails(OfferteId)
 	#dim LeverAdres As APPS.TRANSP.dto.InternationaalAdres = ..OfferteService.GeefLeverAdres(OfferteId)
 
-	Set BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
-	Set BerekenInput.LeverAdres = LeverAdres
+	#dim BerekenInput As APPS.TRANSP.OfferteService.dto.BerekenInput = ..MaakBerekenInput(Verpakkingen, LeverAdres)
 
 	do ..TransportOfferteService.BerekenOfferte("UPS", BerekenInput)
 	quit
 ]]></Implementation>
 </Method>
+
+<Method name="MaakBerekenInput">
+<FormalSpec>Verpakkingen:APPS.VKP.Offerte.dto.VerpakkingList,LeverAdres:APPS.TRANSP.dto.InternationaalAdres</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.BerekenInput</ReturnType>
+<Implementation><![CDATA[
+	Set BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
+	Set BerekenInput.LeverAdres = LeverAdres
+	
+	if ($IsObject(Verpakkingen) && Verpakkingen.Count() > 0)
+	{
+		set Iterator = ##class(TECH.ListIterator).%New(Verpakkingen)
+		while Iterator.HasNext() {
+			#dim Verpakking As APPS.VKP.Offerte.dto.Verpakking = Iterator.Next()
+			#dim TeVerzendItem As APPS.TRANSP.OfferteService.dto.TeverzendenItem = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItem).%New()
+			Set TeVerzendItem.Gewicht = Verpakking.Gewicht
+			Set TeVerzendItem.WaardeGoederen = Verpakking.WaardeGoederen
+			Set TeVerzendItem.Afmeting = Verpakking.Afmeting.%ConstructClone()
+			Do BerekenInput.TeVerzendenItems.Insert(TeVerzendItem)
+		}
+	}
+	
+	Quit BerekenInput
+]]></Implementation>
+</Method>
 </Class>