Index: vhUnitTest/APPS/VKP/Offerte/impl/HandelOfferteNaarVanHoeckeOfferteConverteerder/Converteer/Test.cls.xml
===================================================================
diff -u -r37291 -r37300
--- vhUnitTest/APPS/VKP/Offerte/impl/HandelOfferteNaarVanHoeckeOfferteConverteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 37291)
+++ vhUnitTest/APPS/VKP/Offerte/impl/HandelOfferteNaarVanHoeckeOfferteConverteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 37300)
@@ -22,13 +22,20 @@
 <Implementation><![CDATA[
 	#dim OfferteFake As vhTest.Mock.APPS.VKP.Offerte = ..GeefOfferteFake(##class(DOM.common.enu.Personality).Hein())
 
-	#dim OfferteKopieerderFake As vhTest.Fake.APPS.VKP.Offerte.impl.OfferteKopieerder = ##class(vhTest.Fake.APPS.VKP.Offerte.impl.OfferteKopieerder).%New()
-	#dim OfferteServiceFake As vhTest.Fake.APPS.VKP.OfferteService = ##class(vhTest.Fake.APPS.VKP.OfferteService).%New()
-	#dim ExterneVerkoopServiceSpy As vhTest.Spy.APPS.EC.Verkoop.ExterneVerkoopService = ##class(vhTest.Spy.APPS.EC.Verkoop.ExterneVerkoopService).%New()
+	#dim OfferteKopieerderFake As vhTest.Fake.APPS.VKP.Offerte.impl.OfferteKopieerder 
+	Set OfferteKopieerderFake = ##class(vhTest.Fake.APPS.VKP.Offerte.impl.OfferteKopieerder).%New()
+	
+	#dim OfferteServiceFake As vhTest.Fake.APPS.VKP.OfferteService 
+	Set OfferteServiceFake = ##class(vhTest.Fake.APPS.VKP.OfferteService).%New()
+	
+	#dim ExterneVerkoopServiceSpy As vhTest.Spy.APPS.EC.Verkoop.ExterneVerkoopService 
+	Set ExterneVerkoopServiceSpy = ##class(vhTest.Spy.APPS.EC.Verkoop.ExterneVerkoopService).%New()
 
+	#dim Converteerder As APPS.VKP.Offerte.impl.HandelOfferteNaarVanHoeckeOfferteConverteerder
 	Set Converteerder = ##class(APPS.VKP.Offerte.impl.HandelOfferteNaarVanHoeckeOfferteConverteerder).%New(OfferteKopieerderFake, OfferteServiceFake, ExterneVerkoopServiceSpy, ..GeefCommonAPIStub(), ..GeefWinkelKarServiceMock())
-	#dim Offerte As APPS.VKP.Offerte = Converteerder.Converteer(OfferteFake)
 	
+	Do Converteerder.Converteer(OfferteFake)
+	
 	Do $$$AssertEquals(ExterneVerkoopServiceSpy.GeefStelInStandaardLeveradresTeller(),0)
 ]]></Implementation>
 </Method>
