Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml =================================================================== diff -u -r62905 -r62906 --- WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 62905) +++ WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 62906) @@ -33,11 +33,6 @@ 1 - -WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper -1 - - vhTest.Mock.DOM.Halux.AAP.KlantinstellingenRepository 1 @@ -79,7 +74,7 @@ -DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator="",InventarisService:APPS.MAG.Inventaris.impl.InventarisService,DocsV1:BL.PPS.TBX.DocsV1="",UGLYPickingWrapper:WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper="",KlantinstellingenRepository:DOM.Halux.AAP.KlantinstellingenRepository="",VerkoopAPI:DOM.VKP.VerkoopAPI="",AantalGescandeVhossSequentieItemsBepaler:WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler="",DnaCodeInVhossKastBepaler:WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler="",SequentieService:APPS.Halux.common.impl.SequentieService="",RondAfVhossKastHelper:WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper="" +DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator="",InventarisService:APPS.MAG.Inventaris.impl.InventarisService,DocsV1:BL.PPS.TBX.DocsV1="",KlantinstellingenRepository:DOM.Halux.AAP.KlantinstellingenRepository="",VerkoopAPI:DOM.VKP.VerkoopAPI="",AantalGescandeVhossSequentieItemsBepaler:WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler="",DnaCodeInVhossKastBepaler:WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler="",SequentieService:APPS.Halux.common.impl.SequentieService="",RondAfVhossKastHelper:WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper="" 1 1 %Status @@ -90,7 +85,6 @@ Set ..DateTimeAPI = ##class(TECH.Context).Instance().GeefDateTimeAPI() Set ..InventarisService = $$$Inject(InventarisService, ##class(APPS.MAG.Inventaris.impl.InventarisService).%New()) Set ..DocsV1 = $$$Inject(DocsV1, ##class(BL.PPS.TBX.DocsV1).%New()) - Set ..UGLYPickingWrapper = $$$Inject(UGLYPickingWrapper, ##class(WSimpl.Halux.AAP.DnaCodeService.UGLYPickingWrapper).%New()) Set ..KlantinstellingenRepository = $$$Inject(KlantinstellingenRepository, ##class(DOM.Halux.AAP.KlantinstellingenRepository).%New()) Set ..VerkoopAPI = $$$Inject(VerkoopAPI, ##class(DOM.VKP.impl.VerkoopAPI).%New()) Set ..AantalGescandeVhossSequentieItemsBepaler = $$$Inject(AantalGescandeVhossSequentieItemsBepaler,##class(WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler).%New()) Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaPalletcode/Test.cls.xml =================================================================== diff -u -r61696 -r62906 --- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaPalletcode/Test.cls.xml (.../Test.cls.xml) (revision 61696) +++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekViaPalletcode/Test.cls.xml (.../Test.cls.xml) (revision 62906) @@ -20,7 +20,7 @@ Set KlantinstellingenRepository = ##class(vhTest.Mock.DOM.Halux.AAP.KlantinstellingenRepository).%New() Do KlantinstellingenRepository.VerwachtMethodCall("ZoekViaKlantId",DnaCode1.KlantNummer).DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(Klantinstelling)) - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,, KlantinstellingenRepository) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,KlantinstellingenRepository) #dim Antwoord As WS.Halux.AAP.ZoekViaPalletCodeResponse = DnaCodeService.ZoekViaPalletCode(Request) @@ -68,7 +68,7 @@ Set KlantinstellingenRepository = ##class(vhTest.Mock.DOM.Halux.AAP.KlantinstellingenRepository).%New() Do KlantinstellingenRepository.VerwachtMethodCall("ZoekViaKlantId",DnaCode1.KlantNummer).DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(Klantinstelling)).ExactAantalKeer(1) - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,, KlantinstellingenRepository) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,KlantinstellingenRepository) #dim Antwoord As WS.Halux.AAP.ZoekViaPalletCodeResponse = DnaCodeService.ZoekViaPalletCode(Request) @@ -97,7 +97,7 @@ Set KlantinstellingenRepository = ##class(vhTest.Mock.DOM.Halux.AAP.KlantinstellingenRepository).%New() Do KlantinstellingenRepository.VerwachtMethodCall("ZoekViaKlantId",DnaCode1.KlantNummer).DanReturn(..EmptyIterator()) - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,, KlantinstellingenRepository) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,KlantinstellingenRepository) #dim Antwoord As WS.Halux.AAP.ZoekViaPalletCodeResponse = DnaCodeService.ZoekViaPalletCode(Request) Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfVhossBatch/Test.cls.xml =================================================================== diff -u -r62695 -r62906 --- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfVhossBatch/Test.cls.xml (.../Test.cls.xml) (revision 62695) +++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/RondAfVhossBatch/Test.cls.xml (.../Test.cls.xml) (revision 62906) @@ -34,7 +34,7 @@ Do SequentieService.IndienMethodCall("HeeftProductieSequentie",Request.BatchId).DanReturn($$$True) Do SequentieService.IndienMethodCall("GeefProductieSequentie",Request.BatchId).DanReturn(ProductieSequentie) - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,SequentieService) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,SequentieService) #dim Antwoord As WS.Halux.AAP.RondAfVhossBatchResponse = DnaCodeService.RondAfVhossBatch(Request) @@ -78,7 +78,7 @@ Set RondAfVhossKastHelper = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New() Do RondAfVhossKastHelper.IndienMethodCall("ProbeerEchteVhossIdTeBepalenNietTBX",Request.BatchId,1,ProductieSequentie,1).DanReturn("O100000042") - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,SequentieService,RondAfVhossKastHelper) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,SequentieService,RondAfVhossKastHelper) #dim Antwoord As WS.Halux.AAP.RondAfVhossBatchResponse = DnaCodeService.RondAfVhossBatch(Request) @@ -136,7 +136,7 @@ Do RondAfVhossKastHelper.IndienMethodCall("ProbeerEchteVhossIdTeBepalenNietTBX",Request.BatchId,3,ProductieSequentie,1).DanReturn("3-1") Do RondAfVhossKastHelper.IndienMethodCall("ProbeerEchteVhossIdTeBepalenNietTBX",Request.BatchId,4,ProductieSequentie,1).DanReturn("3-1") - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,SequentieService,RondAfVhossKastHelper) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,SequentieService,RondAfVhossKastHelper) #dim Antwoord As WS.Halux.AAP.RondAfVhossBatchResponse = DnaCodeService.RondAfVhossBatch(Request) @@ -180,7 +180,7 @@ Set RondAfVhossKastHelper = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New() Do RondAfVhossKastHelper.IndienMethodCall("GeefTbxVhossKastenIterator",Request.BatchId).DanReturn(TbxVhossKastenIterator) - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,,RondAfVhossKastHelper) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,RondAfVhossKastHelper) #dim Antwoord As WS.Halux.AAP.RondAfVhossBatchResponse = DnaCodeService.RondAfVhossBatch(Request) @@ -236,7 +236,7 @@ Do RondAfVhossKastHelper.IndienMethodCall("ProbeerEchteVhossIdTeBepalenTBX",TbxSequentieItemIterator,$$$ElkeWaarde).DanReturn("O100000042") Do RondAfVhossKastHelper.IndienMethodCall("ProbeerEchteVhossIdTeBepalenTBX",TbxSequentieItemIterator2,$$$ElkeWaarde).DanReturn("O100000042") - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,,RondAfVhossKastHelper) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,RondAfVhossKastHelper) #dim Antwoord As WS.Halux.AAP.RondAfVhossBatchResponse = DnaCodeService.RondAfVhossBatch(Request) Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/BewaarKlantinstellingen.cls.xml =================================================================== diff -u -r61696 -r62906 --- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/BewaarKlantinstellingen.cls.xml (.../BewaarKlantinstellingen.cls.xml) (revision 61696) +++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/BewaarKlantinstellingen.cls.xml (.../BewaarKlantinstellingen.cls.xml) (revision 62906) @@ -31,7 +31,7 @@ Do VerkoopApiStub.IndienMethodCall("GeefKlant",$$$ElkeWaarde).DanReturn(StandaardKlant) Do VerkoopApiStub.IndienMethodCall("BestaatKlant",Request.KlantId).DanReturn($$$True) - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(,,,,,KlantinstellingenRepositoryMock, VerkoopApiStub) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(,,,,KlantinstellingenRepositoryMock, VerkoopApiStub) #dim Antwoord As WS.Halux.AAP.ZoekViaPalletCodeResponse = DnaCodeService.BewerkKlantinstellingen(Request) @@ -67,7 +67,7 @@ Do VerkoopApiStub.IndienMethodCall("GeefKlant",$$$ElkeWaarde).DanReturn(StandaardKlant) Do VerkoopApiStub.IndienMethodCall("BestaatKlant",Request.KlantId).DanReturn($$$False) - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(,,,,,KlantinstellingenRepositoryMock, VerkoopApiStub) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(,,,,KlantinstellingenRepositoryMock, VerkoopApiStub) #dim Antwoord As WS.Halux.AAP.ZoekViaPalletCodeResponse = DnaCodeService.BewerkKlantinstellingen(Request) @@ -102,7 +102,7 @@ #dim StandaardKlant As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant() Do VerkoopApiStub.IndienMethodCall("GeefKlant",$$$ElkeWaarde).DanReturn(StandaardKlant) - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(,,,,,KlantinstellingenRepositoryMock, VerkoopApiStub) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(,,,,KlantinstellingenRepositoryMock, VerkoopApiStub) #dim Antwoord As WS.Halux.AAP.ZoekViaPalletCodeResponse = DnaCodeService.BewerkKlantinstellingen(Request) @@ -133,7 +133,7 @@ #dim StandaardKlant As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant() Do VerkoopApiStub.IndienMethodCall("GeefKlant",$$$ElkeWaarde).DanReturn(StandaardKlant) - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(,,,,,KlantinstellingenRepositoryMock, VerkoopApiStub) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(,,,,KlantinstellingenRepositoryMock, VerkoopApiStub) #dim Antwoord As WS.Halux.AAP.ZoekViaPalletCodeResponse = DnaCodeService.BewerkKlantinstellingen(Request) Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekAlleVhossLadesBijDnaCode/Test.cls.xml =================================================================== diff -u -r61696 -r62906 --- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekAlleVhossLadesBijDnaCode/Test.cls.xml (.../Test.cls.xml) (revision 61696) +++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/ZoekAlleVhossLadesBijDnaCode/Test.cls.xml (.../Test.cls.xml) (revision 62906) @@ -23,7 +23,7 @@ Set AantalGescandeVhossSequentieItemsBepalerStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler).%New() Do AantalGescandeVhossSequentieItemsBepalerStub.IndienMethodCall("BepaalAantalGescandeVhossSequentieItems",DnaCode1, Request.GuiVhossVolgnummer).DanReturn(DnaCodeAfmeldenResponse) - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,AantalGescandeVhossSequentieItemsBepalerStub) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,AantalGescandeVhossSequentieItemsBepalerStub) #dim Antwoord As WS.Halux.AAP.ZoekAlleVhossLadesBijDnaCodeResponse = DnaCodeService.ZoekAlleVhossLadesBijDnaCode(Request) @@ -50,7 +50,7 @@ Set AantalGescandeVhossSequentieItemsBepalerStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler).%New() Do AantalGescandeVhossSequentieItemsBepalerStub.IndienMethodCall("BepaalAantalGescandeVhossSequentieItems",DnaCode1, Request.GuiVhossVolgnummer).DanReturn(DnaCodeAfmeldenResponse) - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,AantalGescandeVhossSequentieItemsBepalerStub) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,AantalGescandeVhossSequentieItemsBepalerStub) #dim Antwoord As WS.Halux.AAP.ZoekAlleVhossLadesBijDnaCodeResponse = DnaCodeService.ZoekAlleVhossLadesBijDnaCode(Request) @@ -76,7 +76,7 @@ Set AantalGescandeVhossSequentieItemsBepalerStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler).%New() Do AantalGescandeVhossSequentieItemsBepalerStub.IndienMethodCall("BepaalAantalGescandeVhossSequentieItems",DnaCode1, Request.GuiVhossVolgnummer).DanReturn(DnaCodeAfmeldenResponse) - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,AantalGescandeVhossSequentieItemsBepalerStub) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,AantalGescandeVhossSequentieItemsBepalerStub) #dim Antwoord As WS.Halux.AAP.ZoekAlleVhossLadesBijDnaCodeResponse = DnaCodeService.ZoekAlleVhossLadesBijDnaCode(Request) Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml =================================================================== diff -u -r62824 -r62906 --- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml (.../Test.cls.xml) (revision 62824) +++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml (.../Test.cls.xml) (revision 62906) @@ -157,7 +157,7 @@ Set DnaCodeInVhossKastBepalerStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New() Do DnaCodeInVhossKastBepalerStub.IndienMethodCall("MagDnaCodeInVhossKast", DnaCode1, Request.PalletCode, Request.BatchId).DanReturn(1) - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,DnaCodeInVhossKastBepalerStub) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,DnaCodeInVhossKastBepalerStub) #dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request) @@ -187,7 +187,7 @@ Set DnaCodeInVhossKastBepalerStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New() Do DnaCodeInVhossKastBepalerStub.IndienMethodCall("MagDnaCodeInVhossKast", DnaCode1, Request.PalletCode, Request.BatchId).DanReturn(0) - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,DnaCodeInVhossKastBepalerStub) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,DnaCodeInVhossKastBepalerStub) #dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request) @@ -218,7 +218,7 @@ Set DnaCodeInVhossKastBepalerStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New() Do DnaCodeInVhossKastBepalerStub.IndienMethodCall("MagDnaCodeInVhossKast", DnaCode1, Request.PalletCode, Request.BatchId).DanReturn(2) - Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,DnaCodeInVhossKastBepalerStub) + Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,DnaCodeInVhossKastBepalerStub) #dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)