Index: vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/TeOntvangenProductLocker/Test.cls.xml
===================================================================
diff -u -r51148 -r51163
--- vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/TeOntvangenProductLocker/Test.cls.xml	(.../Test.cls.xml)	(revision 51148)
+++ vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/TeOntvangenProductLocker/Test.cls.xml	(.../Test.cls.xml)	(revision 51163)
@@ -9,19 +9,24 @@
 	Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","Identnummer","L||1234").DanReturn(987654)
 	Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","Identnummer2","L||5678").DanReturn(876543)
 	
+	Set HerverpakteSoprServiceMock = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService).%New()
+	Do HerverpakteSoprServiceMock.VerwachtMethodCall("IsHerverpakteSopr",987654).DanReturn($$$False)
+	Do HerverpakteSoprServiceMock.VerwachtMethodCall("IsHerverpakteSopr",876543).DanReturn($$$False)
+	
 	Set MultiGlobalLockerMock = ##class(vhTest.Mock.TECH.Lock.MultiGlobalLocker).%New()
 	Do MultiGlobalLockerMock.VerwachtMethodCall("ClearGlobalRefs").DanDoeNiks()
 	Do MultiGlobalLockerMock.VerwachtMethodCall("VoegToeGlobalRef","^KPR(987654)").DanDoeNiks()
 	Do MultiGlobalLockerMock.VerwachtMethodCall("VoegToeGlobalRef","^KPR(876543)").DanDoeNiks()
 	Do MultiGlobalLockerMock.VerwachtMethodCall("HeeftTeLockenNodes").DanReturn($$$True)
 	
-	Set ProductLocker = ##class(AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker).%New(ProductLookupMock,MultiGlobalLockerMock)
+	Set ProductLocker = ##class(AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker).%New(ProductLookupMock,MultiGlobalLockerMock,HerverpakteSoprServiceMock)
 	
 	Do ProductLocker.BepaalTeLockenProducten(..GeefJournal("ontvangstjournaal.xml"))
 
 	Do $$$AssertTrue(ProductLocker.HeeftTeLockenProducten())
 	
 	Do ProductLookupMock.Verifieer()
+	Do HerverpakteSoprServiceMock.Verifieer()
 	Do MultiGlobalLockerMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -32,10 +37,10 @@
 	Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","Identnummer","L||1234").DanReturn(987654)
 	Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","Identnummer2","L||5678").DanReturn(876543)
 	
-	Set HerverpakteSoprService = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService).%New()
-	Do HerverpakteSoprService.VerwachtMethodCall("IsHerverpakteSopr",987654).DanReturn($$$False)
-	Do HerverpakteSoprService.VerwachtMethodCall("IsHerverpakteSopr",876543).DanReturn($$$True)
-	Do HerverpakteSoprService.VerwachtMethodCall("GeefProductIdVanKindSoprDatSoprKindHeeft",876543).DanReturn(765432)
+	Set HerverpakteSoprServiceMock = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService).%New()
+	Do HerverpakteSoprServiceMock.VerwachtMethodCall("IsHerverpakteSopr",987654).DanReturn($$$False)
+	Do HerverpakteSoprServiceMock.VerwachtMethodCall("IsHerverpakteSopr",876543).DanReturn($$$True)
+	Do HerverpakteSoprServiceMock.VerwachtMethodCall("GeefProductIdVanKindSoprDatSoprKindHeeft",876543).DanReturn(765432)
 	
 	Set MultiGlobalLockerMock = ##class(vhTest.Mock.TECH.Lock.MultiGlobalLocker).%New()
 	Do MultiGlobalLockerMock.VerwachtMethodCall("ClearGlobalRefs").DanDoeNiks()
@@ -44,14 +49,14 @@
 	Do MultiGlobalLockerMock.VerwachtMethodCall("VoegToeGlobalRef","^KPR(765432)").DanDoeNiks().ExactAantalKeer(1)
 	Do MultiGlobalLockerMock.VerwachtMethodCall("HeeftTeLockenNodes").DanReturn($$$True)
 	
-	Set ProductLocker = ##class(AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker).%New(ProductLookupMock,MultiGlobalLockerMock,HerverpakteSoprService)
+	Set ProductLocker = ##class(AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker).%New(ProductLookupMock,MultiGlobalLockerMock,HerverpakteSoprServiceMock)
 	
 	Do ProductLocker.BepaalTeLockenProducten(..GeefJournal("ontvangstjournaal.xml"))
 
 	Do $$$AssertTrue(ProductLocker.HeeftTeLockenProducten())
 	
 	Do ProductLookupMock.Verifieer()
