Index: vhUnitTest/WSimpl/AX/CalculatedProduct/ProductUpdater/Test.cls.xml
===================================================================
diff -u -r58659 -r58716
--- vhUnitTest/WSimpl/AX/CalculatedProduct/ProductUpdater/Test.cls.xml	(.../Test.cls.xml)	(revision 58659)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/ProductUpdater/Test.cls.xml	(.../Test.cls.xml)	(revision 58716)
@@ -54,89 +54,17 @@
 </Method>
 
 <Method name="Test: Een Tbx-Product wordt geüpdatet">
-<Implementation><![CDATA[
-	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..GeefRequest()
-	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
-	#dim ProductData As DOM.PM.dto.ProductData = ##class(DOM.PM.dto.ProductData).%New()
-	
-	#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-	Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#ProductId, Request.ItemId).DanReturn(ProductStub)
-	Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request, ProductData).DanReturn(ProductStub)
-	Set ..ProductService = ProductServiceMock
-	
-	#dim DataMProductRepositoryMock As vhTest.Mock.DOM.PM.impl.DataM.DataMProductRepository = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProductRepository).%New()
-	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("TBX", Request, ProductData)
-	#dim GeupdatetProduct As DOM.PM.Product = ProductUpdater.GeefGeupdatetProduct(Request, ..#ProductId)
-	
-	Do ..ProductService.Verifieer()
-	Do ..DataMProductRepository.Verifieer()
-	Do ..Logger.Verifieer()
+<Implementation><![CDATA[	Do ..AssertProductUpdaterVoorLadeVariant(##class(AXimpl.PM.enu.LadeVariant).TBX())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Een Lbx-Product wordt geüpdatet">
-<Implementation><![CDATA[
-	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..GeefRequest()
-	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
-	#dim ProductData As DOM.PM.dto.ProductData = ##class(DOM.PM.dto.ProductData).%New()
-	
-	#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-	Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#ProductId, Request.ItemId).DanReturn(ProductStub)
-	Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request, ProductData).DanReturn(ProductStub)
-	Set ..ProductService = ProductServiceMock
-	
-	#dim DataMProductRepositoryMock As vhTest.Mock.DOM.PM.impl.DataM.DataMProductRepository = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProductRepository).%New()
-	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()
+<Implementation><![CDATA[	Do ..AssertProductUpdaterVoorLadeVariant(##class(AXimpl.PM.enu.LadeVariant).LBX())
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Een Tax-Product wordt geüpdatet">
-<Implementation><![CDATA[
-	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..GeefRequest()
-	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
-	#dim ProductData As DOM.PM.dto.ProductData = ##class(DOM.PM.dto.ProductData).%New()
-	
-	#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
-	Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#ProductId, Request.ItemId).DanReturn(ProductStub)
-	Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request, ProductData).DanReturn(ProductStub)
-	Set ..ProductService = ProductServiceMock
-	
-	#dim DataMProductRepositoryMock As vhTest.Mock.DOM.PM.impl.DataM.DataMProductRepository = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProductRepository).%New()
-	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("TAX", Request, ProductData)
-	#dim GeupdatetProduct As DOM.PM.Product = ProductUpdater.GeefGeupdatetProduct(Request, ..#ProductId)
-	
-	Do ..ProductService.Verifieer()
-	Do ..DataMProductRepository.Verifieer()
-	Do ..Logger.Verifieer()
+<Implementation><![CDATA[	Do ..AssertProductUpdaterVoorLadeVariant(##class(AXimpl.PM.enu.LadeVariant).TAX())
 ]]></Implementation>
 </Method>
 
@@ -174,6 +102,37 @@
 ]]></Implementation>
 </Method>
 
+<Method name="AssertProductUpdaterVoorLadeVariant">
+<FormalSpec>LadeVariant:AXimpl.PM.enu.LadeVariant</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..GeefRequest()
+	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
+	#dim ProductData As DOM.PM.dto.ProductData = ##class(DOM.PM.dto.ProductData).%New()
+	
+	#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#ProductId, Request.ItemId).DanReturn(ProductStub)
+	Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request, ProductData).DanReturn(ProductStub)
+	Set ..ProductService = ProductServiceMock
+	
+	#dim DataMProductRepositoryMock As vhTest.Mock.DOM.PM.impl.DataM.DataMProductRepository = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProductRepository).%New()
+	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(LadeVariant, Request, ProductData)
+	#dim GeupdatetProduct As DOM.PM.Product = ProductUpdater.GeefGeupdatetProduct(Request, ..#ProductId)
+	
+	Do ..ProductService.Verifieer()
+	Do ..DataMProductRepository.Verifieer()
+	Do ..Logger.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="GeefProductUpdater">
 <FormalSpec>LadeVariant:AXimpl.PM.enu.LadeVariant=##class(AXimpl.PM.enu.LadeVariant).LBX(),Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,ProductData:DOM.PM.dto.ProductData=##class(DOM.PM.dto.ProductData).%New()</FormalSpec>
 <Private>1</Private>