Index: vhUnitTest/APPS/CRM/impl/CRMKlantIterator.cls.xml
===================================================================
diff -u -r29059 -r40096
--- vhUnitTest/APPS/CRM/impl/CRMKlantIterator.cls.xml	(.../CRMKlantIterator.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/CRM/impl/CRMKlantIterator.cls.xml	(.../CRMKlantIterator.cls.xml)	(revision 40096)
@@ -3,16 +3,31 @@
 <Class name="vhUnitTest.APPS.CRM.impl.CRMKlantIterator">
 <Super>DOM.VKP.impl.DataM.DataMKlantIterator</Super>
 
+<Property name="KlantNrs">
+<Type>%String</Type>
+<Collection>array</Collection>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
+<FormalSpec>KlantNr:%Integer</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Do ##super()
-	Set ..KlantNr = ($O(^DKL("K","KL.A",""),-1))
-	Quit $$$OK
+	do ..KlantNrs.SetAt(KlantNr,KlantNr)
+	quit ##super()
 ]]></Implementation>
 </Method>
+
+<Method name="LookupNext">
+<Private>1</Private>
+<Implementation><![CDATA[	set ..KlantNr = ..KlantNrs.Next(..KlantNr)
+]]></Implementation>
+</Method>
+
+<Method name="Reset">
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/CRM/TestKlantBestand.cls.xml
===================================================================
diff -u -r36761 -r40096
--- vhUnitTest/APPS/CRM/TestKlantBestand.cls.xml	(.../TestKlantBestand.cls.xml)	(revision 36761)
+++ vhUnitTest/APPS/CRM/TestKlantBestand.cls.xml	(.../TestKlantBestand.cls.xml)	(revision 40096)
@@ -12,69 +12,47 @@
 <Private>1</Private>
 </Property>
 