@@ -37,13 +44,20 @@
 <Implementation><![CDATA[
 	#dim OfferteFake As vhTest.Mock.APPS.VKP.Offerte = ..GeefOfferteFake(##class(DOM.common.enu.Personality).VanHoecke())
 	
-	#dim OfferteKopieerderFake As vhTest.Fake.APPS.VKP.Offerte.impl.OfferteKopieerder = ##class(vhTest.Fake.APPS.VKP.Offerte.impl.OfferteKopieerder).%New()
-	#dim OfferteServiceFake As vhTest.Fake.APPS.VKP.OfferteService = ##class(vhTest.Fake.APPS.VKP.OfferteService).%New()
-	#dim ExterneVerkoopServiceSpy As vhTest.Spy.APPS.EC.Verkoop.ExterneVerkoopService = ##class(vhTest.Spy.APPS.EC.Verkoop.ExterneVerkoopService).%New()
+	#dim OfferteKopieerderFake As vhTest.Fake.APPS.VKP.Offerte.impl.OfferteKopieerder 
+	Set OfferteKopieerderFake = ##class(vhTest.Fake.APPS.VKP.Offerte.impl.OfferteKopieerder).%New()
 	
+	#dim OfferteServiceFake As vhTest.Fake.APPS.VKP.OfferteService 
+	Set OfferteServiceFake = ##class(vhTest.Fake.APPS.VKP.OfferteService).%New()
+	
+	#dim ExterneVerkoopServiceSpy As vhTest.Spy.APPS.EC.Verkoop.ExterneVerkoopService 
+	Set ExterneVerkoopServiceSpy = ##class(vhTest.Spy.APPS.EC.Verkoop.ExterneVerkoopService).%New()
+	
+	#dim Converteerder As APPS.VKP.Offerte.impl.HandelOfferteNaarVanHoeckeOfferteConverteerder
 	Set Converteerder = ##class(APPS.VKP.Offerte.impl.HandelOfferteNaarVanHoeckeOfferteConverteerder).%New(OfferteKopieerderFake, OfferteServiceFake, ExterneVerkoopServiceSpy, ..GeefCommonAPIStub(), ..GeefWinkelKarServiceMock())
-	#dim Offerte As APPS.VKP.Offerte = Converteerder.Converteer(OfferteFake)
 	
+	Do Converteerder.Converteer(OfferteFake)
+	
 	Do $$$AssertEquals(ExterneVerkoopServiceSpy.GeefStelInStandaardLeveradresTeller(),1)
 ]]></Implementation>
 </Method>
@@ -65,50 +79,69 @@
 <Private>1</Private>
 <ReturnType>vhTest.Mock.APPS.common.CommonAPI</ReturnType>
 <Implementation><![CDATA[
-	#dim KlantDataDummy As DOM.common.dto.KlantData = ##class(DOM.common.dto.KlantData).%New()	
-	Set KlantDataDummy.ID = ""
-	Set KlantDataDummy.Code = ""
-	Set KlantDataDummy.Naam = ""
-	Set KlantDataDummy.Land = ""
-	Set KlantDataDummy.Gemeente = ""
-	Set KlantDataDummy.Taal = ""
-	
 	#dim DataServiceStub As vhTest.Mock.APPS.common.DataService = ##class(vhTest.Mock.APPS.common.DataService).%New()
-	Do DataServiceStub.IndienMethodCall("GeefKlantData", $$$ElkeWaarde).DanReturn(KlantDataDummy)
+	Do DataServiceStub.IndienMethodCall("GeefKlantData", $$$ElkeWaarde).DanReturn(..GeefKlantDataDummy())
 	#dim CommonAPIStub As vhTest.Mock.APPS.common.CommonAPI	= ##class(vhTest.Mock.APPS.common.CommonAPI).%New()
 	Do CommonAPIStub.IndienMethodCall("GeefDataService", $$$ElkeWaarde).DanReturn(DataServiceStub)
 	Quit CommonAPIStub
 ]]></Implementation>
 </Method>
 
