Index: vhTest/Utils/APPS/VKP/Offerte/dto/VerpakkingList.cls.xml =================================================================== diff -u -r36388 -r37549 --- vhTest/Utils/APPS/VKP/Offerte/dto/VerpakkingList.cls.xml (.../VerpakkingList.cls.xml) (revision 36388) +++ vhTest/Utils/APPS/VKP/Offerte/dto/VerpakkingList.cls.xml (.../VerpakkingList.cls.xml) (revision 37549) @@ -14,7 +14,51 @@ Set Verpakking.ProductID = 1 Set Verpakking.WaardeGoederen = 10.5 Set Verpakking.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(90,80,70) + Set Verpakking.VerpakkingType = ##class(APPS.VKP.Offerte.enu.VerpakkingType).Probox() + Set Verpakking.LadeType = ##class(APPS.VKP.Offerte.enu.LadeType).Taorbox() Do VerpakkingsList.Insert(Verpakking) + + Set Verpakking = ##class(APPS.VKP.Offerte.dto.Verpakking).%New() + Set Verpakking.Aantal = 4 + Set Verpakking.Gewicht = 250 + Set Verpakking.ProductID = 2 + Set Verpakking.WaardeGoederen = 15.5 + Set Verpakking.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(190,180,170) + Set Verpakking.VerpakkingType = ##class(APPS.VKP.Offerte.enu.VerpakkingType).Probox() + Set Verpakking.LadeType = ##class(APPS.VKP.Offerte.enu.LadeType).LegraboxPure() + Do VerpakkingsList.Insert(Verpakking) + + Set Verpakking = ##class(APPS.VKP.Offerte.dto.Verpakking).%New() + Set Verpakking.Aantal = 3 + Set Verpakking.Gewicht = 175 + Set Verpakking.ProductID = 3 + Set Verpakking.WaardeGoederen = 19.2 + Set Verpakking.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(120,130,150) + Set Verpakking.VerpakkingType = ##class(APPS.VKP.Offerte.enu.VerpakkingType).V1() + Set Verpakking.LadeType = ##class(APPS.VKP.Offerte.enu.LadeType).LegraboxPure() + Do VerpakkingsList.Insert(Verpakking) + + Set Verpakking = ##class(APPS.VKP.Offerte.dto.Verpakking).%New() + Set Verpakking.Aantal = 1 + Set Verpakking.Gewicht = 17 + Set Verpakking.ProductID = 4 + Set Verpakking.WaardeGoederen = 9.5 + Set Verpakking.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(20,30,50) + Set Verpakking.VerpakkingType = ##class(APPS.VKP.Offerte.enu.VerpakkingType).V1() + Set Verpakking.LadeType = ##class(APPS.VKP.Offerte.enu.LadeType).Taorbox() + Do VerpakkingsList.Insert(Verpakking) + + + Set Verpakking = ##class(APPS.VKP.Offerte.dto.Verpakking).%New() + Set Verpakking.Aantal = 5 + Set Verpakking.Gewicht = 35 + Set Verpakking.ProductID = 5 + Set Verpakking.WaardeGoederen = 29.5 + Set Verpakking.Afmeting = ##class(APPS.TRANSP.dto.Afmeting).%New(50,60,70) + Set Verpakking.VerpakkingType = ##class(APPS.VKP.Offerte.enu.VerpakkingType).FlatpackV1() + Set Verpakking.LadeType = ##class(APPS.VKP.Offerte.enu.LadeType).Taorbox() + Do VerpakkingsList.Insert(Verpakking) + Quit VerpakkingsList ]]> Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml =================================================================== diff -u -r37401 -r37549 --- vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml (.../Test.cls.xml) (revision 37401) +++ vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml (.../Test.cls.xml) (revision 37549) @@ -192,7 +192,7 @@ Do $$$AssertEquals(CollisOpPallet.Settings.PalletFormaten.Count(), 2) Do $$$AssertEquals(CollisOpPallet.Settings.PalletFormaten.GetAt(1), ##class(APPS.TRANSP.Stapeling.enu.PalletFormaat).EuroPallet()) Do $$$AssertEquals(CollisOpPallet.Settings.PalletFormaten.GetAt(2), ##class(APPS.TRANSP.Stapeling.enu.PalletFormaat).WegwerpPallet()) - Do $$$AssertEquals(CollisOpPallet.Collis.Count(), 1) + Do $$$AssertEquals(CollisOpPallet.Collis.Count(), 5) #dim ColliOpPallet As APPS.TRANSP.Stapeling.dto.ColliOpPallet = CollisOpPallet.Collis.GetAt(1) Do $$$AssertEquals(ColliOpPallet.Aantal, 2) Do $$$AssertEquals(ColliOpPallet.GewichtInKg, .1)