Index: vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/HoofdDataGenerator/DataVoorToeleveringGenerator/GenereerData/Test.cls.xml
===================================================================
diff -u -r71899 -r71901
--- vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/HoofdDataGenerator/DataVoorToeleveringGenerator/GenereerData/Test.cls.xml	(.../Test.cls.xml)	(revision 71899)
+++ vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/HoofdDataGenerator/DataVoorToeleveringGenerator/GenereerData/Test.cls.xml	(.../Test.cls.xml)	(revision 71901)
@@ -29,10 +29,10 @@
 	Set BatchPitchExported = ##class(APPS.Halux.Planning.Pitching.BatchPitchExported).%New()
 	Set BatchPitchExported.Volgnummer = BatchPitchExportedVolgnummer
 	Set BatchPitchExported.LijnNummer = LijnNummer
-	#dim BatchPitchExportedIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(BatchPitchExported)
+	#dim BatchPitchExportedLijst As %ListOfObjects = ##class(TECH.ListUtils).CreateListOfObjects(BatchPitchExported)
 	
-	Set BatchPitchExportedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository).%New()
-	Do BatchPitchExportedRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", BatchId).ExactAantalKeer(2).DanReturn(BatchPitchExportedIterator)
+	Set BatchPitchExportedServiceMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService).%New()
+	Do BatchPitchExportedServiceMock.VerwachtMethodCall("ZoekViaBatchId", BatchId).ExactAantalKeer(2).DanReturn(BatchPitchExportedLijst)
 	
 	#dim OrderMock As vhTest.Mock.DOM.VKP.Order = ##class(vhTest.Mock.DOM.VKP.Order).%New()
 	Do OrderMock.VerwachtMethodCall("GeefAxSalesId").ExactAantalKeer(1).DanDoeNiks()
@@ -51,7 +51,7 @@
 	Set LegacyPartijApiMock = ##class(vhTest.Mock.DOM.PARTIJ.LegacyPartijAPI).%New()
 	Do LegacyPartijApiMock.VerwachtMethodCall("GeefKlantNummerVoorPartijID", "K||1234").ExactAantalKeer(1).DanReturn(KlantId)
 		
-	Set DataVoorToeleveringGenerator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.HoofdDataGenerator.DataVoorToeleveringGenerator).%New(BatchPitchExportedRepositoryMock, OrderApiMock, PartijAPIMock, LegacyPartijApiMock)
+	Set DataVoorToeleveringGenerator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.HoofdDataGenerator.DataVoorToeleveringGenerator).%New(BatchPitchExportedServiceMock, OrderApiMock, PartijAPIMock, LegacyPartijApiMock)
 	#dim BatchNaarObjectiveData As APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.dto.BatchNaarObjectiveData = DataVoorToeleveringGenerator.GenereerData(BatchMock, ToeleveringMock, SequentieNummerToelevering)
 	
 	Do $$$AssertEquals(BatchNaarObjectiveData.DueBefore, VerwachtTijdstipGeformatteerd)
@@ -68,67 +68,68 @@
 	Do OrderMock.Verifieer()
 	Do PartijAPIMock.Verifieer()
 	Do LegacyPartijApiMock.Verifieer()
-	Do BatchPitchExportedRepositoryMock.Verifieer()
+	Do BatchPitchExportedServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Rangorde kan niet bepaald worden aangezien deze leeg is -&gt; error gooien en loggen">
 <Implementation><![CDATA[
-	#dim DummyBatchId As %String = 12345
-	#dim DummySequentieNummerToelevering As %Integer = 1
+	#dim BatchId As %String = 12345
+	#dim SequentieNummerToelevering As %Integer = 1
+	#dim ErrorBoodschap As %String = "Rangorde kan niet gevonden worden aangezien de batch nog niet gepitcht is voor BatchId '12345'."
 	
-	Set BatchPitchedLijst = ##class(%ListOfObjects).%New()
-	#dim BatchPitchedIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(BatchPitchedLijst)
+	Set BatchPitchExportedLijst = ##class(%ListOfObjects).%New()
 	
-	Set BatchPitchedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository).%New()
-	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", DummyBatchId).ExactAantalKeer(1).DanReturn(BatchPitchedIterator)
-	
+	Set BatchPitchExportedServiceMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService).%New()
+	Do BatchPitchExportedServiceMock.VerwachtMethodCall("ZoekViaBatchId", BatchId).ExactAantalKeer(1).DanReturn(BatchPitchExportedLijst)
+		
 	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.VerwachtMethodCall("GeefID").ExactAantalKeer(1).DanReturn(DummyBatchId)
+	Do BatchMock.VerwachtMethodCall("GeefID").ExactAantalKeer(1).DanReturn(BatchId)
 	Do BatchMock.VerwachtMethodCall("GeefLijn").ExactAantalKeer(1).DanDoeNiks()
 	
 	Set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New()
