Index: vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/TestLeverDatum.cls.xml =================================================================== diff -u -r59354 -r60014 --- vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/TestLeverDatum.cls.xml (.../TestLeverDatum.cls.xml) (revision 59354) +++ vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/TestLeverDatum.cls.xml (.../TestLeverDatum.cls.xml) (revision 60014) @@ -161,7 +161,7 @@ Do OfferteRepositoryMock.IndienMethodCall("BestaatViaExterneId",..#LageEDInummer).DanReturn($$$False) Set BackgroundCartStatusUpdaterMock = ##class(vhTest.Mock.WSimpl.EC.Unishop.OrderConfirmation.Service.BackgroundCartStatusUpdater).%New() - Do BackgroundCartStatusUpdaterMock.IndienMethodCall("UpdateCartStatus",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks() + Do BackgroundCartStatusUpdaterMock.VerwachtMethodCall("UpdateCartStatus",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks() Set DateTimeAPIMock = ##class(vhTest.Mock.TECH.DateTime.DateTimeAPI).%New() Do DateTimeAPIMock.IndienMethodCall("CurrentDate").DanReturn($$INTDATE^vhLib.DataTypes(..Huidigedatum)) @@ -174,6 +174,7 @@ #dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub,ExterneVerkoopService,OfferteRepositoryMock,BackgroundCartStatusUpdaterMock, DateTimeAPIMock,OrderVrijgaveBepaler,AsynchroneOrderSluiter).ConfirmOrder(..#LageEDInummer,..Shop,..BestelReferentie,..GevraagdeLeverdatum) + Do BackgroundCartStatusUpdaterMock.Verifieer() Do ..VanHoeckeOfferte.Verifieer() ]]> Index: vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/Test1.cls.xml =================================================================== diff -u -r59354 -r60014 --- vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/Test1.cls.xml (.../Test1.cls.xml) (revision 59354) +++ vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/Test1.cls.xml (.../Test1.cls.xml) (revision 60014) @@ -33,7 +33,10 @@ #dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Unable to confirm order","Offerte '6' van handel is nog niet besteld.") Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings)) - #dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub).ConfirmOrder(..EDInr,..Shop,..BestelReferentie,..GevraagdeLeverdatum) + Set BackgroundCartStatusUpdaterMock = ##class(vhTest.Mock.WSimpl.EC.Unishop.OrderConfirmation.Service.BackgroundCartStatusUpdater).%New() + Do BackgroundCartStatusUpdaterMock.IndienMethodCall("UpdateCartStatus",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks() + + #dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub,,,BackgroundCartStatusUpdaterMock).ConfirmOrder(..EDInr,..Shop,..BestelReferentie,..GevraagdeLeverdatum) ]]> @@ -48,7 +51,10 @@ #dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Unable to confirm order. (EDINr: "_OngeldigEDINummer_")") Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings)) - #dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub).ConfirmOrder(OngeldigEDINummer,..Shop,..BestelReferentie,..GevraagdeLeverdatum) + Set BackgroundCartStatusUpdaterMock = ##class(vhTest.Mock.WSimpl.EC.Unishop.OrderConfirmation.Service.BackgroundCartStatusUpdater).%New() + Do BackgroundCartStatusUpdaterMock.IndienMethodCall("UpdateCartStatus",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks() + + #dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub,,,BackgroundCartStatusUpdaterMock).ConfirmOrder(OngeldigEDINummer,..Shop,..BestelReferentie,..GevraagdeLeverdatum) ]]> @@ -64,8 +70,11 @@ #dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Unable to confirm order. (EDINr: 77667)","Invalid EDI number (77667) for webshop", OfferteBestaatNietMelding) Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings)) + + Set BackgroundCartStatusUpdaterMock = ##class(vhTest.Mock.WSimpl.EC.Unishop.OrderConfirmation.Service.BackgroundCartStatusUpdater).%New() + Do BackgroundCartStatusUpdaterMock.IndienMethodCall("UpdateCartStatus",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks() - #dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub,"",OfferteRepositoryMock,"").ConfirmOrder(..#LageEDInummer,..Shop,..BestelReferentie,..GevraagdeLeverdatum) + #dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub,"",OfferteRepositoryMock,BackgroundCartStatusUpdaterMock,"").ConfirmOrder(..#LageEDInummer,..Shop,..BestelReferentie,..GevraagdeLeverdatum) ]]> @@ -157,19 +166,18 @@ Do OfferteRepositoryMock.IndienMethodCall("BestaatViaExterneId",..#LageEDInummer).DanReturn($$$False) Set BackgroundCartStatusUpdaterMock = ##class(vhTest.Mock.WSimpl.EC.Unishop.OrderConfirmation.Service.BackgroundCartStatusUpdater).%New() - Do BackgroundCartStatusUpdaterMock.IndienMethodCall("UpdateCartStatus",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks() - + Do BackgroundCartStatusUpdaterMock.VerwachtMethodCall("UpdateCartStatus",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks() Set OrderVrijgaveBepaler = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarService.BestelWinkelkar.OrderVrijgaveBepaler).%New() - Do OrderVrijgaveBepaler.IndienMethodCall("MagOrderMakenZonderWinkelkar",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$False) + Do OrderVrijgaveBepaler.IndienMethodCall("MagOrderMakenZonderWinkelkar",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$False) - Set AsynchroneOrderSluiter= ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarService.BestelWinkelkar.AsynchroneOrderSluiter).%New() #dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult =..GeefOrderServiceInternal(OfferteServiceStub,ExterneVerkoopService,OfferteRepositoryMock,BackgroundCartStatusUpdaterMock,OrderVrijgaveBepaler,AsynchroneOrderSluiter).ConfirmOrder(..#LageEDInummer,..Shop,..BestelReferentie,..GevraagdeLeverdatum) + Do BackgroundCartStatusUpdaterMock.Verifieer() Do ..VanHoeckeOfferte.Verifieer() ]]> Index: vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/AutomatischSluitenTest.cls.xml =================================================================== diff -u -r59354 -r60014 --- vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/AutomatischSluitenTest.cls.xml (.../AutomatischSluitenTest.cls.xml) (revision 59354) +++ vhUnitTest/WSimpl/EC/Unishop/OrderConfirmation/Service/ConfirmOrder/AutomatischSluitenTest.cls.xml (.../AutomatischSluitenTest.cls.xml) (revision 60014) @@ -73,7 +73,7 @@ Do OfferteRepositoryMock.IndienMethodCall("BestaatViaExterneId",..#LageEDInummer).DanReturn($$$False) Set BackgroundCartStatusUpdaterMock = ##class(vhTest.Mock.WSimpl.EC.Unishop.OrderConfirmation.Service.BackgroundCartStatusUpdater).%New() - Do BackgroundCartStatusUpdaterMock.IndienMethodCall("UpdateCartStatus",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks() + Do BackgroundCartStatusUpdaterMock.VerwachtMethodCall("UpdateCartStatus",$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks() Set OrderVrijgaveBepaler = ##class(vhTest.Mock.WSimpl.Vhisie4.Winkelkar.WinkelkarService.BestelWinkelkar.OrderVrijgaveBepaler).%New() Do OrderVrijgaveBepaler.VerwachtMethodCall("MagOrderMakenZonderWinkelkar","UT_DummyBestelRef",VanHoeckePersonalityId,VanHoeckeOfferteID,SfsKlantID).DanReturn($$$True) @@ -88,6 +88,7 @@ Set OrderServiceInternal = ##class(WSimpl.EC.Unishop.OrderConfirmation.Service).%New(OfferteServiceStub, ExterneVerkoopService , OfferteRepositoryMock, BackgroundCartStatusUpdaterMock,, AuthorisatieControleurMock, OrderVrijgaveBepaler, AsynchroneOrderSluiter) #dim BestelOfferteResultaat As WS.EC.Unishop.OrderConfirmation.ConfirmOrderResult = OrderServiceInternal.ConfirmOrder(..#LageEDInummer,..Shop, BestelReferentie, GevraagdeLeverdatum) + Do BackgroundCartStatusUpdaterMock.Verifieer() Do OrderVrijgaveBepaler.Verifieer() Do AsynchroneOrderSluiter.Verifieer() Do ExterneVerkoopService.Verifieer()