Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml
===================================================================
diff -u -r32191 -r33283
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml	(.../APPS/EC/impl/LoginParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml)	(revision 32191)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml	(.../WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml)	(revision 33283)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="vhUnitTest.APPS.EC.impl.LoginParameterBepalerGebruikerID.ResultaatBepalerNietOpgegevenGebruiker">
-<Super>TECH.RegisteredObject,vhUnitTest.APPS.EC.impl.LoginParameterBepalerGebruikerID.ResultaatBepaler</Super>
+<Class name="vhUnitTest.WSimpl.Unishop.Login.ParameterBepalerGebruikerID.ResultaatBepalerNietOpgegevenGebruiker">
+<Super>TECH.RegisteredObject,vhUnitTest.WSimpl.Unishop.Login.ParameterBepalerGebruikerID.ResultaatBepaler</Super>
 
 <Method name="GeefOpgegevenGebruikerID">
 <ReturnType>%String</ReturnType>
FishEye: Tag 33283 refers to a dead (removed) revision in file `vhUnitTest/APPS/EC/impl/LoginParameterBepaler/TestBase.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/LoginParameterBepalerMock.cls.xml
===================================================================
diff -u -r33278 -r33283
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/LoginParameterBepalerMock.cls.xml	(.../APPS/EC/impl/LoginParameterBepaler/LoginParameterBepalerMock.cls.xml)	(revision 33278)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/LoginParameterBepalerMock.cls.xml	(.../WSimpl/Unishop/Login/ParameterBepaler/LoginParameterBepalerMock.cls.xml)	(revision 33283)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="vhUnitTest.APPS.EC.impl.LoginParameterBepaler.LoginParameterBepalerMock">
+<Class name="vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.LoginParameterBepalerMock">
 <Super>WSimpl.Unishop.Login.ParameterBepaler</Super>
 
 <Method name="ZetKlantSessieData">
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/HaefeleBE/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/HaefeleBE/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/HaefeleBE/Test.cls.xml	(revision 33283)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.HaefeleBE.Test">
+<Super>vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.TestBase</Super>
+
+<Method name="GeefTaal">
+<Private>1</Private>
+<ReturnType>DOM.enu.Taal</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.enu.Taal).Nederlands()
+]]></Implementation>
+</Method>
+
+<Method name="GeefRemoteIP">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit "195.0.0.1"
+]]></Implementation>
+</Method>
+
+<Method name="GeefVerwachtResultaat">
+<Private>1</Private>
+<ReturnType>WSimpl.Unishop.Login.Parameters</ReturnType>
+<Implementation><![CDATA[
+	set VerwachtResultaat = ##class(APPS.EC.dto.LoginParametersSFS).%New()
+	set VerwachtResultaat.GebruikerID = "hfleBE_1234_USER01"
+	set VerwachtResultaat.KlantID = "hfleBE_1234"
+	set VerwachtResultaat.KlantNaam = "KLANT VAN HaefeleBE"
+	set VerwachtResultaat.RemoteIP = "195.0.0.1"
+	set VerwachtResultaat.PersonalityID = ##class(DOM.common.enu.Personality).HaefeleBE()
+	set VerwachtResultaat.Taal = ##class(DOM.enu.Taal).Nederlands()
+	quit VerwachtResultaat
+]]></Implementation>
+</Method>
+
+<Method name="StelInRefSessieData">
+<FormalSpec>RefSessieData:APPS.EC.dto.RefSessieData</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set RefSessieData.KlantID = $$$DummyString
+	Set RefSessieData.Verwerker = ##class(APPS.EC.enu.UniShopVerwerker).HaefeleBelgie()
+]]></Implementation>
+</Method>
+
+<Method name="StelInKlantSessieData">
+<FormalSpec>KSD:APPS.EC.dto.KlantSessieData</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#define HaefeleBEKlantNr 1234
+	#define HaefeleBEUserID  "USER01"
+	
+	Set KSD.KlantID = $$$HaefeleBEKlantNr
+	Set KSD.GebruikerID = $$$HaefeleBEUserID
+	Set KSD.KlantNaam = "KLANT VAN HaefeleBE"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
FishEye: Tag 33283 refers to a dead (removed) revision in file `vhUnitTest/APPS/EC/impl/LoginParameterBepalerGebruikerID/ResultaatBepalerNietOpgegevenGebruiker.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/VanRaemdonck/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/VanRaemdonck/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/VanRaemdonck/Test.cls.xml	(revision 33283)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.VanRaemdonck.Test">
+<Super>vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.TestBase</Super>
+
+<Method name="GeefTaal">
+<Private>1</Private>
+<ReturnType>DOM.enu.Taal</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.enu.Taal).Nederlands()
+]]></Implementation>
+</Method>
+
+<Method name="GeefRemoteIP">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit "195.0.0.1"
+]]></Implementation>
+</Method>
+
+<Method name="GeefVerwachtResultaat">
+<Private>1</Private>
+<ReturnType>WSimpl.Unishop.Login.Parameters</ReturnType>
+<Implementation><![CDATA[
+	set VerwachtResultaat = ##class(APPS.EC.dto.LoginParametersHandelMetVerificatie).%New()
+	set VerwachtResultaat.GebruikerID = "raem_1234_USER01"
+	set VerwachtResultaat.KlantID = "raem_1234"
+	set VerwachtResultaat.KlantNaam = "KLANT VAN VanRaemdonck"
+	set VerwachtResultaat.RemoteIP = "195.0.0.1"
+	set VerwachtResultaat.PersonalityID = ##class(DOM.common.enu.Personality).VanRaemdonck()
+	set VerwachtResultaat.Taal = ##class(DOM.enu.Taal).Nederlands()
+	quit VerwachtResultaat
+]]></Implementation>
+</Method>
+
+<Method name="StelInRefSessieData">
+<FormalSpec>RefSessieData:APPS.EC.dto.RefSessieData</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set RefSessieData.KlantID = $$$DummyString
+	Set RefSessieData.Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).VanRaemdonck()
+]]></Implementation>
+</Method>
+
+<Method name="StelInKlantSessieData">
+<FormalSpec>KSD:APPS.EC.dto.KlantSessieData</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#define VanRaemdonckKlantNr 1234
+	#define VanRaemdonckUserID  "USER01"
+	
+	Set KSD.KlantID = $$$VanRaemdonckKlantNr
+	Set KSD.GebruikerID = $$$VanRaemdonckUserID
+	Set KSD.KlantNaam = "KLANT VAN VanRaemdonck"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/TestGebruikerID.cls.xml
===================================================================
diff -u -r33278 -r33283
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/TestGebruikerID.cls.xml	(.../APPS/EC/impl/LoginParameterBepaler/TestGebruikerID.cls.xml)	(revision 33278)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/TestGebruikerID.cls.xml	(.../WSimpl/Unishop/Login/ParameterBepaler/TestGebruikerID.cls.xml)	(revision 33283)
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="vhUnitTest.APPS.EC.impl.LoginParameterBepaler.TestGebruikerID">
+<Class name="vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.TestGebruikerID">
 <Super>vhUnitTest.TestCase</Super>
 
 <Method name="TestGebruikerIDOpgegeven">
 <Implementation><![CDATA[
-	Set ResultaatBepaler=##class(vhUnitTest.APPS.EC.impl.LoginParameterBepalerGebruikerID.ResultaatBepalerVoorOpgegevenGebruikerID).%New()
+	Set ResultaatBepaler=##class(vhUnitTest.WSimpl.Unishop.Login.ParameterBepalerGebruikerID.ResultaatBepalerVoorOpgegevenGebruikerID).%New()
 	Do ..LoginParameterBepalerControleerGebruikerID(ResultaatBepaler)
 ]]></Implementation>
 </Method>
 
 <Method name="TestGebruikerIDNietOpgegeven">
 <Implementation><![CDATA[
-	Set ResultaatBepaler=##class(vhUnitTest.APPS.EC.impl.LoginParameterBepalerGebruikerID.ResultaatBepalerNietOpgegevenGebruiker).%New()
+	Set ResultaatBepaler=##class(vhUnitTest.WSimpl.Unishop.Login.ParameterBepalerGebruikerID.ResultaatBepalerNietOpgegevenGebruiker).%New()
 	Do ..LoginParameterBepalerControleerGebruikerID(ResultaatBepaler)
 ]]></Implementation>
 </Method>
 
 <Method name="LoginParameterBepalerControleerGebruikerID">
 <Description>
 Loopt over alle verwerkers van de UniShop </Description>