-	Do HerverpakteSoprService.Verifieer()
+	Do HerverpakteSoprServiceMock.Verifieer()
 	Do MultiGlobalLockerMock.Verifieer()
 ]]></Implementation>
 </Method>
@@ -60,10 +65,12 @@
 <Implementation><![CDATA[
 	Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Admin.Common.ProductBepaler).%New()
 	
+	Set HerverpakteSoprServiceMock = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService).%New()
+	
 	Set MultiGlobalLockerMock = ##class(vhTest.Mock.TECH.Lock.MultiGlobalLocker).%New()
 	Do MultiGlobalLockerMock.VerwachtMethodCall("HeeftTeLockenNodes").DanReturn($$$True)
 	
-	Set ProductLocker = ##class(AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker).%New(ProductLookupMock,MultiGlobalLockerMock)
+	Set ProductLocker = ##class(AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker).%New(ProductLookupMock,MultiGlobalLockerMock,HerverpakteSoprServiceMock)
 	
 	Do $$$AssertTrue(ProductLocker.HeeftTeLockenProducten())
 	
@@ -75,10 +82,12 @@
 <Implementation><![CDATA[
 	Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Admin.Common.ProductBepaler).%New()
 	
+	Set HerverpakteSoprServiceMock = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService).%New()
+	
 	Set MultiGlobalLockerMock = ##class(vhTest.Mock.TECH.Lock.MultiGlobalLocker).%New()
 	Do MultiGlobalLockerMock.VerwachtMethodCall("Lock",5).DanReturn($$$True)
 	
-	Set ProductLocker = ##class(AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker).%New(ProductLookupMock,MultiGlobalLockerMock)
+	Set ProductLocker = ##class(AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker).%New(ProductLookupMock,MultiGlobalLockerMock,HerverpakteSoprServiceMock)
 	
 	Do $$$AssertTrue(ProductLocker.LockProducten())
 	
@@ -90,10 +99,12 @@
 <Implementation><![CDATA[
 	Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Admin.Common.ProductBepaler).%New()
 	
+	Set HerverpakteSoprServiceMock = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService).%New()
+	
 	Set MultiGlobalLockerMock = ##class(vhTest.Mock.TECH.Lock.MultiGlobalLocker).%New()
 	Do MultiGlobalLockerMock.VerwachtMethodCall("Unlock",0).DanReturn($$$True)
 	
-	Set ProductLocker = ##class(AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker).%New(ProductLookupMock,MultiGlobalLockerMock)
+	Set ProductLocker = ##class(AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker).%New(ProductLookupMock,MultiGlobalLockerMock,HerverpakteSoprServiceMock)
 	
 	Do $$$AssertTrue(ProductLocker.UnlockProducten())
 	
@@ -107,6 +118,9 @@
 	Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Admin.Common.ProductBepaler).%New()
 	Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","Identnummer","L||1234").DanReturn(987654)
 	
+	Set HerverpakteSoprServiceMock = ##class(vhTest.Mock.AXimpl.Admin.Common.HerverpakteSoprService).%New()
+	Do HerverpakteSoprServiceMock.VerwachtMethodCall("IsHerverpakteSopr",987654).DanReturn($$$False)
+	
 	Set EenExceptie = ##class(TECH.Exceptions.GeneralErrorException).%New("EenExceptie")
 	Do ProductLookupMock.IndienMethodCall("GeefProductIdVoorLeverancierId","Identnummer2","L||5678").DanException(EenExceptie)
 	
@@ -117,13 +131,14 @@
 	Do MultiGlobalLockerMock.VerwachtMethodCall("ClearGlobalRefs").ExactAantalKeer(2)
 	Do MultiGlobalLockerMock.VerwachtMethodCall("VoegToeGlobalRef","^KPR(987654)").DanDoeNiks()
 	
-	Set ProductLocker = ##class(AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker).%New(ProductLookupMock,MultiGlobalLockerMock)
+	Set ProductLocker = ##class(AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker).%New(ProductLookupMock,MultiGlobalLockerMock,HerverpakteSoprServiceMock)
 
 	Do ProductLocker.BepaalTeLockenProducten(..GeefJournal("ontvangstjournaal.xml"))
 
 	Do $$$AssertFalse(ProductLocker.HeeftTeLockenProducten())
 	
 	Do ProductLookupMock.Verifieer()
+	Do HerverpakteSoprServiceMock.Verifieer()
 	Do MultiGlobalLockerMock.Verifieer()
 ]]></Implementation>
 </Method>