Index: vhTest/Fake/DOM/VKP/dto/KortingSpecificatieFactory.cls.xml
===================================================================
diff -u
--- vhTest/Fake/DOM/VKP/dto/KortingSpecificatieFactory.cls.xml	(revision 0)
+++ vhTest/Fake/DOM/VKP/dto/KortingSpecificatieFactory.cls.xml	(revision 51202)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.DOM.VKP.dto.KortingSpecificatieFactory">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>DOM.VKP.dto.KortingSpecificatieFactory</Super>
+
+<Method name="Maak">
+<FormalSpec>Variant:DOM.PM.enu.Variant,Personality:DOM.common.Personality,KlantId:DOM.common.PartijID</FormalSpec>
+<ReturnType>DOM.VKP.dto.KortingSpecificaties</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestBase.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestBase.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestBase.cls.xml	(revision 51202)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.TestBase">
+<Abstract>1</Abstract>
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="Variant">
+<Type>DOM.PM.enu.Variant.AutoComplete</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="PersonalityId">
+<Type>DOM.common.enu.Personality.AutoComplete</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="AssertBewaarCorrecteKorting">
+<FormalSpec>Ref:%String,DataOpt:%String,VerwachteKorting:TECH.Percentage</FormalSpec>
+<Implementation><![CDATA[
+	#dim DummyKortingSpecificatieLbx As DOM.VKP.dto.KortingSpecificaties = ##class(DOM.VKP.dto.KortingSpecificaties).%New()
+	#dim DummyKortingSpecificatieTax As DOM.VKP.dto.KortingSpecificaties = ##class(DOM.VKP.dto.KortingSpecificaties).%New()
+	#dim DummyKortingSpecificatieTbx As DOM.VKP.dto.KortingSpecificaties = ##class(DOM.VKP.dto.KortingSpecificaties).%New()
+	
+	#dim KortingSpecificatieFactoryMock As vhTest.Mock.DOM.VKP.dto.KortingSpecificatieFactory = ##class(vhTest.Mock.DOM.VKP.dto.KortingSpecificatieFactory).%New()
+	Do KortingSpecificatieFactoryMock.VerwachtMethodCall("Maak", ..Variant.LegraboxPure, ..GeefPersonalityId(), "DummyKlantID").ExactAantalKeer(1).DanReturn(DummyKortingSpecificatieLbx)
+	Do KortingSpecificatieFactoryMock.VerwachtMethodCall("Maak", ..Variant.Taorbox, ..GeefPersonalityId(), "DummyKlantID").ExactAantalKeer(1).DanReturn(DummyKortingSpecificatieTax)
+	Do KortingSpecificatieFactoryMock.VerwachtMethodCall("Maak", ..Variant.TandemboxAntaro, ..GeefPersonalityId(), "DummyKlantID").ExactAantalKeer(1).DanReturn(DummyKortingSpecificatieTbx)
+	
+	#dim KortingServiceMock As vhTest.Mock.DOM.VKP.KortingService = ##class(vhTest.Mock.DOM.VKP.KortingService).%New()
+	Do KortingServiceMock.VerwachtMethodCall("StelInKorting", DummyKortingSpecificatieLbx, VerwachteKorting).ExactAantalKeer(1)
+	Do KortingServiceMock.VerwachtMethodCall("StelInKorting", DummyKortingSpecificatieTax, VerwachteKorting).ExactAantalKeer(1)
+	Do KortingServiceMock.VerwachtMethodCall("StelInKorting", DummyKortingSpecificatieTbx, VerwachteKorting).ExactAantalKeer(1)
+	
+	#dim KortingBewaarder As WSimpl.Unishop.Login.KortingBewaarder = ##class(WSimpl.Unishop.Login.KortingBewaarder).%New(KortingSpecificatieFactoryMock, KortingServiceMock)
+	Do KortingBewaarder.BewaarMeegegevenKorting(Ref, DataOpt)
+	
+	Do KortingSpecificatieFactoryMock.Verifieer()
+	Do KortingServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="AssertKortingWordtNietBewaard">
+<FormalSpec>Ref:%String,DataOpt:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim KortingSpecificatieFactoryMock As vhTest.Mock.DOM.VKP.dto.KortingSpecificatieFactory = ##class(vhTest.Mock.DOM.VKP.dto.KortingSpecificatieFactory).%New()
+	Do KortingSpecificatieFactoryMock.VerwachtMethodCall("Maak", $$$ElkeWaarde, ..GeefPersonalityId(), "DummyKlantID").Nooit()
+	
+	#dim KortingServiceMock As vhTest.Mock.DOM.VKP.KortingService = ##class(vhTest.Mock.DOM.VKP.KortingService).%New()
+	Do KortingServiceMock.VerwachtMethodCall("StelInKorting", $$$ElkeWaarde, $$$ElkeWaarde).Nooit()
+	
+	#dim KortingBewaarder As WSimpl.Unishop.Login.KortingBewaarder = ##class(WSimpl.Unishop.Login.KortingBewaarder).%New(KortingSpecificatieFactoryMock, KortingServiceMock)
+	Do KortingBewaarder.BewaarMeegegevenKorting(Ref, DataOpt)
+	
+	Do KortingSpecificatieFactoryMock.Verifieer()
+	Do KortingServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="GeefRef">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+
+<Method name="GeefPersonalityId">
+<Abstract>1</Abstract>
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestVanRaemdonck.cls.xml
===================================================================
diff -u -r33282 -r51202
--- vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestVanRaemdonck.cls.xml	(.../TestVanRaemdonck.cls.xml)	(revision 33282)
+++ vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestVanRaemdonck.cls.xml	(.../TestVanRaemdonck.cls.xml)	(revision 51202)
@@ -1,118 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.TestVanRaemdonck">
-<Super>vhUnitTest.TestCase</Super>
+<Super>vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.TestBase</Super>
 
-<Property name="KortingServiceMock">
-<Type>vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.KortingServiceMock</Type>
-</Property>
-
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ##super(aTestName)
-	#dim VerkoopPrijsAPIMock As vhTest.Mock.DOM.VKP.VerkoopPrijsAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopPrijsAPI).MockInstance()
-	Set ..KortingServiceMock = ##class(vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.KortingServiceMock).%New()
-	Do VerkoopPrijsAPIMock.IndienMethodCall("GeefKortingService").DanReturn(..KortingServiceMock)
-]]></Implementation>
-</Method>
-
 <Method name="GeefRef">
