Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteer/Test.cls.xml
===================================================================
diff -u -r42000 -r42005
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 42000)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 42005)
@@ -8,27 +8,32 @@
 <Private>1</Private>
 </Property>
 
+<Property name="LoginParameters">
+<Type>WSimpl.Unishop.Login.ParametersHandel</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ##super(aTestName)
 	Set ..DecrypteerRequestStub = ##class(vhTest.Utils.WS.Vhisie4.Auth.DecrypteerRequest).StandaardDecrypteerRequest()
+	
+	Set ..LoginParameters = ##class(WSimpl.Unishop.Login.ParametersHandel).%New()
+	Set ..LoginParameters.GebruikerID = "daro_5_1"
+	Set ..LoginParameters.KlantID = "daro_5"
+	Set ..LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Daro()
+	Set ..LoginParameters.RemoteIP = "127.0.0.257"
+	Set ..LoginParameters.Taal = "N"
 ]]></Implementation>
 </Method>
 
 <Method name="Test Standaardgedrag">
 <Implementation><![CDATA[
 	Set ..DecrypteerRequestStub.Header.PersonalityId = ##class(DOM.common.enu.Personality).Daro()
 	
-	Set LoginParameters = ##class(WSimpl.Unishop.Login.ParametersHandel).%New()
-	Set LoginParameters.GebruikerID = "daro_5_1"
-	Set LoginParameters.KlantID = "daro_5"
-	Set LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Daro()
-	Set LoginParameters.RemoteIP = "127.0.0.257"
-	Set LoginParameters.Taal = "N"
-	
 	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)
+	Do LoginParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters)
 
 	Set HandelPersonalityStub = ##class(vhTest.Mock.DOM.common.impl.HandelPersonality).%New(##class(DOM.common.enu.Personality).Daro(),$$$DummyInteger)
 	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Daro())
@@ -38,7 +43,7 @@
 	Set KlantDataDummy.ID = "5"
 	Set KlantDataDummy.Naam = "Tom Gilles The Spy"
 	Set KlantDataBepalerStub = ##class(vhTest.Mock.DOM.VKP.impl.KlantDataBepaler).%New()
-	Do KlantDataBepalerStub.IndienMethodCall("GeefKlantData",HandelPersonalityStub,LoginParameters.KlantID).DanReturn(KlantDataDummy)
+	Do KlantDataBepalerStub.IndienMethodCall("GeefKlantData",HandelPersonalityStub,..LoginParameters.KlantID).DanReturn(KlantDataDummy)
 		
 	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(KlantDataDummy)
 	
@@ -111,62 +116,52 @@
 
 <Method name="Test: enkel TBX en LBX voor Destil">
 <Implementation><![CDATA[
+	Set ..LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Destil()
 	
-	Set LoginParameters = ##class(WSimpl.Unishop.Login.ParametersHandel).%New()
-	Set LoginParameters.GebruikerID = $$$DummyString
-	Set LoginParameters.KlantID = "destil_1"
-	Set LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Destil()
-	Set LoginParameters.RemoteIP = $$$DummyString
-	Set LoginParameters.Taal = $$$DummyString
-	
 	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)
+	Do LoginParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters)
 	
 	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock,)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(..DecrypteerRequestStub)
 	
 	Do $$$AssertEquals(Response.IsGeldig,"1")
-	Do $$$AssertEquals(Response.ToegelatenLadetypes.Count(),2)
+	If $$$AssertEquals(Response.ToegelatenLadetypes.Count(),2) {
+		Do $$$AssertInList(Response.ToegelatenLadetypes,"LBX")
+		Do $$$AssertInList(Response.ToegelatenLadetypes,"TBX")
+	}
 	
 	Do LoginParameterBepalerMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: enkel TBX en LBX voor Kisch">
 <Implementation><![CDATA[
-	Set LoginParameters = ##class(WSimpl.Unishop.Login.ParametersHandel).%New()
-	Set LoginParameters.GebruikerID = "kisch_64_1"
-	Set LoginParameters.KlantID = "kisch_64"
-	Set LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Kisch()
-	Set LoginParameters.RemoteIP = $$$DummyString
-	Set LoginParameters.Taal = $$$DummyString
+	Set ..LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Kisch()
 	
 	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)
+	Do LoginParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters)
 	
 	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(..DecrypteerRequestStub)
 	
 	Do $$$AssertEquals(Response.IsGeldig,"1")