-	Do LoggerMock.VerwachtMethodCall("Error", "BepaalRangorde", "Rangorde kan niet gevonden worden aangezien de batch nog niet gepitcht is voor BatchId '12345'.", $$$False).DanDoeNiks()
-		
-	#dim Substring = ##class(TECH.ListUtils).CreateListOfDataTypes("Rangorde kan niet gevonden worden aangezien de batch nog niet gepitcht is voor BatchId '12345'.")
+	Do LoggerMock.VerwachtMethodCall("Error", "BepaalRangorde", ErrorBoodschap, $$$False).DanDoeNiks()
+	
+	#dim Substring = ##class(TECH.ListUtils).CreateListOfDataTypes(ErrorBoodschap)
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataNotFoundException",Substring))
-	Set DataVoorToeleveringGenerator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.HoofdDataGenerator.DataVoorToeleveringGenerator).%New(BatchPitchedRepositoryMock, "", "", "", LoggerMock)
-	#dim BatchNaarObjectiveData As APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.dto.BatchNaarObjectiveData = DataVoorToeleveringGenerator.GenereerData(BatchMock, "", DummySequentieNummerToelevering)
 	
-	Do BatchPitchedRepositoryMock.Verifieer()
+	Set DataVoorToeleveringGenerator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.HoofdDataGenerator.DataVoorToeleveringGenerator).%New(BatchPitchExportedServiceMock, "", "", "", LoggerMock)
+	#dim BatchNaarObjectiveData As APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.dto.BatchNaarObjectiveData = DataVoorToeleveringGenerator.GenereerData(BatchMock, "", SequentieNummerToelevering)
+	
+	Do BatchPitchExportedServiceMock.Verifieer()
 	Do BatchMock.Verifieer()
 	Do LoggerMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Meerdere objecten worden gevonden -&gt; error gooien en loggen">
 <Implementation><![CDATA[
-	#dim DummyBatchId As %String = 12345
-	#dim DummySequentieNummerToelevering As %Integer = 1
+	#dim BatchId As %String = 12345
+	#dim SequentieNummerToelevering As %Integer = 1
+	#dim ErrorBoodschap As %String = "De rangorde kan niet worden bepaald voor BatchId '12345', aangezien er meerdere batches zijn gepitcht."
 	
-	Set BatchPitched1 = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
-	Set BatchPitched2 = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
-	Set BatchPitchedLijst = ##class(%ListOfObjects).%New()
-	Do BatchPitchedLijst.Insert(BatchPitched1)
-	Do BatchPitchedLijst.Insert(BatchPitched2)
-	#dim BatchPitchedIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(BatchPitchedLijst)
+	Set BatchPitchExported1 = ##class(APPS.Halux.Planning.Pitching.BatchPitchExported).%New()
+	Set BatchPitchExported2 = ##class(APPS.Halux.Planning.Pitching.BatchPitchExported).%New()
+	#dim BatchPitchExportedLijst As %ListOfObjects = ##class(TECH.ListUtils).CreateListOfObjects(BatchPitchExported1, BatchPitchExported2)
 	
-	Set BatchPitchedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository).%New()
-	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", DummyBatchId).ExactAantalKeer(1).DanReturn(BatchPitchedIterator)
+	Set BatchPitchExportedServiceMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService).%New()
+	Do BatchPitchExportedServiceMock.VerwachtMethodCall("ZoekViaBatchId", BatchId).ExactAantalKeer(1).DanReturn(BatchPitchExportedLijst)
 	
 	#dim BatchMock As vhTest.Mock.APPS.Halux.common.Batch = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
-	Do BatchMock.VerwachtMethodCall("GeefID").ExactAantalKeer(1).DanReturn(DummyBatchId)
+	Do BatchMock.VerwachtMethodCall("GeefID").ExactAantalKeer(1).DanReturn(BatchId)
 	Do BatchMock.VerwachtMethodCall("GeefLijn").ExactAantalKeer(1).DanDoeNiks()
 	
+	
 	Set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New()
-	Do LoggerMock.VerwachtMethodCall("Error", "BepaalRangorde", "De rangorde kan niet worden bepaald voor BatchId '12345', aangezien er meerdere batches zijn gepitcht.", $$$False).DanDoeNiks()
+	Do LoggerMock.VerwachtMethodCall("Error", "BepaalRangorde", ErrorBoodschap, $$$False).DanDoeNiks()
 	
-	#dim Substring = ##class(TECH.ListUtils).CreateListOfDataTypes("De rangorde kan niet worden bepaald voor BatchId '12345', aangezien er meerdere batches zijn gepitcht.")
+	#dim Substring = ##class(TECH.ListUtils).CreateListOfDataTypes(ErrorBoodschap)
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataCorruptException",Substring))
-	Set DataVoorToeleveringGenerator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.HoofdDataGenerator.DataVoorToeleveringGenerator).%New(BatchPitchedRepositoryMock, "", "", "", LoggerMock)
-	#dim BatchNaarObjectiveData As APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.dto.BatchNaarObjectiveData = DataVoorToeleveringGenerator.GenereerData(BatchMock, "", DummySequentieNummerToelevering)
 	
-	Do BatchPitchedRepositoryMock.Verifieer()
+	Set DataVoorToeleveringGenerator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.HoofdDataGenerator.DataVoorToeleveringGenerator).%New(BatchPitchExportedServiceMock, "", "", "", LoggerMock)
+	#dim BatchNaarObjectiveData As APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.dto.BatchNaarObjectiveData = DataVoorToeleveringGenerator.GenereerData(BatchMock, "", SequentieNummerToelevering)
+	
+	Do BatchPitchExportedServiceMock.Verifieer()
 	Do BatchMock.Verifieer()
 	Do LoggerMock.Verifieer()
 ]]></Implementation>