-<FormalSpec>ResultaatBepaler:vhUnitTest.APPS.EC.impl.LoginParameterBepalerGebruikerID.ResultaatBepaler</FormalSpec>
+<FormalSpec>ResultaatBepaler:vhUnitTest.WSimpl.Unishop.Login.ParameterBepalerGebruikerID.ResultaatBepaler</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim OpgegevenGebruikerID As %String = ResultaatBepaler.GeefOpgegevenGebruikerID()
@@ -41,7 +41,7 @@
 	#define DummyDataOpt 	$$$DummyString
 	#define DummyTaal       ##class(DOM.enu.Taal).Nederlands()
 	
-	set LoginParameterBepaler = ##class(vhUnitTest.APPS.EC.impl.LoginParameterBepaler.LoginParameterBepalerMock).%New()
+	set LoginParameterBepaler = ##class(vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.LoginParameterBepalerMock).%New()
 
 	Set FakeRefSessieData = ##class(APPS.EC.dto.RefSessieData).%New()
 	do ..StelInRefSessieData(FakeRefSessieData,Verwerker)
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/GeefLoginParameters/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/GeefLoginParameters/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/GeefLoginParameters/Test.cls.xml	(revision 33283)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.GeefLoginParameters.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="Kisch">
+<Type>%String</Type>
+<Default>9LZLj_OcHCYCeOdo7noiyFxoPc4jHxU/HNcaZPKffZQ-</Default>
+</Parameter>
+
+<Method name="Test">
+<Implementation><![CDATA[
+	set KlantSessieDataBepalerSpy = ##class(vhTest.Mock.APPS.EC.KlantSessieDataBepaler).%New()
+	
+	do KlantSessieDataBepalerSpy.VerwachtMethodCall("GeefKlantSessieData",$$$ElkeWaarde).ExactAantalKeer(0)
+	
+	set LoginParameterBepaler = ##class(WSimpl.Unishop.Login.ParameterBepaler).%New(KlantSessieDataBepalerSpy)
+	do LoginParameterBepaler.GeefLoginParameters(..#Kisch,"","","")
+	
+	do KlantSessieDataBepalerSpy.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: DataOpt kan niet gedecript worden">
+<Implementation><![CDATA[
+	#define DataOptNietKisch "kt2ijlqAK/QLgcDhOELfqTg1ORp5xZXnO7lMBPy7bSNSwabj6K2SBz_k0jVRqxEZeajfZH8OdYzbAkBsW23sSg--"
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Invalid Decryption")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
+
+	set KlantSessieDataBepaler = ##class(APPS.EC.impl.KlantSessieDataBepaler).%New()
+	
+	set LoginParameterBepaler = ##class(WSimpl.Unishop.Login.ParameterBepaler).%New(KlantSessieDataBepaler)
+	do LoginParameterBepaler.GeefLoginParameters(..#Kisch,$$$DataOptNietKisch,"","")
+]]></Implementation>
+</Method>
+
+<Method name="Test: DataOpt waarbij het klantnr niet ingevuld is">
+<Implementation><![CDATA[
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("KlantSessieData is niet volledig")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
+	
+	#define DataOptZonderKlantNr 	"TBhqvOJP4JLgA3j/hOr7Jv7bYHDq9Br_UJGe/SvP5ar5vSSG7pRRE1E13IvxFnJe"
+	set KlantSessieDataBepaler = ##class(APPS.EC.impl.KlantSessieDataBepaler).%New()
+	
+	set LoginParameterBepaler = ##class(WSimpl.Unishop.Login.ParameterBepaler).%New(KlantSessieDataBepaler)
+	do LoginParameterBepaler.GeefLoginParameters(..#Kisch,$$$DataOptZonderKlantNr,"","")
+]]></Implementation>
+</Method>
+
+<Method name="Test: DataOpt waarbij het ingevuld is">
+<Implementation><![CDATA[
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("KlantSessieData is niet volledig")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
+	
+	#define DataOptZonderKlantNr 	"TBhqvOJP4JLgA3j/hOr7Jv7bYHDq9Br_UJGe/SvP5ar5vSSG7pRRE1E13IvxFnJe"
+	set KlantSessieDataBepaler = ##class(APPS.EC.impl.KlantSessieDataBepaler).%New()
+	
+	set LoginParameterBepaler = ##class(WSimpl.Unishop.Login.ParameterBepaler).%New(KlantSessieDataBepaler)
+	do LoginParameterBepaler.GeefLoginParameters(..#Kisch,$$$DataOptZonderKlantNr,"","")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Werkende klant">
+<Implementation><![CDATA[
+	#define WerkendeDataOpt 	"nFvd9mfXUkpk//J61YC930o22j6Ph_d2UCMMK4kGTPl98AMpuoM_7qQ7lTcqEtqj"
+	set KlantSessieDataBepaler = ##class(APPS.EC.impl.KlantSessieDataBepaler).%New()
+	
+	set LoginParameterBepaler = ##class(WSimpl.Unishop.Login.ParameterBepaler).%New(KlantSessieDataBepaler)
+	do LoginParameterBepaler.GeefLoginParameters(..#Kisch,$$$WerkendeDataOpt,"","")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/Daro/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/Daro/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/Daro/Test.cls.xml	(revision 33283)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.Daro.Test">
+<Super>vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.TestBase</Super>
+
+<Method name="GeefTaal">
+<Private>1</Private>
+<ReturnType>DOM.enu.Taal</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.enu.Taal).Engels()
+]]></Implementation>
+</Method>
+
+<Method name="GeefRemoteIP">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit "195.0.0.1"
+]]></Implementation>
+</Method>
+
+<Method name="GeefVerwachtResultaat">
+<Private>1</Private>
+<ReturnType>WSimpl.Unishop.Login.Parameters</ReturnType>
+<Implementation><![CDATA[
+	set VerwachtResultaat = ##class(APPS.EC.dto.LoginParametersHandelMetVerificatie).%New()
+	set VerwachtResultaat.GebruikerID = "daro_1234_USER01"
+	set VerwachtResultaat.KlantID = "daro_1234"
+	set VerwachtResultaat.KlantNaam = "KLANT VAN Daro-UK"
+	set VerwachtResultaat.RemoteIP = "195.0.0.1"
+	set VerwachtResultaat.PersonalityID = ##class(DOM.common.enu.Personality).Daro()
+	set VerwachtResultaat.Taal = ##class(DOM.enu.Taal).Engels()
+	quit VerwachtResultaat
+]]></Implementation>
+</Method>
+
+<Method name="StelInRefSessieData">
+<FormalSpec>RefSessieData:APPS.EC.dto.RefSessieData</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set RefSessieData.KlantID = $$$DummyString
+	Set RefSessieData.Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).Daro()
+]]></Implementation>
+</Method>
+
+<Method name="StelInKlantSessieData">
+<FormalSpec>KSD:APPS.EC.dto.KlantSessieData</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#define DaroKlantNr 1234
+	#define DaroUserID  "USER01"
+	
+	Set KSD.KlantID = $$$DaroKlantNr
+	Set KSD.GebruikerID = $$$DaroUserID
+	Set KSD.KlantNaam = "KLANT VAN Daro-UK"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/Dupont/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/Dupont/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/Dupont/Test.cls.xml	(revision 33283)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.Dupont.Test">
+<Super>vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.HandelAnoniemBase</Super>
+
+<Parameter name="PersonalityID">
+<Type>%String</Type>
+<Default>4</Default>
+</Parameter>
+
+<Parameter name="HandelPrefix">
+<Type>%String</Type>
+<Default>dupont_</Default>
+</Parameter>
+
+<Method name="GeefVerwerker">
+<ReturnType>APPS.EC.enu.WebShopVerwerker</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebShopVerwerker).Dupont()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml
===================================================================
diff -u -r32191 -r33283
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml	(.../APPS/EC/impl/LoginParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml)	(revision 32191)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml	(.../WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml)	(revision 33283)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="vhUnitTest.APPS.EC.impl.LoginParameterBepalerGebruikerID.ResultaatBepalerVoorOpgegevenGebruikerID">
-<Super>TECH.RegisteredObject,vhUnitTest.APPS.EC.impl.LoginParameterBepalerGebruikerID.ResultaatBepaler</Super>
+<Class name="vhUnitTest.WSimpl.Unishop.Login.ParameterBepalerGebruikerID.ResultaatBepalerVoorOpgegevenGebruikerID">
+<Super>TECH.RegisteredObject,vhUnitTest.WSimpl.Unishop.Login.ParameterBepalerGebruikerID.ResultaatBepaler</Super>
 
 <Parameter name="GebruikerID">
 <Type>%String</Type>
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/SFS/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/SFS/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/SFS/Test.cls.xml	(revision 33283)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.SFS.Test">
+<Super>vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.TestBase</Super>
+
+<Method name="GeefTaal">
+<Private>1</Private>
+<ReturnType>DOM.enu.Taal</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.enu.Taal).Duits()
+]]></Implementation>
+</Method>
+
+<Method name="GeefRemoteIP">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit "195.0.0.1"
+]]></Implementation>
+</Method>
+
+<Method name="GeefVerwachtResultaat">
+<Private>1</Private>
+<ReturnType>WSimpl.Unishop.Login.Parameters</ReturnType>
+<Implementation><![CDATA[
+	set VerwachtResultaat = ##class(APPS.EC.dto.LoginParametersSFS).%New()
+	set VerwachtResultaat.GebruikerID = "SFS_1234_USER01"
+	set VerwachtResultaat.KlantID = "SFS_1234"
+	set VerwachtResultaat.KlantNaam = "KLANT VAN SFS"
+	set VerwachtResultaat.RemoteIP = "195.0.0.1"
+	set VerwachtResultaat.PersonalityID = ##class(DOM.common.enu.Personality).SFS()
+	set VerwachtResultaat.Taal = ##class(DOM.enu.Taal).Duits()
+	quit VerwachtResultaat
+]]></Implementation>
+</Method>
+
+<Method name="StelInRefSessieData">
+<FormalSpec>RefSessieData:APPS.EC.dto.RefSessieData</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set RefSessieData.KlantID = $$$DummyString
+	Set RefSessieData.Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).SFS()
+]]></Implementation>
+</Method>
+
+<Method name="StelInKlantSessieData">
+<FormalSpec>KSD:APPS.EC.dto.KlantSessieData</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#define SFSKlantNr 1234
+	#define SFSUserID  "USER01"
+	
+	Set KSD.KlantID = $$$SFSKlantNr
+	Set KSD.GebruikerID = $$$SFSUserID
+	Set KSD.KlantNaam = "KLANT VAN SFS"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
FishEye: Tag 33283 refers to a dead (removed) revision in file `vhUnitTest/APPS/EC/impl/LoginParameterBepaler/TestGebruikerID.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/Destil/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/Destil/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/Destil/Test.cls.xml	(revision 33283)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.Destil.Test">
+<Super>vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.HandelAnoniemBase</Super>
+
+<Parameter name="PersonalityID">
+<Type>%String</Type>
+<Default>6</Default>
+</Parameter>
+
+<Parameter name="HandelPrefix">
+<Type>%String</Type>
+<Default>destil_</Default>
+</Parameter>
+
+<Method name="GeefVerwerker">
+<ReturnType>APPS.EC.enu.WebShopVerwerker</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.EC.enu.WebShopVerwerker).Destil()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
FishEye: Tag 33283 refers to a dead (removed) revision in file `vhUnitTest/APPS/EC/impl/LoginParameterBepalerGebruikerID/ResultaatBepalerVoorOpgegevenGebruikerID.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 33283 refers to a dead (removed) revision in file `vhUnitTest/APPS/EC/impl/LoginParameterBepaler/LoginParameterBepalerMock.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 33283 refers to a dead (removed) revision in file `vhUnitTest/APPS/EC/impl/LoginParameterBepaler/SFS/TestTaal.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/SFS/TestTaal.cls.xml
===================================================================
diff -u -r33278 -r33283
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/SFS/TestTaal.cls.xml	(.../APPS/EC/impl/LoginParameterBepaler/SFS/TestTaal.cls.xml)	(revision 33278)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/SFS/TestTaal.cls.xml	(.../WSimpl/Unishop/Login/ParameterBepaler/SFS/TestTaal.cls.xml)	(revision 33283)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="vhUnitTest.APPS.EC.impl.LoginParameterBepaler.SFS.TestTaal">
+<Class name="vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.SFS.TestTaal">
 <Super>vhUnitTest.TestCase</Super>
 
 <Method name="StelInRefSessieData">
