Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r57271 -r57280
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 57271)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 57280)
@@ -48,6 +48,45 @@
 <Default>RandomSourcingDataAreaId</Default>
 </Parameter>
 
+<Property name="ProductService">
+<Type>WSimpl.AX.CalculatedProduct.ProductService</Type>
+</Property>
+
+<Property name="VariantDescriptionBepaler">
+<Type>WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler</Type>
+</Property>
+
+<Property name="BouwstenenConverter">
+<Type>WSimpl.AX.CalculatedProduct.BouwstenenConverter</Type>
+</Property>
+
+<Property name="SourcingDataAreaIdBepaler">
+<Type>WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler</Type>
+</Property>
+
+<Property name="Formatter">
+<Type>AXimpl.Formatter</Type>
+</Property>
+
+<Property name="AfbeeldingService">
+<Type>WSimpl.AX.CalculatedProduct.AfbeeldingService</Type>
+</Property>
+
+<Property name="ProductDataFactory">
+<Type>DOM.PM.dto.ProductDataFactory</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductData">
+<Type>DOM.PM.dto.ProductData</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="LadeVariantBepaler">
+<Type>WSimpl.AX.CalculatedProduct.LadeVariantBepaler</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="Test: RequestConverter converteert een AxdEntityRequest naar een AxdEntityConfigVariant">
 <Implementation><![CDATA[
 	If ($$$Not(##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefAttrVsAdminProdNrInBomBol())) {
@@ -56,34 +95,13 @@
 		
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
+		Set ..ProductService = ProductServiceMock
 		
-		#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
-		Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim BouwstenenConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
-		Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim SourcingDataAreaIdBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
-		Do SourcingDataAreaIdBepalerMock.VerwachtMethodCall("Bepaal", ProductStub).DanReturn(..#RandomSourcingDataAreaId)
-		
-		#dim FormatterMock As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeRandomNettoAankoopPrijs")
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomGewicht, 2).DanReturn("GeformatteerdeRandomGewicht")
-		
-		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
-		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn(..#RandomAfbeeldingPad)
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		
-		Do BouwstenenConverterMock.Verifieer()
-		Do VariantDescriptionBepalerMock.Verifieer()
-		Do ProductServiceMock.Verifieer()
-		Do SourcingDataAreaIdBepalerMock.Verifieer()
-		Do FormatterMock.Verifieer()
-		Do AfbeeldingServiceMock.Verifieer()
+		Do ..Verifieer()
 	}
 ]]></Implementation>
 </Method>
@@ -95,39 +113,15 @@
 		
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		
-		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
-		Do LadeVariantBepaler.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).TBX())
-		
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
+		Set ..ProductService = ProductServiceMock
 		
-		#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
-		Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim BouwstenenConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
-		Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim SourcingDataAreaIdBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
-		Do SourcingDataAreaIdBepalerMock.VerwachtMethodCall("Bepaal", ProductStub).DanReturn(..#RandomSourcingDataAreaId)
-		
-		#dim FormatterMock As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeRandomNettoAankoopPrijs")
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomGewicht, 2).DanReturn("GeformatteerdeRandomGewicht")
-		
-		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
-		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn(..#RandomAfbeeldingPad)
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock,, LadeVariantBepaler)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request, ##class(AXimpl.PM.enu.LadeVariant).TBX())
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		
-		Do BouwstenenConverterMock.Verifieer()
-		Do VariantDescriptionBepalerMock.Verifieer()
-		Do ProductServiceMock.Verifieer()
-		Do SourcingDataAreaIdBepalerMock.Verifieer()
-		Do FormatterMock.Verifieer()
-		Do AfbeeldingServiceMock.Verifieer()
+		Do ..Verifieer()
 	}
 ]]></Implementation>
 </Method>
@@ -139,39 +133,15 @@
 		
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		
-		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
-		Do LadeVariantBepaler.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).TAX())
-		
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
+		Set ..ProductService = ProductServiceMock
 		
