Index: APPS/EC/impl/RefSessieDataBepaler.cls.xml
===================================================================
diff -u -r29059 -r33363
--- APPS/EC/impl/RefSessieDataBepaler.cls.xml	(.../RefSessieDataBepaler.cls.xml)	(revision 29059)
+++ APPS/EC/impl/RefSessieDataBepaler.cls.xml	(.../RefSessieDataBepaler.cls.xml)	(revision 33363)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.EC.impl.RefSessieDataBepaler">
-<Super>APPS.EC.RefSessieDataBepaler,TECH.RegisteredObject</Super>
+<Super>APPS.EC.RefSessieDataBepaler,TECH.RegisteredObject,TECH.Mockable</Super>
 
 <Method name="GeefRefSessieData">
 <FormalSpec>EncryptedRefSessieData:%String</FormalSpec>
Index: WSimpl/Unishop/Login/Aanmelder.cls.xml
===================================================================
diff -u -r33351 -r33363
--- WSimpl/Unishop/Login/Aanmelder.cls.xml	(.../Aanmelder.cls.xml)	(revision 33351)
+++ WSimpl/Unishop/Login/Aanmelder.cls.xml	(.../Aanmelder.cls.xml)	(revision 33363)
@@ -23,8 +23,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="RefSessieBepaler">
+<Type>APPS.EC.impl.RefSessieDataBepaler</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>LoginParameterBepaler:WSimpl.Unishop.Login.ParameterBepaler,LoginKortingBewaarder:WSimpl.Unishop.Login.KortingBewaarder,SessionService:APPS.EC.WebshopSessionService,WebshopSessieSettingsInvuller:WSimpl.Unishop.Login.WebshopSessieSettingsInvuller</FormalSpec>
+<FormalSpec>LoginParameterBepaler:WSimpl.Unishop.Login.ParameterBepaler,LoginKortingBewaarder:WSimpl.Unishop.Login.KortingBewaarder,SessionService:APPS.EC.WebshopSessionService,WebshopSessieSettingsInvuller:WSimpl.Unishop.Login.WebshopSessieSettingsInvuller,RefSessieBepaler:APPS.EC.impl.RefSessieDataBepaler</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -34,6 +39,7 @@
 	Set ..LoginKortingBewaarder = $$$Inject(LoginKortingBewaarder,##class(WSimpl.Unishop.Login.KortingBewaarder).%New())
 	Set ..SessionService = $$$Inject(SessionService, ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWebshopSessionService())
 	Set ..WebshopSessieSettingsInvuller = $$$Inject(WebshopSessieSettingsInvuller,##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller).%New())
+	Set ..RefSessieBepaler = $$$Inject(RefSessieBepaler, ##class(APPS.EC.impl.RefSessieDataBepaler).%New())
 	
 	quit $$$OK
 ]]></Implementation>
@@ -63,7 +69,7 @@
 <FormalSpec>Ref:%String,SessieID:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim RefSessieData As APPS.EC.dto.RefSessieData = ##class(APPS.EC.impl.RefSessieDataBepaler).%New().GeefRefSessieData(Ref)	
+	#dim RefSessieData As APPS.EC.dto.RefSessieData = ..RefSessieBepaler.GeefRefSessieData(Ref)	
 	#dim WebshopSessieObject As APPS.EC.impl.WebshopSessie = ##class(APPS.EC.impl.WebshopSessie).OpenId(SessieID)
 	Do WebshopSessieObject.ZetWebshopModus(RefSessieData.WebshopModus)
 	Do WebshopSessieObject.Save()
Index: vhTest/Fake/APPS/EC/impl/RefSessieDataBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/EC/impl/RefSessieDataBepaler.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/EC/impl/RefSessieDataBepaler.cls.xml	(revision 33363)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.EC.impl.RefSessieDataBepaler">
+<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>APPS.EC.impl.RefSessieDataBepaler</Super>
+
+<Method name="GeefEncryptedRefSessieData">
+<FormalSpec>RefSessieData:APPS.EC.dto.RefSessieData</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="GeefRefSessieData">
+<FormalSpec>EncryptedRefSessieData:%String</FormalSpec>
+<ReturnType>APPS.EC.dto.RefSessieData</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/APPS/EC/impl/RefSessieDataBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/EC/impl/RefSessieDataBepaler.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/EC/impl/RefSessieDataBepaler.cls.xml	(revision 33363)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.EC.impl.RefSessieDataBepaler">
+<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
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.EC.impl.RefSessieDataBepaler,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="GeefEncryptedRefSessieData">
+<FormalSpec>RefSessieData:APPS.EC.dto.RefSessieData</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefEncryptedRefSessieData",RefSessieData)
+]]></Implementation>
+</Method>
+
+<Method name="GeefRefSessieData">
+<FormalSpec>EncryptedRefSessieData:%String</FormalSpec>
+<ReturnType>APPS.EC.dto.RefSessieData</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefRefSessieData",EncryptedRefSessieData)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/Unishop/Login/Aanmelder/Test.cls.xml
===================================================================
diff -u -r33351 -r33363
--- vhUnitTest/WSimpl/Unishop/Login/Aanmelder/Test.cls.xml	(.../Test.cls.xml)	(revision 33351)
+++ vhUnitTest/WSimpl/Unishop/Login/Aanmelder/Test.cls.xml	(.../Test.cls.xml)	(revision 33363)
@@ -3,34 +3,64 @@
 <Class name="vhUnitTest.WSimpl.Unishop.Login.Aanmelder.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: LoginMetEncryptedParameters roept WebshopSessieSettingsInvuller.VulIn aan om het CheckoutType te zetten. ">