@@ -74,7 +74,7 @@
 	#define DummyDataOpt 	$$$DummyString
 	#define DummyRemoteIP	$$$DummyInteger
 	
-	set LoginParameterBepaler = ##class(vhUnitTest.APPS.EC.impl.LoginParameterBepaler.LoginParameterBepalerMock).%New()
+	set LoginParameterBepaler = ##class(vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.LoginParameterBepalerMock).%New()
 
 	Set FakeRefSessieData = ##class(APPS.EC.dto.RefSessieData).%New()
 	do ..StelInRefSessieData(FakeRefSessieData)
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/VanHoecke/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/VanHoecke/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/VanHoecke/Test.cls.xml	(revision 33283)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.VanHoecke.Test">
+<Super>vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.TestBase</Super>
+
+<Parameter name="GebruikerID">
+<Type>%String</Type>
+<Default>Vhisie||K||1000||1</Default>
+</Parameter>
+
+<Method name="GeefTaal">
+<Private>1</Private>
+<ReturnType>DOM.enu.Taal</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.enu.Taal).Nederlands()
+]]></Implementation>
+</Method>
+
+<Method name="GeefRemoteIP">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit "195.0.0.1"
+]]></Implementation>
+</Method>
+
+<Method name="GeefVerwachtResultaat">
+<Private>1</Private>
+<ReturnType>WSimpl.Unishop.Login.Parameters</ReturnType>
+<Implementation><![CDATA[
+	set VerwachtResultaat = ##class(APPS.EC.dto.LoginParametersVanHoecke).%New()
+	set VerwachtResultaat.GebruikerID = ..#GebruikerID
+	set VerwachtResultaat.KlantID = "K||1000"
+	set VerwachtResultaat.RemoteIP = "195.0.0.1"
+	set VerwachtResultaat.PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke()
+	set VerwachtResultaat.Taal = ##class(DOM.enu.Taal).Nederlands()
+	quit VerwachtResultaat
+]]></Implementation>
+</Method>
+
+<Method name="StelInRefSessieData">
+<FormalSpec>RefSessieData:APPS.EC.dto.RefSessieData</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set RefSessieData.KlantID = "K||1000"
+	Set RefSessieData.Verwerker = ##class(APPS.EC.enu.WebShopVerwerker).VHEPN()
+]]></Implementation>
+</Method>
+
+<Method name="StelInKlantSessieData">
+<FormalSpec>KSD:APPS.EC.dto.KlantSessieData</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Set KSD.GebruikerID = ..#GebruikerID
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/TestBase.cls.xml
===================================================================
diff -u -r33278 -r33283
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/TestBase.cls.xml	(.../APPS/EC/impl/LoginParameterBepaler/TestBase.cls.xml)	(revision 33278)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/TestBase.cls.xml	(.../WSimpl/Unishop/Login/ParameterBepaler/TestBase.cls.xml)	(revision 33283)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="vhUnitTest.APPS.EC.impl.LoginParameterBepaler.TestBase">
+<Class name="vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.TestBase">
 <Abstract>1</Abstract>
 <Super>vhUnitTest.TestCase</Super>
 