-		#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
-		Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim BouwstenenConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
-		Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim SourcingDataAreaIdBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
-		Do SourcingDataAreaIdBepalerMock.VerwachtMethodCall("Bepaal", ProductStub).DanReturn(..#RandomSourcingDataAreaId)
-		
-		#dim FormatterMock As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeRandomNettoAankoopPrijs")
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomGewicht, 2).DanReturn("GeformatteerdeRandomGewicht")
-		
-		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
-		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn(..#RandomAfbeeldingPad)
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock,, LadeVariantBepaler)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request, ##class(AXimpl.PM.enu.LadeVariant).TAX())
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		
-		Do BouwstenenConverterMock.Verifieer()
-		Do VariantDescriptionBepalerMock.Verifieer()
-		Do ProductServiceMock.Verifieer()
-		Do SourcingDataAreaIdBepalerMock.Verifieer()
-		Do FormatterMock.Verifieer()
-		Do AfbeeldingServiceMock.Verifieer()
+		Do ..Verifieer()
 	}
 ]]></Implementation>
 </Method>
@@ -231,11 +201,9 @@
 		#dim SourcingDataAreaIdBepalerStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
 		Do SourcingDataAreaIdBepalerStub.IndienMethodCall("Bepaal", ProductStub).DanReturn(..#RandomSourcingDataAreaId)
 		
-		#dim GeformatteerdeNettoAankoopPrijs As %String = "GeformatteerdeNettoAankoopPrijs"
-		#dim GeformatteerdeGewicht As %String = "GeformatteerdeGewicht"
 		#dim FormatterStub As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
-		Do FormatterStub.IndienMethodCall("FormatNumber", ..#RandomNettoAankoopPrijs, 2).DanReturn(GeformatteerdeNettoAankoopPrijs)
-		Do FormatterStub.IndienMethodCall("FormatNumber", ..#RandomGewicht, 2).DanReturn(GeformatteerdeGewicht)
+		Do FormatterStub.IndienMethodCall("FormatNumber", ..#RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeNettoAankoopPrijs")
+		Do FormatterStub.IndienMethodCall("FormatNumber", ..#RandomGewicht, 2).DanReturn("GeformatteerdeGewicht")
 		
 		#dim AfbeeldingServiceStub As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
 		Do AfbeeldingServiceStub.IndienMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn(..#RandomAfbeeldingPad)
@@ -246,12 +214,12 @@
 		
 		Do $$$AssertEquals(ConfigVariant.GTIN, ..#RandomEANCode)
 		Do $$$AssertEquals(ConfigVariant.ProductName, ..#RandomKorttekst)
-		Do $$$AssertEquals(ConfigVariant.CostPrice, GeformatteerdeNettoAankoopPrijs)
+		Do $$$AssertEquals(ConfigVariant.CostPrice, "GeformatteerdeNettoAankoopPrijs")
 		Do $$$AssertEqualsList(ConfigVariant.VariantDescription, RandomVariantDescription)
 		Do $$$AssertEqualsList(ConfigVariant.BOMLine, RandomBouwstenen)
 		Do $$$AssertEquals(ConfigVariant.SourcingDataAreaId, ..#RandomSourcingDataAreaId)
 		Do $$$AssertEquals(ConfigVariant.Image, ..#RandomAfbeeldingPad)
-		Do $$$AssertEquals(ConfigVariant.Weight, GeformatteerdeGewicht)
+		Do $$$AssertEquals(ConfigVariant.Weight, "GeformatteerdeGewicht")
 		Do $$$AssertEquals(ConfigVariant.Attribute.GetAt(1).ValueTxt, ..#RandomProductId)
 	}
 ]]></Implementation>
@@ -286,40 +254,16 @@
 		
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		Set Request.AttrVsAdminProdNr = "Fixed"
-		
-		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
-		Do LadeVariantBepaler.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
 				
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceMock.VerwachtMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
+		Set ..ProductService = ProductServiceMock
 		
-		#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
-		Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim BouwstenenConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
-		Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim SourcingDataAreaIdBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
-		Do SourcingDataAreaIdBepalerMock.VerwachtMethodCall("Bepaal", ProductStub).DanReturn(..#RandomSourcingDataAreaId)
-		
-		#dim FormatterMock As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeRandomNettoAankoopPrijs")
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomGewicht, 2).DanReturn("GeformatteerdeRandomGewicht")
-		
-		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
-		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn(..#RandomAfbeeldingPad)
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock,, LadeVariantBepaler)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		
-		Do BouwstenenConverterMock.Verifieer()
-		Do VariantDescriptionBepalerMock.Verifieer()
-		Do ProductServiceMock.Verifieer()
-		Do SourcingDataAreaIdBepalerMock.Verifieer()
-		Do FormatterMock.Verifieer()
-		Do AfbeeldingServiceMock.Verifieer()
+		Do ..Verifieer()
 	}
 ]]></Implementation>
 </Method>
@@ -331,41 +275,17 @@
 		
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		Set Request.AttrVsAdminProdNr = "ChangeRequest"
-		
-		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
-		Do LadeVariantBepaler.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
 				
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceMock.IndienMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn("")
 		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductStub)
+		Set ..ProductService = ProductServiceMock
 		
-		#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
-		Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim BouwstenenConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
-		Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim SourcingDataAreaIdBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
-		Do SourcingDataAreaIdBepalerMock.VerwachtMethodCall("Bepaal", ProductStub).DanReturn(..#RandomSourcingDataAreaId)
-		
-		#dim FormatterMock As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeRandomNettoAankoopPrijs")
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomGewicht, 2).DanReturn("GeformatteerdeRandomGewicht")
-		
-		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
-		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn(..#RandomAfbeeldingPad)
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock,, LadeVariantBepaler)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		
-		Do BouwstenenConverterMock.Verifieer()
-		Do VariantDescriptionBepalerMock.Verifieer()
-		Do ProductServiceMock.Verifieer()
-		Do SourcingDataAreaIdBepalerMock.Verifieer()
-		Do FormatterMock.Verifieer()
-		Do AfbeeldingServiceMock.Verifieer()
+		Do ..Verifieer()
 	}
 ]]></Implementation>
 </Method>
@@ -379,40 +299,16 @@
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		Set Request.AttrVsAdminProdNr = "ChangeRequest"
 		
-		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
-		Do LadeVariantBepaler.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
-		
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceMock.IndienMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
 		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductStub)
