Index: vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/Test.cls.xml
===================================================================
diff -u -r51038 -r51176
--- vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/Test.cls.xml	(.../Test.cls.xml)	(revision 51038)
+++ vhUnitTest/AXimpl/Admin/Common/HerverpakteSoprService/Test.cls.xml	(.../Test.cls.xml)	(revision 51176)
@@ -86,11 +86,12 @@
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
 	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
+	Do KindProductServiceStub.IndienMethodCall("GeefAantalHerverpakt",..#ProductId1).DanDoeNiks()
 	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 HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %Boolean = HerverpakteSoprService.IsHerverpakteSopr(..#ProductId1)
 	
 	Do $$$AssertTrue(Result)
@@ -109,7 +110,7 @@
 
 	Set ..ProductRolApi = ProductRolApiStub
 	
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %Boolean = HerverpakteSoprService.IsHerverpakteSopr(..#ProductId1)
 	
 	Do $$$AssertFalse(Result)
@@ -122,7 +123,7 @@
 	Do ProductRolApiStub.IndienMethodCall("BestaatAdministratiefProduct", ..#ProductId1).DanReturn($$$False)
 	
 	Set ..ProductRolApi = ProductRolApiStub
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %Boolean = HerverpakteSoprService.IsHerverpakteSopr(..#ProductId1)
 	
 	Do $$$AssertFalse(Result)
@@ -136,7 +137,7 @@
 	Do ProductRolApiStub.IndienMethodCall("IsSamengesteldProduct", ..#ProductId1).DanReturn($$$False)
 	
 	Set ..ProductRolApi = ProductRolApiStub
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %Boolean = HerverpakteSoprService.IsHerverpakteSopr(..#ProductId1)
 	
 	Do $$$AssertFalse(Result)
@@ -159,7 +160,7 @@
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %Boolean = HerverpakteSoprService.IsHerverpakteSopr(..#ProductId1)
 	
 	Do $$$AssertFalse(Result)
@@ -182,7 +183,7 @@
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %Boolean = HerverpakteSoprService.IsHerverpakteSopr(..#ProductId1)
 	
 	Do $$$AssertFalse(Result)
@@ -206,7 +207,7 @@
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %Boolean = HerverpakteSoprService.IsHerverpakteSopr(..#ProductId1)
 	
 	Do $$$AssertFalse(Result)
@@ -226,11 +227,12 @@
 	
 	Set KindProductServiceStub = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
 	Do KindProductServiceStub.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
+	Do KindProductServiceStub.IndienMethodCall("GeefAantalHerverpakt",..#ProductId1).DanDoeNiks()
 	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 HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %String = HerverpakteSoprService.GeefProductIdVanKindSoprDatSoprKindHeeft(..#ProductId1)
 	
 	Do $$$AssertEquals(Result, ..#ProductId11)
@@ -254,7 +256,7 @@
 	
 	Set ..ProductRolApi = ProductRolApiStub
 	Set ..KindProductService = KindProductServiceStub
-	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService.KindProductService = ..GeefHerverpakteSoprService()
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %String = HerverpakteSoprService.GeefProductIdVanKindSoprDatSoprKindHeeft(..#ProductId1)
 	
 	Do $$$AssertEquals(Result, "")
@@ -321,15 +323,18 @@
 	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",..#ProductId5, $$$False, "Sopr").DanReturn(..#ProductId55)
+	Do KindProductServiceStub.IndienMethodCall("GeefAantalHerverpakt",..#ProductId1).DanDoeNiks()
+	Do KindProductServiceStub.IndienMethodCall("GeefAantalHerverpakt",..#ProductId3).DanDoeNiks()
+	Do KindProductServiceStub.IndienMethodCall("GeefAantalHerverpakt",..#ProductId5).DanDoeNiks()
 	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 HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
 	#dim Result As %ListOfDataTypes = HerverpakteSoprService.GeefLijstHerverpakteSoprs()
 	
 	Do $$$AssertEquals(Result.Count(), 3)
@@ -339,6 +344,32 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: GeefAantalHerverpakt roept GeefAantalHerverpakt van de KindProductService op">
+<Implementation><![CDATA[
+	Set MoederProduct = ##class(vhTest.Mock.DOM.PM.SamengesteldProduct).%New(..#ProductId1)
+	Do MoederProduct.IndienMethodCall("IsStockOverKinderen").DanReturn($$$True)
+	
+	Set ProductRolApiStub = ##class(vhTest.Mock.DOM.PM.ProductRolAPI).%New()
+	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", ..#ProductId11).DanReturn($$$True)
+	
+	Set KindProductServiceMock = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService.KindProductService).%New()
+	Do KindProductServiceMock.IndienMethodCall("GeefKindProductId",..#ProductId1, $$$False, "Sopr").DanReturn(..#ProductId11)
+	Do KindProductServiceMock.VerwachtMethodCall("GeefAantalHerverpakt",..#ProductId1).DanReturn(2)
+	Do KindProductServiceMock.IndienMethodCall("GeefKindProductId",..#ProductId11, $$$True, "SoprKind").DanReturn(..#ProductId111)
+	
+	Set ..ProductRolApi = ProductRolApiStub
+	Set ..KindProductService = KindProductServiceMock
+	#dim HerverpakteSoprService As AXimpl.Admin.Common.HerverpakteSoprService = ..GeefHerverpakteSoprService()
+	#dim Aantal As %Integer = HerverpakteSoprService.GeefAantalHerverpakt(..#ProductId1)
+	
+	Do $$$AssertEquals(Aantal,2)
+	Do KindProductServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="GeefHerverpakteSoprService">
 <Private>1</Private>
 <Implementation><![CDATA[	Quit ##class(AXimpl.Admin.Common.HerverpakteSoprService).%New(..ProductApi, ..ProductRolApi, ..KindProductService)