Index: vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/Test.cls.xml
===================================================================
diff -u -r51035 -r51036
--- vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/Test.cls.xml	(.../Test.cls.xml)	(revision 51035)
+++ vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/Test.cls.xml	(.../Test.cls.xml)	(revision 51036)
@@ -8,6 +8,16 @@
 <Default>1001</Default>
 </Parameter>
 
+<Parameter name="ProductId11">
+<Type>%String</Type>
+<Default>1011</Default>
+</Parameter>
+
+<Parameter name="ProductId111">
+<Type>%String</Type>
+<Default>1111</Default>
+</Parameter>
+
 <Parameter name="ProductId2">
 <Type>%String</Type>
 <Default>1002</Default>
@@ -18,6 +28,36 @@
 <Default>1003</Default>
 </Parameter>
 
+<Parameter name="ProductId33">
+<Type>%String</Type>
+<Default>1033</Default>
+</Parameter>
+
+<Parameter name="ProductId333">
+<Type>%String</Type>
+<Default>1333</Default>
+</Parameter>
+
+<Parameter name="ProductId4">
+<Type>%String</Type>
+<Default>1004</Default>
+</Parameter>
+
+<Parameter name="ProductId5">
+<Type>%String</Type>
+<Default>1005</Default>
+</Parameter>
+
+<Parameter name="ProductId55">
+<Type>%String</Type>
+<Default>1055</Default>
+</Parameter>
+
+<Parameter name="ProductId555">
+<Type>%String</Type>
+<Default>1555</Default>
+</Parameter>
+
 <Property name="ProductApi">
 <Type>DOM.PM.ProductAPI</Type>
 <Private>1</Private>
@@ -42,11 +82,11 @@
 	Do ProductRolApiStub.IndienMethodCall("BestaatAdministratiefProduct", ..#ProductId1).DanReturn($$$True)
 	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId1).DanReturn($$$True)
 	Do ProductRolApiStub.IndienMethodCall("GeefSamengesteldProduct", ..#ProductId1).DanReturn(MoederProduct)
-	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId2).DanReturn($$$True)
+	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId11).DanReturn($$$True)
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId2)
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId2, $$$True, "SoprKind").DanReturn(..#ProductId3)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True, "SoprKind").DanReturn(..#ProductId111)
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
@@ -112,7 +152,7 @@
 	Do ProductRolApiStub.IndienMethodCall("BestaatAdministratiefProduct", ..#ProductId1).DanReturn($$$True)
 	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId1).DanReturn($$$True)
 	Do ProductRolApiStub.IndienMethodCall("GeefSamengesteldProduct", ..#ProductId1).DanReturn(MoederProduct)
-	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId2).DanReturn($$$True)
+	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId11).DanReturn($$$True)
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
 	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn("")
