Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter/Convert/Test.cls.xml
===================================================================
diff -u -r45312 -r45314
--- vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 45312)
+++ vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/ReceptieAfmeldenConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 45314)
@@ -58,22 +58,8 @@
 	
 	Do ..OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(..MaakBonEnLijnen(1))
 	
-	Set ProductStub = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub, ..MaakBouwsteenIteratorFactory(1))
 	
-	Set ProductApiStub = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiStub.IndienMethodCall("GeefProduct","9000001").DanReturn(ProductStub)
-	
-	Set BouwsteenDummy = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
-	Set BouwsteenDummy.ProductId = "9000001"
-	Set Bouwstenen = ##class(%ListOfDataTypes).%New()
-	Do Bouwstenen.Insert(BouwsteenDummy)
-	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(TECH.ListIterator).%New(Bouwstenen)
-	
-	Set BouwsteenIteratorFactory = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory).%New(ProductApiStub)
-	Do BouwsteenIteratorFactory.IndienMethodCall("Maak","9000001").DanReturn(BouwsteenIterator)
-	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub, BouwsteenIteratorFactory)
-	
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)
 	
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ProdRAF.Count(),1)
@@ -89,24 +75,10 @@
 	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
 	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanReturn(Antwoord)
 	
-	Do ..OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(..MaakBonEnLijnen(1))	
+	Do ..OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(..MaakBonEnLijnen(1))
 	
-	Set ProductStub = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub, ..MaakBouwsteenIteratorFactory(1))
 	
-	Set ProductApiStub = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiStub.IndienMethodCall("GeefProduct","9000001").DanReturn(ProductStub)
-	
-	Set BouwsteenDummy = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
-	Set BouwsteenDummy.ProductId = "9000001"
-	Set Bouwstenen = ##class(%ListOfDataTypes).%New()
-	Do Bouwstenen.Insert(BouwsteenDummy)
-	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(TECH.ListIterator).%New(Bouwstenen)
-	
-	Set BouwsteenIteratorFactory = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory).%New(ProductApiStub)
-	Do BouwsteenIteratorFactory.IndienMethodCall("Maak","9000001").DanReturn(BouwsteenIterator)
-	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub, BouwsteenIteratorFactory)
-	
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)
 	
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ProdRAF.Count(),1)
@@ -143,31 +115,8 @@
 	
 	Do ..OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(..MaakBonEnLijnen(2))
 	
-	Set ProductStub1 = ##class(vhTest.Mock.DOM.PM.Product).%New()
-	Set ProductStub2 = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub, ..MaakBouwsteenIteratorFactory(2))
 	