+<Property name="WebshopSessie">
+<Type>APPS.EC.impl.WebshopSessie</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Sleutel">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="GebruikerID">
+<Type>%String</Type>
+<InitialExpression>"vhUnitTest.WSimpl.Unishop.Login.Aanmelder.Test"</InitialExpression>
+</Property>
+
+<Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
-	/*#dim LoginParameterBepaler As vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
+	if ##class(APPS.EC.impl.VanHoeckeWebshopSessie).%ExistsId(..GebruikerID){
+		Set ..WebshopSessie = ##class(APPS.EC.impl.VanHoeckeWebshopSessie).%OpenId(..GebruikerID)
+	} else {
+		Set ..WebshopSessie = ##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New(..GebruikerID)
+		Do ..WebshopSessie.ZetWebshopModus(##class(APPS.EC.enu.WebshopModus).Normaal())
+		Do ..WebshopSessie.Save()		
+	}
+	
+	Set ..Sleutel = ..WebshopSessie.GeefSessieSleutel()
+
+	Do ##super()
+]]></Implementation>
+</Method>
+
+<Method name="Test: LoginMetEncryptedParameters roept WebshopSessieSettingsInvuller.VulIn aan. ">
+<Implementation><![CDATA[
+	#dim LoginParameterBepaler As vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
 	#dim LoginKortingBewaarder As vhTest.Mock.WSimpl.Unishop.Login.KortingBewaarder = ##class(vhTest.Mock.WSimpl.Unishop.Login.KortingBewaarder).%New()
 	#dim SessionService As vhTest.Mock.APPS.EC.WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
 	#dim WebshopSessieSettingsInvuller As vhTest.Mock.WSimpl.Unishop.Login.WebshopSessieSettingsInvuller = ##class(vhTest.Mock.WSimpl.Unishop.Login.WebshopSessieSettingsInvuller).%New()
+	#dim RefSessieBepaler As vhTest.Mock.APPS.EC.impl.RefSessieDataBepaler = ##class(vhTest.Mock.APPS.EC.impl.RefSessieDataBepaler).%New()
+	
 	#dim Ref As %String = ""
 	#dim DataOpt As %String = ""
 	#dim Taal As %String = ""
 	#dim RemoteIP As %String = ""
 	#dim LoginParameters As WSimpl.Unishop.Login.Parameters = ##class(WSimpl.Unishop.Login.ParametersVanHoecke).%New()
 	#dim WebshopSessie As APPS.EC.dto.WebshopSessie = ##class(APPS.EC.dto.WebshopSessie).%New()
 	Set WebshopSessie.VhintraSessie = ##class(APPS.algemeen.VhintraShell.dto.VhintraSessie).%New()
-	Set WebshopSessie.VhintraSessie.SessieSleutel = "Sessiesleutel"
+	Set WebshopSessie.VhintraSessie.SessieSleutel = ..Sleutel
 	
-	Do LoginParameterBepaler.VerwachtMethodCall("GeefLoginParameters", Ref,DataOpt,Taal,RemoteIP).DanReturn(LoginParameters)
-	Do LoginKortingBewaarder.VerwachtMethodCall("BewaarMeegegevenKorting",Ref, DataOpt).DanDoeNiks()
-	Do SessionService.VerwachtMethodCall("Login",LoginParameters).DanReturn(WebshopSessie)
+	Do LoginParameterBepaler.IndienMethodCall("GeefLoginParameters", Ref,DataOpt,Taal,RemoteIP).DanReturn(LoginParameters)
+	Do LoginKortingBewaarder.IndienMethodCall("BewaarMeegegevenKorting",Ref, DataOpt).DanDoeNiks()
+	Do SessionService.IndienMethodCall("Login",LoginParameters).DanReturn(WebshopSessie)
 	Do WebshopSessieSettingsInvuller.VerwachtMethodCall("VulIn",WebshopSessie).DanDoeNiks()
+	Do RefSessieBepaler.IndienMethodCall("GeefRefSessieData",Ref).DanReturn(##class(APPS.EC.dto.RefSessieData).%New())
 	
-	#dim Aanmelder As WSimpl.Unishop.Login.Aanmelder = ##class(WSimpl.Unishop.Login.Aanmelder).%New(LoginParameterBepaler, LoginKortingBewaarder, SessionService, WebshopSessieSettingsInvuller)
+	#dim Aanmelder As WSimpl.Unishop.Login.Aanmelder = ##class(WSimpl.Unishop.Login.Aanmelder).%New(LoginParameterBepaler, LoginKortingBewaarder, SessionService, WebshopSessieSettingsInvuller,RefSessieBepaler)
 	Do Aanmelder.LoginMetEncryptedParameters(Ref,DataOpt,Taal,RemoteIP)
 
-	Do LoginParameterBepaler.Verifieer()
-	Do LoginKortingBewaarder.Verifieer()
-	Do SessionService.Verifieer()
 	Do WebshopSessieSettingsInvuller.Verifieer()
-	*/
 ]]></Implementation>
 </Method>
 </Class>