+		Set ..ProductService = ProductServiceMock
 		
-		#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
-		Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim BouwstenenConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
-		Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim SourcingDataAreaIdBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
-		Do SourcingDataAreaIdBepalerMock.VerwachtMethodCall("Bepaal", ProductStub).DanReturn(..#RandomSourcingDataAreaId)
-		
-		#dim FormatterMock As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeRandomNettoAankoopPrijs")
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomGewicht, 2).DanReturn("GeformatteerdeRandomGewicht")
-		
-		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
-		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn(..#RandomAfbeeldingPad)
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock,, LadeVariantBepaler)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		
-		Do BouwstenenConverterMock.Verifieer()
-		Do VariantDescriptionBepalerMock.Verifieer()
-		Do ProductServiceMock.Verifieer()
-		Do SourcingDataAreaIdBepalerMock.Verifieer()
-		Do FormatterMock.Verifieer()
-		Do AfbeeldingServiceMock.Verifieer()
+		Do ..Verifieer()
 	}
 ]]></Implementation>
 </Method>
@@ -425,39 +321,15 @@
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest("")
 		Set Request.AttrVsAdminProdNr = "Customizable"
 		
-		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
-		Do LadeVariantBepaler.IndienMethodCall("Bepaal", "", Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
-		
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductStub)
+		Set ..ProductService = ProductServiceMock
 		
-		#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
-		Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim BouwstenenConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
-		Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim SourcingDataAreaIdBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
-		Do SourcingDataAreaIdBepalerMock.VerwachtMethodCall("Bepaal", ProductStub).DanReturn(..#RandomSourcingDataAreaId)
-		
-		#dim FormatterMock As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeRandomNettoAankoopPrijs")
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomGewicht, 2).DanReturn("GeformatteerdeRandomGewicht")
-		
-		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
-		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn(..#RandomAfbeeldingPad)
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock,, LadeVariantBepaler)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		
-		Do BouwstenenConverterMock.Verifieer()
-		Do VariantDescriptionBepalerMock.Verifieer()
-		Do ProductServiceMock.Verifieer()
-		Do SourcingDataAreaIdBepalerMock.Verifieer()
-		Do FormatterMock.Verifieer()
-		Do AfbeeldingServiceMock.Verifieer()
+		Do ..Verifieer()
 	}
 ]]></Implementation>
 </Method>
@@ -518,48 +390,19 @@
 		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
 		Set Request.AttrVsAdminProdNr = "Customizable"
 		
-		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
-		Do LadeVariantBepaler.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
+		Set ..ProductData = ..GeefProductData()
 		
