Index: vhUnitTest/APPS/EC/impl/ExterneVerkoopService/OfferteBesteller/Test.cls.xml
===================================================================
diff -u -r50940 -r50952
--- vhUnitTest/APPS/EC/impl/ExterneVerkoopService/OfferteBesteller/Test.cls.xml	(.../Test.cls.xml)	(revision 50940)
+++ vhUnitTest/APPS/EC/impl/ExterneVerkoopService/OfferteBesteller/Test.cls.xml	(.../Test.cls.xml)	(revision 50952)
@@ -3,55 +3,79 @@
 <Class name="vhUnitTest.APPS.EC.impl.ExterneVerkoopService.OfferteBesteller.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="OnAfterOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ##super(aTestName)
-	Do ##class(vhTest.Dummy.TECH.PubSub.impl.PubSubAPI).MockInstance()
-]]></Implementation>
-</Method>
-
 <Method name="Test: BestelOfferte geeft foutmelding offerte">
 <Implementation><![CDATA[
-	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteMock.IndienMethodCall("GeefKlantID").DanReturn("DummyKlantID")
+	#dim RandomOfferteId As %String = "RandomOfferteId"
+	#dim RandomKlantId As %String = "RandomKlantId"
+	#dim RandomPersonalityId As %String = "RandomPersonalityId"
 	
-	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Do OfferteServiceMock.IndienMethodCall("GeefOfferte", $$$ElkeWaarde).DanReturn(OfferteMock)
-	Do OfferteServiceMock.IndienMethodCall("GeefBestelStatusUpdater").DanReturn("")
+	#dim OfferteStub As vhTest.Mock.APPS.VKP.Offerte = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteStub.IndienMethodCall("GeefKlantID").DanReturn(RandomKlantId)
 	
+	#dim OfferteServiceStub As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferte", RandomOfferteId).DanReturn(OfferteStub)
+	
 	#dim OfferteVoorBestellingValidatorStub As vhTest.Mock.APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator = ##class(vhTest.Mock.APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator).%New()
-	Do OfferteVoorBestellingValidatorStub.IndienMethodCall("Valideer", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanException($$$DummyException)
+	Do OfferteVoorBestellingValidatorStub.IndienMethodCall("Valideer", OfferteStub, RandomKlantId, RandomPersonalityId).DanException($$$DummyException)
 	
 	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("DummyException")
-	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",Substrings))
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException", Substrings))
 
-	Set OfferteBesteller = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteBesteller).%New(OfferteServiceMock, "", OfferteVoorBestellingValidatorStub)
-	Do OfferteBesteller.BestelOfferte("DummyOfferteID","DummyKlantID", "DummyPersonalityID")
+	#dim BestelStatusUpdaterStub As vhTest.Mock.APPS.VKP.Offerte.BestelStatusUpdater = ##class(vhTest.Mock.APPS.VKP.Offerte.BestelStatusUpdater).%New()
+
+	#dim OfferteBesteller As APPS.EC.impl.ExterneVerkoopService.OfferteBesteller = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteBesteller).%New(OfferteServiceStub, "", OfferteVoorBestellingValidatorStub, "", BestelStatusUpdaterStub)
+	Do OfferteBesteller.BestelOfferte(RandomOfferteId, RandomKlantId, RandomPersonalityId)
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Ongeldige vhisie4 offerte geeft geen foutmelding">
+<Method name="Test: Vhisie4 offerte met vervallen prijzen wordt toch verwerkt">
 <Implementation><![CDATA[
-	Set OfferteMock = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteMock.IndienMethodCall("GeefKlantID").DanReturn("DummyKlantID")
-	Do OfferteMock.IndienMethodCall("GeefWinkelkarID").DanReturn("DummyWinkelkarID")
+	#dim RandomOfferteId As %String = "RandomOfferteId"
+	#dim RandomKlantId As %String = "RandomKlantId"
+	#dim RandomPersonalityId As %String = "RandomPersonalityId"
+	#dim RandomPersonality As DOM.common.Personality = ##class(DOM.common.HeinPersonality).Instance()
+	#dim RandomWinkelkarId As %String = "RandomWinkelkarId"
 	
-	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	Do OfferteServiceMock.IndienMethodCall("GeefOfferte", $$$ElkeWaarde).DanReturn(OfferteMock)
-	Do OfferteServiceMock.IndienMethodCall("GeefBestelStatusUpdater").DanReturn("")
+	#dim OfferteStub As vhTest.Mock.APPS.VKP.Offerte = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteStub.IndienMethodCall("IsBesteld").DanReturn($$$False)
+	Do OfferteStub.IndienMethodCall("GeefWinkelkarID").DanReturn(RandomWinkelkarId)
+	Do OfferteStub.IndienMethodCall("ZijnPrijzenVervallen").DanReturn($$$True)
+	Do OfferteStub.IndienMethodCall("GeefID").DanReturn(RandomOfferteId)
+	Do OfferteStub.IndienMethodCall("GeefKlantID").DanReturn(RandomKlantId)
+	Do OfferteStub.IndienMethodCall("GeefPersonalityID").DanReturn(RandomPersonality)
+	Do OfferteStub.IndienMethodCall("IsVhisie4").DanReturn($$$True)
 	
-	#dim OfferteVoorBestellingValidatorStub As vhTest.Mock.APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator = ##class(vhTest.Mock.APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator).%New()
-	Do OfferteVoorBestellingValidatorStub.IndienMethodCall("Valideer", $$$ElkeWaarde, $$$ElkeWaarde, $$$ElkeWaarde).DanException(##class(APPS.VKP.Offerte.impl.OfferteNietMeerGeldigException).%ClassName(1))
+	#dim OfferteServiceStub As vhTest.Mock.APPS.VKP.OfferteService = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Do OfferteServiceStub.IndienMethodCall("GeefOfferte", RandomOfferteId).DanReturn(OfferteStub)
 	
-	Set WinkelkarControleurMock = ##class(vhTest.Mock.APPS.EC.Winkelkar.WinkelkarControleur).%New()
-	Do WinkelkarControleurMock.IndienMethodCall("ControleerWinkelkarViaID","DummyWinkelkarID").DanDoeNiks()
+	#dim RandomMaatwerkLijnen As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("MaatwerkLijn1", "MaatwerkLijn2")
 	
-	Set BestelStatusUpdaterMock = ##class(vhTest.Mock.APPS.VKP.Offerte.BestelStatusUpdater).%New()
-	Do BestelStatusUpdaterMock.IndienMethodCall("ZetStatusBesteld", $$$ElkeWaarde).DanDoeNiks()
+	#dim WinkelkarServiceStub As vhTest.Mock.APPS.EC.Winkelkar.WinkelkarService = ##class(vhTest.Mock.APPS.EC.Winkelkar.WinkelkarService).%New()
+	Do WinkelkarServiceStub.IndienMethodCall("GeefMaatwerkLijnen", RandomWinkelkarId).DanReturn(RandomMaatwerkLijnen)
 	
-	Set OfferteBesteller = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteBesteller).%New(OfferteServiceMock, "", OfferteVoorBestellingValidatorStub, WinkelkarControleurMock, BestelStatusUpdaterMock)
-	Do OfferteBesteller.BestelOfferte("DummyOfferteID","DummyKlantID", "DummyPersonalityID")
+	#dim CommonApiStub As vhTest.Mock.DOM.common.CommonAPI = ##class(vhTest.Mock.DOM.common.CommonAPI).%New()
+	Do CommonApiStub.IndienMethodCall("GeefPersonality", RandomPersonalityId).DanReturn(RandomPersonality)
+	
+	#dim Validator As APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator = ##class(APPS.EC.Verkoop.impl.OfferteVoorBestellingValidator).%New(WinkelkarServiceStub, "", CommonApiStub)
+	
+	#dim WinkelkarControleurMock As vhTest.Mock.APPS.EC.Winkelkar.WinkelkarControleur = ##class(vhTest.Mock.APPS.EC.Winkelkar.WinkelkarControleur).%New()
+	Do WinkelkarControleurMock.VerwachtMethodCall("ControleerWinkelkarViaID", RandomWinkelkarId).ExactAantalKeer(1)
+	
+	#dim BestelStatusUpdaterMock As vhTest.Mock.APPS.VKP.Offerte.BestelStatusUpdater = ##class(vhTest.Mock.APPS.VKP.Offerte.BestelStatusUpdater).%New()
+	Do BestelStatusUpdaterMock.VerwachtMethodCall("ZetStatusBesteld", OfferteStub).ExactAantalKeer(1)
+	
+	#dim EventRaiserStub As vhTest.Mock.TECH.PubSub.EventRaiser = ##class(vhTest.Mock.TECH.PubSub.EventRaiser).%New()
+	Do EventRaiserStub.IndienMethodCall("RaiseEventSync", $$$ElkeWaarde).DanDoeNiks()
+	
+	#dim PubSubApiMock As vhTest.Mock.TECH.PubSub.PubSubAPI = ##class(vhTest.Mock.TECH.PubSub.PubSubAPI).%New()
+	Do PubSubApiMock.VerwachtMethodCall("GeefEventRaiser").DanReturn(EventRaiserStub).ExactAantalKeer(1)
+	
+	#dim OfferteBesteller As APPS.EC.impl.ExterneVerkoopService.OfferteBesteller = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteBesteller).%New(OfferteServiceStub, "", Validator, WinkelkarControleurMock, BestelStatusUpdaterMock, PubSubApiMock)
+	Do OfferteBesteller.BestelOfferte(RandomOfferteId, RandomKlantId, RandomPersonalityId)
+	
+	Do WinkelkarControleurMock.Verifieer()
+	Do BestelStatusUpdaterMock.Verifieer()
+	Do PubSubApiMock.Verifieer()
 ]]></Implementation>
 </Method>
 </Class>