Index: vhUnitTest/CHUI/VKP/OrderIngave/OrderSluiterFactory/Test.cls.xml =================================================================== diff -u -r47602 -r48753 --- vhUnitTest/CHUI/VKP/OrderIngave/OrderSluiterFactory/Test.cls.xml (.../Test.cls.xml) (revision 47602) +++ vhUnitTest/CHUI/VKP/OrderIngave/OrderSluiterFactory/Test.cls.xml (.../Test.cls.xml) (revision 48753) @@ -85,6 +85,7 @@ Set OrderMock = ##class(vhTest.Mock.DOM.VKP.Order).%New() Do OrderMock.VerwachtMethodCall("IsBevestigdKlantOrder").DanReturn($$$False) Do OrderMock.VerwachtMethodCall("GeefOrderType").DanReturn("") + Do OrderMock.VerwachtMethodCall("IsOrderManueel").DanReturn($$$False) #dim OrderAPIMock as DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).MockInstance() Do OrderAPIMock.VerwachtMethodCall("BestaatOrder","1000").DanReturn($$$True) @@ -106,7 +107,29 @@ Set OrderMock = ##class(vhTest.Mock.DOM.VKP.Order).%New() Do OrderMock.VerwachtMethodCall("GeefAxSalesId").DanReturn("DummyAXSalesId") + + #dim OrderAPIMock as DOM.VKP.OrderAPI = ##class(vhTest.Mock.DOM.VKP.OrderAPI).MockInstance() + Do OrderAPIMock.VerwachtMethodCall("BestaatOrder","1000").DanReturn($$$True) + Do OrderAPIMock.VerwachtMethodCall("GeefOrder","1000").DanReturn(OrderMock) + Set OrderSluiterFactory = ##class(CHUI.VKP.OrderIngave.OrderSluiterFactory).%New(OrderAPIMock) + #dim OrderSluiter As CHUI.VKP.OrderIngave.OrderSluiter = OrderSluiterFactory.GeefOrderSluiter("1000") + + Do $$$AssertEquals(OrderSluiter.%ClassName(1),##class(CHUI.VKP.OrderIngave.BevestigdAXOrderSluiterv01).%ClassName(1)) + Do OrderAPIMock.Verifieer() + Do OrderMock.Verifieer() +]]> + + + + @@ -57,7 +58,7 @@ #dim Order as DOM.VKP.Order = ..OrderAPI.GeefOrder(OrdNr) #dim IsBevestigdAXOrderActief as %Boolean = ##class(TECH.Config.ConfigMgr).Instance().GeefBoolean("BevestigdAXOrderSluitenActief") #dim IsBevestigdAXOrder As %Boolean = $$$HasLength(Order.GeefAxSalesId()) - Quit IsBevestigdAXOrderActief&&IsBevestigdAXOrder + Quit IsBevestigdAXOrderActief&&(IsBevestigdAXOrder||Order.IsOrderManueel()) ]]>