Index: vhTest/Dummy/DOM/VKP/impl/HandelKlantDataRepository.cls.xml =================================================================== diff -u --- vhTest/Dummy/DOM/VKP/impl/HandelKlantDataRepository.cls.xml (revision 0) +++ vhTest/Dummy/DOM/VKP/impl/HandelKlantDataRepository.cls.xml (revision 45587) @@ -0,0 +1,15 @@ + + + +DOM.VKP.impl.HandelKlantDataRepository + + +ID:%String +TECH.Persistent + + + + + + Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml =================================================================== diff -u -r45585 -r45587 --- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml (.../Test.cls.xml) (revision 45585) +++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml (.../Test.cls.xml) (revision 45587) @@ -38,6 +38,16 @@ 1 + +vhTest.Dummy.DOM.VKP.impl.HandelKlantDataRepository +1 + + + +vhTest.Dummy.DOM.common.impl.HandelPersonalityRepository +1 + + aTestName:%String @@ -88,10 +100,10 @@ Set KortingBewaarderMock = ##class(vhTest.Mock.WSimpl.Unishop.Login.KortingBewaarder).%New() Do KortingBewaarderMock.VerwachtMethodCall("BewaarMeegegevenKorting",..DecrypteerRequestStub.Ref,..DecrypteerRequestStub.DataOpt).ExactAantalKeer(1) - Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New() - Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantDataDummy) + Set HandelKlantDataRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New() + Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantDataDummy) - Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepository,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,KortingBewaarderMock,..UrlBepalerStub) + Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,KortingBewaarderMock,..UrlBepalerStub) #dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub) @@ -191,10 +203,10 @@ Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New() Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("destil_") - Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New() - Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantDataDummy) + Set HandelKlantDataRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New() + Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantDataDummy) - Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepository,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub) + Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub) #dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub) @@ -228,10 +240,10 @@ Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New() Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("kisch_") - Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New() - Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantDataDummy) + Set HandelKlantDataRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New() + Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantDataDummy) - Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepository,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub) + Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub) #dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub) @@ -259,13 +271,16 @@ Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(..KlantDataDummy) + Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New() + Do HandelPersonalityRepositoryStub.VerwachtMethodCall("GeefViaID",##class(DOM.common.enu.Personality).Daro()).DanReturn(HandelPersonalityStub) + Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New() Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("daro_") - Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New() - Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantDataDummy) + Set HandelKlantDataRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New() + Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantDataDummy) - Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepository,,..WebshopSessionServiceDummy,,..KortingBewaarderDummy,..UrlBepalerStub) + Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub) #dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub) @@ -276,6 +291,7 @@ } Do LoginParameterBepalerMock.Verifieer() + Do HandelPersonalityRepositoryStub.Verifieer() ]]> @@ -295,10 +311,10 @@ Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New() Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("daro") - Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New() - Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn("") + Set HandelKlantDataRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New() + Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn("") - Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,HandelKlantDataRepository,,..WebshopSessionServiceDummy,,..KortingBewaarderDummy,..UrlBepalerStub) + Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,HandelKlantDataRepositoryStub,..HandelPersonalityRepositoryDummy,..WebshopSessionServiceDummy,,..KortingBewaarderDummy,..UrlBepalerStub) #dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub) @@ -329,7 +345,7 @@ Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New() Do HandelPersonalityRepositoryStub.IndienMethodCall("GeefViaID", ##class(DOM.common.enu.Personality).Daro()).DanReturn(HandelPersonalityStub) - Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,HandelPersonalityRepositoryStub,WebshopSessionService,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub) + Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,..HandelKlantDataRepositoryDummy,HandelPersonalityRepositoryStub,WebshopSessionService,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub) #dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub) @@ -349,7 +365,7 @@ Set LoginParameterBepalerStub = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New() Do LoginParameterBepalerStub.IndienMethodCall("GeefLoginParameters",..DecrypteerRequestStub.Ref, ..DecrypteerRequestStub.DataOpt, ..DecrypteerRequestStub.Header.Taal, ..DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(..LoginParameters) - Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,..WebshopSessionServiceDummy,..SettingsManagerDummy,..KortingBewaarderDummy,..UrlBepalerStub) + Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,..HandelKlantDataRepositoryDummy,..HandelPersonalityRepositoryDummy,..WebshopSessionServiceDummy,..SettingsManagerDummy,..KortingBewaarderDummy,..UrlBepalerStub) #dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub) @@ -372,7 +388,7 @@ Set UrlBepalerMock = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New() Do UrlBepalerMock.VerwachtMethodCall("GeefUrl","10").DanReturn("darotest.taorbox.com").ExactAantalKeer(0) - Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,..WebshopSessionServiceDummy,..SettingsManagerDummy,..KortingBewaarderDummy,UrlBepalerMock) + Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,..HandelKlantDataRepositoryDummy,..HandelPersonalityRepositoryDummy,..WebshopSessionServiceDummy,..SettingsManagerDummy,..KortingBewaarderDummy,UrlBepalerMock) #dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub) Index: vhTest/Dummy/DOM/common/impl/HandelPersonalityRepository.cls.xml =================================================================== diff -u --- vhTest/Dummy/DOM/common/impl/HandelPersonalityRepository.cls.xml (revision 0) +++ vhTest/Dummy/DOM/common/impl/HandelPersonalityRepository.cls.xml (revision 45587) @@ -0,0 +1,15 @@ + + + +DOM.common.impl.HandelPersonalityRepository + + +ID:%String +TECH.Persistent + + + + + +