-	Do $$$AssertEquals(Response.ToegelatenLadetypes.Count(),2)
+	If $$$AssertEquals(Response.ToegelatenLadetypes.Count(),2) {
+		Do $$$AssertInList(Response.ToegelatenLadetypes,"LBX")
+		Do $$$AssertInList(Response.ToegelatenLadetypes,"TBX")
+	}
 	
 	Do LoginParameterBepalerMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: enkel LBX en TAX voor Daro">
 <Implementation><![CDATA[
-	Set LoginParameters = ##class(WSimpl.Unishop.Login.ParametersHandel).%New()
-	Set LoginParameters.GebruikerID = "daro_5_1"
-	Set LoginParameters.KlantID = "daro_5"
-	Set LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Daro()
-	Set LoginParameters.RemoteIP = "127.0.0.257"
-	Set LoginParameters.Taal = "N"
+	Set ..LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Daro()
 	
 	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)
+	Do LoginParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters)
 	
 	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock)
 	
@@ -181,22 +176,15 @@
 
 <Method name="Test: ongeldig indien incorrecte data uit ref/dataopt">
 <Implementation><![CDATA[
-	Set LoginParameters = ##class(WSimpl.Unishop.Login.ParametersHandel).%New()
-	Set LoginParameters.GebruikerID = "Incorrect_GebruikerId"
-	Set LoginParameters.KlantID = "K||7833"
-	Set LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke()
-	Set LoginParameters.RemoteIP = "127.0.0.257"
-	Set LoginParameters.Taal = "N"
-	
 	Set LoginParameterBepalerStub = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
-	Do LoginParameterBepalerStub.IndienMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(LoginParameters)
+	Do LoginParameterBepalerStub.IndienMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters)
 	
 	Set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New("WS.VHISIE4")
 	Do LoggerMock.VerwachtMethodCall("Error",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).ExactAantalKeer(1)
 	
 	Set HandelPersonalityStub = ##class(vhTest.Mock.DOM.common.impl.HandelPersonality).%New(##class(DOM.common.enu.Personality).Daro(),$$$DummyInteger)
 	Set KlantDataBepalerStub = ##class(vhTest.Mock.DOM.VKP.impl.KlantDataBepaler).%New()
-	Do KlantDataBepalerStub.IndienMethodCall("GeefKlantData",HandelPersonalityStub,LoginParameters.KlantID).DanReturn("")
+	Do KlantDataBepalerStub.IndienMethodCall("GeefKlantData",HandelPersonalityStub,..LoginParameters.KlantID).DanReturn("")
 	
 	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerStub, LoggerMock,,,,,KlantDataBepalerStub)
 	
@@ -210,12 +198,11 @@
 
 <Method name="Test: LoginParameters bevat geen KlantId -&gt; Klant met nieuw Id aanmaken">
 <Implementation><![CDATA[
-	Set LoginParameters = ##class(WSimpl.Unishop.Login.ParametersHandel).%New()
-	Set LoginParameters.KlantID = ""
-	Set LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Daro()
+	Set ..LoginParameters.KlantID = ""
+	Set ..LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Daro()
 	
 	Set LoginParameterBepalerStub = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
-	Do LoginParameterBepalerStub.IndienMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(LoginParameters)
+	Do LoginParameterBepalerStub.IndienMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters)
 
 	Set HandelPersonalityStub = ##class(vhTest.Mock.DOM.common.impl.HandelPersonality).%New(##class(DOM.common.enu.Personality).Daro(),$$$DummyInteger)
 	Do HandelPersonalityStub.IndienMethodCall("GeefID").DanReturn(##class(DOM.common.enu.Personality).Daro())