Index: vhUnitTest/WSimpl/AX/CalculatedProduct/Converter/Test.cls.xml
===================================================================
diff -u -r43031 -r43036
--- vhUnitTest/WSimpl/AX/CalculatedProduct/Converter/Test.cls.xml	(.../Test.cls.xml)	(revision 43031)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/Converter/Test.cls.xml	(.../Test.cls.xml)	(revision 43036)
@@ -8,80 +8,39 @@
 <Private>1</Private>
 </Property>
 
-<Method name="OnBeforeAllTests">
-<Implementation><![CDATA[
-	Do ##super()
-	
-	Set ..Converter = ##class(WSimpl.AX.CalculatedProduct.Converter).%New()
-]]></Implementation>
-</Method>
-
 <Method name="Test: Converter geeft een CalculatedProductOut terug">
 <Implementation><![CDATA[
+	Set ..Converter = ##class(WSimpl.AX.CalculatedProduct.Converter).%New()
+	
 	#dim DummyCalculatedProductIn As AXif.Dynamics.CalculatedProductIn.Envelope = ##class(AXif.Dynamics.CalculatedProductIn.Envelope).%New()
 	#dim CalculatedProductOut As AXif.Dynamics.CalculatedProductOut.Envelope = ..Converter.Convert(DummyCalculatedProductIn)
 	
 	Do $$$AssertTrue(CalculatedProductOut.%IsA("AXif.Dynamics.CalculatedProductOut.Envelope"))
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Converter maakt een ConfigVariant voor elke Request">
+<Method name="Test: RequestConverter wordt voor elke Request opgeroepen">
 <Implementation><![CDATA[
-	#dim DummyCalculatedProductIn As AXif.Dynamics.CalculatedProductIn.Envelope = ##class(AXif.Dynamics.CalculatedProductIn.Envelope).%New()
+	#dim RandomMessageId As %String = "RandomMessageId"
+	#dim RandomAantalRequests As %Integer = 5
 	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	#dim DummyCalculatedProductIn As AXif.Dynamics.CalculatedProductIn.Envelope = ##class(AXif.Dynamics.CalculatedProductIn.Envelope).%New()
+	#dim Index As %Integer = 1
 	
-	Do DummyCalculatedProductIn.Body.MessagePart.MessagePart.Request.Insert(DummyRequest)
-	Do DummyCalculatedProductIn.Body.MessagePart.MessagePart.Request.Insert(DummyRequest)
-	Do DummyCalculatedProductIn.Body.MessagePart.MessagePart.Request.Insert(DummyRequest)
+	For Index=1:1:RandomAantalRequests {
+		Do DummyCalculatedProductIn.Body.MessagePart.MessagePart.Request.Insert(DummyRequest)
+	}
 	
-	#dim CalculatedProductOut As AXif.Dynamics.CalculatedProductOut.Envelope = ..Converter.Convert(DummyCalculatedProductIn)
+	#dim RequestConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.RequestConverter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.RequestConverter).%New()
+	Do RequestConverterMock.VerwachtMethodCall("Convert", DummyRequest, RandomMessageId).ExactAantalKeer(RandomAantalRequests)
 	
-	Do $$$AssertEquals(DummyCalculatedProductIn.Body.MessagePart.MessagePart.Request.Count(), CalculatedProductOut.Body.MessagePart.MessagePart.ConfigVariant.Count())
-]]></Implementation>
-</Method>
-
-<Method name="Test: MessageId is gelijk voor alle ConfigVarianten">
-<Implementation><![CDATA[
-	#dim DummyCalculatedProductIn As AXif.Dynamics.CalculatedProductIn.Envelope = ##class(AXif.Dynamics.CalculatedProductIn.Envelope).%New()
-	#dim DummyRequest As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	Set ..Converter = ##class(WSimpl.AX.CalculatedProduct.Converter).%New(RequestConverterMock)
 	
-	Do DummyCalculatedProductIn.Body.MessagePart.MessagePart.Request.Insert(DummyRequest)
-	Do DummyCalculatedProductIn.Body.MessagePart.MessagePart.Request.Insert(DummyRequest)
-	
-	#dim RandomMessageId As %String = "RandomMessageId"
 	#dim CalculatedProductOut As AXif.Dynamics.CalculatedProductOut.Envelope = ..Converter.Convert(DummyCalculatedProductIn, RandomMessageId)
 	
-	Do $$$AssertEquals(CalculatedProductOut.Body.MessagePart.MessagePart.ConfigVariant.GetAt(1).MessageId, RandomMessageId)
-	Do $$$AssertEquals(CalculatedProductOut.Body.MessagePart.MessagePart.ConfigVariant.GetAt(2).MessageId, RandomMessageId)
+	Do RequestConverterMock.Verifieer()
 ]]></Implementation>
 </Method>
-
-<Method name="Test: Converter geeft velden ItemId, ConfigId en SalesId onbewerkt terug">
-<Implementation><![CDATA[
-	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
-	#dim RandomItemId As %String = "RandomItemId"
-	#dim RandomConfigId As %String = "RandomConfigId"
-	#dim RandomSalesId As %String = "RandomSalesId"
-	
-	Set Request.ItemId = RandomItemId
-	Set Request.ConfigId = RandomConfigId
-	Set Request.SalesId = RandomSalesId
-	
-	#dim CalculatedProductIn As AXif.Dynamics.CalculatedProductIn.Envelope = ##class(AXif.Dynamics.CalculatedProductIn.Envelope).%New()
-	#dim RequestList As %ListOfObjects = ##class(%ListOfObjects).%New()
-	
-	Do RequestList.Insert(Request)
-	
-	Set CalculatedProductIn.Body.MessagePart.MessagePart.Request = RequestList
-
-	#dim CalculatedProductOut As AXif.Dynamics.CalculatedProductOut.Envelope = ..Converter.Convert(CalculatedProductIn)
-	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = CalculatedProductOut.Body.MessagePart.MessagePart.ConfigVariant.GetAt(1)
-
-	Do $$$AssertEquals(ConfigVariant.ItemId, RandomItemId)
-	Do $$$AssertEquals(ConfigVariant.ConfigId, RandomConfigId)
-	Do $$$AssertEquals(ConfigVariant.SalesId, RandomSalesId)
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r43032 -r43036
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 43032)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 43036)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="WSimpl.AX.CalculatedProduct.RequestConverter">
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.Mockable</Super>
 
 <Method name="Convert">
 <FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,MessageId:%String=""</FormalSpec>
Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(revision 0)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(revision 43036)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.WSimpl.AX.CalculatedProduct.RequestConverter">
+<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.RequestConverter,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Convert">
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,MessageId:%String=""</FormalSpec>
+<ReturnType>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Convert",Request,MessageId)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/WSimpl/AX/CalculatedProduct/BouwstenenRepository.cls.xml
===================================================================
diff -u
--- vhTest/Fake/WSimpl/AX/CalculatedProduct/BouwstenenRepository.cls.xml	(revision 0)
+++ vhTest/Fake/WSimpl/AX/CalculatedProduct/BouwstenenRepository.cls.xml	(revision 43036)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.WSimpl.AX.CalculatedProduct.BouwstenenRepository">
+<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.BouwstenenRepository</Super>
+
+<Method name="BestaatViaID">
+<FormalSpec>ID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="GeefViaID">
+<FormalSpec>ID:%String</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u
--- vhTest/Fake/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(revision 0)
+++ vhTest/Fake/WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(revision 43036)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.WSimpl.AX.CalculatedProduct.RequestConverter">
+<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.RequestConverter</Super>
+
+<Method name="Convert">
+<FormalSpec>Request:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest,MessageId:%String=""</FormalSpec>
+<ReturnType>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/AX/CalculatedProduct/Converter.cls.xml
===================================================================
diff -u -r43033 -r43036
--- WSimpl/AX/CalculatedProduct/Converter.cls.xml	(.../Converter.cls.xml)	(revision 43033)
+++ WSimpl/AX/CalculatedProduct/Converter.cls.xml	(.../Converter.cls.xml)	(revision 43036)
@@ -9,12 +9,13 @@
 </Property>
 
 <Method name="%OnNew">
+<FormalSpec>RequestConverter:WSimpl.AX.CalculatedProduct.RequestConverter</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New()
+	Set ..RequestConverter = $$$Inject(RequestConverter, ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -32,7 +33,7 @@
 	#dim RequestIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(CalculatedProductIn.Body.MessagePart.MessagePart.Request)
 	
 	While (RequestIterator.HasNext()) {
-		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = RequestIterator.Next()
+		#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = RequestIterator.Next()		
 		#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = ..RequestConverter.Convert(Request, MessageId)
 		
 		Do CalculatedProductOut.Body.MessagePart.MessagePart.ConfigVariant.Insert(ConfigVariant)
Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/BouwstenenRepository.cls.xml
===================================================================
diff -u
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/BouwstenenRepository.cls.xml	(revision 0)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/BouwstenenRepository.cls.xml	(revision 43036)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.WSimpl.AX.CalculatedProduct.BouwstenenRepository">
+<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.BouwstenenRepository,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="BestaatViaID">
+<FormalSpec>ID:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("BestaatViaID",ID)
+]]></Implementation>
+</Method>
+
+<Method name="GeefViaID">
+<FormalSpec>ID:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("GeefViaID",ID)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>