-	Set ProductApiStub = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiStub.IndienMethodCall("GeefProduct","9000001").DanReturn(ProductStub1)
-	Do ProductApiStub.IndienMethodCall("GeefProduct","9000002").DanReturn(ProductStub2)
-	
-	Set BouwsteenDummy1 = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
-	Set BouwsteenDummy1.ProductId = "9000001"
-	Set Bouwstenen1 = ##class(%ListOfDataTypes).%New()
-	Do Bouwstenen1.Insert(BouwsteenDummy1)
-	#dim BouwsteenIterator1 As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(TECH.ListIterator).%New(Bouwstenen1)
-	
-	Set BouwsteenDummy2 = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
-	Set BouwsteenDummy2.ProductId = "9000002"
-	Set Bouwstenen2 = ##class(%ListOfDataTypes).%New()
-	Do Bouwstenen2.Insert(BouwsteenDummy2)
-	#dim BouwsteenIterator2 As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(TECH.ListIterator).%New(Bouwstenen2)
-	
-	Set BouwsteenIteratorFactory = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory).%New(ProductApiStub)
-	Do BouwsteenIteratorFactory.IndienMethodCall("Maak","9000001").DanReturn(BouwsteenIterator1)
-	Do BouwsteenIteratorFactory.IndienMethodCall("Maak","9000002").DanReturn(BouwsteenIterator2)
-	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub, BouwsteenIteratorFactory)
-	
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)
 	
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ProdRAF.Count(),2)
@@ -177,29 +126,13 @@
 
 <Method name="Test: InventSync geeft error -&gt; opeten">
 <Implementation><![CDATA[
-	#dim Antwoord As AXif.Dynamics.Inventory.MessageParts = ..MaakInventSyncAntwoord(2)
-	
 	Set InventoryOutConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()
 	Do InventoryOutConverterStub.IndienMethodCall("Convert",..Matches.DataTransferObject(..RequestInventoryOut),$$$ElkeWaarde).DanException($$$DummyException)
 	
 	Do ..OrderApiStub.IndienMethodCall("GeefBon",$$$DummyInteger,$$$ElkeWaarde).DanReturn(..MaakBonEnLijnen(1))
 	
-	Set ProductStub = ##class(vhTest.Mock.DOM.PM.Product).%New()
+	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub)
 	
-	Set ProductApiStub = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
-	Do ProductApiStub.IndienMethodCall("GeefProduct","9000001").DanReturn(ProductStub)
-	
-	Set BouwsteenDummy = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
-	Set BouwsteenDummy.ProductId = "9000001"
-	Set Bouwstenen = ##class(%ListOfDataTypes).%New()
-	Do Bouwstenen.Insert(BouwsteenDummy)
-	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(TECH.ListIterator).%New(Bouwstenen)
-	
-	Set BouwsteenIteratorFactory = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory).%New(ProductApiStub)
-	Do BouwsteenIteratorFactory.IndienMethodCall("Maak","9000001").DanReturn(BouwsteenIterator)
-	
-	Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.ReceptieAfmeldenConverter).%New(InventoryOutConverterStub, ..OrderApiStub, BouwsteenIteratorFactory)
-	
 	#dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..Request,..GUID)
 	
 	Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ProdRAF.Count(),1)
@@ -221,6 +154,7 @@
 	For ii=1:1:AantalInventSync {
 		Do Header.InventSync.Insert(InventSync)
 	}
+	
 	Do MessagePart.Header.Insert(Header)
 	Set Antwoord.MessagePart = MessagePart
 	
@@ -247,6 +181,44 @@
 	Quit StandaardBon
 ]]></Implementation>
 </Method>
+
+<Method name="MaakBouwsteenIteratorFactory">
+<FormalSpec>AantalBouwstenenIterators:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory</ReturnType>
+<Implementation><![CDATA[
+	Set BouwsteenIteratorFactory = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory).%New(..MaakProductApiStub(AantalBouwstenenIterators))
+	
+	#dim ii As %Integer
+	For ii=1:1:AantalBouwstenenIterators {
+		Set BouwsteenDummy = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
+		Set BouwsteenDummy.ProductId = "900000"_ii
+		Set Bouwstenen = ##class(%ListOfDataTypes).%New()
+		Do Bouwstenen.Insert(BouwsteenDummy)
+		#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = ##class(TECH.ListIterator).%New(Bouwstenen)
+		Do BouwsteenIteratorFactory.IndienMethodCall("Maak","900000"_ii).DanReturn(BouwsteenIterator)
+	}
+	
+	Quit BouwsteenIteratorFactory
+]]></Implementation>
+</Method>
+
+<Method name="MaakProductApiStub">
+<FormalSpec>AantalProducten:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>vhTest.Mock.DOM.PM.ProductAPI</ReturnType>
+<Implementation><![CDATA[
+	Set ProductApiStub = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	
+	#dim ii As %Integer
+	For ii=1:1:AantalProducten {
+		Set ProductStub = ##class(vhTest.Mock.DOM.PM.Product).%New()
+		Do ProductApiStub.IndienMethodCall("GeefProduct","900000"_ii).DanReturn(ProductStub)
+	}
+	
+	Quit ProductApiStub
+]]></Implementation>
+</Method>
 </Class>