-		Set ProductData = ##class(DOM.PM.dto.ProductData).%New()
-		Set ProductData.PRNr = ..#RandomProductId
-		Set ProductData.DossierNummer = ..#RandomDossierNr
-		
-		#dim ProductDataFactoryStub As vhTest.Mock.DOM.PM.dto.ProductDataFactory = ##class(vhTest.Mock.DOM.PM.dto.ProductDataFactory).%New()
-		Do ProductDataFactoryStub.IndienMethodCall("MaakProductData", ..#RandomProductId, ..#RandomDossierNr).DanReturn(ProductData)
-		
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceMock.IndienMethodCall("HeeftBezwaarVoorProductDelete", ..#RandomProductId).DanReturn($$$False)
 		Do ProductServiceMock.IndienMethodCall("GeefProduct", ..#RandomProductId, Request.ItemId).DanReturn(ProductStub)
-		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request, ProductData).DanReturn(ProductStub)
+		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request, ..ProductData).DanReturn(ProductStub)
+		Set ..ProductService = ProductServiceMock
 		
-		#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
-		Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim BouwstenenConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
-		Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim SourcingDataAreaIdBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
-		Do SourcingDataAreaIdBepalerMock.VerwachtMethodCall("Bepaal", ProductStub).DanReturn(..#RandomSourcingDataAreaId)
-		
-		#dim FormatterMock As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeRandomNettoAankoopPrijs")
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomGewicht, 2).DanReturn("GeformatteerdeRandomGewicht")
-		
-		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
-		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn(..#RandomAfbeeldingPad)
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock, ProductDataFactoryStub, LadeVariantBepaler)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		
-		Do BouwstenenConverterMock.Verifieer()
-		Do VariantDescriptionBepalerMock.Verifieer()
-		Do ProductServiceMock.Verifieer()
-		Do SourcingDataAreaIdBepalerMock.Verifieer()
-		Do FormatterMock.Verifieer()
-		Do AfbeeldingServiceMock.Verifieer()
+		Do ..Verifieer()
 	}
 ]]></Implementation>
 </Method>
@@ -575,48 +418,60 @@
 		#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
 		Do LadeVariantBepaler.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(##class(AXimpl.PM.enu.LadeVariant).LBX())
 		
-		Set ProductData = ##class(DOM.PM.dto.ProductData).%New()
-		Set ProductData.PRNr = ..#RandomProductId
-		Set ProductData.DossierNummer = ..#RandomDossierNr
-		
-		#dim ProductDataFactoryStub As vhTest.Mock.DOM.PM.dto.ProductDataFactory = ##class(vhTest.Mock.DOM.PM.dto.ProductDataFactory).%New()
-		Do ProductDataFactoryStub.IndienMethodCall("MaakProductData", ..#RandomProductId, ..#RandomDossierNr).DanReturn(ProductData)
-		
 		#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
 		Do ProductServiceMock.IndienMethodCall("HeeftBezwaarVoorProductDelete", ..#RandomProductId).DanReturn($$$True)
 		Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductStub)
+		Set ..ProductService = ProductServiceMock
 		
-		#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
-		Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim BouwstenenConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
-		Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
-		
-		#dim SourcingDataAreaIdBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
-		Do SourcingDataAreaIdBepalerMock.VerwachtMethodCall("Bepaal", ProductStub).DanReturn(..#RandomSourcingDataAreaId)
-		
-		#dim FormatterMock As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeRandomNettoAankoopPrijs")
-		Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomGewicht, 2).DanReturn("GeformatteerdeRandomGewicht")
-		
-		#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
-		Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn(..#RandomAfbeeldingPad)
-		
-		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(ProductServiceMock, VariantDescriptionBepalerMock, BouwstenenConverterMock, SourcingDataAreaIdBepalerMock, FormatterMock, AfbeeldingServiceMock, ProductDataFactoryStub, LadeVariantBepaler)
+		#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ..GeefRequestConverter(ProductStub, Request)
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, ..#RandomMessageId)
 		
 		Do $$$AssertTrue(ConfigVariant.%IsA("AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant"))
-		
-		Do BouwstenenConverterMock.Verifieer()
-		Do VariantDescriptionBepalerMock.Verifieer()
-		Do ProductServiceMock.Verifieer()
-		Do SourcingDataAreaIdBepalerMock.Verifieer()
-		Do FormatterMock.Verifieer()
-		Do AfbeeldingServiceMock.Verifieer()
+		Do ..Verifieer()
 	}
 ]]></Implementation>
 </Method>
 
