Index: vhUnitTest/APPS/TRANSP/impl/TransportService/DoeNalculatie/Test.cls.xml
===================================================================
diff -u -r52392 -r52394
--- vhUnitTest/APPS/TRANSP/impl/TransportService/DoeNalculatie/Test.cls.xml	(.../Test.cls.xml)	(revision 52392)
+++ vhUnitTest/APPS/TRANSP/impl/TransportService/DoeNalculatie/Test.cls.xml	(.../Test.cls.xml)	(revision 52394)
@@ -4,7 +4,14 @@
 <Super>vhUnitTest.TestCase</Super>
 
 <Method name="Test: Standaardgedrag">
-<Implementation><![CDATA[	Do ##class(APPS.TRANSP.impl.TransportService).%New().DoeNacalculatie("K||2671",$H-10,$H)
+<Implementation><![CDATA[
+	Set TransportdataVoorKlantBepalerMock = ##class(vhTest.Mock.APPS.TRANSP.impl.TransportService.TransportdataVoorKlantBepaler).%New()
+	Do TransportdataVoorKlantBepalerMock.VerwachtMethodCall("BepaalTransportData",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).ExactAantalKeer(1).DanReturn(##class(%ListOfDataTypes).%New())
+	
+	Set TransportService = ##class(APPS.TRANSP.impl.TransportService).%New(,,TransportdataVoorKlantBepalerMock)
+	Do TransportService.DoeNacalculatie("K||2671",$H-10,$H)
+	
+	Do TransportdataVoorKlantBepalerMock.Verifieer()
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/TRANSP/impl/TransportService.cls.xml
===================================================================
diff -u -r52392 -r52394
--- APPS/TRANSP/impl/TransportService.cls.xml	(.../TransportService.cls.xml)	(revision 52392)
+++ APPS/TRANSP/impl/TransportService.cls.xml	(.../TransportService.cls.xml)	(revision 52394)
@@ -13,15 +13,21 @@
 <Private>1</Private>
 </Property>
 
+<Property name="TransportdataVoorKlantBepaler">
+<Type>APPS.TRANSP.impl.TransportService.TransportdataVoorKlantBepaler</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>EmailVoorBevestigingBepaler:APPS.TRANSP.impl.TransportService.EmailVoorBevestigingBepaler="",VerpakkingEenheidFactory:APPS.TRANSP.impl.VerpakkingEenheidFactory</FormalSpec>
+<FormalSpec>EmailVoorBevestigingBepaler:APPS.TRANSP.impl.TransportService.EmailVoorBevestigingBepaler="",VerpakkingEenheidFactory:APPS.TRANSP.impl.VerpakkingEenheidFactory,TransportdataVoorKlantBepaler:APPS.TRANSP.impl.TransportService.TransportdataVoorKlantBepaler</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..EmailVoorBevestigingBepaler = $$$Implementation(EmailVoorBevestigingBepaler,##class(APPS.TRANSP.impl.TransportService.EmailVoorBevestigingBepaler).%New())
 	Set ..VerpakkingEenheidFactory = $$$Inject(VerpakkingEenheidFactory, ##class(APPS.TRANSP.impl.VerpakkingEenheidFactory).%New())
+	Set ..TransportdataVoorKlantBepaler = $$$Inject(TransportdataVoorKlantBepaler, ##class(APPS.TRANSP.impl.TransportService.TransportdataVoorKlantBepaler).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -235,7 +241,7 @@
 <Implementation><![CDATA[
 	//Data ophalen
 	#dim RitDataLijst = ##class(%ListOfDataTypes).%New()
-	Set RitDataLijst = ##class(APPS.TRANSP.impl.TransportService.TransportdataVoorKlantBepaler).%New().BepaalTransportData(KlantId, BeginDatum, EindDatum)
+	Set RitDataLijst = ..TransportdataVoorKlantBepaler.BepaalTransportData(KlantId, BeginDatum, EindDatum)
 	
 	Do ##class(Tools.Wlip).%New(127).ObjToXML(RitDataLijst)