Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml =================================================================== diff -u -r47172 -r47274 --- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml (.../SalesOrderConverter.cls.xml) (revision 47172) +++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml (.../SalesOrderConverter.cls.xml) (revision 47274) @@ -19,7 +19,7 @@ -AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler +AXimpl.Admin.Common.ProductBepaler 1 @@ -34,7 +34,7 @@ -OrderAPI:DOM.VKP.OrderAPI,OrderLevenCyclusService:APPS.VKP.OrderLevenCyclusService,DateTimeAPI:TECH.DateTime="",ProductBepaler:AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler,DocumentReferentiesRepository:DOM.VKP.DocumentReferentiesRepository,OrderlijnenSorteerder:DOM.VKP.impl.DataM.DataMOrder.OrderlijnenSorteerder +OrderAPI:DOM.VKP.OrderAPI,OrderLevenCyclusService:APPS.VKP.OrderLevenCyclusService,DateTimeAPI:TECH.DateTime="",ProductBepaler:AXimpl.Admin.Common.ProductBepaler,DocumentReferentiesRepository:DOM.VKP.DocumentReferentiesRepository,OrderlijnenSorteerder:DOM.VKP.impl.DataM.DataMOrder.OrderlijnenSorteerder 1 1 %Status @@ -43,7 +43,7 @@ Set ..OrderAPI = $$$Inject(OrderAPI,##class(DOM.DomeinContext).Instance().GeefOrderAPI()) Set ..DateTimeAPI = $$$Implementation(DateTimeAPI, ##class(TECH.Context).Instance().GeefDateTimeAPI()) Set ..OrderLevenCyclusService = $$$Inject(OrderLevenCyclusService,##class(APPS.VKP.OrderLevenCyclusService).%New(..DateTimeAPI)) - Set ..ProductBepaler = $$$Inject(ProductBepaler, ##class(AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler).%New()) + Set ..ProductBepaler = $$$Inject(ProductBepaler, ##class(AXimpl.Admin.Common.ProductBepaler).%New()) Set ..DocumentReferentiesRepository = $$$Inject(DocumentReferentiesRepository,##class(DOM.VKP.DocumentReferentiesRepository).%New()) Set ..OrderlijnenSorteerder = $$$Inject(OrderlijnenSorteerder, ##class(DOM.VKP.impl.DataM.DataMOrder.OrderlijnenSorteerder).%New()) Index: vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml =================================================================== diff -u -r47174 -r47274 --- vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml (.../Test.cls.xml) (revision 47174) +++ vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml (.../Test.cls.xml) (revision 47274) @@ -76,7 +76,7 @@ Do OrderLevenCyclusServiceMock.IndienMethodCall("MaakOrderMetKlantGegevens", $$$ElkeWaarde,$$$ElkeWaarde).DanReturn(OrderMock) Do OrderLevenCyclusServiceMock.VerwachtMethodCall("VoegToeProductVoorKlant",OrderMock,"DummyKlantID","DummyProductID",10).DanReturn(ProductOrderlijnMock).ExactAantalKeer(1) - Set ProductBepalerMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler).%New() + Set ProductBepalerMock = ##class(vhTest.Mock.AXimpl.Admin.Common.ProductBepaler).%New() Do ProductBepalerMock.VerwachtMethodCall("GeefProductId","0.741.108.3","DummyKlantID").DanReturn("DummyProductID") Set SalesOrderConverter = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter).%New(..GeefOrderApi(OrderMock), OrderLevenCyclusServiceMock,,ProductBepalerMock,..GeefDocumentReferentie(), ..GeefOrderLijnenSorteerder()) @@ -112,7 +112,7 @@ Do OrderLevenCyclusServiceMock.IndienMethodCall("MaakOrderMetKlantGegevens", $$$ElkeWaarde,$$$ElkeWaarde).DanReturn(OrderMock) Do OrderLevenCyclusServiceMock.VerwachtMethodCall("VoegToeProductVoorKlant",OrderMock,"DummyKlantID","7411083",10).DanReturn(ProductOrderlijnMock).ExactAantalKeer(1) - Set ProductBepalerMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler).%New() + Set ProductBepalerMock = ##class(vhTest.Mock.AXimpl.Admin.Common.ProductBepaler).%New() Do ProductBepalerMock.VerwachtMethodCall("ValideerProductId","7411083").ExactAantalKeer(1).DanDoeNiks() Set SalesOrderConverter = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter).%New(..GeefOrderApi(OrderMock), OrderLevenCyclusServiceMock,,ProductBepalerMock,..GeefDocumentReferentie(), ..GeefOrderLijnenSorteerder())