Index: vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter/ExporteerBatchPitchedDataNaarObjective/Test.cls.xml
===================================================================
diff -u -r71899 -r74532
--- vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter/ExporteerBatchPitchedDataNaarObjective/Test.cls.xml	(.../Test.cls.xml)	(revision 71899)
+++ vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter/ExporteerBatchPitchedDataNaarObjective/Test.cls.xml	(.../Test.cls.xml)	(revision 74532)
@@ -40,6 +40,7 @@
 <Method name="Test: Indien fase nog niet actief, niets doen">
 <Implementation><![CDATA[
 	Do ..BatchMock.VerwachtMethodCall("IsReedsGestart").ExactAantalKeer(0)
+	Do ..BatchMock.VerwachtMethodCall("GeefCategorie").DanReturn(##class(APPS.Halux.common.enu.Categorie).Merivobox())
 	
 	Set DummyBatchPitchedDto = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
 	#dim BatchPitchedRepositoryMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository = ..GeefBatchPitchedRepositoryMock(..BatchMock, DummyBatchPitchedDto)
@@ -63,6 +64,7 @@
 	
 	Do ..BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
 	Do ..BatchMock.VerwachtMethodCall("GeefID").ExactAantalKeer(0)
+	Do ..BatchMock.VerwachtMethodCall("GeefCategorie").DanReturn(##class(APPS.Halux.common.enu.Categorie).Merivobox())
 	
 	Set DummyBatchPitchedDto = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
 	#dim BatchPitchedRepositoryMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository = ..GeefBatchPitchedRepositoryMock(..BatchMock, DummyBatchPitchedDto)
@@ -83,7 +85,7 @@
 	
 	Do ..BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
 	Do ..BatchMock.VerwachtMethodCall("GeefID").DanReturn(DummyBatchId)
-	Do ..BatchMock.VerwachtMethodCall("GeefCategorie").ExactAantalKeer(0)
+	Do ..BatchMock.VerwachtMethodCall("GeefCategorie").DanReturn(##class(APPS.Halux.common.enu.Categorie).Merivobox())
 	Set DummyBatchPitchedDto = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
 	#dim BatchPitchedRepositoryMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository = ..GeefBatchPitchedRepositoryMock(..BatchMock, DummyBatchPitchedDto)
 	
@@ -108,7 +110,7 @@
 	
 	Do ..BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
 	Do ..BatchMock.VerwachtMethodCall("GeefID").DanReturn(DummyBatchId)
-	Do ..BatchMock.VerwachtMethodCall("GeefCategorie").ExactAantalKeer(1).DanReturn("Legrabox")
+	Do ..BatchMock.VerwachtMethodCall("GeefCategorie").ExactAantalKeer(3).DanReturn("Legrabox")
 	Set DummyBatchPitchedDto = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
 	#dim BatchPitchedRepositoryMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository = ..GeefBatchPitchedRepositoryMock(..BatchMock, DummyBatchPitchedDto)
 	
@@ -132,42 +134,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Indien verzenden batch niet gelukt -&gt; niet markeren als &apos;verzonden&apos; en error loggen">
-<Implementation><![CDATA[
-	#dim DummyBatchId = 12345
-	#dim IsReedsGestart As %Boolean = $$$True
-	#dim IsExported As %Boolean = $$$False
-	
-	Do ..BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
-	Do ..BatchMock.VerwachtMethodCall("GeefID").DanReturn(DummyBatchId)
-	Do ..BatchMock.VerwachtMethodCall("GeefCategorie").DanReturn("Onbepaald")
-	Set DummyBatchPitchedDto = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
-	#dim BatchPitchedRepositoryMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository = ..GeefBatchPitchedRepositoryMock(..BatchMock, DummyBatchPitchedDto)
-	
-	#dim BatchesExportedLijst As %ListOfObjects = ..GeefBatchesExportedLijst(DummyBatchId, IsExported)
-	
-	Set BatchPitchExportedServiceMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService).%New()
-	Do BatchPitchExportedServiceMock.VerwachtMethodCall("ZoekViaBatchId", DummyBatchId).DanReturn(BatchesExportedLijst)
-	Do BatchPitchExportedServiceMock.VerwachtMethodCall("MarkeerBatchAlsExportedNaarObjective", DummyBatchId).ExactAantalKeer(0)
-	Do BatchPitchExportedServiceMock.VerwachtMethodCall("BepaalVolgnummerEnBewaar", DummyBatchPitchedDto).DanDoeNiks()
-	
-	Set BatchNaarObjectiveUitvoeringInfoRepositoryMock = ##class(vhTest.Mock.APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfoRepository).%New()
-	Do BatchNaarObjectiveUitvoeringInfoRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", DummyBatchId).ExactAantalKeer(0)
-	
-	Set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New()
-	Do LoggerMock.VerwachtMethodCall("Error", "TriggerBatchNaarObjectiveAansturingActie", "De identifier 'TriggerBatchNaarObjectiveAansturingActie voor categorie 'Onbepaald'.' wordt niet ondersteund door de klasse 'APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter.", $$$False).DanDoeNiks()
-	
-	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(..MESServiceStub, BatchPitchedRepositoryMock, BatchNaarObjectiveUitvoeringInfoRepositoryMock, LoggerMock, BatchPitchExportedServiceMock)
-	Do BatchPitchDataExporter.ExporteerBatchPitchedDataNaarObjective()
-	
-	Do ..BatchMock.Verifieer()
-	Do BatchPitchedRepositoryMock.Verifieer()
-	Do BatchNaarObjectiveUitvoeringInfoRepositoryMock.Verifieer()
-	Do BatchPitchExportedServiceMock.Verifieer()
-	Do LoggerMock.Verifieer()
-]]></Implementation>
-</Method>
-
 <Method name="Test: Indien meerdere verzonden batches -&gt; geen error gooien, wel loggen">
 <Implementation><![CDATA[
 	#dim DummyBatchId = 12345
@@ -177,9 +143,9 @@
 	
 	Set BatchMock = ##class(vhTest.Mock.APPS.Halux.common.Batch).%New()
 	Do BatchMock.IndienMethodCall("GeefLijn").DanReturn(..#Lijn)
-	Do BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
-	Do BatchMock.VerwachtMethodCall("GeefID").DanReturn(DummyBatchId)
-	Do BatchMock.VerwachtMethodCall("GeefCategorie").ExactAantalKeer(0)
+	Do BatchMock.IndienMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
+	Do BatchMock.IndienMethodCall("GeefID").DanReturn(DummyBatchId)
+	Do BatchMock.VerwachtMethodCall("GeefCategorie").DanReturn(##class(APPS.Halux.common.enu.Categorie).Merivobox())
 	Set DummyBatchPitchedDto = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
 	#dim BatchPitchedRepositoryMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository = ..GeefBatchPitchedRepositoryMock(BatchMock, DummyBatchPitchedDto)
 	
@@ -209,6 +175,7 @@
 	Do ..BatchMock.IndienMethodCall("GeefLijn").DanReturn(..#Lijn)
 	Do ..BatchMock.VerwachtMethodCall("GeefID").DanReturn(DummyBatchId)
 	Do ..BatchMock.VerwachtMethodCall("IsReedsGestart").DanReturn(IsReedsGestart)
+	Do ..BatchMock.VerwachtMethodCall("GeefCategorie").DanReturn(##class(APPS.Halux.common.enu.Categorie).Merivobox())
 	
 	Set DummyBatchPitchedDto = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
 	#dim BatchPitchedRepositoryMock As vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository = ..GeefBatchPitchedRepositoryMock(..BatchMock, DummyBatchPitchedDto)
@@ -220,7 +187,7 @@
 	Do BatchPitchExportedServiceMock.IndienMethodCall("BepaalVolgnummerEnBewaar", DummyBatchPitchedDto).DanException(EenExceptie)
 	
 	Set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New()
-	Do LoggerMock.VerwachtMethodCall("Error", "ExporteerBatchPitchedDataNaarObjective", "EenExceptie", $$$False).DanDoeNiks()
+	Do LoggerMock.VerwachtMethodCall("ErrorMail", "ExporteerBatchPitchedDataNaarObjective", "EenExceptie").DanDoeNiks()
 	
 	Set BatchPitchDataExporter = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New(..MESServiceStub, BatchPitchedRepositoryMock,, LoggerMock, BatchPitchExportedServiceMock)
 	Do BatchPitchDataExporter.ExporteerBatchPitchedDataNaarObjective()