@@ -135,10 +175,10 @@
 	Do ProductRolApiStub.IndienMethodCall("BestaatAdministratiefProduct", ..#ProductId1).DanReturn($$$True)
 	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId1).DanReturn($$$True)
 	Do ProductRolApiStub.IndienMethodCall("GeefSamengesteldProduct", ..#ProductId1).DanReturn(MoederProduct)
-	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId2).DanReturn($$$False)
+	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId11).DanReturn($$$False)
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId2)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
@@ -158,11 +198,11 @@
 	Do ProductRolApiStub.IndienMethodCall("BestaatAdministratiefProduct", ..#ProductId1).DanReturn($$$True)
 	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId1).DanReturn($$$True)
 	Do ProductRolApiStub.IndienMethodCall("GeefSamengesteldProduct", ..#ProductId1).DanReturn(MoederProduct)
-	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId2).DanReturn($$$True)
+	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId11).DanReturn($$$True)
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId2)
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId2, $$$True, "SoprKind").DanReturn("")
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True, "SoprKind").DanReturn("")
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
@@ -182,18 +222,18 @@
 	Do ProductRolApiStub.IndienMethodCall("BestaatAdministratiefProduct", ..#ProductId1).DanReturn($$$True)
 	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId1).DanReturn($$$True)
 	Do ProductRolApiStub.IndienMethodCall("GeefSamengesteldProduct", ..#ProductId1).DanReturn(MoederProduct)
-	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId2).DanReturn($$$True)
+	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId11).DanReturn($$$True)
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId2)
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId2, $$$True, "SoprKind").DanReturn(..#ProductId3)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True, "SoprKind").DanReturn(..#ProductId111)
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
 	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
 	#dim Result As %String = HerverpakteSoprService.GeefProductIdVanKindSoprDatSoprKindHeeft(..#ProductId1)
 	
-	Do $$$AssertEquals(Result, ..#ProductId2)
+	Do $$$AssertEquals(Result, ..#ProductId11)
 ]]></Implementation>
 </Method>
 
@@ -206,11 +246,11 @@
 	Do ProductRolApiStub.IndienMethodCall("BestaatAdministratiefProduct", ..#ProductId1).DanReturn($$$True)
 	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId1).DanReturn($$$True)
 	Do ProductRolApiStub.IndienMethodCall("GeefSamengesteldProduct", ..#ProductId1).DanReturn(MoederProduct)
-	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId2).DanReturn($$$True)
+	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId11).DanReturn($$$True)
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId2)
-	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId2, $$$True, "SoprKind").DanReturn("")
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True, "SoprKind").DanReturn("")
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
@@ -221,6 +261,84 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: GeefLijstHerverpakteSoprs">
+<Implementation><![CDATA[
+	#dim Lijst As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	Do Lijst.Insert(..#ProductId1)
+	Do Lijst.Insert(..#ProductId2)
+	Do Lijst.Insert(..#ProductId3)
+	Do Lijst.Insert(..#ProductId4)
+	Do Lijst.Insert(..#ProductId5)
+	
+	#dim ProductIDIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Lijst)
+	
+	Set ProductApiStub = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ProductApiStub.IndienMethodCall("GeefProductIDIterator").DanReturn(ProductIDIterator)
+	
+	Set Product1 = ##class(vhTest.Mock.DOM.PM.AdministratiefProduct).%New(..#ProductId1)
+	Do Product1.IndienMethodCall("GeefActiefStatus").DanReturn(##class(DOM.PM.enu.ActiefStatus).Actief())
+	Set Product2 = ##class(vhTest.Mock.DOM.PM.AdministratiefProduct).%New(..#ProductId2)
+	Do Product2.IndienMethodCall("GeefActiefStatus").DanReturn(##class(DOM.PM.enu.ActiefStatus).Actief())
+	Set Product3 = ##class(vhTest.Mock.DOM.PM.AdministratiefProduct).%New(..#ProductId3)
+	Do Product3.IndienMethodCall("GeefActiefStatus").DanReturn(##class(DOM.PM.enu.ActiefStatus).Actief())
+	Set Product4 = ##class(vhTest.Mock.DOM.PM.AdministratiefProduct).%New(..#ProductId4)
+	Do Product4.IndienMethodCall("GeefActiefStatus").DanReturn(##class(DOM.PM.enu.ActiefStatus).Actief())
+	Set Product5 = ##class(vhTest.Mock.DOM.PM.AdministratiefProduct).%New(..#ProductId5)
+	Do Product5.IndienMethodCall("GeefActiefStatus").DanReturn(##class(DOM.PM.enu.ActiefStatus).Actief())
+	
+	Set MoederProduct1 = ##class(vhTest.Mock.DOM.PM.SamengesteldProduct).%New(..#ProductId1)
+	Do MoederProduct1.IndienMethodCall("IsStockOverKinderen").DanReturn($$$True)
+	Set MoederProduct2 = ##class(vhTest.Mock.DOM.PM.SamengesteldProduct).%New(..#ProductId2)
+	Do MoederProduct2.IndienMethodCall("IsStockOverKinderen").DanReturn($$$True)
+	Set MoederProduct3 = ##class(vhTest.Mock.DOM.PM.SamengesteldProduct).%New(..#ProductId3)
+	Do MoederProduct3.IndienMethodCall("IsStockOverKinderen").DanReturn($$$True)
+	Set MoederProduct4 = ##class(vhTest.Mock.DOM.PM.SamengesteldProduct).%New(..#ProductId4)
+	Do MoederProduct4.IndienMethodCall("IsStockOverKinderen").DanReturn($$$True)
+	Set MoederProduct5 = ##class(vhTest.Mock.DOM.PM.SamengesteldProduct).%New(..#ProductId5)
+	Do MoederProduct5.IndienMethodCall("IsStockOverKinderen").DanReturn($$$True)
+	
+	Set ProductRolApiStub = ##class(vhTest.Mock.DOM.PM.ProductRolAPI).%New()
+	Do ProductRolApiStub.IndienMethodCall("BestaatAdministratiefProduct", ..#ProductId1).DanReturn($$$True)
+	Do ProductRolApiStub.IndienMethodCall("BestaatAdministratiefProduct", ..#ProductId2).DanReturn($$$False)
+	Do ProductRolApiStub.IndienMethodCall("BestaatAdministratiefProduct", ..#ProductId3).DanReturn($$$True)
+	Do ProductRolApiStub.IndienMethodCall("BestaatAdministratiefProduct", ..#ProductId4).DanReturn($$$False)
+	Do ProductRolApiStub.IndienMethodCall("BestaatAdministratiefProduct", ..#ProductId5).DanReturn($$$True)
+	Do ProductRolApiStub.IndienMethodCall("GeefAdministratiefProduct", ..#ProductId1).DanReturn(Product1)
+	Do ProductRolApiStub.IndienMethodCall("GeefAdministratiefProduct", ..#ProductId2).DanReturn(Product2)
+	Do ProductRolApiStub.IndienMethodCall("GeefAdministratiefProduct", ..#ProductId3).DanReturn(Product3)
+	Do ProductRolApiStub.IndienMethodCall("GeefAdministratiefProduct", ..#ProductId4).DanReturn(Product4)
+	Do ProductRolApiStub.IndienMethodCall("GeefAdministratiefProduct", ..#ProductId5).DanReturn(Product5)
+	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId1).DanReturn($$$True)
+	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId3).DanReturn($$$True)
+	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId5).DanReturn($$$True)
+	Do ProductRolApiStub.IndienMethodCall("GeefSamengesteldProduct", ..#ProductId1).DanReturn(MoederProduct1)
+	Do ProductRolApiStub.IndienMethodCall("GeefSamengesteldProduct", ..#ProductId3).DanReturn(MoederProduct3)
+	Do ProductRolApiStub.IndienMethodCall("GeefSamengesteldProduct", ..#ProductId5).DanReturn(MoederProduct5)
+	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId11).DanReturn($$$True)
+	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId33).DanReturn($$$True)
+	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId55).DanReturn($$$True)
+	
+	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId3, $$$False, "Sopr").DanReturn(..#ProductId33)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId5, $$$False, "Sopr").DanReturn(..#ProductId55)	
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True, "SoprKind").DanReturn(..#ProductId111)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId33, $$$True, "SoprKind").DanReturn(..#ProductId333)
+	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId55, $$$True, "SoprKind").DanReturn(..#ProductId555)
+	
+	Set ..ProductApi = ProductApiStub
+	Set ..ProductRolApi = ProductRolApiStub
+	Set ..KindProductService = KindProductServiceStub
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim Result As %ListOfDataTypes = HerverpakteSoprService.GeefLijstHerverpakteSoprs()
+	
+	Do $$$AssertEquals(Result.Count(), 3)
+	Do $$$AssertEquals(Result.GetAt(1), ..#ProductId1)
+	Do $$$AssertEquals(Result.GetAt(2), ..#ProductId3)
+	Do $$$AssertEquals(Result.GetAt(3), ..#ProductId5)
+]]></Implementation>
+</Method>
+
 <Method name="GeefHerverpakteSoprService">
 <Private>1</Private>
 <Implementation><![CDATA[	Quit ##class(AXimpl.Admin.Common.HerverpakteSoprService).%New(..ProductApi, ..ProductRolApi, ..KindProductService)