Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml
===================================================================
diff -u -r33082 -r33100
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml	(.../Test.cls.xml)	(revision 33082)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml	(.../Test.cls.xml)	(revision 33100)
@@ -3,168 +3,148 @@
 <Class name="vhUnitTest.WS.EC.Unishop.InternationaleZending.Service.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: Offerte.Service wordt aangeroepen met de juiste OfferteId">
-<Implementation><![CDATA[
-	#dim OfferteId As %Integer = 666
+<Property name="VerkoopOfferteServiceMock">
+<Type>vhTest.Mock.APPS.VKP.OfferteService</Type>
+<Private>1</Private>
+</Property>
 
-	set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	do OfferteServiceMock.VerwachtMethodCall("GeefProductVerpakkingDetails",OfferteId)
-	do OfferteServiceMock.IndienMethodCall("GeefLeverAdres",OfferteId).DanReturn(##class(APPS.TRANSP.dto.LeveringAdres).%New())
-	
-	Set NaarBerekenInputConverterMock = ##class(vhTest.Mock.APPS.VKP.OfferteService.impl.NaarBerekenInputConverter).%New()
-	Do NaarBerekenInputConverterMock.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde,OfferteId).DanDoeNiks()
-	
-	set TransportOfferteServiceDummy = ##class(vhTest.Dummy.APPS.TRANSP.OfferteService).%New()
-	
-	set InternationaleZending = ##class(WS.EC.Unishop.InternationaleZending.Service).%New(OfferteServiceMock, TransportOfferteServiceDummy, NaarBerekenInputConverterMock)
-	Do InternationaleZending.GeefMogelijkeZendingen(OfferteId)
-	
-	Do OfferteServiceMock.Verifieer()
-]]></Implementation>
-</Method>
+<Property name="HaalZendingDetailsMock">
+<Type>vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.ZendingDetails</Type>
+<Private>1</Private>
+</Property>
 
