Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml
===================================================================
diff -u -r73387 -r73833
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 73387)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml	(.../Test.cls.xml)	(revision 73833)
@@ -7,6 +7,7 @@
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "DnaCode"
+	Set Request.BatchId = 1234567
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
@@ -26,8 +27,13 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()	
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock)
+	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
+	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
+	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
+	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -37,6 +43,7 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
+	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -64,6 +71,7 @@
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "DnaCode"
+	Set Request.BatchId = 1234567
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
@@ -83,8 +91,13 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective", DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock)
+	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
+	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
+	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
+	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"-1021")
@@ -94,6 +107,7 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
+	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -173,10 +187,15 @@
 	Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep",DnaCode1.Toelevering).DanDoeNiks()
 	
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
-	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
+	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective", DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,, DnaCodeInVhossKastBepalerStub,,, ToeleveringServiceMock, DocumentGeneratorMock)
+	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
+	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
+	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
+	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,, DnaCodeInVhossKastBepalerStub,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -185,6 +204,7 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
+	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -253,6 +273,7 @@
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "K00000A"
 	Set Request.Toelevering = "356789"
+	Set Request.BatchId = 1234567
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
@@ -271,8 +292,13 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock)
+	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
+	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
+	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
+	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -281,6 +307,7 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
+	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -343,6 +370,7 @@
 	Set Request.DnaCode = "DnaCode"
 	Set Request.Aantal = -1
 	Set Request.PalletCode = "TBX12345"
+	Set Request.BatchId = 1234567
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
@@ -373,8 +401,13 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock)
+	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
+	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
+	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
+	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -383,6 +416,7 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
+	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -391,6 +425,7 @@
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "DnaCode"
 	Set Request.Locatie = $$$DummyString
+	Set Request.BatchId = 1234567
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
@@ -406,8 +441,13 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock)
+	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
+	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
+	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
+	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -416,6 +456,7 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
+	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -424,6 +465,7 @@
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "DnaCode"
 	Set Request.Locatie = $$$DummyString
+	Set Request.BatchId = 1234567
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
@@ -453,8 +495,13 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock)
+	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
+	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
+	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
+	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -463,13 +510,15 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
+	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Als toelevering een spacestep bevat, moet de response true bevatten in property &apos;IsSST&apos; ">
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "DnaCode"
+	Set Request.BatchId = 1234567
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
@@ -485,8 +534,13 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock)
+	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
+	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
+	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
+	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -496,13 +550,15 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
+	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Als toelevering geen spacestep bevat, moet de response false bevatten in property &apos;IsSST&apos; ">
 <Implementation><![CDATA[
 	Set Request = ##class(WS.Halux.AAP.DnaCodeAfmeldenRequest).%New()
 	Set Request.DnaCode = "DnaCode"
+	Set Request.BatchId = 1234567
 	
 	Set DnaCode1 = ##class(DOM.Halux.AAP.DnaCode).%New()
 	Set DnaCode1.Toelevering = "222222"
@@ -518,8 +574,13 @@
 	Set DocumentGeneratorMock = ##class(vhTest.Mock.APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()
 	Do DocumentGeneratorMock.VerwachtMethodCall("GenereerDocumentVoorObjective",DnaCode1.DnaCode).DanDoeNiks()
 	
-	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock)
+	#dim BatchServiceMock As vhTest.Mock.APPS.Halux.common.BatchService = ##class(vhTest.Mock.APPS.Halux.common.BatchService).%New()
+	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
+	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(1)	
+	Do BatchServiceMock.VerwachtMethodCall("GeefBatch",Request.BatchId).DanReturn(BatchMock)
 	
+	Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock, DocumentGeneratorMock,,BatchServiceMock)
+	
 	#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
 	
 	Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -529,6 +590,7 @@
 	Do DnaCodeRepositoryMock.Verifieer()
 	Do ToeleveringServiceMock.Verifieer()
 	Do DocumentGeneratorMock.Verifieer()
+	Do BatchServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 </Class>