Index: vhTest/Fake/WSimpl/AX/CalculatedProduct/Converter.cls.xml
===================================================================
diff -u
--- vhTest/Fake/WSimpl/AX/CalculatedProduct/Converter.cls.xml	(revision 0)
+++ vhTest/Fake/WSimpl/AX/CalculatedProduct/Converter.cls.xml	(revision 44847)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.WSimpl.AX.CalculatedProduct.Converter">
+<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.Converter</Super>
+
+<Method name="Convert">
+<FormalSpec>CalculatedProductIn:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery,MessageId:%String</FormalSpec>
+<ReturnType>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/AX/CalculatedProduct/CalculatedProductService.cls.xml
===================================================================
diff -u -r44839 -r44847
--- WS/AX/CalculatedProduct/CalculatedProductService.cls.xml	(.../CalculatedProductService.cls.xml)	(revision 44839)
+++ WS/AX/CalculatedProduct/CalculatedProductService.cls.xml	(.../CalculatedProductService.cls.xml)	(revision 44847)
@@ -11,17 +11,44 @@
 <Default>http://www.vanhoecke.be/AX/CalculatedProduct/CalculatedProductService</Default>
 </Parameter>
 
+<Property name="Converter">
+<Type>WSimpl.AX.CalculatedProduct.Converter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="XmlCorrelater">
+<Type>TECH.XMLCorrelater</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="MessageManager">
+<Type>AXimpl.MessageManager</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>XmlCorrelater:TECH.XMLCorrelater="",Converter:WSimpl.AX.CalculatedProduct.Converter="",MessageManager:AXimpl.MessageManager=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..XmlCorrelater = $$$Inject(XmlCorrelater, ##class(TECH.XMLCorrelater).%New())
+	Set ..Converter = $$$Inject(Converter, ##class(WSimpl.AX.CalculatedProduct.Converter).%New())
+	Set ..MessageManager = $$$Inject(MessageManager, ##class(AXimpl.MessageManager).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GetCalculatedProductData">
 <FormalSpec>In:%GlobalCharacterStream</FormalSpec>
 <ReturnType>%GlobalCharacterStream</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	#dim Converter As WSimpl.AX.CalculatedProduct.Converter = ##class(WSimpl.AX.CalculatedProduct.Converter).%New()
-	#dim XmlCorrelater As TECH.XMLCorrelater = ##class(TECH.XMLCorrelater).%New()
-	#dim GUID As %String = ##class(AXimpl.MessageManager).%New().GenerateID()
-	
-	#dim BOMBOLOutQuery As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery = XmlCorrelater.FromStream(In, "AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery", "ADUMsgBOMBOLOutQuery")
-	#dim BOMBOLInQuery As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery = Converter.Convert(BOMBOLOutQuery, GUID)
+	#dim GUID As %String = ..MessageManager.GenerateID()
+	#dim BOMBOLOutQuery As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery = ..XmlCorrelater.FromStream(In, "AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery", "ADUMsgBOMBOLOutQuery")
+	#dim BOMBOLInQuery As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery = ..Converter.Convert(BOMBOLOutQuery, GUID)
 
 	Quit ##class(TECH.XmlObjectUtils).GeefXMLStream(BOMBOLInQuery)
 ]]></Implementation>
Index: vhTest/Mock/WSimpl/AX/CalculatedProduct/Converter.cls.xml
===================================================================
diff -u
--- vhTest/Mock/WSimpl/AX/CalculatedProduct/Converter.cls.xml	(revision 0)
+++ vhTest/Mock/WSimpl/AX/CalculatedProduct/Converter.cls.xml	(revision 44847)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.WSimpl.AX.CalculatedProduct.Converter">
+<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.Converter,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Convert">
+<FormalSpec>CalculatedProductIn:AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery,MessageId:%String</FormalSpec>
+<ReturnType>AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Convert",CalculatedProductIn,MessageId)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/AX/CalculatedProduct/Converter.cls.xml
===================================================================
diff -u -r44839 -r44847
--- WSimpl/AX/CalculatedProduct/Converter.cls.xml	(.../Converter.cls.xml)	(revision 44839)
+++ WSimpl/AX/CalculatedProduct/Converter.cls.xml	(.../Converter.cls.xml)	(revision 44847)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="WSimpl.AX.CalculatedProduct.Converter">
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.Mockable</Super>
 
 <Property name="RequestConverter">
 <Type>WSimpl.AX.CalculatedProduct.RequestConverter</Type>
Index: vhUnitTest/WS/AX/CalculatedProduct/CalculatedProductService/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WS/AX/CalculatedProduct/CalculatedProductService/Test.cls.xml	(revision 0)
+++ vhUnitTest/WS/AX/CalculatedProduct/CalculatedProductService/Test.cls.xml	(revision 44847)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WS.AX.CalculatedProduct.CalculatedProductService.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: In stream wordt geconverteerd naar Out stream">
+<Implementation><![CDATA[
+	#dim DummyStreamIn As %GlobalCharacterStream = ##class(%GlobalCharacterStream).%New()
+	#dim DummyBOMBOLOutQuery As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery).%New()
+	#dim DummyBOMBOLInQuery As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery = ##class(AXif.Dynamics.CalculatedProductOut.MessageParts.AxdADUMsgBOMBOLInQuery).%New()
+	#dim RandomGUID As %String = "RandomGUID"
+	
+	#dim XmlCorrelaterMock As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
+	Do XmlCorrelaterMock.VerwachtMethodCall("FromStream", DummyStreamIn, "AXif.Dynamics.CalculatedProductIn.MessageParts.AxdADUMsgBOMBOLOutQuery", "ADUMsgBOMBOLOutQuery").DanReturn(DummyBOMBOLOutQuery)
+	
+	#dim ConverterMock As vhTest.Mock.WSimpl.AX.CalculatedProduct.Converter = ##class(vhTest.Mock.WSimpl.AX.CalculatedProduct.Converter).%New()
+	Do ConverterMock.VerwachtMethodCall("Convert", DummyBOMBOLOutQuery, RandomGUID).DanReturn(DummyBOMBOLInQuery)
+	
+	#dim MessageManagerMock As vhTest.Mock.AXimpl.MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
+	Do MessageManagerMock.VerwachtMethodCall("GenerateID").DanReturn(RandomGUID)
+	
+	#dim CalculatedProductService As WS.AX.CalculatedProduct.CalculatedProductService = ##class(WS.AX.CalculatedProduct.CalculatedProductService).%New(XmlCorrelaterMock, ConverterMock, MessageManagerMock)
+	#dim StreamOut As %GlobalCharacterStream = CalculatedProductService.GetCalculatedProductData(DummyStreamIn)
+	
+	Do XmlCorrelaterMock.Verifieer()
+	Do ConverterMock.Verifieer()
+	Do MessageManagerMock.Verifieer()
+		
+	Do $$$AssertTrue(StreamOut.%IsA("%GlobalCharacterStream"))
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>