-<Method name="Test: BerekenOfferte wordt opgeroepen met de gewenste verpakkinginformatie">
-<Implementation><![CDATA[
-	set Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(40,50,60)
-	set Verpakking = ##class(APPS.VKP.Offerte.dto.Verpakking).%New(Afmeting, 25, 200,"123-456",2)
-	set Verpakkingen = ##class(APPS.VKP.Offerte.dto.VerpakkingList).%New()
-	Do Verpakkingen.Insert(Verpakking)
-	
-	#dim OfferteId As %Integer = 666
-	
+<Property name="BerekenInputMatcher">
+<Type>Tools.Mock.ArgumentMatchers.DataTransferObjectMatcher</Type>
+<Private>1</Private>
+</Property>
 
-	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	do OfferteServiceStub.IndienMethodCall("GeefProductVerpakkingDetails",OfferteId).DanReturn(Verpakkingen)
-	do OfferteServiceStub.IndienMethodCall("GeefLeverAdres",OfferteId).DanReturn(##class(APPS.TRANSP.dto.LeveringAdres).%New())
+<Property name="NaarBerekenInputConverterMock">
+<Type>vhTest.Mock.APPS.VKP.OfferteService.impl.NaarBerekenInputConverter</Type>
+<Private>1</Private>
+</Property>
 
-	Set NaarBerekenInputConverterMock = ##class(vhTest.Mock.APPS.VKP.OfferteService.impl.NaarBerekenInputConverter).%New()
-	Do NaarBerekenInputConverterMock.IndienMethodCall("Convert",Verpakkingen,$$$ElkeWaarde,OfferteId).DanDoeNiks()
+<Property name="InternationaleZending">
+<Type>WS.EC.Unishop.InternationaleZending.Service</Type>
+<Private>1</Private>
+</Property>
 
-	set TransportOfferteServiceMock = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	do TransportOfferteServiceMock.VerwachtMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde)
+<Property name="OfferteID">
+<Type>%String</Type>
+<InitialExpression>666</InitialExpression>
+<Private>1</Private>
+</Property>
 
-	set InternationaleZending = ##class(WS.EC.Unishop.InternationaleZending.Service).%New(OfferteServiceStub,TransportOfferteServiceMock,NaarBerekenInputConverterMock)
+<Property name="DummyZendingDetails">
+<Type>APPS.TRANSP.OfferteService.dto.OfferteData</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="DummyVerpakkingen">
+<Type>APPS.VKP.Offerte.dto.VerpakkingList</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="DummyLeverAdres">
+<Type>APPS.TRANSP.dto.InternationaalAdres</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Set ..VerkoopOfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Set ..HaalZendingDetailsMock = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.ZendingDetails).%New()
+	Set ..NaarBerekenInputConverterMock = ##class(vhTest.Mock.APPS.VKP.OfferteService.impl.NaarBerekenInputConverter).%New()
+	Set ..InternationaleZending = ##class(WS.EC.Unishop.InternationaleZending.Service).%New(..VerkoopOfferteServiceMock,..NaarBerekenInputConverterMock,..HaalZendingDetailsMock)
 	
-	Do InternationaleZending.GeefMogelijkeZendingen(OfferteId)
+	Set ..BerekenInputMatcher = ##class(Tools.Mock.ArgumentMatchers.DataTransferObjectMatcher).%New(..GeefBerekenInput())
 	
-	Do TransportOfferteServiceMock.Verifieer()
+	Set ..DummyZendingDetails = ..GeefZendingDetails()
+	Set ..DummyVerpakkingen = ..GeefVerpakkingen()
+	Set ..DummyLeverAdres = ..GeefLeverAdres()
+	
+	Do ##super()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: GeefLeverAdres wordt aangeroepen met de juiste OfferteId">
+<Method name="Test: GeefMogelijkeZendingen wordt opgeroepen en geeft zendingdetails terug.">
 <Implementation><![CDATA[
-	#dim OfferteId As %Integer = 666
+	Do ..VerkoopOfferteServiceMock.VerwachtMethodCall("GeefProductVerpakkingDetails",..OfferteID).DanReturn(..DummyVerpakkingen)
+	Do ..VerkoopOfferteServiceMock.VerwachtMethodCall("GeefLeverAdres",..OfferteID).DanReturn(..DummyLeverAdres)
+	Do ..NaarBerekenInputConverterMock.VerwachtMethodCall("Convert", ..DummyVerpakkingen, ..DummyLeverAdres,..OfferteID).DanReturn(..GeefBerekenInput())
 
-	set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	do OfferteServiceMock.IndienMethodCall("GeefProductVerpakkingDetails",OfferteId).DanDoeNiks()
-	do OfferteServiceMock.VerwachtMethodCall("GeefLeverAdres",OfferteId).DanReturn(##class(APPS.TRANSP.dto.LeveringAdres).%New())
+	Do ..HaalZendingDetailsMock.VerwachtMethodCall("GeefZendingDetails",..BerekenInputMatcher).DanReturn(..DummyZendingDetails)
 	
-	set TransportOfferteServiceMock = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	do TransportOfferteServiceMock.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanDoeNiks()
-	
-	Set NaarBerekenInputConverterMock = ##class(vhTest.Mock.APPS.VKP.OfferteService.impl.NaarBerekenInputConverter).%New()
-	Do NaarBerekenInputConverterMock.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde ,OfferteId).DanDoeNiks()
+	#dim Resultaat As APPS.TRANSP.OfferteService.dto.OfferteData = ..InternationaleZending.GeefMogelijkeZendingen(..OfferteID)
 
-	set InternationaleZending = ##class(WS.EC.Unishop.InternationaleZending.Service).%New(OfferteServiceMock, TransportOfferteServiceMock, NaarBerekenInputConverterMock)
-	Do InternationaleZending.GeefMogelijkeZendingen(OfferteId)
-	
-	Do OfferteServiceMock.Verifieer()
+	Do ..VerkoopOfferteServiceMock.Verifieer()
+	Do ..NaarBerekenInputConverterMock.Verifieer()
+	Do ..HaalZendingDetailsMock.Verifieer()
+	Do $$$AssertObject(..DummyZendingDetails, Resultaat)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: BerekenOfferte wordt opgeroepen met het gewenste leveradres">
+<Method name="GeefZendingDetails">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
 <Implementation><![CDATA[
+	#dim ZendingDetails As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+	#dim ZendingDetail As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+	Set ZendingDetail.Code = 1
+	Set ZendingDetail.Duurtijd = 10
+	Set ZendingDetail.Gegarandeerd = 1
+	Set ZendingDetail.Kostprijs = 50.1 
+	Set ZendingDetail.Omschrijving = "UPS Express" 
+	Do ZendingDetails.Items.Insert(ZendingDetail)
 	
-	#dim OfferteId As %Integer = 666
+	Quit ZendingDetails
+]]></Implementation>
+</Method>
 
+<Method name="GeefVerpakkingen">
+<Private>1</Private>
+<ReturnType>APPS.VKP.Offerte.dto.VerpakkingList</ReturnType>
+<Implementation><![CDATA[
+	set Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(40,50,60)
+	set Verpakking = ##class(APPS.VKP.Offerte.dto.Verpakking).%New(Afmeting, 25, 200, "123-456", 2)
+	set Verpakkingen = ##class(APPS.VKP.Offerte.dto.VerpakkingList).%New()
+	Do Verpakkingen.Insert(Verpakking)
+	Quit Verpakkingen
+]]></Implementation>
+</Method>
+
+<Method name="GeefLeverAdres">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.dto.InternationaalAdres</ReturnType>
+<Implementation><![CDATA[
 	Set LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
 	Set LeverAdres.LandCode = "BE"
 	Set LeverAdres.Postcode = "9170"
 	Set LeverAdres.ProvincieCode = "OV"
 	Set LeverAdres.Straat = "Kemzekestraat"
 	Set LeverAdres.Woonplaats = "Sint-Gillis-Waas"
-	
-	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	do OfferteServiceStub.IndienMethodCall("GeefProductVerpakkingDetails",OfferteId).DanDoeNiks()
-	do OfferteServiceStub.IndienMethodCall("GeefLeverAdres",OfferteId).DanReturn(LeverAdres)
-
-	Set BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
-	Set BerekenInput.Referentie = OfferteId
-	Set BerekenInput.LeverAdres = LeverAdres
-	
-	set BerekenInputMatcher = ##class(Tools.Mock.ArgumentMatchers.DataTransferObjectMatcher).%New(BerekenInput)
-
-	set TransportOfferteServiceMock = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	do TransportOfferteServiceMock.VerwachtMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),BerekenInputMatcher)
-
-	set InternationaleZending = ##class(WS.EC.Unishop.InternationaleZending.Service).%New(OfferteServiceStub,TransportOfferteServiceMock)
-	
-	Do InternationaleZending.GeefMogelijkeZendingen(OfferteId)
-	
-	Do TransportOfferteServiceMock.Verifieer()
+	Quit LeverAdres
 ]]></Implementation>
 </Method>
 
-<Method name="Test: BerekenOfferte wordt opgeroepen met het gewenste lijst van details">
+<Method name="GeefBerekenInput">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.BerekenInput</ReturnType>
 <Implementation><![CDATA[
-	
-	#dim OfferteId As %Integer = 666
+	Set BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
+	Set BerekenInput.Referentie = ..OfferteID
+	Set BerekenInput.LeverAdres = ..GeefLeverAdres()
 
-	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, "123-456", 2)
-	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()
+ 	#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 TeVerzendItem.Aantal = 2 
 	Set TeVerzendItem.ProductID = "123-456"
 	
-	Set BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
-	Set BerekenInput.Referentie = OfferteId
 	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",##class(APPS.TRANSP.enu.TransportFirma).UPS(),BerekenInputMatcher)
-
-	set InternationaleZending = ##class(WS.EC.Unishop.InternationaleZending.Service).%New(OfferteServiceStub,TransportOfferteServiceMock)
-	
-	Do InternationaleZending.GeefMogelijkeZendingen(OfferteId)
-	
-	Do TransportOfferteServiceMock.Verifieer()
+	Quit BerekenInput
 ]]></Implementation>
 </Method>
