Index: APPS/VKP/impl/KlantDataBewaarder.cls.xml
===================================================================
diff -u -r35976 -r35977
--- APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 35976)
+++ APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 35977)
@@ -13,8 +13,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="KlantService">
-<Type>APPS.CRM.KlantService</Type>
+<Property name="KlantIdValidator">
+<Type>APPS.CRM.impl.KlantIDValidator</Type>
 <Private>1</Private>
 </Property>
 
@@ -29,13 +29,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>KlantService:APPS.CRM.KlantService,KlantDataRepository:DOM.VKP.impl.KlantDataRepository="",KlantDataFactory:APPS.VKP.impl.KlantDataFactory=""</FormalSpec>
+<FormalSpec>KlantIdValidator:APPS.CRM.impl.KlantIDValidator="",KlantDataRepository:DOM.VKP.impl.KlantDataRepository="",KlantDataFactory:APPS.VKP.impl.KlantDataFactory=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..KlantService = $$$Inject(KlantService, ##class(APPS.CRM.KlantService).%New())
+	Set ..KlantIdValidator = $$$Inject(KlantIdValidator, ##class(APPS.CRM.impl.KlantIDValidator).%New())
 	Set ..KlantDataRepository = $$$Inject(KlantDataRepository, ##class(DOM.VKP.impl.KlantDataRepository).%New())
 	Set ..KlantDataFactory = $$$Inject(KlantDataFactory, ##class(APPS.VKP.impl.KlantDataFactory).%New())
 	
@@ -71,7 +71,7 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, SFSPersonality)
 	
-	Do ..KlantService.GeefKlantIDValidator().Valideer(..KlantDataDto.ID, SFSPersonality)
+	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, SFSPersonality)
 	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
@@ -81,7 +81,7 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, HaefeleBEPersonality)
 	
-	Do ..KlantService.GeefKlantIDValidator().Valideer(..KlantDataDto.ID, HaefeleBEPersonality)
+	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, HaefeleBEPersonality)
 	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
@@ -91,7 +91,7 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, HeinPersonality)
 	
-	Do ..KlantService.GeefKlantIDValidator().Valideer(..KlantDataDto.ID, HeinPersonality)
+	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, HeinPersonality)
 	Do ..ConverteerKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
@@ -101,7 +101,7 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, DestilPersonality)
 	
-	Do ..KlantService.GeefKlantIDValidator().Valideer(..KlantDataDto.ID, DestilPersonality)
+	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, DestilPersonality)
 	Do ..ConverteerHandelKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
@@ -111,7 +111,7 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, DupontPersonality)
 	
-	Do ..KlantService.GeefKlantIDValidator().Valideer(..KlantDataDto.ID, DupontPersonality)
+	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, DupontPersonality)
 	Do ..ConverteerHandelKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
@@ -121,7 +121,7 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, VanRaemdonckPersonality)
 	
-	Do ..KlantService.GeefKlantIDValidator().Valideer(..KlantDataDto.ID, VanRaemdonckPersonality)
+	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, VanRaemdonckPersonality)
 	Do ..ConverteerVanRaemdonckKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
@@ -131,7 +131,7 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, KischPersonality)
 	
-	Do ..KlantService.GeefKlantIDValidator().Valideer(..KlantDataDto.ID, KischPersonality)
+	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, KischPersonality)
 	Do ..ConverteerKischKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
@@ -141,7 +141,7 @@
 <Implementation><![CDATA[
 	Set ..KlantData = ..GeefKlantData(..KlantDataDto.ID, DaroPersonality)
 	
-	Do ..KlantService.GeefKlantIDValidator().Valideer(..KlantDataDto.ID, DaroPersonality)
+	Do ..KlantIdValidator.Valideer(..KlantDataDto.ID, DaroPersonality)
 	Do ..ConverteerDaroKlantData(..KlantData, ..KlantDataDto)
 ]]></Implementation>
 </Method>
