Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r57270 -r57271
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 57270)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 57271)
@@ -51,14 +51,7 @@
 <Method name="Test: RequestConverter converteert een AxdEntityRequest naar een AxdEntityConfigVariant">
 <Implementation><![CDATA[
 	If ($$$Not(##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol())) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-		Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn(..#RandomEANCode)
-		Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn(..#RandomKorttekst)
-		Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(..#RandomNettoAankoopPrijs)
-		Do ProductStub.IndienMethodCall("GeefGewichtInGram").DanReturn(..#RandomGewicht)
-		Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(..#RandomProductId)
-		Do ProductStub.IndienMethodCall("IsGenerischProduct").DanReturn($$$False)
-		
+		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
@@ -98,13 +91,7 @@
 <Method name="Test: IsActiefAttrVsAdminProdNrInBomBol =&gt; Nieuwe implementatie NIET igv TBX">
 <Implementation><![CDATA[
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-		Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn(..#RandomEANCode)
-		Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn(..#RandomKorttekst)
-		Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(..#RandomNettoAankoopPrijs)
-		Do ProductStub.IndienMethodCall("GeefGewichtInGram").DanReturn(..#RandomGewicht)
-		Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(..#RandomProductId)
-		Do ProductStub.IndienMethodCall("IsGenerischProduct").DanReturn($$$False)
+		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
 		
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		
@@ -148,13 +135,7 @@
 <Method name="Test: IsActiefAttrVsAdminProdNrInBomBol =&gt; Nieuwe implementatie NIET igv TAX">
 <Implementation><![CDATA[
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-		Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn(..#RandomEANCode)
-		Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn(..#RandomKorttekst)
-		Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(..#RandomNettoAankoopPrijs)
-		Do ProductStub.IndienMethodCall("GeefGewichtInGram").DanReturn(..#RandomGewicht)
-		Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(..#RandomProductId)
-		Do ProductStub.IndienMethodCall("IsGenerischProduct").DanReturn($$$False)
+		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
 		
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		
@@ -234,13 +215,7 @@
 <Method name="Test: RequestConverter vult velden in op basis van het gevonden Product">
 <Implementation><![CDATA[
 	If ($$$Not(##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol())) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-		Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn(..#RandomEANCode)
-		Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn(..#RandomKorttekst)
-		Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(..#RandomNettoAankoopPrijs)
-		Do ProductStub.IndienMethodCall("GeefGewichtInGram").DanReturn(..#RandomGewicht)
-		Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(..#RandomProductId)
-		Do ProductStub.IndienMethodCall("IsGenerischProduct").DanReturn($$$False)
+		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
 
 		#dim ProductServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceStub.IndienMethodCall("GeefProduct", $$$ElkeWaarde, $$$ElkeWaarde).DanReturn(ProductStub)
@@ -307,13 +282,7 @@
 <Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is Fixed">
 <Implementation><![CDATA[
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-		Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn(..#RandomEANCode)
-		Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn(..#RandomKorttekst)
-		Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(..#RandomNettoAankoopPrijs)
-		Do ProductStub.IndienMethodCall("GeefGewichtInGram").DanReturn(..#RandomGewicht)
-		Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(..#RandomProductId)
-		Do ProductStub.IndienMethodCall("IsGenerischProduct").DanReturn($$$False)
+		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
 		
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		Set Request.AttrVsAdminProdNr = "Fixed"
@@ -358,13 +327,7 @@
 <Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is ChangeRequest en GeefProduct geeft leeg">
 <Implementation><![CDATA[
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-		Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn(..#RandomEANCode)
-		Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn(..#RandomKorttekst)
-		Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(..#RandomNettoAankoopPrijs)
-		Do ProductStub.IndienMethodCall("GeefGewichtInGram").DanReturn(..#RandomGewicht)
-		Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(..#RandomProductId)
-		Do ProductStub.IndienMethodCall("IsGenerischProduct").DanReturn($$$False)
+		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
 		
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		Set Request.AttrVsAdminProdNr = "ChangeRequest"
@@ -410,12 +373,7 @@
 <Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is ChangeRequest en GeefProduct geeft GenerischProduct">
 <Implementation><![CDATA[
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-		Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn(..#RandomEANCode)
-		Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn(..#RandomKorttekst)
-		Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(..#RandomNettoAankoopPrijs)
-		Do ProductStub.IndienMethodCall("GeefGewichtInGram").DanReturn(..#RandomGewicht)
-		Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(..#RandomProductId)
+		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
 		Do ProductStub.IndienMethodCall("IsGenerischProduct").DanReturn($$$True)
 		
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
@@ -462,12 +420,7 @@
 <Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is Customizable en AdminProductNummer is niet meegegeven =&gt; Nieuw product volgens kenmerken">
 <Implementation><![CDATA[
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-		Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn(..#RandomEANCode)
-		Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn(..#RandomKorttekst)
-		Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(..#RandomNettoAankoopPrijs)
-		Do ProductStub.IndienMethodCall("GeefGewichtInGram").DanReturn(..#RandomGewicht)
-		Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(..#RandomProductId)
+		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
 		
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest("")
 		Set Request.AttrVsAdminProdNr = "Customizable"
@@ -534,7 +487,7 @@
 <Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is Customizable en AdminProductNummer is meegegeven maar GeefProduct geeft GenerischProduct">
 <Implementation><![CDATA[
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
+		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
 		Do ProductStub.IndienMethodCall("IsGenerischProduct").DanReturn($$$True)
 		
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
@@ -559,13 +512,7 @@
 <Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is Customizable en AdminProductNummer is meegegeven =&gt; Product update">
 <Implementation><![CDATA[
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-		Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn(..#RandomEANCode)
-		Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn(..#RandomKorttekst)
-		Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(..#RandomNettoAankoopPrijs)
-		Do ProductStub.IndienMethodCall("GeefGewichtInGram").DanReturn(..#RandomGewicht)
-		Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(..#RandomProductId)
-		Do ProductStub.IndienMethodCall("IsGenerischProduct").DanReturn($$$False)
+		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
 		Do ProductStub.IndienMethodCall("GeefDossierNr").DanReturn(..#RandomDossierNr)
 		
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
@@ -620,12 +567,7 @@
 <Method name="Test: IsActiefAttrVsAdminProdNrInBomBol en AttrVsAdminProdNr is Customizable en AdminProductNummer is meegegeven maar HeeftBezwaarVoorProductDelete is True">
 <Implementation><![CDATA[
 	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol()) {
-		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
-		Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn(..#RandomEANCode)
-		Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn(..#RandomKorttekst)
-		Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(..#RandomNettoAankoopPrijs)
-		Do ProductStub.IndienMethodCall("GeefGewichtInGram").DanReturn(..#RandomGewicht)
-		Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(..#RandomProductId)
+		#dim ProductStub As vhTest.Mock.DOM.PM.Product = ..GeefProductStub()
 		
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		Set Request.AttrVsAdminProdNr = "Customizable"
@@ -675,6 +617,23 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefProductStub">
+<Private>1</Private>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[
+	#dim ProductStub As vhTest.Mock.DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	
+	Do ProductStub.IndienMethodCall("GeefEANCode").DanReturn(..#RandomEANCode)
+	Do ProductStub.IndienMethodCall("GeefKorttekst").DanReturn(..#RandomKorttekst)
+	Do ProductStub.IndienMethodCall("GeefNettoAankoopPrijsInclCif").DanReturn(..#RandomNettoAankoopPrijs)
+	Do ProductStub.IndienMethodCall("GeefGewichtInGram").DanReturn(..#RandomGewicht)
+	Do ProductStub.IndienMethodCall("GeefPRNr").DanReturn(..#RandomProductId)
+	Do ProductStub.IndienMethodCall("IsGenerischProduct").DanReturn($$$False)
+	
+	Quit ProductStub
+]]></Implementation>
+</Method>
+
 <Method name="MaakRequest">
 <FormalSpec>ProductId:%String</FormalSpec>
 <Private>1</Private>