+<Method name="GeefRequestConverter">
+<FormalSpec>ProductStub:vhTest.Mock.DOM.PM.Product,Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,LadeVariant:AXimpl.PM.enu.LadeVariant=##class(AXimpl.PM.enu.LadeVariant).LBX()</FormalSpec>
+<Private>1</Private>
+<ReturnType>WSimpl.AX.CalculatedProduct.RequestConverter</ReturnType>
+<Implementation><![CDATA[
+	#dim VariantDescriptionBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler).%New()
+	Do VariantDescriptionBepalerMock.VerwachtMethodCall("Bepaal", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
+	
+	#dim BouwstenenConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenConverter).%New()
+	Do BouwstenenConverterMock.VerwachtMethodCall("Convert", ProductStub, Request.MessageId).DanReturn(##class(%ListOfObjects).%New())
+	
+	#dim SourcingDataAreaIdBepalerMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.SourcingDataAreaIdBepaler).%New()
+	Do SourcingDataAreaIdBepalerMock.VerwachtMethodCall("Bepaal", ProductStub).DanReturn(..#RandomSourcingDataAreaId)
+	
+	#dim FormatterMock As vhTest.Mock.AXimpl.Formatter = ##class(vhTest.Mock.AXimpl.Formatter).%New()
+	Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomNettoAankoopPrijs, 2).DanReturn("GeformatteerdeRandomNettoAankoopPrijs")
+	Do FormatterMock.VerwachtMethodCall("FormatNumber", ..#RandomGewicht, 2).DanReturn("GeformatteerdeRandomGewicht")
+	
+	#dim AfbeeldingServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.AfbeeldingService).%New()
+	Do AfbeeldingServiceMock.VerwachtMethodCall("GeefAfbeeldingPad", ProductStub).DanReturn(..#RandomAfbeeldingPad)
+	
+	#dim ProductDataFactoryStub As vhTest.Mock.DOM.PM.dto.ProductDataFactory = ##class(vhTest.Mock.DOM.PM.dto.ProductDataFactory).%New()
+	Do ProductDataFactoryStub.IndienMethodCall("MaakProductData", ..#RandomProductId, ..#RandomDossierNr).DanReturn(..ProductData)
+	
+	#dim LadeVariantBepaler As vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.LadeVariantBepaler).%New()
+	Do LadeVariantBepaler.IndienMethodCall("Bepaal", ..#RandomProductId, Request.Attribute).DanReturn(LadeVariant)
+	Do LadeVariantBepaler.IndienMethodCall("Bepaal", "", Request.Attribute).DanReturn(LadeVariant)
+	
+	Set ..VariantDescriptionBepaler = VariantDescriptionBepalerMock
+	Set ..BouwstenenConverter = BouwstenenConverterMock
+	Set ..SourcingDataAreaIdBepaler = SourcingDataAreaIdBepalerMock
+	Set ..Formatter = FormatterMock
+	Set ..AfbeeldingService = AfbeeldingServiceMock
+	Set ..ProductDataFactory = ProductDataFactoryStub
+	Set ..LadeVariantBepaler = LadeVariantBepaler
+	
+	Quit ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New(..ProductService, ..VariantDescriptionBepaler, ..BouwstenenConverter, ..SourcingDataAreaIdBepaler, ..Formatter, ..AfbeeldingService, ..ProductDataFactory, ..LadeVariantBepaler)
+]]></Implementation>
+</Method>
+
 <Method name="GeefProductStub">
 <Private>1</Private>
 <ReturnType>DOM.PM.Product</ReturnType>
@@ -666,6 +521,30 @@
 	Quit Attribute
 ]]></Implementation>
 </Method>
+
+<Method name="GeefProductData">
+<Private>1</Private>
+<ReturnType>DOM.PM.dto.ProductData</ReturnType>
+<Implementation><![CDATA[
+	Set ProductData = ##class(DOM.PM.dto.ProductData).%New()
+	Set ProductData.PRNr = ..#RandomProductId
+	Set ProductData.DossierNummer = ..#RandomDossierNr
+	
+	Quit ProductData
+]]></Implementation>
+</Method>
+
+<Method name="Verifieer">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do ..BouwstenenConverter.Verifieer()
+	Do ..VariantDescriptionBepaler.Verifieer()
+	Do ..ProductService.Verifieer()
+	Do ..SourcingDataAreaIdBepaler.Verifieer()
+	Do ..Formatter.Verifieer()
+	Do ..AfbeeldingService.Verifieer()
+]]></Implementation>
+</Method>
 </Class>