FishEye: Tag 35977 refers to a dead (removed) revision in file `vhTest/Mock/APPS/CRM/KlantService.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/CRM/KlantService.cls.xml
===================================================================
diff -u -r35971 -r35977
--- APPS/CRM/KlantService.cls.xml	(.../KlantService.cls.xml)	(revision 35971)
+++ APPS/CRM/KlantService.cls.xml	(.../KlantService.cls.xml)	(revision 35977)
@@ -12,7 +12,7 @@
 <ClassType/>
 <IncludeCode>TECH.Error</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>TECH.Mockable</Super>
+<Super>TECH.RegisteredObject</Super>
 
 <Method name="GeefKlantLijst">
 <Description>
Index: vhUnitTest/APPS/VKP/impl/KlantDataBewaarder/Test.cls.xml
===================================================================
diff -u -r35976 -r35977
--- vhUnitTest/APPS/VKP/impl/KlantDataBewaarder/Test.cls.xml	(.../Test.cls.xml)	(revision 35976)
+++ vhUnitTest/APPS/VKP/impl/KlantDataBewaarder/Test.cls.xml	(.../Test.cls.xml)	(revision 35977)
@@ -57,18 +57,15 @@
 	
 	#dim KlantIdValidatorStub As vhTest.Mock.APPS.CRM.KlantIDValidator = ##class(vhTest.Mock.APPS.CRM.KlantIDValidator).%New()
 	Do KlantIdValidatorStub.IndienMethodCall("Valideer", $$$ElkeWaarde, RandomPersonality)
-	
-	#dim KlantServiceStub As vhTest.Mock.APPS.CRM.KlantService = ##class(vhTest.Mock.APPS.CRM.KlantService).%New()
-	Do KlantServiceStub.IndienMethodCall("GeefKlantIDValidator").DanReturn(KlantIdValidatorStub)
-	
+
 	#dim KlantDataRepositoryStub As vhTest.Mock.DOM.VKP.impl.KlantDataRepository = ##class(vhTest.Mock.DOM.VKP.impl.KlantDataRepository).%New()
 	Do KlantDataRepositoryStub.IndienMethodCall("BestaatViaID", $$$ElkeWaarde).DanReturn($$$False)
 	Do KlantDataRepositoryStub.IndienMethodCall("Bewaar", RandomKlantData)
 	
 	#dim KlantDataFactoryMock As vhTest.Mock.APPS.VKP.impl.KlantDataFactory = ##class(vhTest.Mock.APPS.VKP.impl.KlantDataFactory).%New()
 	Do KlantDataFactoryMock.VerwachtMethodCall("MaakKlantData", RandomPersonality).DanReturn(RandomKlantData)
 	
-	#dim KlantDataBewaarder As APPS.VKP.impl.KlantDataBewaarder = ##class(APPS.VKP.impl.KlantDataBewaarder).%New(KlantServiceStub, KlantDataRepositoryStub, KlantDataFactoryMock)
+	#dim KlantDataBewaarder As APPS.VKP.impl.KlantDataBewaarder = ##class(APPS.VKP.impl.KlantDataBewaarder).%New(KlantIdValidatorStub, KlantDataRepositoryStub, KlantDataFactoryMock)
 	Do KlantDataBewaarder.Bewaar(RandomPersonality, ##class(DOM.common.dto.HandelKlantData).%New())
 	
 	Do KlantDataFactoryMock.Verifieer()
@@ -89,13 +86,9 @@
 	Do KlantDataRepositoryMock.VerwachtMethodCall("GeefViaID", KlantDataDto.ID).DanReturn(DummyKlantData)
 	Do KlantDataRepositoryMock.VerwachtMethodCall("Bewaar", DummyKlantData)
 	
-	#dim KlantServiceMock As vhTest.Mock.APPS.CRM.KlantService = ##class(vhTest.Mock.APPS.CRM.KlantService).%New()
-	Do KlantServiceMock.VerwachtMethodCall("GeefKlantIDValidator").DanReturn(KlantIdValidatorMock)
-	
-	#dim KlantDataBewaarder As APPS.VKP.impl.KlantDataBewaarder = ##class(APPS.VKP.impl.KlantDataBewaarder).%New(KlantServiceMock, KlantDataRepositoryMock)
+	#dim KlantDataBewaarder As APPS.VKP.impl.KlantDataBewaarder = ##class(APPS.VKP.impl.KlantDataBewaarder).%New(KlantIdValidatorMock, KlantDataRepositoryMock)
 	Do KlantDataBewaarder.Bewaar(Personality, KlantDataDto)
 	
-	Do KlantServiceMock.Verifieer()
 	Do KlantDataRepositoryMock.Verifieer()
 	Do KlantIdValidatorMock.Verifieer()
 ]]></Implementation>
FishEye: Tag 35977 refers to a dead (removed) revision in file `vhTest/Fake/APPS/CRM/KlantService.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?