Index: AXimpl/Dynamics/InventoryOut/Converter/SpaceTowerService.cls.xml
===================================================================
diff -u -r55267 -r55270
--- AXimpl/Dynamics/InventoryOut/Converter/SpaceTowerService.cls.xml	(.../SpaceTowerService.cls.xml)	(revision 55267)
+++ AXimpl/Dynamics/InventoryOut/Converter/SpaceTowerService.cls.xml	(.../SpaceTowerService.cls.xml)	(revision 55270)
@@ -14,7 +14,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>BouwsteenIteratorFactory:AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory,ProductApi:DOM.PM.ProductAPI=""</FormalSpec>
+<FormalSpec>BouwsteenIteratorFactory:AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory="",ProductApi:DOM.PM.ProductAPI=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/SpaceTowerService/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/SpaceTowerService/Test.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/SpaceTowerService/Test.cls.xml	(revision 55270)
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.Dynamics.InventoryOut.Converter.SpaceTowerService.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="SpaceTowerProductId">
+<Type>%String</Type>
+<Default>1000</Default>
+</Parameter>
+
+<Parameter name="ProductId1">
+<Type>%String</Type>
+<Default>1001</Default>
+</Parameter>
+
+<Parameter name="ProductId2">
+<Type>%String</Type>
+<Default>1002</Default>
+</Parameter>
+
+<Parameter name="ProductId3">
+<Type>%String</Type>
+<Default>1003</Default>
+</Parameter>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	Do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProducten(..#SpaceTowerProductId, ..#ProductId3)
+ 	Do ##class(vhTest.Utils.DOM.PM.Product).CreeerProducten(..#SpaceTowerProductId, ..#ProductId3)
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProducten(..#SpaceTowerProductId, ..#ProductId3)
+ 	Do ##super()
+]]></Implementation>
+</Method>
+
+<Method name="Test: SpaceTower met 3 Kinderen met elk 3 Bouwstenen">
+<Implementation><![CDATA[
+	#dim ProductApiStub As DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiStub.IndienMethodCall("GeefProduct", ..#SpaceTowerProductId).DanReturn(..GeefSpaceTower())
+	
+	#dim BouwsteenIteratorFactoryStub As AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory).%New()
+	Do BouwsteenIteratorFactoryStub.IndienMethodCall("Maak", ..#ProductId1).DanReturn(..GeefBouwsteenIteratorVanSpaceTowerKinderen(101))
+	Do BouwsteenIteratorFactoryStub.IndienMethodCall("Maak", ..#ProductId2).DanReturn(..GeefBouwsteenIteratorVanSpaceTowerKinderen(102))
+	Do BouwsteenIteratorFactoryStub.IndienMethodCall("Maak", ..#ProductId3).DanReturn(..GeefBouwsteenIteratorVanSpaceTowerKinderen(103))
+	
+	#dim SpaceTowerService As AXimpl.Dynamics.InventoryOut.Converter.SpaceTowerService = ##class(AXimpl.Dynamics.InventoryOut.Converter.SpaceTowerService).%New(BouwsteenIteratorFactoryStub, ProductApiStub)
+	
+	#dim BouwsteenIterator As AXimpl.Admin.DOM.PM.BouwsteenIterator = SpaceTowerService.GeefSpaceTowerBouwsteenIterator(..#SpaceTowerProductId)
+	
+	Do $$$AssertTrue(BouwsteenIterator.HasNext())
+	Do $$$AssertEquals(BouwsteenIterator.Next().ProductId, 1011)
+	Do $$$AssertEquals(BouwsteenIterator.Next().ProductId, 1012)
+	Do $$$AssertEquals(BouwsteenIterator.Next().ProductId, 1013)
+	Do $$$AssertTrue(BouwsteenIterator.HasNext())
+	Do $$$AssertEquals(BouwsteenIterator.Next().ProductId, 1021)
+	Do $$$AssertEquals(BouwsteenIterator.Next().ProductId, 1022)
+	Do $$$AssertEquals(BouwsteenIterator.Next().ProductId, 1023)
+	Do $$$AssertTrue(BouwsteenIterator.HasNext())
+	Do $$$AssertEquals(BouwsteenIterator.Next().ProductId, 1031)
+	Do $$$AssertEquals(BouwsteenIterator.Next().ProductId, 1032)
+	Do $$$AssertEquals(BouwsteenIterator.Next().ProductId, 1033)
+	Do $$$AssertFalse(BouwsteenIterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="GeefSpaceTower">
+<Private>1</Private>
+<ReturnType>DOM.PM.Product</ReturnType>
+<Implementation><![CDATA[
+	#dim SpaceTower As DOM.PM.Product = ##class(vhTest.Mock.DOM.PM.Product).%New(..#SpaceTowerProductId)
+	Do SpaceTower.IndienMethodCall("GeefKindBouwstenenIterator").DanReturn(..GeefKindBouwstenenIteratorVanSpaceTower())
+	
+	Quit SpaceTower
+]]></Implementation>
+</Method>
+
+<Method name="GeefKindBouwstenenIteratorVanSpaceTower">
+<Private>1</Private>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	#dim BouwsteenKind1 As DOM.PM.Bouwstenen.BouwsteenKind = ##class(DOM.PM.Bouwstenen.BouwsteenKind).%New()
+	Set BouwsteenKind1.Type = "K"
+	Do BouwsteenKind1.KindProductSetObjectId(..#ProductId1)
+	Set BouwsteenKind1.Aantal = 2
+	#dim BouwsteenKind2 As DOM.PM.Bouwstenen.BouwsteenKind = ##class(DOM.PM.Bouwstenen.BouwsteenKind).%New()
+	Set BouwsteenKind2.Type = "K"
+	Do BouwsteenKind2.KindProductSetObjectId(..#ProductId2)
+	Set BouwsteenKind2.Aantal = 2
+	#dim BouwsteenKind3 As DOM.PM.Bouwstenen.BouwsteenKind = ##class(DOM.PM.Bouwstenen.BouwsteenKind).%New()
+	Set BouwsteenKind3.Type = "K"
+	Do BouwsteenKind3.KindProductSetObjectId(..#ProductId3)
+	Set BouwsteenKind3.Aantal = 1
+	
+	#dim BouwsteenLijst As %ListOfObjects = ##class(%ListOfObjects).%New()
+	Do BouwsteenLijst.Insert(BouwsteenKind1)
+	Do BouwsteenLijst.Insert(BouwsteenKind2)
+	Do BouwsteenLijst.Insert(BouwsteenKind3)
+	
+	#dim KindBouwstenenIteratorVanSpaceTower As TECH.Iterator = ##class(TECH.ListIterator).%New(BouwsteenLijst)
+	
+	Quit KindBouwstenenIteratorVanSpaceTower
+]]></Implementation>
+</Method>
+
+<Method name="GeefBouwsteenIteratorVanSpaceTowerKinderen">
+<FormalSpec>BouwsteenProductNrBeginnendMet:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.ListIterator</ReturnType>
+<Implementation><![CDATA[
+	Set Bouwstenen = ##class(%ListOfDataTypes).%New()
+	
+	#dim ii As %Integer
+	For ii=1:1:3 {
+		Set BouwsteenDummy = ##class(AXimpl.Admin.DOM.PM.Bouwsteen).%New()
+		Set BouwsteenDummy.ProductId = BouwsteenProductNrBeginnendMet_ii
+		Do Bouwstenen.Insert(BouwsteenDummy)
+	}
+	
+	Quit ##class(TECH.ListIterator).%New(Bouwstenen)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/SpaceTowerService.cls.xml
===================================================================
diff -u -r55267 -r55270
--- vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/SpaceTowerService.cls.xml	(.../SpaceTowerService.cls.xml)	(revision 55267)
+++ vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/SpaceTowerService.cls.xml	(.../SpaceTowerService.cls.xml)	(revision 55270)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>BouwsteenIteratorFactory:AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory,ProductApi:DOM.PM.ProductAPI=""</FormalSpec>
+<FormalSpec>BouwsteenIteratorFactory:AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory="",ProductApi:DOM.PM.ProductAPI=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>