Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_Dozon.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_Dozon.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTAXMPprijzen/TAX_Dozon.txt (revision 70629) @@ -0,0 +1,6 @@ + + + 323.99 + 259.2 + 259.2 + \ No newline at end of file Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt =================================================================== diff -u -r68635 -r70629 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt (.../WS.EC.SessionService.txt) (revision 68635) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessionService.txt (.../WS.EC.SessionService.txt) (revision 70629) @@ -143,6 +143,7 @@ + Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml =================================================================== diff -u -r68634 -r70629 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 68634) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefVerkoopprijsBerekenaar/Test.cls.xml (.../Test.cls.xml) (revision 70629) @@ -86,6 +86,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).HaefeleNO()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).OPO()) Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Martens()) + Do VerwachteBepalers.SetAt(..VanHoeckeVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Dozon()) Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinVerkoopprijsBerekenaarClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml =================================================================== diff -u -r68634 -r70629 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 68634) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefLandenBepaler/Test.cls.xml (.../Test.cls.xml) (revision 70629) @@ -83,6 +83,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleNO()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).OPO()) Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Martens()) + Do VerwachteBepalers.SetAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Dozon()) Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml =================================================================== diff -u -r68634 -r70629 --- vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 68634) +++ vhUnitTest/APPS/EC/Transport/impl/Factory/GeefTransportFirmaBepaler/Test.cls.xml (.../Test.cls.xml) (revision 70629) @@ -85,6 +85,7 @@ Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).HaefeleNO()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).OPO()) Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Martens()) + Do VerwachteBepalers.SetAt(..VanHoeckeTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Dozon()) Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Hein()) Do VerwachteBepalers.SetAt(..HeinTransportFirmaBepalerClassName,##class(DOM.common.enu.Personality).Seefelder()) Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_Dozon.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_Dozon.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestTBXMPprijzen/TBX_Dozon.txt (revision 70629) @@ -0,0 +1,6 @@ + + + 145.68 + 116.544 + 116.544 + \ No newline at end of file Index: vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml =================================================================== diff -u -r68635 -r70629 --- vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 68635) +++ vhUnitTest/DOM/common/impl/PersonalityService/IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel/Test.cls.xml (.../Test.cls.xml) (revision 70629) @@ -34,7 +34,7 @@ while PersonalityIterator.HasNext() { #dim PersonalityId as %String = PersonalityIterator.Next() - if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleFR,..Personality.HaefeleDK,..Personality.HaefeleCH, ..Personality.HaefeleNO, ..Personality.Martens){ + if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleFR,..Personality.HaefeleDK,..Personality.HaefeleCH, ..Personality.HaefeleNO, ..Personality.Martens, ..Personality.Dozon){ Do $$$AssertTrue(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout") } ElseIf ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.VanHoecke,..Personality.VanHoeckeVoorHalux,..Personality.SFS,..Personality.OPO,..Personality.Kisch,..Personality.Destil,..Personality.HaefeleBE,..Personality.VanRaemdonck,..Personality.Noteborn,..Personality.Daro,..Personality.BeslagDesign,..Personality.Demo,..Personality.Galimberti,..Personality.Pavanello,..Personality.Ferexpert,..Personality.Beslagteknikk,..Personality.YachtSupplier,..Personality.DeceuninckDeforce,..Personality.Pierard,..Personality.HahleOy,..Personality.BiemarBois,..Personality.CampeTonny, ..Personality.Dupont) { Do $$$AssertFalse(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout") @@ -61,7 +61,7 @@ while PersonalityIterator.HasNext() { #dim PersonalityId as %String = PersonalityIterator.Next() - if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer, ..Personality.Dupont,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleBE,..Personality.VanRaemdonck,..Personality.Pavanello,..Personality.Ferexpert,,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleDK,..Personality.HaefeleFR,..Personality.HaefeleCH, ..Personality.HaefeleNO, ..Personality.Martens){ + if ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.HaefeleNL, ..Personality.Hein, ..Personality.Seefelder, ..Personality.Zweygart,..Personality.JBarth,..Personality.Kleiner,..Personality.Layer, ..Personality.Dupont,..Personality.Rini,..Personality.Furnifit,..Personality.DeBisschop,..Personality.HaefeleDE,..Personality.HaefeleSE,..Personality.HaefeleFI,..Personality.DSGroup,..Personality.HaefeleBE,..Personality.VanRaemdonck,..Personality.Pavanello,..Personality.Ferexpert,,..Personality.HaefeleAT,..Personality.HaefeleIT,..Personality.HaefeleDK,..Personality.HaefeleFR,..Personality.HaefeleCH, ..Personality.HaefeleNO, ..Personality.Martens, ..Personality.Dozon){ Do $$$AssertTrue(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout") } ElseIf ##class(TECH.StringUtils).Equals(PersonalityId,..Personality.VanHoecke,..Personality.VanHoeckeVoorHalux,..Personality.SFS,..Personality.OPO,..Personality.Kisch,..Personality.Destil,..Personality.Noteborn,..Personality.Daro,..Personality.BeslagDesign,..Personality.Demo,..Personality.Galimberti,..Personality.Beslagteknikk,..Personality.YachtSupplier,..Personality.DeceuninckDeforce,..Personality.Pierard,..Personality.HahleOy,..Personality.BiemarBois,..Personality.CampeTonny) { Do $$$AssertFalse(Service.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(PersonalityId),"Personality "_ ##class(DOM.common.enu.Personality).DisplayList().GetAt(PersonalityId) _ " Fout") Index: vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_Dozon.txt =================================================================== diff -u --- vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_Dozon.txt (revision 0) +++ vhTestFiles/UnitTests/APPS.EC.Winkelkar.WinkelkarService.impl.PrijsBerekeningPrijsBepaler/MPTest/TestLBXMPprijzen/LBX_Dozon.txt (revision 70629) @@ -0,0 +1,6 @@ + + + 164.61 + 131.696 + 131.696 + \ No newline at end of file