Index: vhUnitTest/APPS/Halux/common/impl/SequentieService/TestLBX.cls.xml =================================================================== diff -u -r29059 -r64994 --- vhUnitTest/APPS/Halux/common/impl/SequentieService/TestLBX.cls.xml (.../TestLBX.cls.xml) (revision 29059) +++ vhUnitTest/APPS/Halux/common/impl/SequentieService/TestLBX.cls.xml (.../TestLBX.cls.xml) (revision 64994) @@ -19,30 +19,30 @@ #dim ResultSet As TECH.ResultSet = $$ExecDynQuery^vhLib.Query(Query,$LB(LBXBatch.GeefID())) If $$$AssertTrue(ResultSet.Next()){ #dim SequentieNummer As %Integer = 0 - Do $$$AssertEquals(ResultSet.Data("ProductID"),"934526") + Do $$$AssertEquals(ResultSet.Data("ProductID"),"1703729") Do $$$AssertEquals(ResultSet.Data("BatchID"),##class(vhTest.Dummy.APPS.Halux.common.BatchID).GewoneLegraboxBatchID()) Do $$$AssertEquals(ResultSet.Data("DeelAantal"),1) Do $$$AssertEquals(ResultSet.Data("TotaalAantal"),1) Do $$$AssertEquals(ResultSet.Data("ToeleveringID"),"UTToelevID_Gewoon_Legrabox") Do $$$AssertEquals(ResultSet.Data("ToeleveringLijnID"),"UTToelevLijnID1") Do $$$AssertEquals(ResultSet.Data("SequentieNummer"),$I(SequentieNummer)) Do $$$AssertTrue(ResultSet.Next()) - Do $$$AssertEquals(ResultSet.Data("ProductID"),"936970") + Do $$$AssertEquals(ResultSet.Data("ProductID"),"2809514") Do $$$AssertEquals(ResultSet.Data("DeelAantal"),1) Do $$$AssertEquals(ResultSet.Data("TotaalAantal"),4) Do $$$AssertEquals(ResultSet.Data("ToeleveringLijnID"),"UTToelevLijnID2") Do $$$AssertEquals(ResultSet.Data("SequentieNummer"),$I(SequentieNummer)) Do $$$AssertTrue(ResultSet.Next()) - Do $$$AssertEquals(ResultSet.Data("ProductID"),"936970") + Do $$$AssertEquals(ResultSet.Data("ProductID"),"2809514") Do $$$AssertEquals(ResultSet.Data("DeelAantal"),2) Do $$$AssertEquals(ResultSet.Data("TotaalAantal"),4) Do $$$AssertEquals(ResultSet.Data("ToeleveringLijnID"),"UTToelevLijnID2") Do $$$AssertEquals(ResultSet.Data("SequentieNummer"),$I(SequentieNummer)) Do $$$AssertTrue(ResultSet.Next()) - Do $$$AssertEquals(ResultSet.Data("ProductID"),"936970") + Do $$$AssertEquals(ResultSet.Data("ProductID"),"2809514") Do $$$AssertEquals(ResultSet.Data("SequentieNummer"),$I(SequentieNummer)) Do $$$AssertTrue(ResultSet.Next()) - Do $$$AssertEquals(ResultSet.Data("ProductID"),"936970") + Do $$$AssertEquals(ResultSet.Data("ProductID"),"2809514") Do $$$AssertEquals(ResultSet.Data("SequentieNummer"),$I(SequentieNummer)) Do $$$AssertFalse(ResultSet.Next()) } @@ -58,43 +58,43 @@ #dim ResultSet As TECH.ResultSet = $$ExecDynQuery^vhLib.Query(Query,$LB(LBXBatch.GeefID())) If $$$AssertTrue(ResultSet.Next()){ #dim SequentieNummer As %Integer = 0 - Do $$$AssertEquals(ResultSet.Data("ProductID"),"935561") + Do $$$AssertEquals(ResultSet.Data("ProductID"),"1741520") Do $$$AssertEquals(ResultSet.Data("DeelAantal"),1) Do $$$AssertEquals(ResultSet.Data("TotaalAantal"),4) - Do $$$AssertEquals(ResultSet.Data("ToeleveringLijnID"),"UTToelevLijnID2") + Do $$$AssertEquals(ResultSet.Data("ToeleveringLijnID"),"UTToelevLijnID1") Do $$$AssertEquals(ResultSet.Data("ZijVlakID"),1) - Do $$$AssertEquals(ResultSet.Data("SlotID"),26) + Do $$$AssertEquals(ResultSet.Data("SlotID"),30) Do $$$AssertTrue(ResultSet.Next()) - Do $$$AssertEquals(ResultSet.Data("ProductID"),"935561") + Do $$$AssertEquals(ResultSet.Data("ProductID"),"1741520") Do $$$AssertEquals(ResultSet.Data("DeelAantal"),2) Do $$$AssertEquals(ResultSet.Data("TotaalAantal"),4) - Do $$$AssertEquals(ResultSet.Data("SlotID"),24) + Do $$$AssertEquals(ResultSet.Data("SlotID"),28) Do $$$AssertTrue(ResultSet.Next()) - Do $$$AssertEquals(ResultSet.Data("ProductID"),"935561") + Do $$$AssertEquals(ResultSet.Data("ProductID"),"1741520") Do $$$AssertEquals(ResultSet.Data("DeelAantal"),3) Do $$$AssertEquals(ResultSet.Data("TotaalAantal"),4) - Do $$$AssertEquals(ResultSet.Data("SlotID"),22) + Do $$$AssertEquals(ResultSet.Data("SlotID"),26) Do $$$AssertTrue(ResultSet.Next()) - Do $$$AssertEquals(ResultSet.Data("ProductID"),"935561") + Do $$$AssertEquals(ResultSet.Data("ProductID"),"1741520") Do $$$AssertEquals(ResultSet.Data("DeelAantal"),4) Do $$$AssertEquals(ResultSet.Data("TotaalAantal"),4) - Do $$$AssertEquals(ResultSet.Data("SlotID"),20) + Do $$$AssertEquals(ResultSet.Data("SlotID"),24) Do $$$AssertTrue(ResultSet.Next()) - Do $$$AssertEquals(ResultSet.Data("ProductID"),"935564") + Do $$$AssertEquals(ResultSet.Data("ProductID"),"1766726") Do $$$AssertEquals(ResultSet.Data("BatchID"),##class(vhTest.Dummy.APPS.Halux.common.BatchID).VHossLegraboxBatchID()) Do $$$AssertEquals(ResultSet.Data("DeelAantal"),1) Do $$$AssertEquals(ResultSet.Data("TotaalAantal"),2) Do $$$AssertEquals(ResultSet.Data("ToeleveringID"),"UTToelevID_VHoss_Legrabox") - Do $$$AssertEquals(ResultSet.Data("ToeleveringLijnID"),"UTToelevLijnID1") + Do $$$AssertEquals(ResultSet.Data("ToeleveringLijnID"),"UTToelevLijnID2") Do $$$AssertEquals(ResultSet.Data("ZijVlakID"),1) - Do $$$AssertEquals(ResultSet.Data("SlotID"),30) + Do $$$AssertEquals(ResultSet.Data("SlotID"),22) Do $$$AssertTrue(ResultSet.Next()) - Do $$$AssertEquals(ResultSet.Data("ProductID"),"935564") + Do $$$AssertEquals(ResultSet.Data("ProductID"),"1766726") Do $$$AssertEquals(ResultSet.Data("DeelAantal"),2) Do $$$AssertEquals(ResultSet.Data("TotaalAantal"),2) - Do $$$AssertEquals(ResultSet.Data("ToeleveringLijnID"),"UTToelevLijnID1") + Do $$$AssertEquals(ResultSet.Data("ToeleveringLijnID"),"UTToelevLijnID2") Do $$$AssertEquals(ResultSet.Data("ZijVlakID"),1) - Do $$$AssertEquals(ResultSet.Data("SlotID"),28) + Do $$$AssertEquals(ResultSet.Data("SlotID"),20) Do $$$AssertFalse(ResultSet.Next()) } ]]> Index: vhUnitTest/APPS/Halux/common/impl/SequentieService/MaakSequentie/ToeleveringAPI.cls.xml =================================================================== diff -u -r64985 -r64994 --- vhUnitTest/APPS/Halux/common/impl/SequentieService/MaakSequentie/ToeleveringAPI.cls.xml (.../ToeleveringAPI.cls.xml) (revision 64985) +++ vhUnitTest/APPS/Halux/common/impl/SequentieService/MaakSequentie/ToeleveringAPI.cls.xml (.../ToeleveringAPI.cls.xml) (revision 64994) @@ -34,7 +34,7 @@ @@ -95,11 +95,11 @@ #dim Producten As %ListOfDataTypes = ..GeefProductenInVHoss(ToeleveringID) Set ToeleveringLijnen = ##class(%ListOfObjects).%New() - #dim ToeleveringLijnStub As DOM.AKP.ProductToeleveringLijn = ..MaakToelveringLijnStub("UTToelevLijnID1",Producten.GetAt(1),2) + #dim ToeleveringLijnStub As DOM.AKP.ProductToeleveringLijn = ..MaakToelveringLijnStub("UTToelevLijnID1",Producten.GetAt(1),4) Do ToeleveringLijnen.Insert(ToeleveringLijnStub) Do ToeleveringStub.IndienMethodCall("GeefToeleveringLijn","UTToelevLijnID1").DanReturn(ToeleveringLijnStub) - Set ToeleveringLijnStub = ..MaakToelveringLijnStub("UTToelevLijnID2",Producten.GetAt(2),4) + Set ToeleveringLijnStub = ..MaakToelveringLijnStub("UTToelevLijnID2",Producten.GetAt(2),2) Do ToeleveringLijnen.Insert(ToeleveringLijnStub) Do ToeleveringStub.IndienMethodCall("GeefToeleveringLijn","UTToelevLijnID2").DanReturn(ToeleveringLijnStub)