Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails/Test.cls.xml
===================================================================
diff -u -r33539 -r33625
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails/Test.cls.xml	(.../Test.cls.xml)	(revision 33539)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails/Test.cls.xml	(.../Test.cls.xml)	(revision 33625)
@@ -6,7 +6,7 @@
 <Method name="Test : Carbon neutral wordt voorzien door transportfirma. ">
 <Implementation><![CDATA[
 	Set TransportOfferteServiceStub = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..GeefOfferteData("UPS")
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(vhTest.Utils.APPS.TRANSP.OfferteService.dto.OfferteData).GeefOfferteDataTransporteur("UPS")
 	Set OfferteData.Items.GetAt(1).CarbonNeutralPrijs = 0.80
 	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(OfferteData)
 	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),$$$ElkeWaarde).DanReturn(##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New())
@@ -30,7 +30,7 @@
 <Method name="Test : Carbon neutral wordt niet voorzien door transportfirma. ">
 <Implementation><![CDATA[
 	Set TransportOfferteServiceStub = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..GeefOfferteData("UPS")
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(vhTest.Utils.APPS.TRANSP.OfferteService.dto.OfferteData).GeefOfferteDataTransporteur("UPS")
 	Set OfferteData.Items.GetAt(1).CarbonNeutralPrijs = ""
 	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(OfferteData)
 	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),$$$ElkeWaarde).DanReturn(##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New())
@@ -48,7 +48,7 @@
 <Method name="Test : Kostprijs wordt voorzien door transportfirma. ">
 <Implementation><![CDATA[
 	Set TransportOfferteServiceStub = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..GeefOfferteData("UPS")
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(vhTest.Utils.APPS.TRANSP.OfferteService.dto.OfferteData).GeefOfferteDataTransporteur("UPS")
 	Set OfferteData.Items.GetAt(1).Kostprijs = 44.5
 	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(OfferteData)
 	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),$$$ElkeWaarde).DanReturn(##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New())
@@ -66,7 +66,7 @@
 <Method name="Test : Leverdatum wordt voorzien door transportfirma. ">
 <Implementation><![CDATA[
 	Set TransportOfferteServiceStub = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..GeefOfferteData("UPS")
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(vhTest.Utils.APPS.TRANSP.OfferteService.dto.OfferteData).GeefOfferteDataTransporteur("UPS")
 	Set OfferteData.Items.GetAt(1).Duurtijd = 10
 	Set OfferteData.Items.GetAt(1).OphaalDatum = ..GeefHuidigeDatum()
 	Set OfferteData.Items.GetAt(1).LeverDatum = ##class(TECH.DateTime).DatumBereken(..GeefHuidigeDatum(),10,##class(TECH.enu.DatePart).Dag())
@@ -96,8 +96,8 @@
 <Method name="Test : GeefZendingDetails van twee transportfirma&apos;s ">
 <Implementation><![CDATA[
 	Set TransportOfferteServiceStub = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(..GeefOfferteData("UPS"))
-	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),$$$ElkeWaarde).DanReturn(..GeefOfferteData("DHL"))
+	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(##class(vhTest.Utils.APPS.TRANSP.OfferteService.dto.OfferteData).GeefOfferteDataTransporteur("UPS"))
+	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),$$$ElkeWaarde).DanReturn(##class(vhTest.Utils.APPS.TRANSP.OfferteService.dto.OfferteData).GeefOfferteDataTransporteur("DHL"))
 
 	Set HaalZendingDetails = ##class(WS.EC.Unishop.InternationaleZending.impl.ZendingDetails).%New(TransportOfferteServiceStub)
 	set BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
@@ -113,8 +113,8 @@
 <Method name="Test : GeefZendingDetails van twee transportfirma&apos;s (2-1)">
 <Implementation><![CDATA[
 	Set TransportOfferteServiceStub = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(..GeefOfferteData("UPS",2))
-	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),$$$ElkeWaarde).DanReturn(..GeefOfferteData("DHL"))
+	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(##class(vhTest.Utils.APPS.TRANSP.OfferteService.dto.OfferteData).GeefOfferteDataTransporteur("UPS",2))
+	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),$$$ElkeWaarde).DanReturn(##class(vhTest.Utils.APPS.TRANSP.OfferteService.dto.OfferteData).GeefOfferteDataTransporteur("DHL"))
 	
 	Set HaalZendingDetails = ##class(WS.EC.Unishop.InternationaleZending.impl.ZendingDetails).%New(TransportOfferteServiceStub)
 	Set BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
@@ -132,8 +132,8 @@
 <Method name="Test : GeefZendingDetails van twee transportfirma&apos;s (1-2)">
 <Implementation><![CDATA[
 	Set TransportOfferteServiceStub = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(..GeefOfferteData("UPS"))
-	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),$$$ElkeWaarde).DanReturn(..GeefOfferteData("DHL",2))
+	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(##class(vhTest.Utils.APPS.TRANSP.OfferteService.dto.OfferteData).GeefOfferteDataTransporteur("UPS"))
+	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),$$$ElkeWaarde).DanReturn(##class(vhTest.Utils.APPS.TRANSP.OfferteService.dto.OfferteData).GeefOfferteDataTransporteur("DHL",2))
 	
 	Set HaalZendingDetails = ##class(WS.EC.Unishop.InternationaleZending.impl.ZendingDetails).%New(TransportOfferteServiceStub)
 	Set BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
@@ -151,8 +151,8 @@
 <Method name="Test : GeefZendingDetails van twee transportfirma&apos;s (3-2)">
 <Implementation><![CDATA[
 	Set TransportOfferteServiceStub = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(..GeefOfferteData("UPS",3))
-	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),$$$ElkeWaarde).DanReturn(..GeefOfferteData("DHL",2))
+	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(##class(vhTest.Utils.APPS.TRANSP.OfferteService.dto.OfferteData).GeefOfferteDataTransporteur("UPS",3))
+	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),$$$ElkeWaarde).DanReturn(##class(vhTest.Utils.APPS.TRANSP.OfferteService.dto.OfferteData).GeefOfferteDataTransporteur("DHL",2))
 	
 	Set HaalZendingDetails = ##class(WS.EC.Unishop.InternationaleZending.impl.ZendingDetails).%New(TransportOfferteServiceStub)
 	Set BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
@@ -172,7 +172,7 @@
 <Method name="Test : GeefZendingDetails van twee transportfirma&apos;s Waarbij 1 transportfirma faalt bij het ophalen van gegevens ">
 <Implementation><![CDATA[
 	Set TransportOfferteServiceStub = ##class(vhTest.Mock.APPS.TRANSP.OfferteService).%New()
-	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(..GeefOfferteData("UPS"))
+	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).UPS(),$$$ElkeWaarde).DanReturn(##class(vhTest.Utils.APPS.TRANSP.OfferteService.dto.OfferteData).GeefOfferteDataTransporteur("UPS"))
 	Do TransportOfferteServiceStub.IndienMethodCall("BerekenOfferte",##class(APPS.TRANSP.enu.TransportFirma).DHL(),$$$ElkeWaarde).DanException($$$DummyException)
 
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("DummyException")
@@ -183,23 +183,6 @@
 	#dim ZendingDetailsResult As WS.EC.ExterneVerkoop.dto.VerzendingMogelijkheden = HaalZendingDetails.GeefZendingDetails(BerekenInput)
 ]]></Implementation>
 </Method>
-
-<Method name="GeefOfferteData">
-<FormalSpec>Transporteur:%String,Aantal:%Integer=1</FormalSpec>
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
-<Implementation><![CDATA[
-	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
-	#dim i As %Integer
-	for i = 1 : 1 : Aantal {
-		#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
-		Set OfferteItem.Kostprijs = 0
-		Set OfferteItem.Omschrijving = Transporteur
-		Do OfferteData.Items.Insert(OfferteItem)
-	}
-	Quit OfferteData
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Utils/APPS/TRANSP/OfferteService/dto/OfferteData.cls.xml
===================================================================
diff -u -r33622 -r33625
--- vhTest/Utils/APPS/TRANSP/OfferteService/dto/OfferteData.cls.xml	(.../OfferteData.cls.xml)	(revision 33622)
+++ vhTest/Utils/APPS/TRANSP/OfferteService/dto/OfferteData.cls.xml	(.../OfferteData.cls.xml)	(revision 33625)
@@ -83,6 +83,23 @@
 	Quit OfferteData
 ]]></Implementation>
 </Method>
+
+<Method name="GeefOfferteDataTransporteur">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Transporteur:%String,Aantal:%Integer=1</FormalSpec>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+	#dim i As %Integer
+	for i = 1 : 1 : Aantal {
+		#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+		Set OfferteItem.Kostprijs = 0
+		Set OfferteItem.Omschrijving = Transporteur
+		Do OfferteData.Items.Insert(OfferteItem)
+	}
+	Quit OfferteData
+]]></Implementation>
+</Method>
 </Class>