@@ -10,7 +10,7 @@
 	#define DummyRef 		$$$DummyString
 	#define DummyDataOpt 	$$$DummyString
 	
-	set LoginParameterBepaler = ##class(vhUnitTest.APPS.EC.impl.LoginParameterBepaler.LoginParameterBepalerMock).%New()
+	set LoginParameterBepaler = ##class(vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.LoginParameterBepalerMock).%New()
 	
 	Set FakeRefSessieData = ##class(APPS.EC.dto.RefSessieData).%New()
 	do ..StelInRefSessieData(FakeRefSessieData)
FishEye: Tag 33283 refers to a dead (removed) revision in file `vhUnitTest/APPS/EC/impl/LoginParameterBepaler/HandelAnoniemBase.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepaler.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepaler.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepalerGebruikerID/ResultaatBepaler.cls.xml	(revision 33283)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Unishop.Login.ParameterBepalerGebruikerID.ResultaatBepaler">
+<Super>APPS.EC.enu.UniShopVerwerker.Verwerker</Super>
+
+<Property name="VerwachteGebruikerID">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="GeefVerwachteGebruikerID">
+<FormalSpec>UniShopVerwerker:APPS.EC.enu.UniShopVerwerker</FormalSpec>
+<Implementation><![CDATA[
+	Set ..VerwachteGebruikerID=""
+	Do ..Verwerk(UniShopVerwerker)
+	Quit ..VerwachteGebruikerID
+]]></Implementation>
+</Method>
+
+<Method name="GeefOpgegevenGebruikerID">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/HandelAnoniemBase.cls.xml
===================================================================
diff -u -r33278 -r33283
--- vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/HandelAnoniemBase.cls.xml	(.../APPS/EC/impl/LoginParameterBepaler/HandelAnoniemBase.cls.xml)	(revision 33278)
+++ vhUnitTest/WSimpl/Unishop/Login/ParameterBepaler/HandelAnoniemBase.cls.xml	(.../WSimpl/Unishop/Login/ParameterBepaler/HandelAnoniemBase.cls.xml)	(revision 33283)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="vhUnitTest.APPS.EC.impl.LoginParameterBepaler.HandelAnoniemBase">
+<Class name="vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.HandelAnoniemBase">
 <Abstract>1</Abstract>
-<Super>vhUnitTest.APPS.EC.impl.LoginParameterBepaler.TestBase</Super>
+<Super>vhUnitTest.WSimpl.Unishop.Login.ParameterBepaler.TestBase</Super>
 
 <Parameter name="HandelPrefix">
 <Type>%String</Type>