Index: vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/CRM/impl/KlantIDValidator/Test.cls.xml	(revision 46826)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.CRM.impl.KlantIDValidator.Test">
+<Super>vhUnitTest.DOM.common.Personality.Base</Super>
+
+<Property name="Validator">
+<Type>APPS.CRM.impl.KlantIDValidator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="PersonalityRepo">
+<Type>DOM.common.impl.PersonalityRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	set VerkoopApiStub = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
+	do VerkoopApiStub.IndienMethodCall("BestaatKlant",$$$ElkeWaarde).DanReturn($$$True)
+	set HandelRepoStub = ##class(vhTest.Mock.DOM.VKP.impl.KlantDataRepository).%New()
+	do HandelRepoStub.IndienMethodCall("BestaatViaID",$$$ElkeWaarde).DanReturn($$$True)
+	
+	set ..Validator = ##class(APPS.CRM.impl.KlantIDValidator).%New(VerkoopApiStub,HandelRepoStub)
+	set ..PersonalityRepo = ##class(DOM.common.impl.PersonalityRepository).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: afdwingen dat klantid&apos;s enkel geldig zijn in de correcte personality">
+<Implementation><![CDATA[
+	#dim PersonalityIterator As TECH.Iterator = ..PersonalityRepo.ZoekAlle()
+	while PersonalityIterator.HasNext() {
+		#dim Personality As DOM.common.Personality = PersonalityIterator.Next()
+		
+		continue:(Personality.GeefID() = ..Enum.Personality.VanHoeckeVoorHalux)
+		
+		do ..AssertIsGeldigKlantId(Personality)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="AssertIsGeldigKlantId">
+<FormalSpec>TeControlerePersonality:DOM.common.Personality</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim PersonalityIterator As TECH.Iterator = ..PersonalityRepo.ZoekAlle()
+	while PersonalityIterator.HasNext() {
+		#dim Personality As DOM.common.Personality = PersonalityIterator.Next()
+		
+		continue:(Personality.GeefID() = ..Enum.Personality.VanHoeckeVoorHalux)
+		
+		#dim VerwachtResultaat As %Boolean = ( Personality.GeefID() = TeControlerePersonality.GeefID() )
+		#dim KlantId As %String = Personality.GeefPrefix()_"1234"
+		#dim Melding As %String = Personality.GeefNaam()_" klant "_$$$SingleQuotes(KlantId)_" wordt verwacht "_$$$If(VerwachtResultaat,"geldig","ongeldig")_" te zijn voor personality "_$$$SingleQuotes(TeControlerePersonality.GeefNaam())_", prefix : "_$$$SingleQuotes(TeControlerePersonality.GeefPrefix())
+		
+		do $$$AssertEquals(..Validator.IsGeldig(KlantId,TeControlerePersonality),VerwachtResultaat, Melding )
+		
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
FishEye: Tag 46826 refers to a dead (removed) revision in file `vhUnitTest/APPS/CRM/impl/KlantIDValidator/TestDaro.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/CRM/impl/KlantIDValidator.cls.xml
===================================================================
diff -u -r46722 -r46826
--- APPS/CRM/impl/KlantIDValidator.cls.xml	(.../KlantIDValidator.cls.xml)	(revision 46722)
+++ APPS/CRM/impl/KlantIDValidator.cls.xml	(.../KlantIDValidator.cls.xml)	(revision 46826)
@@ -8,6 +8,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="VerkoopApi">
+<Type>DOM.VKP.VerkoopAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="HandelKlantDataRepository">
 <Type>DOM.VKP.impl.HandelKlantDataRepository</Type>
 <Private>1</Private>
@@ -29,21 +34,21 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>initvalue:%CacheString</FormalSpec>
+<FormalSpec>VerkoopApi:DOM.VKP.VerkoopAPI,HandelKlantDataRepo:DOM.VKP.impl.HandelKlantDataRepository</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 ..HandelKlantDataRepository = $$$Inject(HandelKlantDataRepo,##class(DOM.VKP.impl.HandelKlantDataRepository).%New())
 	Set ..PersonalityService = ##class(DOM.common.impl.PersonalityService).%New()
-	Set ..HandelKlantDataRepository = ##class(DOM.VKP.impl.HandelKlantDataRepository).%New() 
-	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="IsGeldig">
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,Personality:DOM.common.Personality</FormalSpec>
+<FormalSpec>KlantID:DOM.VKP.KlantID,Personality:DOM.common.Personality</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Set ..KlantID = KlantID
@@ -57,7 +62,7 @@
 </Method>
 
 <Method name="Valideer">
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,Personality:DOM.common.Personality</FormalSpec>
+<FormalSpec>KlantID:DOM.VKP.KlantID,Personality:DOM.common.Personality</FormalSpec>
 <Implementation><![CDATA[
 	If '..IsGeldig(KlantID , Personality ) { 
 		do ..ThrowError() 
@@ -76,7 +81,7 @@
 
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
-<Implementation><![CDATA[	Set ..IsGeldigKlantID = (##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().BestaatKlant(..KlantID))
+<Implementation><![CDATA[	Set ..IsGeldigKlantID = (..VerkoopApi.BestaatKlant(..KlantID))
 ]]></Implementation>
 </Method>
 
Index: vhTest/Mock/APPS/CRM/KlantIDValidator.cls.xml
===================================================================
diff -u -r29059 -r46826
--- vhTest/Mock/APPS/CRM/KlantIDValidator.cls.xml	(.../KlantIDValidator.cls.xml)	(revision 29059)
+++ vhTest/Mock/APPS/CRM/KlantIDValidator.cls.xml	(.../KlantIDValidator.cls.xml)	(revision 46826)
@@ -9,14 +9,14 @@
 <Inheritance>right</Inheritance>
 
 <Method name="IsGeldig">
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,Personality:DOM.common.Personality=""</FormalSpec>
+<FormalSpec>KlantID:DOM.VKP.KlantID,Personality:DOM.common.Personality</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("IsGeldig",KlantID,Personality)
 ]]></Implementation>
 </Method>
 
 <Method name="Valideer">
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,Personality:DOM.common.Personality=""</FormalSpec>
+<FormalSpec>KlantID:DOM.VKP.KlantID,Personality:DOM.common.Personality</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("Valideer",KlantID,Personality)
 ]]></Implementation>
 </Method>
Index: vhTest/Fake/DOM/common/impl/PersonalityRepository.cls.xml
===================================================================
diff -u -r46607 -r46826
--- vhTest/Fake/DOM/common/impl/PersonalityRepository.cls.xml	(.../PersonalityRepository.cls.xml)	(revision 46607)
+++ vhTest/Fake/DOM/common/impl/PersonalityRepository.cls.xml	(.../PersonalityRepository.cls.xml)	(revision 46826)
@@ -16,7 +16,12 @@
 
 <Method name="Bewaar">
 <FormalSpec>Data:TECH.Persistent</FormalSpec>
-<Implementation><![CDATA[
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="ZoekAlle">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
 
@@ -35,8 +40,7 @@
 
 <Method name="VerwijderViaID">
 <FormalSpec>ID:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: vhTest/Mock/DOM/common/impl/PersonalityRepository.cls.xml
===================================================================
diff -u -r46607 -r46826
--- vhTest/Mock/DOM/common/impl/PersonalityRepository.cls.xml	(.../PersonalityRepository.cls.xml)	(revision 46607)
+++ vhTest/Mock/DOM/common/impl/PersonalityRepository.cls.xml	(.../PersonalityRepository.cls.xml)	(revision 46826)
@@ -39,6 +39,12 @@
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwijderViaID",ID)
 ]]></Implementation>
 </Method>
+
+<Method name="ZoekAlle">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("ZoekAlle")
+]]></Implementation>
+</Method>
 </Class>
 
 
FishEye: Tag 46826 refers to a dead (removed) revision in file `vhUnitTest/APPS/CRM/impl/KlantIDValidator/TestVanRaemdonck.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 46826 refers to a dead (removed) revision in file `vhUnitTest/APPS/CRM/impl/KlantIDValidator/Base.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 46826 refers to a dead (removed) revision in file `vhUnitTest/APPS/CRM/impl/KlantIDValidator/TestKisch.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 46826 refers to a dead (removed) revision in file `vhUnitTest/APPS/CRM/impl/KlantIDValidator/TestVanHoecke.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 46826 refers to a dead (removed) revision in file `vhUnitTest/APPS/CRM/impl/KlantIDValidator/TestHaefeleBE.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 46826 refers to a dead (removed) revision in file `vhUnitTest/APPS/CRM/impl/KlantIDValidator/TestSFS.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 46826 refers to a dead (removed) revision in file `vhUnitTest/APPS/CRM/impl/KlantIDValidator/TestDupont.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: DOM/common/VanHoeckePersonality.cls.xml
===================================================================
diff -u -r46530 -r46826
--- DOM/common/VanHoeckePersonality.cls.xml	(.../VanHoeckePersonality.cls.xml)	(revision 46530)
+++ DOM/common/VanHoeckePersonality.cls.xml	(.../VanHoeckePersonality.cls.xml)	(revision 46826)
@@ -36,6 +36,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefPrefix">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit "K||"
+]]></Implementation>
+</Method>
+
 <Method name="GeefNaam">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit "Van Hoecke nv"
FishEye: Tag 46826 refers to a dead (removed) revision in file `vhUnitTest/APPS/CRM/impl/KlantIDValidator/TestDestil.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/CRM/KlantIDValidator.cls.xml
===================================================================
diff -u -r29059 -r46826
--- APPS/CRM/KlantIDValidator.cls.xml	(.../KlantIDValidator.cls.xml)	(revision 29059)
+++ APPS/CRM/KlantIDValidator.cls.xml	(.../KlantIDValidator.cls.xml)	(revision 46826)
@@ -6,14 +6,14 @@
 
 <Method name="IsGeldig">
 <Abstract>1</Abstract>
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,Personality:DOM.common.Personality=""</FormalSpec>
+<FormalSpec>KlantID:DOM.VKP.KlantID,Personality:DOM.common.Personality</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="Valideer">
 <Abstract>1</Abstract>
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,Personality:DOM.common.Personality=""</FormalSpec>
+<FormalSpec>KlantID:DOM.VKP.KlantID,Personality:DOM.common.Personality</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>