-
-<Method name="Test: GeefMogelijkeZendingen wordt opgeroepen en geeft zendingdetails">
-<Implementation><![CDATA[
-	
-	#dim OfferteId As %Integer = 666
-
-	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	do OfferteServiceStub.IndienMethodCall("GeefLeverAdres",OfferteId).DanDoeNiks()
-	do OfferteServiceStub.IndienMethodCall("GeefProductVerpakkingDetails",OfferteId).DanDoeNiks()
-
-	#dim TransportData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
-
-	set TransportOfferteServiceMock = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	do TransportOfferteServiceMock.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(), $$$ElkeWaarde).DanReturn(TransportData)
-
-	set InternationaleZending = ##class(WS.EC.Unishop.InternationaleZending.Service).%New(OfferteServiceStub,TransportOfferteServiceMock)
-
-	#dim ResultData As APPS.TRANSP.OfferteService.dto.OfferteData = InternationaleZending.GeefMogelijkeZendingen(OfferteId)
-	
-	Do $$$AssertEquals(TransportData,ResultData)
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: WS/EC/Unishop/InternationaleZending/Service.cls.xml
===================================================================
diff -u -r33082 -r33100
--- WS/EC/Unishop/InternationaleZending/Service.cls.xml	(.../Service.cls.xml)	(revision 33082)
+++ WS/EC/Unishop/InternationaleZending/Service.cls.xml	(.../Service.cls.xml)	(revision 33100)
@@ -8,41 +8,40 @@
 <Private>1</Private>
 </Property>
 
-<Property name="TransportOfferteService">
-<Type>APPS.TRANSP.OfferteService</Type>
+<Property name="NaarBerekenInputConverter">
+<Type>APPS.VKP.OfferteService.impl.NaarBerekenInputConverter</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="NaarBerekenInputConverter">
-<Type>APPS.VKP.OfferteService.impl.NaarBerekenInputConverter</Type>
+<Property name="ZendingDetails">
+<Type>WS.EC.Unishop.InternationaleZending.impl.ZendingDetails</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>OfferteService:APPS.VKP.OfferteService,TransportOfferteService:APPS.TRANSP.OfferteService,VerpakkingConverteerder:APPS.VKP.OfferteService.impl.NaarBerekenInputConverter</FormalSpec>
+<FormalSpec>OfferteService:APPS.VKP.OfferteService,NaarBerekenInputConverter:APPS.VKP.OfferteService.impl.NaarBerekenInputConverter,ZendingDetails:WS.EC.Unishop.InternationaleZending.impl.ZendingDetails</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..OfferteService = $$$Implementation(OfferteService,##class(APPS.VKP.impl.OfferteService).%New())
-	Set ..TransportOfferteService = $$$Implementation(TransportOfferteService, ##class(APPS.TRANSP.impl.OfferteService).%New())
-	Set ..NaarBerekenInputConverter = $$$Implementation(VerpakkingConverteerder, ##class(APPS.VKP.OfferteService.impl.NaarBerekenInputConverter).%New())
-	
+	Set ..NaarBerekenInputConverter = $$$Implementation(NaarBerekenInputConverter, ##class(APPS.VKP.OfferteService.impl.NaarBerekenInputConverter).%New())
+	Set ..ZendingDetails = $$$Implementation(ZendingDetails, ##class(WS.EC.Unishop.InternationaleZending.impl.ZendingDetails).%New())
 	quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="GeefMogelijkeZendingen">
 <FormalSpec>OfferteId:%String</FormalSpec>
-<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<ReturnType>WS.EC.Unishop.InternationaleZending.dto.Details</ReturnType>
 <Implementation><![CDATA[
 	#dim Verpakkingen As APPS.VKP.Offerte.dto.VerpakkingList = ..OfferteService.GeefProductVerpakkingDetails(OfferteId)
 	#dim LeverAdres As APPS.TRANSP.dto.InternationaalAdres = ..OfferteService.GeefLeverAdres(OfferteId)
 
 	#dim BerekenInput As APPS.TRANSP.OfferteService.dto.BerekenInput = ..NaarBerekenInputConverter.Convert(Verpakkingen, LeverAdres, OfferteId)
-
-	Quit ..TransportOfferteService.BerekenOfferte(##class(APPS.TRANSP.enu.TransportFirma).UPS(), BerekenInput)
+	
+	Quit ..ZendingDetails.GeefZendingDetails(BerekenInput)
 ]]></Implementation>
 </Method>
 </Class>