Index: vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/AutomatischSluitenTest.cls.xml
===================================================================
diff -u -r54843 -r54893
--- vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/AutomatischSluitenTest.cls.xml	(.../AutomatischSluitenTest.cls.xml)	(revision 54843)
+++ vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/AutomatischSluitenTest.cls.xml	(.../AutomatischSluitenTest.cls.xml)	(revision 54893)
@@ -3,7 +3,7 @@
 <Class name="vhUnitTest.WSimpl.EC.Unishop.OrderConfirmation.Service.ConfirmOrder.AutomatischSluitenTest">
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>vhUnitTest.WSimpl.EC.Unishop.OrderConfirmation.Service.ConfirmOrder.TestBase</Super>
+<Super>vhUnitTest.TestCase</Super>
 
 <Parameter name="LageEDInummer">
 <Type>%Integer</Type>
@@ -15,6 +15,18 @@
 <Default>1</Default>
 </Parameter>
 
+<Property name="Shop">
+<Type>%String</Type>
+</Property>
+
+<Property name="OfferteVanHandel">
+<Type>APPS.VKP.Offerte</Type>
+</Property>
+
+<Property name="VanHoeckeOfferte">
+<Type>vhTest.Mock.APPS.VKP.Offerte</Type>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
@@ -26,15 +38,26 @@
 
 <Method name="Test: gedrag indien automatisch sluiten mag">
 <Implementation><![CDATA[
+	#dim SfsKlantID As %String = ##class(DOM.VKP.enu.Klant).SFS()
+	#dim VanHoeckePersonalityId As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).VanHoecke()
+	
+	#dim VanHoeckeOfferteID As %Integer = 7
+	#dim BestelReferentie As %String = "UT_DummyBestelRef"
+	#dim GevraagdeLeverdatum As %String = "31-12-2099"
+	
 	#dim DummyDocumentReferentiesKlantBestelling as DOM.VKP.DocumentReferenties = ..GeefDocumentReferenties()
 	#dim DummyDocumentReferentiesLeverancierOfferte as DOM.VKP.DocumentReferenties = ..GeefDocumentReferenties()
 
+	Set ..OfferteVanHandel = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
 	Do ..OfferteVanHandel.IndienMethodCall("GeefID").DanReturn(..#OfferteNummer)
 	Do ..OfferteVanHandel.IndienMethodCall("IsBesteld").DanReturn($$$True)
 	Do ..OfferteVanHandel.IndienMethodCall("GeefDocumentReferenties").DanReturn(DummyDocumentReferentiesKlantBestelling)
 	Do ..OfferteVanHandel.IndienMethodCall("IsVhisie4").DanReturn($$$True)
 	
+	Set ..VanHoeckeOfferte = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do ..VanHoeckeOfferte.IndienMethodCall("GeefID").DanReturn(VanHoeckeOfferteID)
 	Do ..VanHoeckeOfferte.IndienMethodCall("GeefBestelOpmerking").DanReturn("BestelOpmerking")
+	Do ..VanHoeckeOfferte.IndienMethodCall("ZetLeverDatum",$$INTDATE^vhLib.DataTypes("31-12-2099"))
 	Do ..VanHoeckeOfferte.IndienMethodCall("GeefDocumentReferenties").DanReturn(DummyDocumentReferentiesLeverancierOfferte)
 	Do ..VanHoeckeOfferte.IndienMethodCall("GeefExterneId",).DanReturn($$$DummyInteger)
 	
@@ -60,22 +83,18 @@
 	Set AsynchroneOrderSluiter= ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarService.BestelWinkelkar.AsynchroneOrderSluiter).%New()
 	Do AsynchroneOrderSluiter.VerwachtMethodCall("MaakEnSluitOrderViaOfferteID",7)
 	
-	#dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub,ExterneVerkoopService,IntractoMelderMock,OfferteRepositoryMock,OrderVrijgaveBepaler,AsynchroneOrderSluiter).ConfirmOrder(..#LageEDInummer,..Shop,..BestelReferentie,..GevraagdeLeverdatum)
+	Set AuthorisatieControleurMock = ##class(vhTest.Mock.APPS.EC.Winkelkar.AuthorisatieControleur).%New()
+	Do AuthorisatieControleurMock.IndienMethodCall("ControleerWerkenMetBestellingVanHandel",VanHoeckeOfferteID)
 	
+	Set OrderServiceInternal = ##class(vhUnitTest.WSimpl.EC.Unishop.OrderConfirmation.Service.ConfirmOrder.ServiceMock).%New(OfferteServiceStub, ExterneVerkoopService ,IntractoMelderMock, OfferteRepositoryMock, , AuthorisatieControleurMock,OrderVrijgaveBepaler,AsynchroneOrderSluiter)
+	#dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult = OrderServiceInternal.ConfirmOrder(..#LageEDInummer,..Shop, BestelReferentie, GevraagdeLeverdatum)
+	
 	Do OrderVrijgaveBepaler.Verifieer()
 	Do AsynchroneOrderSluiter.Verifieer()
 	Do ExterneVerkoopService.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="GeefOrderServiceInternal">
-<FormalSpec>OfferteService:APPS.VKP.OfferteService="",ExterneVerkoopService:APPS.EC.Verkoop.ExterneVerkoopService="",IntractoInformeerderMock:WSimpl.EC.Unishop.OrderConfirmation.Service.IntractoMelder.CartPort="",OfferteRepositoryMock:APPS.VKP.Offerte.OfferteRepository="",OrderVrijgaveBepaler:WSimpl.Vhisie4.Winkelkar.WinkelkarService.BestelWinkelkar.OrderVrijgaveBepaler="",AsynchroneOrderSluiter:WSimpl.Vhisie4.Winkelkar.WinkelkarService.BestelWinkelkar.AsynchroneOrderSluiter=""</FormalSpec>
-<Private>1</Private>
-<ReturnType>WSimpl.EC.Unishop.OrderConfirmation.Service</ReturnType>
-<Implementation><![CDATA[	Quit ##class(vhUnitTest.WSimpl.EC.Unishop.OrderConfirmation.Service.ConfirmOrder.ServiceMock).%New(OfferteService, ExterneVerkoopService ,IntractoInformeerderMock, OfferteRepositoryMock, , ..AuthorisatieControleurMock,OrderVrijgaveBepaler,AsynchroneOrderSluiter)
-]]></Implementation>
-</Method>
-
 <Method name="GeefDocumentReferenties">
 <Private>1</Private>
 <ReturnType>DOM.VKP.DocumentReferenties</ReturnType>