+<Method name="GeefKlantDataDummy">
+<Private>1</Private>
+<ReturnType>DOM.common.dto.KlantData</ReturnType>
+<Implementation><![CDATA[
+	#dim KlantDataDummy As DOM.common.dto.KlantData = ##class(DOM.common.dto.KlantData).%New()	
+	Set KlantDataDummy.ID = $$$DummyInteger
+	Set KlantDataDummy.Code = $$$DummyString
+	Set KlantDataDummy.Naam = $$$DummyString
+	Set KlantDataDummy.Land = $$$DummyString
+	Set KlantDataDummy.Gemeente = $$$DummyString
+	Set KlantDataDummy.Taal = $$$DummyString
+	Quit KlantDataDummy
+]]></Implementation>
+</Method>
+
 <Method name="GeefOfferteFake">
 <FormalSpec>Personality:DOM.common.enu.Personality</FormalSpec>
 <Private>1</Private>
 <ReturnType>vhTest.Mock.APPS.VKP.Offerte</ReturnType>
 <Implementation><![CDATA[
 	Set OfferteFake = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
 	Do OfferteFake.IndienMethodCall("GeefID").DanReturn($$$DummyString)
-	
-	#dim PersonalityMock As vhTest.Mock.DOM.common.Personality = ##class(vhTest.Mock.DOM.common.Personality).%New()
-	Do PersonalityMock.IndienMethodCall("GeefKlantID").DanReturn($$$DummyString)
-	Do PersonalityMock.IndienMethodCall("IsHandel").DanReturn($$$True)
-	
 	Do OfferteFake.IndienMethodCall("GeefPersonalityID").DanReturn(Personality)
 	Do OfferteFake.IndienMethodCall("GeefKlantID").DanReturn($$$DummyString)
-	Do OfferteFake.IndienMethodCall("GeefPersonality").DanReturn(PersonalityMock)
-	Do OfferteFake.IndienMethodCall("GeefBestelOpmerking").DanReturn("DummyOpmerking")
-	Do OfferteFake.IndienMethodCall("GeefLeverDatum").DanReturn("")
-	Do OfferteFake.IndienMethodCall("GeefPrijsBerekeningDatum").DanReturn("")
-	Do OfferteFake.IndienMethodCall("GeefOrderID").DanReturn("DummyOrderID")
-	Do OfferteFake.IndienMethodCall("GeefWinkelkarID").DanReturn("DummyWinkelkarID")
-	
-	#dim LeverAdres As DOM.VKP.impl.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
-	Do LeverAdres.ZetID("DummyID")
-	Do OfferteFake.IndienMethodCall("GeefLeverAdres").DanReturn(LeverAdres)
-
+	Do OfferteFake.IndienMethodCall("GeefPersonality").DanReturn(..GeefPersonalityStub())
+	Do OfferteFake.IndienMethodCall("GeefBestelOpmerking").DanReturn($$$DummyString)
+	Do OfferteFake.IndienMethodCall("GeefLeverDatum").DanReturn($$$DummyDate)
+	Do OfferteFake.IndienMethodCall("GeefPrijsBerekeningDatum").DanReturn($$$DummyDate)
+	Do OfferteFake.IndienMethodCall("GeefOrderID").DanReturn($$$DummyInteger)
+	Do OfferteFake.IndienMethodCall("GeefWinkelkarID").DanReturn($$$DummyInteger)
+	Do OfferteFake.IndienMethodCall("GeefLeverAdres").DanReturn(..GeefLeverAdresDummy())
 	Quit OfferteFake
 ]]></Implementation>
 </Method>
+
+<Method name="GeefPersonalityStub">
+<Private>1</Private>
+<ReturnType>vhTest.Mock.DOM.common.Personality</ReturnType>
+<Implementation><![CDATA[
+	#dim PersonalityStub As vhTest.Mock.DOM.common.Personality = ##class(vhTest.Mock.DOM.common.Personality).%New()
+	Do PersonalityStub.IndienMethodCall("GeefKlantID").DanReturn($$$DummyString)
+	Do PersonalityStub.IndienMethodCall("IsHandel").DanReturn($$$True)
+	Quit PersonalityStub
+]]></Implementation>
+</Method>
+
+<Method name="GeefLeverAdresDummy">
+<Private>1</Private>
+<ReturnType>DOM.VKP.impl.LeverAdres</ReturnType>
+<Implementation><![CDATA[
+	#dim LeverAdresDummy As DOM.VKP.impl.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	Do LeverAdresDummy.ZetID($$$DummyInteger)
+	Quit LeverAdresDummy
+]]></Implementation>
+</Method>
 </Class>