-<Method name="TestKlantUnitTest">
-<Implementation><![CDATA[
-	Set KlantService = ##class(APPS.CRM.KlantService).%New()
-	#dim Klanten As %ListOfDataTypes = KlantService.GeefKlantLijst()
-	Set KlantIt = ##class(TECH.ListIterator).%New(Klanten)
-	#dim Gevonden As %Boolean = 0
-	#dim Klant As %String = ""
-	While ('Gevonden && KlantIt.HasNext()){
-		Set Klant = KlantIt.Next()
-		If (Klant.Nummer = ..KlantNummer) Set Gevonden = 1
-	}	
-	Do $$$AssertTrue($IsObject(Klant),"Klant UnitTest is gevonden")
-	Do $$$AssertEquals(Klant.Naam,"UNITTEST KLANT","De klantnaam is correct.")
-	Do $$$AssertEquals(Klant.Nummer,..KlantNummer,"Het KlantNr is correct.")
-	Do $$$AssertEquals(Klant.Actief,"Actief","De klant is 'actief'")
-]]></Implementation>
-</Method>
-
 <Method name="OnBeforeOneTest">
 <FormalSpec>TestCase:%String</FormalSpec>
 <Implementation><![CDATA[
-	Do ##super(TestCase)
+	do ##super(TestCase)
 
-	Set KlantObject = ##class(DOM.common.dto.Partij).%New()
-	Set KlantObject.KlantNummer = ..KlantNummer
-	Set KlantObject.KlantNaam = "UnitTest Klant"
-	Set KlantObject.Toenaam = "Jos"
-	Set KlantObject.Aanspreking = "Dhr"
-	Set KlantObject.Taal = "N"
-	Set KlantObject.Telefoon1 = "09/333.33.33"
-	Set KlantObject.Email = "UnitTest@vanhoecke.be"
-	Set KlantObject.Adres = ..GeefAdres()
-	Set KlantObject.BTWNummer = "123456"
-	
+	#dim KlantObject As DOM.common.dto.Partij = ##class(vhTest.Utils.DOM.common.dto.Partij).BelgischeKlant()
 	#dim PartijID As DOM.common.PartijID = ##class(APPS.KlantBeheer.KlantLevenCyclusService).%New().MaakKlant(KlantObject,##class(DOM.CRM.enu.TypeTemplateKlant).Consument())
-	Set ..KlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(PartijID)
 	
-	do ##class(DOM.DomeinContext).Instance().PushVerkoopAPIClassName("vhUnitTest.APPS.CRM.CRMVerkoopAPI")
+	set ..KlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(PartijID)
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterOneTest">
 <FormalSpec>TestCase:%String</FormalSpec>
 <Implementation><![CDATA[
 	#dim PartijID As DOM.common.PartijID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(..KlantNummer)
-	Do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(PartijID)
+	do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(PartijID)
 	
 	do ##super(TestCase)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefAdres">
-<Private>1</Private>
-<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Method name="TestKlantUnitTest">
 <Implementation><![CDATA[
-	#Dim Adres As DOM.VKP.LeverAdres = ##class(DOM.VKP.impl.LeverAdresFactory).%New().MaakLeverAdres()
+	Set StubVerkoopApi = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New() 
+	Do StubVerkoopApi.IndienMethodCall("GeefKlantIterator").DanReturn(##class(vhUnitTest.APPS.CRM.impl.CRMKlantIterator).%New(..KlantNummer))
 	
-	Do Adres.ZetStraat("Industriepark 7")
-	Do Adres.ZetPostcode("8700")
-	Do Adres.ZetGemeente("Sint Niklaas")
-	Do Adres.ZetLandNr( ##class(DOM.common.enu.Land).Belgie())
+	Set KlantService = ##class(APPS.CRM.KlantService).%New(StubVerkoopApi)
 	
-	Quit Adres
+	Set KlantIt = ##class(TECH.ListIterator).%New(KlantService.GeefKlantLijst())
+	#dim Gevonden As %Boolean = 0
+	While ('Gevonden && KlantIt.HasNext()) {
+		#dim Klant As DOM.VKP.Klant = KlantIt.Next()
+		If (Klant.Nummer = ..KlantNummer) Set Gevonden = 1
+	}
+		
+	If $$$AssertTrue(Gevonden,"Klant is niet gevonden in de lijst") {
+		Do $$$AssertEquals(Klant.Naam,"EEN BELG","De klantnaam is correct.")
+		Do $$$AssertEquals(Klant.Nummer,..KlantNummer,"Het KlantNr is correct.")
+		Do $$$AssertEquals(Klant.Actief,"Actief","De klant is 'actief'")
+	}
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Utils/DOM/common/dto/Partij.cls.xml
===================================================================
diff -u
--- vhTest/Utils/DOM/common/dto/Partij.cls.xml	(revision 0)
+++ vhTest/Utils/DOM/common/dto/Partij.cls.xml	(revision 40096)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Utils.DOM.common.dto.Partij">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="BelgischeKlant">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.dto.Partij</ReturnType>
+<Implementation><![CDATA[
+	Set KlantObject = ##class(DOM.common.dto.Partij).%New()
+	Set KlantObject.KlantNaam = "Een Belg"
+	Set KlantObject.Toenaam = ""
+	Set KlantObject.Aanspreking = "Dhr"
+	Set KlantObject.Taal = "N"
+	Set KlantObject.Telefoon1 = "09/333.33.33"
+	Set KlantObject.Email = "eenbelg@vanhoecke.be"
+	Set KlantObject.Adres = ##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch()
+	Set KlantObject.BTWNummer = "123456789"
+	quit KlantObject
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/CRM/KlantService.cls.xml
===================================================================
diff -u -r35977 -r40096
--- APPS/CRM/KlantService.cls.xml	(.../KlantService.cls.xml)	(revision 35977)
+++ APPS/CRM/KlantService.cls.xml	(.../KlantService.cls.xml)	(revision 40096)
@@ -14,20 +14,42 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="VerkoopApi">
+<Type>DOM.VKP.VerkoopAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="PartijApi">
+<Type>DOM.PARTIJ.PartijAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>VerkoopApi:DOM.VKP.VerkoopAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..VerkoopApi = $$$Inject(VerkoopApi,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
+	set ..PartijApi = ##class(DOM.DomeinContext).Instance().GeefPartijAPI()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefKlantLijst">
 <Description>
 Lijst van DOM.CRM.dto.KlantId</Description>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
-	#dim VerkoopAPI As DOM.VKP.VerkoopAPI = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI()
-	#dim KlantIt As TECH.Iterator = VerkoopAPI.GeefKlantIterator()
+	#dim KlantIt As TECH.Iterator = ..VerkoopApi.GeefKlantIterator()
 	
 	Set Klanten = ##class(%ListOfObjects).%New()
 	
 	While KlantIt.HasNext(){
 		#dim Klant As DOM.VKP.VanHoeckeKlant = KlantIt.Next()
-		#dim Partij As DOM.PARTIJ.Partij = ##class(DOM.DomeinContext).Instance().GeefPartijAPI().GeefPartij(Klant.GeefID())
-		Set dtoKlantId = ..Partij2KlantId(Partij)			
+		#dim Partij As DOM.PARTIJ.Partij = ..PartijApi.GeefPartij(Klant.GeefID())
+		#dim dtoKlantId As DOM.CRM.dto.KlantId = ..Partij2KlantId(Partij)			
 		Do Klanten.Insert(dtoKlantId)
 	}
 	Quit Klanten
FishEye: Tag 40096 refers to a dead (removed) revision in file `vhUnitTest/APPS/CRM/CRMVerkoopAPI.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?