Index: APPS/Blum/impl/UserCartValidator.cls.xml =================================================================== diff -u -r40915 -r40960 --- APPS/Blum/impl/UserCartValidator.cls.xml (.../UserCartValidator.cls.xml) (revision 40915) +++ APPS/Blum/impl/UserCartValidator.cls.xml (.../UserCartValidator.cls.xml) (revision 40960) @@ -3,15 +3,29 @@ TECH.Mockable + +Derde.EC.ToegangRepository +1 + + + +ToegangRepository:Derde.EC.ToegangRepository +1 +1 +%Status +1 + + + -UserCart:APPS.Blum.OnlineProductConfigurator.dto.Winkelkar +Email:%String="" %String @@ -49,7 +49,7 @@ do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("APPS.Blum.OnlineProductConfigurator.impl.EmailOngekendExceptie",Substrings)) Set Valideerder = ##class(APPS.Blum.impl.UserCartValidator).%New() - Do Valideerder.GeefGebruikerID(..UserCart) + Do Valideerder.GeefGebruikerID(..UserCart.userName) ]]> @@ -62,7 +62,7 @@ do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("APPS.Blum.OnlineProductConfigurator.impl.EmailNietUniekExceptie",Substrings)) Set Valideerder = ##class(APPS.Blum.impl.UserCartValidator).%New() - Do Valideerder.GeefGebruikerID(..UserCart) + Do Valideerder.GeefGebruikerID(..UserCart.userName) ]]> Index: APPS/Blum/impl/OnlineProductConfigurator/KlantBepaler.cls.xml =================================================================== diff -u -r40923 -r40960 --- APPS/Blum/impl/OnlineProductConfigurator/KlantBepaler.cls.xml (.../KlantBepaler.cls.xml) (revision 40923) +++ APPS/Blum/impl/OnlineProductConfigurator/KlantBepaler.cls.xml (.../KlantBepaler.cls.xml) (revision 40960) @@ -23,8 +23,13 @@ 1 + +APPS.Blum.impl.OnlineProductConfigurator.KlantBepaler.Vhisie4KlantInfoOphaler +1 + + -UserCartValidator:APPS.Blum.impl.UserCartValidator,LegacyPartijAPI:DOM.PARTIJ.LegacyPartijAPI,VerkoopAPI:DOM.VKP.VerkoopAPI,ToegangRepository:Derde.EC.ToegangRepository +UserCartValidator:APPS.Blum.impl.UserCartValidator,LegacyPartijAPI:DOM.PARTIJ.LegacyPartijAPI,VerkoopAPI:DOM.VKP.VerkoopAPI,ToegangRepository:Derde.EC.ToegangRepository,Vhisie4KlantInfoOphaler:APPS.Blum.impl.OnlineProductConfigurator.KlantBepaler.Vhisie4KlantInfoOphaler 1 1 %Status @@ -34,6 +39,7 @@ Set ..LegacyPartijAPI = $$$Inject(LegacyPartijAPI, ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI()) Set ..VerkoopAPI = $$$Inject(VerkoopAPI, ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI()) Set ..ToegangRepository = $$$Inject(ToegangRepository, ##class(Derde.EC.ToegangRepository).%New()) + Set ..Vhisie4KlantInfoOphaler = ##class(APPS.Blum.impl.OnlineProductConfigurator.KlantBepaler.Vhisie4KlantInfoOphaler).%New() quit $$$OK ]]> @@ -44,14 +50,18 @@ APPS.Blum.OnlineProductConfigurator.dto.Klant Index: vhTest/Mock/APPS/Blum/impl/UserCartValidator.cls.xml =================================================================== diff -u -r40915 -r40960 --- vhTest/Mock/APPS/Blum/impl/UserCartValidator.cls.xml (.../UserCartValidator.cls.xml) (revision 40915) +++ vhTest/Mock/APPS/Blum/impl/UserCartValidator.cls.xml (.../UserCartValidator.cls.xml) (revision 40960) @@ -10,9 +10,9 @@ right -UserCart:APPS.Blum.OnlineProductConfigurator.dto.Winkelkar +Email:%String="" %String - Index: vhTest/Fake/APPS/Blum/impl/UserCartValidator.cls.xml =================================================================== diff -u -r40915 -r40960 --- vhTest/Fake/APPS/Blum/impl/UserCartValidator.cls.xml (.../UserCartValidator.cls.xml) (revision 40915) +++ vhTest/Fake/APPS/Blum/impl/UserCartValidator.cls.xml (.../UserCartValidator.cls.xml) (revision 40960) @@ -8,7 +8,7 @@ APPS.Blum.impl.UserCartValidator -UserCart:APPS.Blum.OnlineProductConfigurator.dto.Winkelkar +Email:%String="" %String Index: vhUnitTest/APPS/Blum/impl/OnlineProductConfigurator/KlantBepaler/Test.cls.xml =================================================================== diff -u -r40931 -r40960 --- vhUnitTest/APPS/Blum/impl/OnlineProductConfigurator/KlantBepaler/Test.cls.xml (.../Test.cls.xml) (revision 40931) +++ vhUnitTest/APPS/Blum/impl/OnlineProductConfigurator/KlantBepaler/Test.cls.xml (.../Test.cls.xml) (revision 40960) @@ -10,7 +10,7 @@ #dim VanHoeckeKlant As DOM.VKP.VanHoeckeKlant = ..GeefVanHoeckeKlant() Set UserCartValidatorMock = ##class(vhTest.Mock.APPS.Blum.impl.UserCartValidator).%New() - Do UserCartValidatorMock.VerwachtMethodCall("GeefGebruikerID", Winkelkar).DanReturn("GebruikerID") + Do UserCartValidatorMock.VerwachtMethodCall("GeefGebruikerID", Winkelkar.userName).DanReturn("GebruikerID") Set LegacyPartijAPIMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New() Do LegacyPartijAPIMock.VerwachtMethodCall("GeefKlantPartijID", "KlantID").DanReturn("K||KlantID") @@ -49,7 +49,7 @@ Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(##class(TECH.Exceptions.GeneralErrorException).%ClassName(1),Substrings)) Set KlantBepaler = ##class(APPS.Blum.impl.OnlineProductConfigurator.KlantBepaler).%New(UserCartValidatorStub,,,ToegangRepositoryStub) - #dim ConfiguratorKlant As APPS.Blum.OnlineProductConfigurator.dto.Klant = KlantBepaler.GeefKlant("") + #dim ConfiguratorKlant As APPS.Blum.OnlineProductConfigurator.dto.Klant = KlantBepaler.GeefKlant(..GeefWinkelkar()) ]]>