-<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit "yxP6M/JvO4w9hy/mydDJaA--"    ; decrypted = "RAEM\\\Normaal"
 ]]></Implementation>
 </Method>
 
+<Method name="GeefPersonalityId">
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ..PersonalityId.VanRaemdonck
+]]></Implementation>
+</Method>
+
 <Method name="TestBewaarKorting10Procent">
 <Implementation><![CDATA[
 	#dim Ref As %String = ..GeefRef()
 	#dim DataOpt As %String = "3bvqNBthSk0lJ7anOL7KHXB3l50dlUIYgCeY5FKZSpxCqbTU/QdlxzrXEC4o39JU1Q5T7Nrfyzcuk05qKaI9p_9auP/nDtLkLGIs3PT0YF8-"
-	Do ..AssertBewaarCorrecteKorting(Ref,DataOpt,0.1)
+	
+	Do ..AssertBewaarCorrecteKorting(Ref, DataOpt, 0.1)
 ]]></Implementation>
 </Method>
 
 <Method name="TestBewaarKortingLeegMaken">
 <Implementation><![CDATA[
 	#dim Ref As %String = ..GeefRef()
 	#dim DataOpt As %String = "3bvqNBthSk0lJ7anOL7KHXB3l50dlUIYgCeY5FKZSpxCqbTU/QdlxzrXEC4o39JUX_N65ubDLn7vUl3x_NEqKjOzTyQR_6GIltaKbfkT7NY-"
-	Do ..AssertBewaarCorrecteKorting(Ref,DataOpt,0)
+	
+	Do ..AssertBewaarCorrecteKorting(Ref, DataOpt, 0)
 ]]></Implementation>
 </Method>
 
 <Method name="TestBewaarKortingFoutieveInputLetters">
 <Implementation><![CDATA[
-	Do $$$AssertException("AssertBewaarKortingFoutieveInputLetters","TECH.Exceptions.GeneralErrorException","Kan korting 'abc' niet parsen. (Personality: '8', Klant: 'DummyKlantID', 'DummyKlantNaam')")	
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Kan korting 'abc' niet parsen. (Personality: '8', Klant: 'DummyKlantID', 'DummyKlantNaam')")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException", Substrings))
 	
-	Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingSpecificaties.Count(),0) 
-	Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingPercentages.Count(),0)
+	#dim Ref As %String = ..GeefRef()
+	#dim DataOpt As %String = "3bvqNBthSk0lJ7anOL7KHXB3l50dlUIYgCeY5FKZSpxCqbTU/QdlxzrXEC4o39JUZo/ibLupFnOu58xioU3Shwjqu7wYk5oT60sA2nUQ6_c-" // korting = "abc"
+	
+	Do ..AssertBewaarCorrecteKorting(Ref, DataOpt, "abc")
 ]]></Implementation>
 </Method>
 
 <Method name="TestBewaarKortingFoutieveInputDecimaal">
 <Implementation><![CDATA[
-	// korting = 0.3 	
-	Do $$$AssertException("AssertBewaarKortingFoutieveInputDecimalen","TECH.Exceptions.GeneralErrorException","Kan korting '0.3' niet parsen. (Personality: '8', Klant: 'DummyKlantID', 'DummyKlantNaam')")	
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Kan korting '0.3' niet parsen. (Personality: '8', Klant: 'DummyKlantID', 'DummyKlantNaam')")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException", Substrings))
 	
-	Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingSpecificaties.Count(),0) 
-	Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingPercentages.Count(),0)
-]]></Implementation>
-</Method>
-
-<Method name="AssertBewaarCorrecteKorting">
-<FormalSpec>Ref:%String,DataOpt:%String,Korting:TECH.Percentage</FormalSpec>
-<Implementation><![CDATA[
-	
-	Set LoginKortingBewaarder = ##class(WSimpl.Unishop.Login.KortingBewaarder).%New()
-	Do LoginKortingBewaarder.BewaarMeegegevenKorting(Ref,DataOpt)
-	
-	If $$$AssertEquals(..KortingServiceMock.IngesteldeKortingSpecificaties.Count(),2) {
-		#dim KS1 As DOM.VKP.dto.KortingSpecificaties = ..KortingServiceMock.IngesteldeKortingSpecificaties.GetAt(1)
-		Do ..AssertBasisInfoKortingSpecificties(KS1)
-		Do $$$AssertEquals(KS1.Variant,##class(DOM.PM.enu.Variant).LegraboxPure())
-		
-		#dim KS2 As DOM.VKP.dto.KortingSpecificaties = ..KortingServiceMock.IngesteldeKortingSpecificaties.GetAt(2)
-		Do ..AssertBasisInfoKortingSpecificties(KS2)
-		Do $$$AssertEquals(KS2.Variant,##class(DOM.PM.enu.Variant).Taorbox())
-	}
-	
-	If $$$AssertEquals(..KortingServiceMock.IngesteldeKortingPercentages.Count(),2) {
-		Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingPercentages.GetAt(1),Korting)
-		Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingPercentages.GetAt(2),Korting)
-	}
-]]></Implementation>
-</Method>
-
-<Method name="AssertBewaarKortingFoutieveInputLetters">
-<Implementation><![CDATA[
 	#dim Ref As %String = ..GeefRef()
-	#dim DataOpt As %String = "3bvqNBthSk0lJ7anOL7KHXB3l50dlUIYgCeY5FKZSpxCqbTU/QdlxzrXEC4o39JUZo/ibLupFnOu58xioU3Shwjqu7wYk5oT60sA2nUQ6_c-"
+	#dim DataOpt As %String = "3bvqNBthSk0lJ7anOL7KHXB3l50dlUIYgCeY5FKZSpxCqbTU/QdlxzrXEC4o39JUlQkZWzT1YLvgfNOsvrA9XQjqu7wYk5oT60sA2nUQ6_c-" // korting = 0.3 (ipv 30)
 	
-	Set LoginKortingBewaarder = ##class(WSimpl.Unishop.Login.KortingBewaarder).%New()
-	Do LoginKortingBewaarder.BewaarMeegegevenKorting(Ref,DataOpt)
+	Do ..AssertBewaarCorrecteKorting(Ref, DataOpt, 0.3)
 ]]></Implementation>
 </Method>
