Index: vhUnitTest/WSimpl/AX/CalculatedProduct/ProductUpdater/Test.cls.xml =================================================================== diff -u -r57287 -r57300 --- vhUnitTest/WSimpl/AX/CalculatedProduct/ProductUpdater/Test.cls.xml (.../Test.cls.xml) (revision 57287) +++ vhUnitTest/WSimpl/AX/CalculatedProduct/ProductUpdater/Test.cls.xml (.../Test.cls.xml) (revision 57300) @@ -23,6 +23,11 @@ 1 + +vhLib.Logger +1 + + @@ -62,11 +68,17 @@ Do DataMProductRepositoryMock.VerwachtMethodCall("VerwijderViaID", ..#ProductId, $$$False).DanDoeNiks() Set ..DataMProductRepository = DataMProductRepositoryMock + #dim LoggerMock As vhTest.Mock.vhLib.Logger = ##class(vhTest.Mock.vhLib.Logger).%New() + Do LoggerMock.VerwachtMethodCall("Warning", "ProductUpdater", "Product '"_..#ProductId_"' verwijderd in Cache!").DanDoeNiks() + Do LoggerMock.VerwachtMethodCall("Warning", "ProductUpdater", "Product '"_..#ProductId_"' opnieuw gemaakt in Cache! DossierNummer = '"_..#RandomDossierNr_"'").DanDoeNiks() + Set ..Logger = LoggerMock + #dim ProductUpdater As WSimpl.AX.CalculatedProduct.ProductUpdater = ..GeefProductUpdater("LBX", Request, ProductData) #dim GeupdatetProduct As DOM.PM.Product = ProductUpdater.GeefGeupdatetProduct(Request, ..#ProductId) Do ..ProductService.Verifieer() Do ..DataMProductRepository.Verifieer() + Do ..Logger.Verifieer() ]]> @@ -115,7 +127,7 @@ #dim ProductDataFactoryStub As vhTest.Mock.DOM.PM.dto.ProductDataFactory = ##class(vhTest.Mock.DOM.PM.dto.ProductDataFactory).%New() Do ProductDataFactoryStub.IndienMethodCall("MaakProductData", ..#ProductId, ..#RandomDossierNr).DanReturn(ProductData) - Quit ##class(WSimpl.AX.CalculatedProduct.ProductUpdater).%New(..ProductService, LadeVariantBepalerStub, ..DataMProductRepository, ProductDataFactoryStub) + Quit ##class(WSimpl.AX.CalculatedProduct.ProductUpdater).%New(..ProductService, LadeVariantBepalerStub, ..DataMProductRepository, ProductDataFactoryStub, ..Logger) ]]> Index: WSimpl/AX/CalculatedProduct/ProductUpdater.cls.xml =================================================================== diff -u -r57297 -r57300 --- WSimpl/AX/CalculatedProduct/ProductUpdater.cls.xml (.../ProductUpdater.cls.xml) (revision 57297) +++ WSimpl/AX/CalculatedProduct/ProductUpdater.cls.xml (.../ProductUpdater.cls.xml) (revision 57300) @@ -23,8 +23,13 @@ 1 + +vhLib.Logger +1 + + -ProductService:WSimpl.AX.CalculatedProduct.ProductService="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository="",ProductDataFactory:DOM.PM.dto.ProductDataFactory="" +ProductService:WSimpl.AX.CalculatedProduct.ProductService="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository="",ProductDataFactory:DOM.PM.dto.ProductDataFactory="",Logger:vhLib.Logger="" 1 1 %Status @@ -34,6 +39,7 @@ Set ..LadeVariantBepaler = $$$Inject(LadeVariantBepaler, ##class(WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()) Set ..DataMProductRepository = $$$Inject(DataMProductRepository, ##class(DOM.PM.impl.DataM.DataMProductRepository).%New()) Set ..ProductDataFactory = $$$Inject(ProductDataFactory, ##class(DOM.PM.dto.ProductDataFactory).%New()) + Set ..Logger = $$$Inject(Logger,##class(vhLib.Logger).%New("CalculatedProduct")) Quit $$$OK ]]> @@ -89,6 +95,7 @@ Do ..VerwijderProduct(ProductId) Set Product = ..ProductService.GeefProductGemaaktVolgensAxKenmerken(Request, ..ProductDataFactory.MaakProductData(ProductId, DossierNummer)) + Do ..Logger.Warning("ProductUpdater", "Product '"_ProductId_"' opnieuw gemaakt in Cache! DossierNummer = '"_DossierNummer_"'") Do ..UnlockProduct(ProductId) @@ -99,7 +106,9 @@ ProductId:%String 1 - Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductUpdater.cls.xml =================================================================== diff -u -r57288 -r57300 --- vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductUpdater.cls.xml (.../ProductUpdater.cls.xml) (revision 57288) +++ vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductUpdater.cls.xml (.../ProductUpdater.cls.xml) (revision 57300) @@ -9,7 +9,7 @@ right -ProductService:WSimpl.AX.CalculatedProduct.ProductService="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository="",ProductDataFactory:DOM.PM.dto.ProductDataFactory="" +ProductService:WSimpl.AX.CalculatedProduct.ProductService="",LadeVariantBepaler:WSimpl.AX.CalculatedProduct.LadeVariantBepaler="",DataMProductRepository:DOM.PM.impl.DataM.DataMProductRepository="",ProductDataFactory:DOM.PM.dto.ProductDataFactory="",Logger:vhLib.Logger="" %Status Index: WSimpl/AX/CalculatedProduct/ProductService.cls.xml =================================================================== diff -u -r57242 -r57300 --- WSimpl/AX/CalculatedProduct/ProductService.cls.xml (.../ProductService.cls.xml) (revision 57242) +++ WSimpl/AX/CalculatedProduct/ProductService.cls.xml (.../ProductService.cls.xml) (revision 57300) @@ -82,9 +82,9 @@ If ($$$Not($$$HasLength(Bezwaar))) { Set HeeftBezwaar = $$$False - Do ..Logger.Info("Product delete", "Geen bezwaar gevonden voor ProductId: '"_ProductId_"'") + Do ..Logger.Info("ProductUpdater", "Geen bezwaar gevonden voor ProductId: '"_ProductId_"'") } Else { - Do ..Logger.Warning("Product delete", "Er is minstens 1 bezwaar gevonden voor ProductId: '"_ProductId_"' - Bezwaar: '"_Bezwaar_"'") + Do ..Logger.Warning("ProductUpdater", "Er is minstens 1 bezwaar gevonden voor ProductId: '"_ProductId_"' - Bezwaar: '"_Bezwaar_"'") } Quit HeeftBezwaar Index: vhUnitTest/WSimpl/AX/CalculatedProduct/ProductService/Test.cls.xml =================================================================== diff -u -r57243 -r57300 --- vhUnitTest/WSimpl/AX/CalculatedProduct/ProductService/Test.cls.xml (.../Test.cls.xml) (revision 57243) +++ vhUnitTest/WSimpl/AX/CalculatedProduct/ProductService/Test.cls.xml (.../Test.cls.xml) (revision 57300) @@ -112,7 +112,7 @@ Do CheckDelControleurStub.IndienMethodCall("GeefEersteBezwaarIndienAanwezig", ProductId, $$$ElkeWaarde).DanReturn(RandomBezwaar) Set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New() - Do LoggerMock.VerwachtMethodCall("Warning", "Product delete", "Er is minstens 1 bezwaar gevonden voor ProductId: '"_ProductId_"' - Bezwaar: '"_RandomBezwaar_"'") + Do LoggerMock.VerwachtMethodCall("Warning", "ProductUpdater", "Er is minstens 1 bezwaar gevonden voor ProductId: '"_ProductId_"' - Bezwaar: '"_RandomBezwaar_"'") #dim ProductService As WSimpl.AX.CalculatedProduct.ProductService = ##class(WSimpl.AX.CalculatedProduct.ProductService).%New(,,, CheckDelControleurStub, LoggerMock) @@ -129,7 +129,7 @@ Do CheckDelControleurStub.IndienMethodCall("GeefEersteBezwaarIndienAanwezig", ProductId, $$$ElkeWaarde).DanReturn("") Set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New() - Do LoggerMock.VerwachtMethodCall("Info", "Product delete", "Geen bezwaar gevonden voor ProductId: '"_ProductId_"'") + Do LoggerMock.VerwachtMethodCall("Info", "ProductUpdater", "Geen bezwaar gevonden voor ProductId: '"_ProductId_"'") #dim ProductService As WSimpl.AX.CalculatedProduct.ProductService = ##class(WSimpl.AX.CalculatedProduct.ProductService).%New(,,, CheckDelControleurStub, LoggerMock)