Index: WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml
===================================================================
diff -u -r37231 -r37441
--- WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37231)
+++ WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler.cls.xml	(.../CheckoutTypeBepaler.cls.xml)	(revision 37441)
@@ -9,12 +9,13 @@
 </Property>
 
 <Method name="%OnNew">
+<FormalSpec>CheckoutTypeBepaler:APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..CheckoutTypeBepaler = ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	Set ..CheckoutTypeBepaler = $$$Inject(CheckoutTypeBepaler, ##class(APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
Index: vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler/Test.cls.xml
===================================================================
diff -u -r37223 -r37441
--- vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37223)
+++ vhUnitTest/WSimpl/Unishop/Login/WebshopSessieSettingsInvuller/CheckoutTypeBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37441)
@@ -3,91 +3,21 @@
 <Class name="vhUnitTest.WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="PushKlant">
-<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant</FormalSpec>
+<Method name="Test: CheckoutTypeBepaler bepaalt het Checkouttype met de juiste PersonalityID en KlantID">
 <Implementation><![CDATA[
-	#dim VerkoopAPI As vhTest.Mock.DOM.VKP.VerkoopAPI = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).MockInstance()
-	do VerkoopAPI.IndienMethodCall("GeefKlant",$$$ElkeWaarde).DanReturn(Klant)
-]]></Implementation>
-</Method>
-
-<Method name="Test: CheckoutTypeBepaler met klant Hein geeft MetTransportKeuze Checkouttype ">
-<Implementation><![CDATA[
-	#dim WebshopSessieSettingsInvuller As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler).%New()
 	#dim WebshopSessie As APPS.EC.dto.WebshopSessie = ..MaakWebshopSessieVanHoecke(##class(DOM.VKP.enu.Klant).Hein())
+	#dim CheckoutTypeBepalerMock As vhTest.Mock.APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler
+	Set CheckoutTypeBepalerMock = ##class(vhTest.Mock.APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler).%New()
+	Do CheckoutTypeBepalerMock.VerwachtMethodCall("Bepaal", WebshopSessie.PersonalityID,##class(DOM.VKP.enu.Klant).Hein()).DanDoeNiks()
+	#dim WebshopSessieSettingsInvuller As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler 
+	Set WebshopSessieSettingsInvuller = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler).%New(CheckoutTypeBepalerMock)
 	
-	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(WebshopSessie),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
-]]></Implementation>
-</Method>
-
-<Method name="Test: CheckoutTypeBepaler met personality Hein geeft MetTransportKeuze Checkouttype ">
-<Implementation><![CDATA[
+	Do WebshopSessieSettingsInvuller.Bepaal(WebshopSessie)
 	
-	#dim WebshopSessieSettingsInvuller As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler).%New()
-	#dim WebshopSessie As APPS.EC.dto.WebshopSessie = ##class(APPS.EC.dto.WebshopSessie).%New()
-	Set WebshopSessie.PersonalityID = ##class(DOM.common.enu.Personality).Hein()
-	
-	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(WebshopSessie),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
+	Do CheckoutTypeBepalerMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: CheckoutTypeBepaler voor Benelux geeft Standaard Checkouttype ">
-<Implementation><![CDATA[
-	do ..PushKlant(##class(vhTest.Dummy.DOM.VKP.VanHoeckeKlant).%New())
-	
-	#dim WebshopSessieSettingsInvuller As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler).%New()
-	#dim WebshopSessie As APPS.EC.dto.WebshopSessie = ##class(APPS.EC.dto.WebshopSessie).%New()
-	Set WebshopSessie.PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke()
-	Set WebshopSessie.LandCode = "BE"
-		
-	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(WebshopSessie),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
-]]></Implementation>
-</Method>
-
-<Method name="Test: CheckoutTypeBepaler buiten Benelux geeft MetTransportKeuze Checkouttype ">
-<Implementation><![CDATA[
-	set Klant = ##class(vhTest.Mock.DOM.VKP.VanHoeckeKlant).%New()
-	#dim Adres As DOM.VKP.LeverAdres = ##class(vhTest.Utils.DOM.VKP.LeverAdres).EuLid()
-	do Klant.IndienMethodCall("GeefAdres").DanReturn(Adres)
-	do ..PushKlant(Klant)
-	
-	#dim WebshopSessieSettingsInvuller As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler).%New()
-	#dim WebshopSessie As APPS.EC.dto.WebshopSessie = ##class(APPS.EC.dto.WebshopSessie).%New()
-	Set WebshopSessie.PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke()
-	Set WebshopSessie.LandCode = "DE"
-	
-	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(WebshopSessie),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
-]]></Implementation>
-</Method>
-
-<Method name="Test: CheckoutTypeBepaler zonder vanhoecke personality geeft Standaard Checkouttype ">
-<Implementation><![CDATA[
-	#dim WebshopSessieSettingsInvuller As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler).%New()
-	#dim WebshopSessie As APPS.EC.dto.WebshopSessie = ##class(APPS.EC.dto.WebshopSessie).%New()
-	Set WebshopSessie.PersonalityID = ##class(DOM.common.enu.Personality).Daro()
-	
-	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(WebshopSessie),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
-]]></Implementation>
-</Method>
-
-<Method name="Test: CheckoutTypeBepaler met klantuitzondering geeft Standaard Checkouttype ">
-<Implementation><![CDATA[
-	#dim WebshopSessieSettingsInvuller As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler).%New()
-	#dim WebshopSessie As APPS.EC.dto.WebshopSessie = ..MaakWebshopSessieVanHoecke(##class(DOM.VKP.enu.Klant).DaroFactors())
-	
-	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(WebshopSessie),##class(APPS.EC.Unishop.enu.CheckoutType).Standaard())
-]]></Implementation>
-</Method>
-
-<Method name="Test: CheckoutTypeBepaler met klant buiten benelux geeft MetTransportKeuze Checkouttype ">
-<Implementation><![CDATA[
-	#dim WebshopSessieSettingsInvuller As WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler = ##class(WSimpl.Unishop.Login.WebshopSessieSettingsInvuller.CheckoutTypeBepaler).%New()
-	#dim WebshopSessie As APPS.EC.dto.WebshopSessie = ..MaakWebshopSessieVanHoecke(..GeefNietBeneluxKlantID())
-	
-	Do $$$AssertEquals(WebshopSessieSettingsInvuller.Bepaal(WebshopSessie),##class(APPS.EC.Unishop.enu.CheckoutType).MetTransportKeuze())
-]]></Implementation>
-</Method>
-
 <Method name="MaakWebshopSessieVanHoecke">
 <FormalSpec>KlantID:%String</FormalSpec>
 <Private>1</Private>
@@ -104,15 +34,6 @@
 	Quit WebshopSessie
 ]]></Implementation>
 </Method>
-
-<Method name="GeefNietBeneluxKlantID">
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim NietBeneluxKlant As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakNietBENELUXOnderneming()
-	Quit NietBeneluxKlant.GeefID()
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Mock/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/EC/impl/ConfiguratorService/CheckoutTypeBepaler.cls.xml	(revision 37441)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.EC.impl.ConfiguratorService.CheckoutTypeBepaler,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Bepaal">
+<FormalSpec>PersonalityID:DOM.common.enu.Personality,KlantID:DOM.VKP.KlantID</FormalSpec>
+<ReturnType>APPS.EC.Unishop.enu.CheckoutType</ReturnType>
+<Implementation><![CDATA[	Quit ..VerwerkMethodCall("Bepaal",PersonalityID,KlantID)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>