-
-<Method name="AssertBewaarKortingFoutieveInputDecimalen">
-<Implementation><![CDATA[
-	#dim Ref As %String = ..GeefRef()
-	#dim DataOpt As %String = "3bvqNBthSk0lJ7anOL7KHXB3l50dlUIYgCeY5FKZSpxCqbTU/QdlxzrXEC4o39JUlQkZWzT1YLvgfNOsvrA9XQjqu7wYk5oT60sA2nUQ6_c-"
-	
-	Set LoginKortingBewaarder = ##class(WSimpl.Unishop.Login.KortingBewaarder).%New()
-	Do LoginKortingBewaarder.BewaarMeegegevenKorting(Ref,DataOpt)
-]]></Implementation>
-</Method>
-
-<Method name="AssertBasisInfoKortingSpecificties">
-<FormalSpec>KS:DOM.VKP.dto.KortingSpecificaties</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Do $$$AssertEquals(KS.Aantal,1)
-	Do $$$AssertEquals(KS.Familie,##class(DOM.PM.enu.Familie).Lade())
-	Do $$$AssertEquals(KS.KlantID,"raem_DummyKlantID")
-	Do $$$AssertEquals(KS.PersonalityID,##class(DOM.common.enu.Personality).VanRaemdonck())
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/WSimpl/Unishop/Login/Aanmelder/Test.cls.xml
===================================================================
diff -u -r33410 -r51202
--- vhUnitTest/WSimpl/Unishop/Login/Aanmelder/Test.cls.xml	(.../Test.cls.xml)	(revision 33410)
+++ vhUnitTest/WSimpl/Unishop/Login/Aanmelder/Test.cls.xml	(.../Test.cls.xml)	(revision 51202)
@@ -3,21 +3,27 @@
 <Class name="vhUnitTest.WSimpl.Unishop.Login.Aanmelder.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: LoginMetEncryptedParameters roept WebshopSessieSettingsInvuller.VulIn aan. ">
+<Method name="Test: LoginMetEncryptedParameters roept VulIn-method aan op WebshopSessieSettingsInvuller">
 <Implementation><![CDATA[
+	#dim RandomRef As %String = "RandomRef"
+	#dim RandomDataOpt As %String = "RandomDataOpt"
+	
 	#dim LoginParameterBepalerDummy As vhTest.Dummy.WSimpl.Unishop.Login.ParameterBepaler = ##class(vhTest.Dummy.WSimpl.Unishop.Login.ParameterBepaler).%New()
-	#dim LoginKortingBewaarderDummy As vhTest.Dummy.WSimpl.Unishop.Login.KortingBewaarder = ##class(vhTest.Dummy.WSimpl.Unishop.Login.KortingBewaarder).%New()
+	
 	#dim SessionServiceDummy As vhTest.Dummy.APPS.EC.WebshopSessionService = ##class(vhTest.Dummy.APPS.EC.WebshopSessionService).%New()
 	#dim RefSessieBepalerDummy As vhTest.Dummy.APPS.EC.impl.RefSessieDataBepaler = ##class(vhTest.Dummy.APPS.EC.impl.RefSessieDataBepaler).%New()
 	
+	#dim KortingBewaarderMock As vhTest.Mock.WSimpl.Unishop.Login.KortingBewaarder = ##class(vhTest.Mock.WSimpl.Unishop.Login.KortingBewaarder).%New()
+	Do KortingBewaarderMock.VerwachtMethodCall("BewaarMeegegevenKorting", RandomRef, RandomDataOpt).DanDoeNiks()
+	
 	#dim WebshopSessieSettingsInvullerMock As vhTest.Mock.WSimpl.Unishop.Login.WebshopSessieSettingsInvuller = ##class(vhTest.Mock.WSimpl.Unishop.Login.WebshopSessieSettingsInvuller).%New()
+	Do WebshopSessieSettingsInvullerMock.VerwachtMethodCall("VulIn", SessionServiceDummy.WebshopSessie).DanDoeNiks()
 	
-	Do WebshopSessieSettingsInvullerMock.VerwachtMethodCall("VulIn",SessionServiceDummy.WebshopSessie).DanDoeNiks()
-	
-	#dim Aanmelder As vhUnitTest.WSimpl.Unishop.Login.Aanmelder.SubClass = ##class(vhUnitTest.WSimpl.Unishop.Login.Aanmelder.SubClass).%New(LoginParameterBepalerDummy, LoginKortingBewaarderDummy, SessionServiceDummy, WebshopSessieSettingsInvullerMock,RefSessieBepalerDummy)
-	Do Aanmelder.LoginMetEncryptedParameters("","","","")
+	#dim Aanmelder As vhUnitTest.WSimpl.Unishop.Login.Aanmelder.SubClass = ##class(vhUnitTest.WSimpl.Unishop.Login.Aanmelder.SubClass).%New(LoginParameterBepalerDummy, KortingBewaarderMock, SessionServiceDummy, WebshopSessieSettingsInvullerMock, RefSessieBepalerDummy)
+	Do Aanmelder.LoginMetEncryptedParameters(RandomRef, RandomDataOpt, "", "")
 
 	Do WebshopSessieSettingsInvullerMock.Verifieer()
+	Do KortingBewaarderMock.Verifieer()
 ]]></Implementation>
 </Method>
 </Class>
FishEye: Tag 51202 refers to a dead (removed) revision in file `vhTest/Dummy/WSimpl/Unishop/Login/KortingBewaarder.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestKisch.cls.xml
===================================================================
diff -u -r33282 -r51202
--- vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestKisch.cls.xml	(.../TestKisch.cls.xml)	(revision 33282)
+++ vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestKisch.cls.xml	(.../TestKisch.cls.xml)	(revision 51202)
@@ -1,120 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.TestKisch">
-<Super>vhUnitTest.TestCase</Super>
+<Super>vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.TestBase</Super>
 
-<Property name="KortingServiceMock">
-<Type>vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.KortingServiceMock</Type>
-</Property>
-
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ##super(aTestName)
-	#dim VerkoopPrijsAPIMock As vhTest.Mock.DOM.VKP.VerkoopPrijsAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopPrijsAPI).MockInstance()
-	Set ..KortingServiceMock = ##class(vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.KortingServiceMock).%New()
-	Do VerkoopPrijsAPIMock.IndienMethodCall("GeefKortingService").DanReturn(..KortingServiceMock)
-]]></Implementation>
-</Method>
-
 <Method name="GeefRef">
-<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit "JHBX2iWevl2mVihzVdtiQw--"    ; decrypted = "KISCH\\\Normaal"
 ]]></Implementation>
 </Method>
 
+<Method name="GeefPersonalityId">
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ..PersonalityId.Kisch
+]]></Implementation>
+</Method>
+
 <Method name="TestBewaarKorting10Procent">
 <Implementation><![CDATA[
 	#dim Ref As %String = ..GeefRef()
 	#dim DataOpt As %String = "sKOZimpVGYLJJX7pQ9GLwBCgzUYk0qbMVd1d7bEQH5ydPC0zSPV5hx8ILiB2pqap1pgEPypt7qIhwevlkerfTgtVBcC1bF5WqP9R9i4sIOo"
-	Do ..AssertBewaarCorrecteKorting(Ref,DataOpt,0.1)
+	
+	Do ..AssertBewaarCorrecteKorting(Ref, DataOpt, 0.1)
 ]]></Implementation>
 </Method>
 
 <Method name="TestBewaarKortingLeegMaken">
 <Implementation><![CDATA[
 	#dim Ref As %String = ..GeefRef()
 	#dim DataOpt As %String = "sKOZimpVGYLJJX7pQ9GLwBCgzUYk0qbMVd1d7bEQH5ydPC0zSPV5hx8ILiB2pqap_3oDNzhS75AUTyiU/z4ynyhReZ8jG7/yIUQDfaH06X0-"
-	Do ..AssertBewaarCorrecteKorting(Ref,DataOpt,0)
+	
+	Do ..AssertBewaarCorrecteKorting(Ref, DataOpt, 0)
 ]]></Implementation>
 </Method>
 
 <Method name="TestBewaarKortingFoutieveInputLetters">
 <Implementation><![CDATA[
-	Do $$$AssertException("AssertBewaarKortingFoutieveInputLetters","TECH.Exceptions.GeneralErrorException","Kan korting 'abc' niet parsen. (Personality: '5', Klant: 'DummyKlantID', 'DummyKlantNaam')")	
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Kan korting 'abc' niet parsen. (Personality: '5', Klant: 'DummyKlantID', 'DummyKlantNaam')")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException", Substrings))
 	
-	Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingSpecificaties.Count(),0) 
-	Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingPercentages.Count(),0)
-]]></Implementation>
-</Method>
-
-<Method name="TestBewaarKortingFoutieveInputDecimaal">
-<Implementation><![CDATA[
-	// korting = 0.3 	
-	Do $$$AssertException("AssertBewaarKortingFoutieveInputDecimalen","TECH.Exceptions.GeneralErrorException","Kan korting '0.3' niet parsen. (Personality: '5', Klant: 'DummyKlantID', 'DummyKlantNaam')")	
-	
-	Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingSpecificaties.Count(),0) 
-	Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingPercentages.Count(),0)
-]]></Implementation>
-</Method>
-
-<Method name="AssertBewaarCorrecteKorting">
-<FormalSpec>Ref:%String,DataOpt:%String,Korting:TECH.Percentage</FormalSpec>
-<Implementation><![CDATA[
-	
-	Set LoginKortingBewaarder = ##class(WSimpl.Unishop.Login.KortingBewaarder).%New()
-	Do LoginKortingBewaarder.BewaarMeegegevenKorting(Ref,DataOpt)
-	
-	If $$$AssertEquals(..KortingServiceMock.IngesteldeKortingSpecificaties.Count(),2) {
-		#dim KS1 As DOM.VKP.dto.KortingSpecificaties = ..KortingServiceMock.IngesteldeKortingSpecificaties.GetAt(1)
-		Do ..AssertBasisInfoKortingSpecificties(KS1)
-		Do $$$AssertEquals(KS1.Variant,##class(DOM.PM.enu.Variant).LegraboxPure())
-		
-		#dim KS2 As DOM.VKP.dto.KortingSpecificaties = ..KortingServiceMock.IngesteldeKortingSpecificaties.GetAt(2)
-		Do ..AssertBasisInfoKortingSpecificties(KS2)
-		Do $$$AssertEquals(KS2.Variant,##class(DOM.PM.enu.Variant).Taorbox())
-	}
-	
-	If $$$AssertEquals(..KortingServiceMock.IngesteldeKortingPercentages.Count(),2) {
-		Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingPercentages.GetAt(1),Korting)
-		Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingPercentages.GetAt(2),Korting)
-	}
-]]></Implementation>
-</Method>
-
-<Method name="AssertBewaarKortingFoutieveInputLetters">
-<Implementation><![CDATA[
-	
 	#dim Ref As %String = ..GeefRef()
-	#dim DataOpt As %String = "sKOZimpVGYLJJX7pQ9GLwBCgzUYk0qbMVd1d7bEQH5ydPC0zSPV5hx8ILiB2pqapfqoNpY_AGr8LkU_zUxQJTvRVOJHlzs4EWa_qt8tfNjQ-"
+	#dim DataOpt As %String = "sKOZimpVGYLJJX7pQ9GLwBCgzUYk0qbMVd1d7bEQH5ydPC0zSPV5hx8ILiB2pqapfqoNpY_AGr8LkU_zUxQJTvRVOJHlzs4EWa_qt8tfNjQ-" // korting = "abc"
 	
-	Set LoginKortingBewaarder = ##class(WSimpl.Unishop.Login.KortingBewaarder).%New()
-	Do LoginKortingBewaarder.BewaarMeegegevenKorting(Ref,DataOpt)
+	Do ..AssertBewaarCorrecteKorting(Ref, DataOpt, "abc")
 ]]></Implementation>
 </Method>
 
-<Method name="AssertBewaarKortingFoutieveInputDecimalen">
+<Method name="TestBewaarKortingFoutieveInputDecimaal">
 <Implementation><![CDATA[
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Kan korting '0.3' niet parsen. (Personality: '5', Klant: 'DummyKlantID', 'DummyKlantNaam')")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException", Substrings))
 	
 	#dim Ref As %String = ..GeefRef()
-	#dim DataOpt As %String = "sKOZimpVGYLJJX7pQ9GLwBCgzUYk0qbMVd1d7bEQH5ydPC0zSPV5hx8ILiB2pqap5nR8nAB4p4Gt8HkOKZyl//RVOJHlzs4EWa_qt8tfNjQ-"
+	#dim DataOpt As %String = "sKOZimpVGYLJJX7pQ9GLwBCgzUYk0qbMVd1d7bEQH5ydPC0zSPV5hx8ILiB2pqap5nR8nAB4p4Gt8HkOKZyl//RVOJHlzs4EWa_qt8tfNjQ-" // korting = 0.3 (ipv 30)
 	
-	Set LoginKortingBewaarder = ##class(WSimpl.Unishop.Login.KortingBewaarder).%New()
-	Do LoginKortingBewaarder.BewaarMeegegevenKorting(Ref,DataOpt)
+	Do ..AssertBewaarCorrecteKorting(Ref, DataOpt, 0.3)
 ]]></Implementation>
 </Method>
-
-<Method name="AssertBasisInfoKortingSpecificties">
-<FormalSpec>KS:DOM.VKP.dto.KortingSpecificaties</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Do $$$AssertEquals(KS.Aantal,1)
-	Do $$$AssertEquals(KS.Familie,##class(DOM.PM.enu.Familie).Lade())
-	Do $$$AssertEquals(KS.KlantID,"kisch_DummyKlantID")
-	Do $$$AssertEquals(KS.PersonalityID,##class(DOM.common.enu.Personality).Kisch())
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml
===================================================================
diff -u -r51046 -r51202
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 51046)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 51202)
@@ -28,8 +28,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="KortingBewaarderDummy">
-<Type>vhTest.Dummy.WSimpl.Unishop.Login.KortingBewaarder</Type>
+<Property name="KortingBewaarderStub">
+<Type>vhTest.Mock.WSimpl.Unishop.Login.KortingBewaarder</Type>
 <Private>1</Private>
 </Property>
 
@@ -65,10 +65,10 @@
 	Do ..UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
 	
 	Set ..WebshopSessionServiceDummy = ##class(vhTest.Dummy.APPS.EC.WebshopSessionService).%New()
-	
-	Set ..KortingBewaarderDummy = ##class(vhTest.Dummy.WSimpl.Unishop.Login.KortingBewaarder).%New()
-	
 	Set ..HandelPersonalityRepositoryDummy = ##class(vhTest.Dummy.DOM.common.impl.HandelPersonalityRepository).%New()
+	
+	Set ..KortingBewaarderStub = ##class(vhTest.Mock.WSimpl.Unishop.Login.KortingBewaarder).%New()
+	Do ..KortingBewaarderStub.IndienMethodCall("BewaarMeegegevenKorting", ..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt).DanDoeNiks()
 ]]></Implementation>
 </Method>
 
@@ -221,7 +221,7 @@
 	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
 	Do HandelPersonalityRepositoryStub.IndienMethodCall("GeefViaID", ##class(DOM.common.enu.Personality).Daro()).DanReturn(HandelPersonalityStub)
 		
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,..KortingBewaarderDummy,..UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy, ..KortingBewaarderStub,..UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 		
@@ -252,7 +252,7 @@
 	Set KlantDataBewaarderMock = ##class(vhTest.Mock.APPS.VKP.KlantDataBewaarder).%New()
 	Do KlantDataBewaarderMock.VerwachtMethodCall("Bewaar",HandelPersonalityStub,$$$ElkeWaarde).DanDoeNiks().ExactAantalKeer(1)
 	
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,..HandelKlantDataRepositoryDummy,HandelPersonalityRepositoryStub,WebshopSessionServiceMock,..KortingBewaarderDummy,..UrlBepalerStub,,KlantDataBewaarderMock)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub, ..HandelKlantDataRepositoryDummy, HandelPersonalityRepositoryStub, WebshopSessionServiceMock, ..KortingBewaarderStub, ..UrlBepalerStub,, KlantDataBewaarderMock)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -285,7 +285,7 @@
 	Set KlantDataBewaarderMock = ##class(vhTest.Mock.APPS.VKP.KlantDataBewaarder).%New()
 	Do KlantDataBewaarderMock.VerwachtMethodCall("Bewaar",HandelPersonalityStub,$$$ElkeWaarde).DanDoeNiks().ExactAantalKeer(1)
 	
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,..HandelKlantDataRepositoryDummy,HandelPersonalityRepositoryStub,WebshopSessionServiceMock,..KortingBewaarderDummy,..UrlBepalerStub,,KlantDataBewaarderMock)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub, ..HandelKlantDataRepositoryDummy, HandelPersonalityRepositoryStub, WebshopSessionServiceMock, ..KortingBewaarderStub, ..UrlBepalerStub,, KlantDataBewaarderMock)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -319,7 +319,7 @@
 	Set KlantDataBewaarderMock = ##class(vhTest.Mock.APPS.VKP.KlantDataBewaarder).%New()
 	Do KlantDataBewaarderMock.VerwachtMethodCall("Bewaar",HandelPersonalityStub,$$$ElkeWaarde).DanDoeNiks().ExactAantalKeer(1)
 	
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,..HandelKlantDataRepositoryDummy,HandelPersonalityRepositoryStub,WebshopSessionServiceMock,..KortingBewaarderDummy,..UrlBepalerStub,,KlantDataBewaarderMock)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock, ..HandelKlantDataRepositoryDummy, HandelPersonalityRepositoryStub, WebshopSessionServiceMock, ..KortingBewaarderStub, ..UrlBepalerStub,, KlantDataBewaarderMock)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -352,7 +352,7 @@
 	Set LoginParameterBepalerMock = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
 	Do LoginParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters)
 	
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,..HandelKlantDataRepositoryDummy,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,..KortingBewaarderDummy,..UrlBepalerStub,,KlantDataBewaarderStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock, ..HandelKlantDataRepositoryDummy, HandelPersonalityRepositoryStub, ..WebshopSessionServiceDummy, ..KortingBewaarderStub, ..UrlBepalerStub,, KlantDataBewaarderStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -376,7 +376,7 @@
 	Set UrlBepalerMock = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerMock.VerwachtMethodCall("GeefUrl","10").DanReturn("darotest.taorbox.com").ExactAantalKeer(0)
 	
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,..HandelKlantDataRepositoryDummy,..HandelPersonalityRepositoryDummy,..WebshopSessionServiceDummy,..KortingBewaarderDummy,UrlBepalerMock)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock, ..HandelKlantDataRepositoryDummy, ..HandelPersonalityRepositoryDummy, ..WebshopSessionServiceDummy, ..KortingBewaarderStub, UrlBepalerMock)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
Index: vhTest/Mock/DOM/VKP/dto/KortingSpecificatieFactory.cls.xml
===================================================================
diff -u
--- vhTest/Mock/DOM/VKP/dto/KortingSpecificatieFactory.cls.xml	(revision 0)
+++ vhTest/Mock/DOM/VKP/dto/KortingSpecificatieFactory.cls.xml	(revision 51202)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.DOM.VKP.dto.KortingSpecificatieFactory">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>DOM.VKP.dto.KortingSpecificatieFactory,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Maak">
+<FormalSpec>Variant:DOM.PM.enu.Variant,Personality:DOM.common.Personality,KlantId:DOM.common.PartijID</FormalSpec>
+<ReturnType>DOM.VKP.dto.KortingSpecificaties</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Maak",Variant,Personality,KlantId)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Unishop/Login/KortingBewaarder.cls.xml
===================================================================
diff -u -r51183 -r51202
--- WSimpl/Unishop/Login/KortingBewaarder.cls.xml	(.../KortingBewaarder.cls.xml)	(revision 51183)
+++ WSimpl/Unishop/Login/KortingBewaarder.cls.xml	(.../KortingBewaarder.cls.xml)	(revision 51202)
@@ -18,6 +18,30 @@
 <Private>1</Private>
 </Property>
 
+<Property name="KortingSpecificatieFactory">
+<Type>DOM.VKP.dto.KortingSpecificatieFactory</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KortingService">
+<Type>DOM.VKP.KortingService</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>KortingSpecificatieFactory:DOM.VKP.dto.KortingSpecificatieFactory="",KortingService:DOM.VKP.KortingService=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..KortingSpecificatieFactory = $$$Inject(KortingSpecificatieFactory, ##class(DOM.VKP.dto.KortingSpecificatieFactory).%New())
+	Set ..KortingService = $$$Inject(KortingService, ##class(DOM.VKP.impl.KortingService).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="BewaarMeegegevenKorting">
 <FormalSpec>Ref:%String,DataOpt:%String</FormalSpec>
 <Implementation><![CDATA[
@@ -131,32 +155,21 @@
 <FormalSpec>Personality:DOM.common.Personality,Variant:DOM.PM.enu.Variant</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim KortingService As DOM.VKP.KortingService = ##class(DOM.DomeinContext).Instance().GeefVerkoopPrijsAPI().GeefKortingService()	
-	Set KortingSpecificatie = ##class(DOM.VKP.dto.KortingSpecificaties).%New()
-	Set KortingSpecificatie.Aantal = 1
-	Set KortingSpecificatie.Familie = ##class(DOM.PM.enu.Familie).Lade()
-	Set KortingSpecificatie.Variant = Variant
-	Set KortingSpecificatie.PersonalityID = Personality.GeefID()
-	Set KortingSpecificatie.KlantID = ..KlantSessieData.KlantID
-	
+	#dim KortingSpecificatie As DOM.VKP.dto.KortingSpecificaties = ..KortingSpecificatieFactory.Maak(Variant, Personality.GeefID(), ..KlantSessieData.KlantID)
 	#dim Korting As %String = ..KlantSessieData.Korting
 	#dim KortingPercentage As TECH.Percentage
+	
 	If ($IsValidNum(Korting) && ((Korting=0) || ((Korting>=1) && (Korting<=100)))) {
 		Set KortingPercentage = (Korting / 100)
-	}ElseIf (Korting = "") {
+	} ElseIf (Korting = "") {
 		Set KortingPercentage = 0
-	}Else{
+	} Else {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Kan korting '"_Korting_"' niet parsen. (Personality: '"_Personality.GeefID()_"', Klant: '"_..KlantSessieData.KlantID_"', '"_..KlantSessieData.KlantNaam_"')"))
 	}
 	
-	If Personality.GeefID() '= ##class(DOM.common.enu.Personality).VanHoecke() {
-		#dim HandelPersonality As DOM.common.HandelPersonality = Personality
-		Set KortingSpecificatie.KlantID = HandelPersonality.GeefPrefix()_KortingSpecificatie.KlantID
+	If $$$Not(Korting = "") {
+		Do ..KortingService.StelInKorting(KortingSpecificatie, KortingPercentage)
 	}
-	
-	If (Korting'="") {
-		Do KortingService.StelInKorting(KortingSpecificatie,KortingPercentage)
-	}
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/DOM/VKP/dto/KortingSpecificatieFactory/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/DOM/VKP/dto/KortingSpecificatieFactory/Test.cls.xml	(revision 0)
+++ vhUnitTest/DOM/VKP/dto/KortingSpecificatieFactory/Test.cls.xml	(revision 51202)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.DOM.VKP.dto.KortingSpecificatieFactory.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test">
+<Implementation><![CDATA[
+	Do ..AssertKortingSpecificatieVoorPersonality(##class(DOM.common.VanHoeckePersonality).Instance(), "RandomKlantId", ##class(DOM.common.enu.Personality).VanHoecke(), "RandomKlantId")
+	Do ..AssertKortingSpecificatieVoorPersonality(##class(DOM.common.DaroPersonality).Instance(), "RandomKlantId", ##class(DOM.common.enu.Personality).Daro(), "daro_RandomKlantId")
+]]></Implementation>
+</Method>
+
+<Method name="AssertKortingSpecificatieVoorPersonality">
+<FormalSpec>Personality:DOM.common.Personality,KlantId:%String,VerwachtePersonalityId:DOM.common.enu.Personality,VerwachteKlantId:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim RandomVariant As %String = "RandomVariant"	
+	#dim KortingSpecificatieFactory As DOM.VKP.dto.KortingSpecificatieFactory = ##class(DOM.VKP.dto.KortingSpecificatieFactory).%New()
+	#dim KortingSpecificatie As DOM.VKP.dto.KortingSpecificaties = KortingSpecificatieFactory.Maak(RandomVariant, Personality, KlantId)
+	
+	Do $$$AssertEquals(KortingSpecificatie.Aantal, 1)
+	Do $$$AssertEquals(KortingSpecificatie.Familie, ##class(DOM.PM.enu.Familie).Lade())
+	Do $$$AssertEquals(KortingSpecificatie.Variant, RandomVariant)
+	Do $$$AssertEquals(KortingSpecificatie.PersonalityID, VerwachtePersonalityId)
+	Do $$$AssertEquals(KortingSpecificatie.KlantID, VerwachteKlantId)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestHaefeleBe.cls.xml
===================================================================
diff -u -r40845 -r51202
--- vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestHaefeleBe.cls.xml	(.../TestHaefeleBe.cls.xml)	(revision 40845)
+++ vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestHaefeleBe.cls.xml	(.../TestHaefeleBe.cls.xml)	(revision 51202)
@@ -1,58 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.TestHaefeleBe">
-<Super>vhUnitTest.TestCase</Super>
+<Super>vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.TestBase</Super>
 
-<Property name="KortingServiceMock">
-<Type>vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.KortingServiceMock</Type>
-</Property>
-
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ##super(aTestName)
-	#dim VerkoopPrijsAPIMock As vhTest.Mock.DOM.VKP.VerkoopPrijsAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopPrijsAPI).MockInstance()
-	Set ..KortingServiceMock = ##class(vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.KortingServiceMock).%New()
-	Do VerkoopPrijsAPIMock.IndienMethodCall("GeefKortingService").DanReturn(..KortingServiceMock)
-]]></Implementation>
-</Method>
-
 <Method name="GeefRef">
-<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit "k0uGXfFcFjZZFa7InVf7aw--"
 ]]></Implementation>
 </Method>
 
-<Method name="TestBewaarGeenKortingIndien0InDataOpt">
-<Implementation><![CDATA[
-	#dim Ref As %String = ..GeefRef()
-	#dim DataOptZonderKorting As %String = "5ORS9J/8IP5Qd5qUHgfEDnapEdudJCSEFhN7Gjb2pPDk9i5UHEJgTELsS5TeSoF4" // Korting 0%, maar als cijfer nul meegegeven.
-	Set LoginKortingBewaarder = ##class(WSimpl.Unishop.Login.KortingBewaarder).%New()
-	Do LoginKortingBewaarder.BewaarMeegegevenKorting(Ref,DataOptZonderKorting)
-	Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingSpecificaties.Count(),0)
+<Method name="GeefPersonalityId">
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ..PersonalityId.HaefeleBE
 ]]></Implementation>
 </Method>
 
-<Method name="TestBewaarGeenKortingIndienWelEffectieveWaardeInDataOpt">
+<Method name="Test: Kortingen meegegeven in DataOpt worden niet bewaard">
 <Implementation><![CDATA[
 	#dim Ref As %String = ..GeefRef()
-	#dim DataOptZonderKorting As %String = "EQuY8vtWqMNIf/YgElPBsIepzB6Bs5WaO3rKr6kUxHU-" // Korting 30%
-	Set LoginKortingBewaarder = ##class(WSimpl.Unishop.Login.KortingBewaarder).%New()
-	Do LoginKortingBewaarder.BewaarMeegegevenKorting(Ref,DataOptZonderKorting)
-	Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingSpecificaties.Count(),0)
+	
+	#dim DataOptKortingNulProcent As %String = "5ORS9J/8IP5Qd5qUHgfEDnapEdudJCSEFhN7Gjb2pPDk9i5UHEJgTELsS5TeSoF4" // Korting 0%, maar als cijfer nul meegegeven.
+	#dim DataOptKortingDertigProcent As %String = "EQuY8vtWqMNIf/YgElPBsIepzB6Bs5WaO3rKr6kUxHU-" // Korting 30%
+	#dim DataOptKortingLeeg As %String = "EQuY8vtWqMNIf/YgElPBsHDGUaiLAWSLZoG4NNg/Bag-" // Compleet lege piece voor korting
+	
+	Do ..AssertKortingWordtNietBewaard(Ref, DataOptKortingNulProcent)
+	Do ..AssertKortingWordtNietBewaard(Ref, DataOptKortingDertigProcent)
+	Do ..AssertKortingWordtNietBewaard(Ref, DataOptKortingLeeg)
 ]]></Implementation>
 </Method>
-
-<Method name="TestBewaarGeenKortingIndienNietInDataOpt">
-<Implementation><![CDATA[
-	#dim Ref As %String = ..GeefRef()
-	#dim DataOptZonderKorting As %String = "EQuY8vtWqMNIf/YgElPBsHDGUaiLAWSLZoG4NNg/Bag-" // Compleet lege piece voor korting
-	Set LoginKortingBewaarder = ##class(WSimpl.Unishop.Login.KortingBewaarder).%New()
-	Do LoginKortingBewaarder.BewaarMeegegevenKorting(Ref,DataOptZonderKorting)
-	Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingSpecificaties.Count(),0)
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestDaro.cls.xml
===================================================================
diff -u -r33282 -r51202
--- vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestDaro.cls.xml	(.../TestDaro.cls.xml)	(revision 33282)
+++ vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestDaro.cls.xml	(.../TestDaro.cls.xml)	(revision 51202)
@@ -1,118 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.TestDaro">
-<Super>vhUnitTest.TestCase</Super>
+<Super>vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.TestBase</Super>
 
-<Property name="KortingServiceMock">
-<Type>vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.KortingServiceMock</Type>
-</Property>
-
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ##super(aTestName)
-	#dim VerkoopPrijsAPIMock As vhTest.Mock.DOM.VKP.VerkoopPrijsAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopPrijsAPI).MockInstance()
-	Set ..KortingServiceMock = ##class(vhUnitTest.WSimpl.Unishop.Login.KortingBewaarder.KortingServiceMock).%New()
-	Do VerkoopPrijsAPIMock.IndienMethodCall("GeefKortingService").DanReturn(..KortingServiceMock)
-]]></Implementation>
-</Method>
-
 <Method name="GeefRef">
-<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit "iStP6rzwAyDDSIg/A8r9fA--"    ; decrypted = "DARO\\\Normaal"
 ]]></Implementation>
 </Method>
 
+<Method name="GeefPersonalityId">
+<ReturnType>DOM.common.enu.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ..PersonalityId.Daro
+]]></Implementation>
+</Method>
+
 <Method name="TestBewaarKorting10Procent">
 <Implementation><![CDATA[
 	#dim Ref As %String = ..GeefRef()
 	#dim DataOpt As %String = "KalUi6_NX85Ce0bQpd86acoUF5LKw2rq/pra5kQe/UXZ7D1qqeEFh/10jmc6cY_MZ0PxLulR7RKZQLuBtCcyZZcMOfgNB4OWAk3xmc9/mDQ-"
-	Do ..AssertBewaarCorrecteKorting(Ref,DataOpt,0.1)
+	
+	Do ..AssertBewaarCorrecteKorting(Ref, DataOpt, 0.1)
 ]]></Implementation>
 </Method>
 
 <Method name="TestBewaarKortingLeegMaken">
 <Implementation><![CDATA[
 	#dim Ref As %String = ..GeefRef()
 	#dim DataOpt As %String = "KalUi6_NX85Ce0bQpd86acoUF5LKw2rq/pra5kQe/UXZ7D1qqeEFh/10jmc6cY_MuuwxRFEIBHaBhpa08b3cihJ55SUNVeetn3YqYKrvRQk-"
-	Do ..AssertBewaarCorrecteKorting(Ref,DataOpt,0)
+	
+	Do ..AssertBewaarCorrecteKorting(Ref, DataOpt, 0)
 ]]></Implementation>
 </Method>
 
 <Method name="TestBewaarKortingFoutieveInputLetters">
 <Implementation><![CDATA[
-	Do $$$AssertException("AssertBewaarKortingFoutieveInputLetters","TECH.Exceptions.GeneralErrorException","Kan korting 'abc' niet parsen. (Personality: '10', Klant: 'DummyKlantID', 'DummyKlantNaam')")	
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Kan korting 'abc' niet parsen. (Personality: '10', Klant: 'DummyKlantID', 'DummyKlantNaam')")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException", Substrings))
 	
-	Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingSpecificaties.Count(),0) 
-	Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingPercentages.Count(),0)
+	#dim Ref As %String = ..GeefRef()
+	#dim DataOpt As %String = "KalUi6_NX85Ce0bQpd86acoUF5LKw2rq/pra5kQe/UXZ7D1qqeEFh/10jmc6cY_Me7H4lqlB38GInju6WYg0gd6IVpyYhhI85KbU2ZA249c-" // korting = "abc"
+	
+	Do ..AssertBewaarCorrecteKorting(Ref, DataOpt, "abc")
 ]]></Implementation>
 </Method>
 
 <Method name="TestBewaarKortingFoutieveInputDecimaal">
 <Implementation><![CDATA[
-	// korting = 0.3 	
-	Do $$$AssertException("AssertBewaarKortingFoutieveInputDecimalen","TECH.Exceptions.GeneralErrorException","Kan korting '0.3' niet parsen. (Personality: '10', Klant: 'DummyKlantID', 'DummyKlantNaam')")	
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Kan korting '0.3' niet parsen. (Personality: '10', Klant: 'DummyKlantID', 'DummyKlantNaam')")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException", Substrings))
 	
-	Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingSpecificaties.Count(),0) 
-	Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingPercentages.Count(),0)
-]]></Implementation>
-</Method>
-
-<Method name="AssertBewaarCorrecteKorting">
-<FormalSpec>Ref:%String,DataOpt:%String,Korting:TECH.Percentage</FormalSpec>
-<Implementation><![CDATA[
-	
-	Set LoginKortingBewaarder = ##class(WSimpl.Unishop.Login.KortingBewaarder).%New()
-	Do LoginKortingBewaarder.BewaarMeegegevenKorting(Ref,DataOpt)
-	
-	If $$$AssertEquals(..KortingServiceMock.IngesteldeKortingSpecificaties.Count(),2) {
-		#dim KS1 As DOM.VKP.dto.KortingSpecificaties = ..KortingServiceMock.IngesteldeKortingSpecificaties.GetAt(1)
-		Do ..AssertBasisInfoKortingSpecificties(KS1)
-		Do $$$AssertEquals(KS1.Variant,##class(DOM.PM.enu.Variant).LegraboxPure())
-		
-		#dim KS2 As DOM.VKP.dto.KortingSpecificaties = ..KortingServiceMock.IngesteldeKortingSpecificaties.GetAt(2)
-		Do ..AssertBasisInfoKortingSpecificties(KS2)
-		Do $$$AssertEquals(KS2.Variant,##class(DOM.PM.enu.Variant).Taorbox())
-	}
-	
-	If $$$AssertEquals(..KortingServiceMock.IngesteldeKortingPercentages.Count(),2) {
-		Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingPercentages.GetAt(1),Korting)
-		Do $$$AssertEquals(..KortingServiceMock.IngesteldeKortingPercentages.GetAt(2),Korting)
-	}
-]]></Implementation>
-</Method>
-
-<Method name="AssertBewaarKortingFoutieveInputLetters">
-<Implementation><![CDATA[
 	#dim Ref As %String = ..GeefRef()
-	#dim DataOpt As %String = "KalUi6_NX85Ce0bQpd86acoUF5LKw2rq/pra5kQe/UXZ7D1qqeEFh/10jmc6cY_Me7H4lqlB38GInju6WYg0gd6IVpyYhhI85KbU2ZA249c-"
+	#dim DataOpt As %String = "KalUi6_NX85Ce0bQpd86acoUF5LKw2rq/pra5kQe/UXZ7D1qqeEFh/10jmc6cY_M4LGcaJjU7qxuv606OyXSpd6IVpyYhhI85KbU2ZA249c-" // korting = 0.3 (ipv 30)
 	
-	Set LoginKortingBewaarder = ##class(WSimpl.Unishop.Login.KortingBewaarder).%New()
-	Do LoginKortingBewaarder.BewaarMeegegevenKorting(Ref,DataOpt)
+	Do ..AssertBewaarCorrecteKorting(Ref, DataOpt, 0.3)
 ]]></Implementation>
 </Method>
-
-<Method name="AssertBewaarKortingFoutieveInputDecimalen">
-<Implementation><![CDATA[
-	#dim Ref As %String = ..GeefRef()
-	#dim DataOpt As %String = "KalUi6_NX85Ce0bQpd86acoUF5LKw2rq/pra5kQe/UXZ7D1qqeEFh/10jmc6cY_M4LGcaJjU7qxuv606OyXSpd6IVpyYhhI85KbU2ZA249c-"
-	
-	Set LoginKortingBewaarder = ##class(WSimpl.Unishop.Login.KortingBewaarder).%New()
-	Do LoginKortingBewaarder.BewaarMeegegevenKorting(Ref,DataOpt)
-]]></Implementation>
-</Method>
-
-<Method name="AssertBasisInfoKortingSpecificties">
-<FormalSpec>KS:DOM.VKP.dto.KortingSpecificaties</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Do $$$AssertEquals(KS.Aantal,1)
-	Do $$$AssertEquals(KS.Familie,##class(DOM.PM.enu.Familie).Lade())
-	Do $$$AssertEquals(KS.KlantID,"daro_DummyKlantID")
-	Do $$$AssertEquals(KS.PersonalityID,##class(DOM.common.enu.Personality).Daro())
-]]></Implementation>
-</Method>
 </Class>