Index: vhTest/Fake/WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Fake/WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler.cls.xml	(revision 0)
+++ vhTest/Fake/WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler.cls.xml	(revision 57326)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler</Super>
+
+<Method name="GeefProductVolgensAttrVsAdminProdNr">
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler.cls.xml
===================================================================
diff -u
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler.cls.xml	(revision 0)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler.cls.xml	(revision 57326)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="%OnNew">
+<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",ProductUpdater:WSimpl.AX.CalculatedProduct.ProductUpdater=""</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductVolgensAttrVsAdminProdNr">
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefProductVolgensAttrVsAdminProdNr",Request)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler.cls.xml
===================================================================
diff -u
--- WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler.cls.xml	(revision 0)
+++ WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler.cls.xml	(revision 57326)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler">
+<Super>TECH.Mockable</Super>
+
+<Property name="ProductService">
+<Type>WSimpl.AX.CalculatedProduct.ProductService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductUpdater">
+<Type>WSimpl.AX.CalculatedProduct.ProductUpdater</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ProductService:WSimpl.AX.CalculatedProduct.ProductService="",ProductUpdater:WSimpl.AX.CalculatedProduct.ProductUpdater=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ProductService = $$$Inject(ProductService, ##class(WSimpl.AX.CalculatedProduct.ProductService).%New())
+	Set ..ProductUpdater = $$$Inject(ProductUpdater, ##class(WSimpl.AX.CalculatedProduct.ProductUpdater).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductVolgensAttrVsAdminProdNr">
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[
+	#dim Product As DOM.PM.Product = ""
+	#dim ProductId As %String = ..GeefAttributeValueTxtVolgensAttributeName(Request.Attribute, "AdminProductNummer")
+	
+	If (Request.AttrVsAdminProdNr = "Customizable") {
+		Set Product = ..GeefProductCustomizableAttrVsAdminProdNr(Request, ProductId)
+	} ElseIf (Request.AttrVsAdminProdNr = "ChangeRequest") {
+		Set Product = ..GeefProductChangeRequestAttrVsAdminProdNr(Request)
+	} ElseIf (Request.AttrVsAdminProdNr = "Fixed") {
+		Set Product = ..GeefProductFixedAttrVsAdminProdNr(Request, ProductId)
+	}
+	
+	Quit Product
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductCustomizableAttrVsAdminProdNr">
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,ProductId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[
+	#dim Product As DOM.PM.Product = ""
+	
+	If (($$$HasLength(ProductId)) && ($$$Not(..ProductService.HeeftBezwaarVoorProductDelete(ProductId)))) {
+		Set Product = ..ProductUpdater.GeefGeupdatetProduct(Request, ProductId)
+	} Else {
+		Set Product = ..ProductService.GeefProductGemaaktVolgensAxKenmerken(Request)
+	}
+	
+	Quit Product
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductChangeRequestAttrVsAdminProdNr">
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[	Quit ..ProductService.GeefProductGemaaktVolgensAxKenmerken(Request)
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductFixedAttrVsAdminProdNr">
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,ProductId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[	Quit ..ProductService.GeefProduct(ProductId, Request.ItemId)
+]]></Implementation>
+</Method>
+
+<Method name="GeefAttributeValueTxtVolgensAttributeName">
+<FormalSpec>AttributeLijst:%ListOfObjects,AttributeName:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim AttributesIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(AttributeLijst)
+	#dim Attribute As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute
+	#dim AttributeValueTxt As %String = ""
+	
+	While (AttributesIterator.HasNext() && (AttributeValueTxt = "")) {
+		Set Attribute = AttributesIterator.Next()
+		If (Attribute.Name = AttributeName) {
+			Set AttributeValueTxt = Attribute.ValueTxt	
+		}
+	}
+	
+	Quit AttributeValueTxt
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/ProductVolgensAxAttribuutBepaler/Test.cls.xml	(revision 57326)
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="RandomProductId">
+<Type>%String</Type>
+<Default>RandomProductId</Default>
+</Parameter>
+
+<Property name="ProductService">
+<Type>WSimpl.AX.CalculatedProduct.ProductService</Type>
+</Property>
+
+<Property name="ProductUpdater">
+<Type>WSimpl.AX.CalculatedProduct.ProductUpdater</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Set ..ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Set ..ProductUpdater = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductUpdater).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: AttrVsAdminProdNr is Fixed">
+<Implementation><![CDATA[
+	#dim ProductDummy As vhTest.Dummy.DOM.PM.Product = ##class(vhTest.Dummy.DOM.PM.Product).%New()
+	
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
+	Set Request.AttrVsAdminProdNr = "Fixed"
+			
+	#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(ProductDummy)
+	Set ..ProductService = ProductServiceMock
+	
+	#dim ProductVolgensAxAttribuutBepaler As WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler = ..GeefProductVolgensAxAttribuutBepaler()
+	#dim ProductVolgensAxAttribuut As DOM.PM.Product = ProductVolgensAxAttribuutBepaler.GeefProductVolgensAttrVsAdminProdNr(Request)
+	
+	Do ..ProductService.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: AttrVsAdminProdNr is ChangeRequest">
+<Implementation><![CDATA[
+	#dim ProductDummy As vhTest.Dummy.DOM.PM.Product = ##class(vhTest.Dummy.DOM.PM.Product).%New()
+	
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
+	Set Request.AttrVsAdminProdNr = "ChangeRequest"
+	
+	#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductDummy)
+	Set ..ProductService = ProductServiceMock
+	
+	#dim ProductVolgensAxAttribuutBepaler As WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler = ..GeefProductVolgensAxAttribuutBepaler()
+	#dim ProductVolgensAxAttribuut As DOM.PM.Product = ProductVolgensAxAttribuutBepaler.GeefProductVolgensAttrVsAdminProdNr(Request)
+	
+	Do ..ProductService.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: AttrVsAdminProdNr = Customizable en AdminProductNummer = niet meegegeven =&gt; Nieuw product volgens kenmerken">
+<Implementation><![CDATA[
+	#dim ProductDummy As vhTest.Dummy.DOM.PM.Product = ##class(vhTest.Dummy.DOM.PM.Product).%New()
+	
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest("")
+	Set Request.AttrVsAdminProdNr = "Customizable"
+	
+	#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Do ProductServiceMock.VerwachtMethodCall("GeefProductGemaaktVolgensAxKenmerken", Request).DanReturn(ProductDummy)
+	Set ..ProductService = ProductServiceMock
+	
+	#dim ProductVolgensAxAttribuutBepaler As WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler = ..GeefProductVolgensAxAttribuutBepaler()
+	#dim ProductVolgensAxAttribuut As DOM.PM.Product = ProductVolgensAxAttribuutBepaler.GeefProductVolgensAttrVsAdminProdNr(Request)
+	
+	Do ..ProductService.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: AttrVsAdminProdNr = Customizable en AdminProductNummer = meegegeven =&gt; GeefGeupdatetProduct van ProductUpdater">
+<Implementation><![CDATA[
+	#dim ProductDummy As vhTest.Dummy.DOM.PM.Product = ##class(vhTest.Dummy.DOM.PM.Product).%New()
+	
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
+	Set Request.AttrVsAdminProdNr = "Customizable"
+	
+	#dim ProductServiceMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductService).%New()
+	Do ProductServiceMock.VerwachtMethodCall("HeeftBezwaarVoorProductDelete", ..#RandomProductId).DanReturn($$$False)
+	Set ..ProductService = ProductServiceMock
+	
+	#dim ProductUpdaterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductUpdater = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.ProductUpdater).%New()
+	Do ProductUpdaterMock.VerwachtMethodCall("GeefGeupdatetProduct", Request, ..#RandomProductId).DanReturn(ProductDummy)
+	Set ..ProductUpdater = ProductUpdaterMock
+	
+	#dim ProductVolgensAxAttribuutBepaler As WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler = ..GeefProductVolgensAxAttribuutBepaler()
+	#dim ProductVolgensAxAttribuut As DOM.PM.Product = ProductVolgensAxAttribuutBepaler.GeefProductVolgensAttrVsAdminProdNr(Request)
+	
+	Do ..ProductService.Verifieer()
+	Do ..ProductUpdater.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: AttrVsAdminProdNr = Customizable en AdminProductNummer = meegegeven =&gt; HeeftBezwaarVoorProductDelete =&gt; Nieuw product volgens kenmerken">
+<Implementation><![CDATA[
+	#dim ProductDummy As vhTest.Dummy.DOM.PM.Product = ##class(vhTest.Dummy.DOM.PM.Product).%New()
+	
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ..MaakRequest(..#RandomProductId)
+	Set Request.AttrVsAdminProdNr = "Customizable"
+	
+	#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(ProductDummy)
+	Set ..ProductService = ProductServiceMock
+	
+	#dim ProductVolgensAxAttribuutBepaler As WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler = ..GeefProductVolgensAxAttribuutBepaler()
+	#dim ProductVolgensAxAttribuut As DOM.PM.Product = ProductVolgensAxAttribuutBepaler.GeefProductVolgensAttrVsAdminProdNr(Request)
+	
+	Do ..ProductService.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductVolgensAxAttribuutBepaler">
+<Private>1</Private>
+<ReturnType>WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler</ReturnType>
+<Implementation><![CDATA[	Quit ##class(WSimpl.AX.CalculatedProduct.ProductVolgensAxAttribuutBepaler).%New(..ProductService, ..ProductUpdater)
+]]></Implementation>
+</Method>
+
+<Method name="MaakRequest">
+<FormalSpec>ProductId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest</ReturnType>
+<Implementation><![CDATA[
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	Set Request.ItemId = "RandomRequestItemId"
+	
+	Do Request.Attribute.Insert(..MaakAttribute("AdminProductNummer", ProductId))
+	
+	Quit Request
+]]></Implementation>
+</Method>
+
+<Method name="MaakAttribute">
+<FormalSpec>Name:%String,Value:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute</ReturnType>
+<Implementation><![CDATA[
+	#dim Attribute As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityAttribute).%New()
+	Set Attribute.Name = Name
+	Set Attribute.ValueTxt = Value
+	
+	Quit Attribute
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>