Index: vhUnitTest/AXimpl/MessageInProcessor/Verwerk/Test.cls.xml
===================================================================
diff -u -r49403 -r54725
--- vhUnitTest/AXimpl/MessageInProcessor/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 49403)
+++ vhUnitTest/AXimpl/MessageInProcessor/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 54725)
@@ -18,13 +18,26 @@
 <Private>1</Private>
 </Property>
 
+<Property name="MailAPI">
+<Type>TECH.Mail.MailAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="VerwerkBestandOpnieuwAanvraagRepository">
+<Type>AXimpl.VerwerkBestandOpnieuwAanvraagRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ##super()
 	Set ..FileAPI = ##class(vhTest.Fake.TECH.File.FileAPI).%New()
 	Set ..XmlCorrelater = ##class(vhTest.Fake.TECH.XMLCorrelater).%New()
 	Set ..EventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
+	Set ..VerwerkBestandOpnieuwAanvraagRepository = ##class(vhTest.Fake.AXimpl.VerwerkBestandOpnieuwAanvraagRepository).%New()
+	Set ..MailAPI = ##class(vhTest.Fake.TECH.Mail.MailAPI).%New()
+	Do ##class(vhTest.Fake.TECH.DateTime.DateTimeAPI).Activeer()
 ]]></Implementation>
 </Method>
 
@@ -37,7 +50,18 @@
 
 <Method name="Test: Standaard gedrag">
 <Implementation><![CDATA[
+	
+	Set DirectoryList = ##class(%ListOfDataTypes).%New()
+	Set AXUtilsMock = ##class(vhTest.Mock.AXimpl.Utils).%New()
+	Do AXUtilsMock.IndienMethodCall("GeefAXRequestDirectoryList",$$$ElkeWaarde).DanReturn(DirectoryList)
+		
+	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
 	#dim Filename As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath") _"\SalesOrder\Create\File.txt"
+	#dim FileList as %ListOfDatypes = ##class(TECH.ListUtils).CreateListOfDataTypes(Filename)
+	
+	Set FilesMock = ##class(vhTest.Mock.TECH.Files).%New()
+	Set DummyList = ##class(%ListOfDataTypes).%New()
+	Do FilesMock.VerwachtMethodCall("GetFilesFromListOfDirectories",..Matches.List( DummyList ),"*.xml",20).DanReturn(##class(TECH.ListIterator).%New( FileList))
 
 	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
 	Do FileAPIMock.IndienMethodCall("FileExists",Filename).DanReturn($$$True)
@@ -55,36 +79,17 @@
 	Do ConfigInMock.VerwachtMethodCall("GetRequestEnvelope", "SalesOrder/Create").DanReturn("AXif.Dynamics.SalesOrderIn.Envelope")
 	Do ConfigInMock.VerwachtMethodCall("GetConverter", "SalesOrder/Create").DanReturn(SalesOrderConverterMock)
 	
-	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterMock,,ConfigInMock)
-	Do MessageInProcessor.Verwerk(Filename)
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterMock,,ConfigInMock,,,,AXUtilsMock,FilesMock)
+	Do MessageInProcessor.Verwerk()
 	
 	Do ConfigInMock.Verifieer()
 	Do FileAPIMock.Verifieer()
+	Do FilesMock.Verifieer()
 	Do XmlCorrelaterMock.Verifieer()
 	Do SalesOrderConverterMock.Verifieer()
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Bestand bestaat niet -&gt; niets doen">
-<Implementation><![CDATA[
-	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_IF_IN_ErrorPath","E:\Errors",..#Applicatie)
-	
-	#dim Stream As %Stream.Object = ..XmlStream()
-	#dim FileReader As TECH.File.FileReader = ##class(vhTest.Fake.TECH.File.FileReader).%New(Stream)
-	#dim Filename As %String = "E:\File.txt"
-	
-	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
-	Do FileAPIMock.VerwachtMethodCall("FileExists",Filename).DanReturn($$$False)
-	Do FileAPIMock.VerwachtMethodCall("GeefFileReader",Filename).ExactAantalKeer(0)
-	Do FileAPIMock.VerwachtMethodCall("MoveFile",Filename,"E:\Errors\File.txt").ExactAantalKeer(0)
-			
-	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock)
-	do MessageInProcessor.Verwerk(Filename)
-	
-	do FileAPIMock.Verifieer()
-]]></Implementation>
-</Method>
-
 <Method name="Test: Bestand kan niet gecorreleerd worden">
 <Implementation><![CDATA[
 	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_IF_IN_ErrorPath","E:\Errors",..#Applicatie)
@@ -96,8 +101,19 @@
 	Set DirectoryUtilsStub = ##class(vhTest.Mock.TECH.File.DirectoryUtils).%New()
 	Do DirectoryUtilsStub.IndienMethodCall("CreateIfNotExists",$$$ElkeWaarde).DanDoeNiks()
 	
+	
+	Set DirectoryList = ##class(%ListOfDataTypes).%New()
+	Set AXUtilsMock = ##class(vhTest.Mock.AXimpl.Utils).%New()
+	Do AXUtilsMock.IndienMethodCall("GeefAXRequestDirectoryList",$$$ElkeWaarde).DanReturn(DirectoryList)
+		
+	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
+	#dim FileList as %ListOfDatypes = ##class(TECH.ListUtils).CreateListOfDataTypes(Filename)
+	
+	Set FilesMock = ##class(vhTest.Mock.TECH.Files).%New()
+	Set DummyList = ##class(%ListOfDataTypes).%New()
+	Do FilesMock.VerwachtMethodCall("GetFilesFromListOfDirectories",..Matches.List( DummyList ),"*.xml",20).DanReturn(##class(TECH.ListIterator).%New( FileList))
+	
 	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
-	Do FileAPIMock.IndienMethodCall("FileExists",Filename).DanReturn($$$True)
 	Do FileAPIMock.IndienMethodCall("GeefDirectoryUtils").DanReturn(DirectoryUtilsStub)
 	Do FileAPIMock.VerwachtMethodCall("GeefFileReader",Filename).DanReturn(FileReader)
 	Do FileAPIMock.IndienMethodCall("MoveFile",Filename,$$$ElkeWaarde).DanDoeNiks()
@@ -108,11 +124,12 @@
 	Set EventRaiserMock = ##class(vhTest.Mock.AXimpl.EventRaiser).%New()
 	Do EventRaiserMock.VerwachtMethodCall("RaiseCorruptedRequestReceivedEvent",Filename,..Matches.Stream(Stream))
 	
-	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterStub,EventRaiserMock,)
-	do MessageInProcessor.Verwerk(Filename)
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterStub,EventRaiserMock,,,,,AXUtilsMock,FilesMock)
+	do MessageInProcessor.Verwerk()
 	
 	do FileAPIMock.Verifieer()
 	do EventRaiserMock.Verifieer()
+	Do FilesMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -126,9 +143,20 @@
 	
 	Set DirectoryUtilsStub = ##class(vhTest.Mock.TECH.File.DirectoryUtils).%New()
 	Do DirectoryUtilsStub.IndienMethodCall("CreateIfNotExists",$$$ElkeWaarde).DanDoeNiks()
+
+
+	Set DirectoryList = ##class(%ListOfDataTypes).%New()
+	Set AXUtilsMock = ##class(vhTest.Mock.AXimpl.Utils).%New()
+	Do AXUtilsMock.IndienMethodCall("GeefAXRequestDirectoryList",$$$ElkeWaarde).DanReturn(DirectoryList)
+		
+	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
+	#dim FileList as %ListOfDatypes = ##class(TECH.ListUtils).CreateListOfDataTypes(Filename)
 	
+	Set FilesMock = ##class(vhTest.Mock.TECH.Files).%New()
+	Set DummyList = ##class(%ListOfDataTypes).%New()
+	Do FilesMock.IndienMethodCall("GetFilesFromListOfDirectories",..Matches.List( DummyList ),"*.xml",20).DanReturn(##class(TECH.ListIterator).%New( FileList))
+	
 	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
-	Do FileAPIMock.IndienMethodCall("FileExists",Filename).DanReturn($$$True)
 	Do FileAPIMock.IndienMethodCall("GeefDirectoryUtils").DanReturn(DirectoryUtilsStub)
 	Do FileAPIMock.VerwachtMethodCall("GeefFileReader",Filename).DanReturn(FileReader)
 	Do FileAPIMock.IndienMethodCall("MoveFile",Filename,$$$ElkeWaarde).DanException(##class(TECH.Exceptions.GeneralErrorException).%New($$$DummyString))
@@ -139,19 +167,366 @@
 	Set EventRaiserMock = ##class(vhTest.Mock.AXimpl.EventRaiser).%New()
 	Do EventRaiserMock.VerwachtMethodCall("RaiseCorruptedRequestReceivedEvent",Filename,..Matches.Stream(Stream))
 	
-	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterStub,EventRaiserMock,)
-	do MessageInProcessor.Verwerk(Filename)
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterStub,EventRaiserMock,,,,,AXUtilsMock,FilesMock)
+	do MessageInProcessor.Verwerk()
 	
 	do FileAPIMock.Verifieer()
 	do EventRaiserMock.Verifieer()
 ]]></Implementation>
 </Method>
 
+<Method name="Test Verwerk standaard gedrag verwerkt 1e xml bestand van de 3 bestanden">
+<Implementation><![CDATA[
+	Set DirectoryList = ##class(%ListOfDataTypes).%New()
+	Set AXUtilsMock = ##class(vhTest.Mock.AXimpl.Utils).%New()
+	Do AXUtilsMock.IndienMethodCall("GeefAXRequestDirectoryList",$$$ElkeWaarde).DanReturn(DirectoryList)
+		
+	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
+	#dim Filename As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath") _"\SalesOrder\Create\File.txt"
+	
+	Set FilesMock = ##class(vhTest.Mock.TECH.Files).%New()
+	Set DummyList = ##class(%ListOfDataTypes).%New()
+
+	#dim FileList as %ListOfDatypes = ..GeefFileList()
+
+	Do FilesMock.VerwachtMethodCall("GetFilesFromListOfDirectories",..Matches.List( DummyList ),"*.xml",20).DanReturn(##class(TECH.ListIterator).%New( FileList))
+
+	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	Do FileAPIMock.IndienMethodCall("GeefFileReader",FileList.GetAt(1)).DanReturn(##class(vhTest.Fake.TECH.File.FileReader).%New())
+	Do FileAPIMock.VerwachtMethodCall("DeleteFile",FileList.GetAt(1)).DanDoeNiks()
+
+	#dim AifMessage = ##class(AXif.Dynamics.SalesOrderIn.Envelope).%New()
+	Set XmlCorrelaterMock = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
+	Do XmlCorrelaterMock.VerwachtMethodCall("GeefObjectVanBestand",FileList.GetAt(1),"AXif.Dynamics.SalesOrderIn.Envelope","Envelope").DanReturn(AifMessage)
+	
+	Set SalesOrderConverterMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter).%New()
+	Do SalesOrderConverterMock.VerwachtMethodCall("Convert", AifMessage).DanDoeNiks()
+		
+	Set ConfigInMock = ##class(vhTest.Mock.AXimpl.ConfigIn).%New()
+	Do ConfigInMock.VerwachtMethodCall("GetRequestEnvelope", "SalesOrder/Create").DanReturn("AXif.Dynamics.SalesOrderIn.Envelope")
+	Do ConfigInMock.VerwachtMethodCall("GetConverter", "SalesOrder/Create").DanReturn(SalesOrderConverterMock)
+	
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterMock,,ConfigInMock,,,,AXUtilsMock,FilesMock)
+
+	Do MessageInProcessor.Verwerk()
+	
+	
+	Do ConfigInMock.Verifieer()
+	Do SalesOrderConverterMock.Verifieer()
+	Do XmlCorrelaterMock.Verifieer()
+	Do FileAPIMock.Verifieer()
+	Do FilesMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test Verwerk verwerkt 2e xml bestand van de 3 bestanden na VerwerkAXBerichtLaterOpnieuwException op 1e bestand">
+<Implementation><![CDATA[
+	Set DirectoryList = ##class(%ListOfDataTypes).%New()
+	Set AXUtilsMock = ##class(vhTest.Mock.AXimpl.Utils).%New()
+	Do AXUtilsMock.IndienMethodCall("GeefAXRequestDirectoryList",$$$ElkeWaarde).DanReturn(DirectoryList)
+		
+	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
+	#dim Filename As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath") _"\SalesOrder\Create\File.txt"	
+	Set FilesMock = ##class(vhTest.Mock.TECH.Files).%New()
+	Set DummyList = ##class(%ListOfDataTypes).%New()
+
+	#dim FileList as %ListOfDatypes = ..GeefFileList()
+	Do FilesMock.VerwachtMethodCall("GetFilesFromListOfDirectories",..Matches.List( DummyList ),"*.xml",20).DanReturn(##class(TECH.ListIterator).%New( FileList))
+
+	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	Do FileAPIMock.IndienMethodCall("GeefFileReader",$$$ElkeWaarde).DanReturn(##class(vhTest.Fake.TECH.File.FileReader).%New())
+	Do FileAPIMock.VerwachtMethodCall("DeleteFile",FileList.GetAt(1)).Nooit()
+	Do FileAPIMock.VerwachtMethodCall("DeleteFile",FileList.GetAt(2)).DanDoeNiks()
+
+	#dim AifMessage1 = ##class(AXif.Dynamics.SalesOrderIn.Envelope).%New()
+	#dim AifMessage2 = ##class(AXif.Dynamics.SalesOrderIn.Envelope).%New()
+	Set XmlCorrelaterMock = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
+	Do XmlCorrelaterMock.VerwachtMethodCall("GeefObjectVanBestand",FileList.GetAt(1),"AXif.Dynamics.SalesOrderIn.Envelope","Envelope").DanReturn(AifMessage1)
+	Do XmlCorrelaterMock.VerwachtMethodCall("GeefObjectVanBestand",FileList.GetAt(2),"AXif.Dynamics.SalesOrderIn.Envelope","Envelope").DanReturn(AifMessage2)
+	
+	Set SalesOrderConverterMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter).%New()
+	Set VerwerkOpnieuwException = ##class(AXimpl.VerwerkAXBerichtLaterOpnieuwException).%New("Probeer later nog eens")
+	Do SalesOrderConverterMock.IndienMethodCall("Convert", AifMessage1).DanException(VerwerkOpnieuwException)
+	Do SalesOrderConverterMock.VerwachtMethodCall("Convert", AifMessage2).DanDoeNiks()
+		
+	Set ConfigInMock = ##class(vhTest.Mock.AXimpl.ConfigIn).%New()
+	Do ConfigInMock.VerwachtMethodCall("GetRequestEnvelope", "SalesOrder/Create").DanReturn("AXif.Dynamics.SalesOrderIn.Envelope")
+	Do ConfigInMock.VerwachtMethodCall("GetConverter", "SalesOrder/Create").DanReturn(SalesOrderConverterMock)
+	
+	Set VerwerkBestandOpnieuwAanvraagRepositoryMock = ##class(vhTest.Mock.AXimpl.VerwerkBestandOpnieuwAanvraagRepository).%New()
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("BestaatViaBestandnaam",FileList.GetAt(1)).DanReturn($$$False)
+	Set Aanvraag = ##class(AXimpl.VerwerkBestandOpnieuwAanvraag).%New()
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("Maak").DanReturn(Aanvraag)
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("Bewaar",Aanvraag).DanDoeNiks()
+	
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterMock,,ConfigInMock,VerwerkBestandOpnieuwAanvraagRepositoryMock,,,AXUtilsMock,FilesMock)
+	Do MessageInProcessor.Verwerk()
+	
+	Do $$$AssertEquals(Aanvraag.Teller,1)		
+	Do $$$AssertEquals(Aanvraag.BestandNaam,FileList.GetAt(1))
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.Verifieer()
+	Do ConfigInMock.Verifieer()
+	Do SalesOrderConverterMock.Verifieer()
+	Do XmlCorrelaterMock.Verifieer()
+	Do FileAPIMock.Verifieer()
+	Do FilesMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test Verwerk gedrag indien alle files een VerwerkAXBerichtLaterOpnieuwException gooien">
+<Implementation><![CDATA[
+	Set DirectoryList = ##class(%ListOfDataTypes).%New()
+	Set AXUtilsMock = ##class(vhTest.Mock.AXimpl.Utils).%New()
+	Do AXUtilsMock.IndienMethodCall("GeefAXRequestDirectoryList",$$$ElkeWaarde).DanReturn(DirectoryList)
+		
+	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
+	#dim Filename As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath") _"\SalesOrder\Create\File.txt"
+	
+	Set FilesMock = ##class(vhTest.Mock.TECH.Files).%New()
+	Set DummyList = ##class(%ListOfDataTypes).%New()
+
+	#dim FileList as %ListOfDatypes = ..GeefFileList()
+
+	Do FilesMock.VerwachtMethodCall("GetFilesFromListOfDirectories",..Matches.List( DummyList ),"*.xml",20).DanReturn(##class(TECH.ListIterator).%New( FileList))
+
+	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	Do FileAPIMock.IndienMethodCall("GeefFileReader",$$$ElkeWaarde).DanReturn(##class(vhTest.Fake.TECH.File.FileReader).%New())
+	Do FileAPIMock.VerwachtMethodCall("DeleteFile",FileList.GetAt(1)).Nooit()
+	Do FileAPIMock.VerwachtMethodCall("DeleteFile",FileList.GetAt(2)).Nooit()
+	Do FileAPIMock.VerwachtMethodCall("DeleteFile",FileList.GetAt(3)).Nooit()
+
+	#dim AifMessage = ##class(AXif.Dynamics.SalesOrderIn.Envelope).%New()
+	Set XmlCorrelaterMock = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
+	Do XmlCorrelaterMock.IndienMethodCall("GeefObjectVanBestand",$$$ElkeWaarde,"AXif.Dynamics.SalesOrderIn.Envelope","Envelope").DanReturn(AifMessage)
+	
+	Set SalesOrderConverterMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter).%New()
+	Set VerwerkOpnieuwException = ##class(AXimpl.VerwerkAXBerichtLaterOpnieuwException).%New("Probeer later nog eens")
+	Do SalesOrderConverterMock.IndienMethodCall("Convert", AifMessage).DanException(VerwerkOpnieuwException)
+		
+	Set ConfigInMock = ##class(vhTest.Mock.AXimpl.ConfigIn).%New()
+	Do ConfigInMock.IndienMethodCall("GetRequestEnvelope", "SalesOrder/Create").DanReturn("AXif.Dynamics.SalesOrderIn.Envelope")
+	Do ConfigInMock.IndienMethodCall("GetConverter", "SalesOrder/Create").DanReturn(SalesOrderConverterMock)
+
+	Set VerwerkBestandOpnieuwAanvraagRepositoryMock = ##class(vhTest.Mock.AXimpl.VerwerkBestandOpnieuwAanvraagRepository).%New()
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("BestaatViaBestandnaam",FileList.GetAt(1)).DanReturn($$$True)
+	Set Aanvraag1 = ##class(AXimpl.VerwerkBestandOpnieuwAanvraag).%New()
+	set Aanvraag1.Teller = 5
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("GeefViaBestandNaam",FileList.GetAt(1)).DanReturn(Aanvraag1)
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("Bewaar",Aanvraag1).DanDoeNiks()
+	
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("BestaatViaBestandnaam",FileList.GetAt(2)).DanReturn($$$False)
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("BestaatViaBestandnaam",FileList.GetAt(3)).DanReturn($$$False)
+	
+	Set Aanvraag = ##class(AXimpl.VerwerkBestandOpnieuwAanvraag).%New()
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("Maak").DanReturn(Aanvraag).ExactAantalKeer(2)
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("Bewaar",Aanvraag).DanDoeNiks()
+
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterMock,,ConfigInMock,VerwerkBestandOpnieuwAanvraagRepositoryMock,,,AXUtilsMock,FilesMock)
+
+	Do MessageInProcessor.Verwerk()
+
+	Do $$$AssertEquals(Aanvraag1.Teller,6)	
+	Do $$$AssertEquals(Aanvraag.Teller,1)	
+
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.Verifieer()		
+	Do FileAPIMock.Verifieer()
+	Do FilesMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Goed opnieuw verwerken verwerken van eerder geprobeerd bericht past het verwerkt tijdstip van de VerwerkBestandOpnieuwAanvraag">
+<Implementation><![CDATA[
+	Set DirectoryList = ##class(%ListOfDataTypes).%New()
+	Set AXUtilsMock = ##class(vhTest.Mock.AXimpl.Utils).%New()
+	Do AXUtilsMock.IndienMethodCall("GeefAXRequestDirectoryList",$$$ElkeWaarde).DanReturn(DirectoryList)
+		
+	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
+	#dim Filename As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath") _"\SalesOrder\Create\File.txt"
+	#dim FileList as %ListOfDatypes = ##class(TECH.ListUtils).CreateListOfDataTypes(Filename)
+	
+	Set FilesMock = ##class(vhTest.Mock.TECH.Files).%New()
+	Set DummyList = ##class(%ListOfDataTypes).%New()
+	Do FilesMock.VerwachtMethodCall("GetFilesFromListOfDirectories",..Matches.List( DummyList ),"*.xml",20).DanReturn(##class(TECH.ListIterator).%New( FileList))
+
+	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	Do FileAPIMock.IndienMethodCall("FileExists",Filename).DanReturn($$$True)
+	Do FileAPIMock.VerwachtMethodCall("GeefFileReader",Filename).DanReturn(##class(vhTest.Fake.TECH.File.FileReader).%New())
+	Do FileAPIMock.VerwachtMethodCall("DeleteFile",Filename)
+	
+	#dim AifMessage = ##class(AXif.Dynamics.SalesOrderIn.Envelope).%New()
+	Set XmlCorrelaterMock = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
+	Do XmlCorrelaterMock.VerwachtMethodCall("GeefObjectVanBestand",Filename,"AXif.Dynamics.SalesOrderIn.Envelope","Envelope").DanReturn(AifMessage)
+	
+	Set SalesOrderConverterMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter).%New()
+	Do SalesOrderConverterMock.VerwachtMethodCall("Convert", AifMessage).DanDoeNiks()
+		
+	Set ConfigInMock = ##class(vhTest.Mock.AXimpl.ConfigIn).%New()
+	Do ConfigInMock.VerwachtMethodCall("GetRequestEnvelope", "SalesOrder/Create").DanReturn("AXif.Dynamics.SalesOrderIn.Envelope")
+	Do ConfigInMock.VerwachtMethodCall("GetConverter", "SalesOrder/Create").DanReturn(SalesOrderConverterMock)
+
+	Set VerwerkBestandOpnieuwAanvraagRepositoryMock = ##class(vhTest.Mock.AXimpl.VerwerkBestandOpnieuwAanvraagRepository).%New()
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("BestaatViaBestandnaam",FileList.GetAt(1)).DanReturn($$$True)
+	Set Aanvraag1 = ##class(AXimpl.VerwerkBestandOpnieuwAanvraag).%New()
+	set Aanvraag1.Teller = 5
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("GeefViaBestandNaam",FileList.GetAt(1)).DanReturn(Aanvraag1)
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("Bewaar",Aanvraag1).DanDoeNiks()
+	
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterMock,,ConfigInMock,VerwerkBestandOpnieuwAanvraagRepositoryMock,,,AXUtilsMock,FilesMock)
+	Do MessageInProcessor.Verwerk()
+	
+	Do $$$AssertEquals(Aanvraag1.Teller,5)
+	Do $$$AssertEquals(Aanvraag1.VerwerktOp ,"2011-06-30 09:15:00")
+	
+	Do ConfigInMock.Verifieer()
+	Do FileAPIMock.Verifieer()
+	Do XmlCorrelaterMock.Verifieer()
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.Verifieer()		
+	Do SalesOrderConverterMock.Verifieer()
+	Do FilesMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test Verwerk stuurt een mail indien een bestand meer dan 300 geprobeerd te verwerken is, en daana om de 60 keer">
+<Implementation><![CDATA[
+	Set DirectoryList = ##class(%ListOfDataTypes).%New()
+	Set AXUtilsMock = ##class(vhTest.Mock.AXimpl.Utils).%New()
+	Do AXUtilsMock.IndienMethodCall("GeefAXRequestDirectoryList",$$$ElkeWaarde).DanReturn(DirectoryList)
+		
+	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
+	#dim Filename As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath") _"\SalesOrder\Create\File.txt"
+	
+	Set FilesMock = ##class(vhTest.Mock.TECH.Files).%New()
+	Set DummyList = ##class(%ListOfDataTypes).%New()
+		
+	#dim FileList as %ListOfDatypes = ..GeefFileList()
+	Do FilesMock.VerwachtMethodCall("GetFilesFromListOfDirectories",..Matches.List( DummyList ),"*.xml",20).DanReturn(##class(TECH.ListIterator).%New( FileList))
+
+	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	Do FileAPIMock.IndienMethodCall("GeefFileReader",$$$ElkeWaarde).DanReturn(##class(vhTest.Fake.TECH.File.FileReader).%New())
+	Do FileAPIMock.VerwachtMethodCall("DeleteFile",FileList.GetAt(1)).Nooit()
+	Do FileAPIMock.VerwachtMethodCall("DeleteFile",FileList.GetAt(2)).Nooit()
+	Do FileAPIMock.VerwachtMethodCall("DeleteFile",FileList.GetAt(3)).DanDoeNiks()
+
+	#dim AifMessage1 = ##class(AXif.Dynamics.SalesOrderIn.Envelope).%New()
+	#dim AifMessage2 = ##class(AXif.Dynamics.SalesOrderIn.Envelope).%New()
+	#dim AifMessage3 = ##class(AXif.Dynamics.SalesOrderIn.Envelope).%New()
+	Set XmlCorrelaterMock = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
+	Do XmlCorrelaterMock.VerwachtMethodCall("GeefObjectVanBestand",FileList.GetAt(1),"AXif.Dynamics.SalesOrderIn.Envelope","Envelope").DanReturn(AifMessage1)
+	Do XmlCorrelaterMock.VerwachtMethodCall("GeefObjectVanBestand",FileList.GetAt(2),"AXif.Dynamics.SalesOrderIn.Envelope","Envelope").DanReturn(AifMessage2)
+	Do XmlCorrelaterMock.VerwachtMethodCall("GeefObjectVanBestand",FileList.GetAt(3),"AXif.Dynamics.SalesOrderIn.Envelope","Envelope").DanReturn(AifMessage3)
+	
+	Set SalesOrderConverterMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter).%New()
+	Set VerwerkOpnieuwException = ##class(AXimpl.VerwerkAXBerichtLaterOpnieuwException).%New("Probeer later nog eens")
+	Do SalesOrderConverterMock.IndienMethodCall("Convert", AifMessage1).DanException(VerwerkOpnieuwException)
+	Do SalesOrderConverterMock.IndienMethodCall("Convert", AifMessage2).DanException(VerwerkOpnieuwException)
+	Do SalesOrderConverterMock.VerwachtMethodCall("Convert", AifMessage3).DanDoeNiks()
+		
+	Set ConfigInMock = ##class(vhTest.Mock.AXimpl.ConfigIn).%New()
+	Do ConfigInMock.VerwachtMethodCall("GetRequestEnvelope", "SalesOrder/Create").DanReturn("AXif.Dynamics.SalesOrderIn.Envelope")
+	Do ConfigInMock.VerwachtMethodCall("GetConverter", "SalesOrder/Create").DanReturn(SalesOrderConverterMock)
+	
+	Set VerwerkBestandOpnieuwAanvraagRepositoryMock = ##class(vhTest.Mock.AXimpl.VerwerkBestandOpnieuwAanvraagRepository).%New()
+
+	Set Aanvraag1 = ##class(AXimpl.VerwerkBestandOpnieuwAanvraag).%New()
+	Set Aanvraag1.Teller = 299
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("BestaatViaBestandnaam",FileList.GetAt(1)).DanReturn($$$True)
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("GeefViaBestandNaam",FileList.GetAt(1)).DanReturn(Aanvraag1)
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("Bewaar",Aanvraag1).DanDoeNiks()
+
+	Set Aanvraag2 = ##class(AXimpl.VerwerkBestandOpnieuwAanvraag).%New()
+	Set Aanvraag2.Teller = 359
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("BestaatViaBestandnaam",FileList.GetAt(2)).DanReturn($$$True)
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("GeefViaBestandNaam",FileList.GetAt(2)).DanReturn(Aanvraag2)
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("Bewaar",Aanvraag2).DanDoeNiks()
+
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("BestaatViaBestandnaam",FileList.GetAt(3)).DanReturn($$$False)
+
+	Set MailAPIMock = ##class(vhTest.Mock.TECH.Mail.MailAPI).%New()
+	Set MailMock = ##class(vhTest.Mock.TECH.Mail.Mail).%New()
+	Do MailMock.VerwachtMethodCall("ZetVerzender",$$$SystemMail("AXimpl.MessageInProcessor")).DanDoeNiks()
+	Do MailMock.VerwachtMethodCall("VoegToeOntvanger","ICT_Meldingen@vanhoecke.be")
+	Do MailMock.VerwachtMethodCall("ZetOnderwerp","AX bericht geraakt niet verwerkt")
+	#Dim MeldingTekst as %String = "Bericht in bestand '"_FileList.GetAt(1) _"' geraakt reeds meer dan 5 minuten niet verwerkt. Check de log om te zien waarom."
+	Do MailMock.VerwachtMethodCall("ZetInhoud","Beste,"_ $$$CRLF _ $$$CRLF _ MeldingTekst)
+	Set MeldingTekst = "Bericht in bestand '"_FileList.GetAt(2) _"' geraakt reeds meer dan 5 minuten niet verwerkt. Check de log om te zien waarom."
+	Do MailMock.VerwachtMethodCall("ZetInhoud","Beste,"_ $$$CRLF _ $$$CRLF _ MeldingTekst)
+	
+	Do MailAPIMock.VerwachtMethodCall("MaakNieuwMail").DanReturn(MailMock)
+
+	Do MailAPIMock.VerwachtMethodCall("VerstuurMail",MailMock).DanDoeNiks().ExactAantalKeer(2)
+
+	;#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterMock,,ConfigInMock,,,,AXUtilsMock,FilesMock)
+
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterMock,,ConfigInMock,VerwerkBestandOpnieuwAanvraagRepositoryMock,MailAPIMock,,AXUtilsMock,FilesMock)
+	Do MessageInProcessor.Verwerk()
+	
+	Do $$$AssertEquals(Aanvraag1.Teller,300)		
+	Do $$$AssertEquals(Aanvraag2.Teller,360)		
+	
+	Do MailMock.Verifieer()
+	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.Verifieer()
+	Do ConfigInMock.Verifieer()
+	Do SalesOrderConverterMock.Verifieer()
+	Do XmlCorrelaterMock.Verifieer()
+	Do MailAPIMock.Verifieer()
+	Do FileAPIMock.Verifieer()
+	Do FilesMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: ExceptionLogger wordt opgeroepen indien een fout, verschillend van VerwerkAXBerichtLaterOpnieuwException, optreedt bij het verwerken">
+<Implementation><![CDATA[
+	#dim RandomFullFileName As %String = "RandomFullFileName"
+	#dim DummyException As TECH.IException = $$$DummyException
+	
+	#dim FileIteratorStub As vhTest.Mock.TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do FileIteratorStub.IndienMethodCall("Reset").DanDoeNiks()
+	Do FileIteratorStub.IndienMethodCall("HasNext").DanReturn($$$True)
+	Do FileIteratorStub.IndienMethodCall("Next").DanReturn(RandomFullFileName)
+
+
+	Set DirectoryList = ##class(%ListOfDataTypes).%New()
+	Set AXUtilsMock = ##class(vhTest.Mock.AXimpl.Utils).%New()
+	Do AXUtilsMock.IndienMethodCall("GeefAXRequestDirectoryList",$$$ElkeWaarde).DanReturn(DirectoryList)
+		
+	;#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
+	;#dim Filename As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath") _"\SalesOrder\Create\File.txt"
+	
+	Set FilesMock = ##class(vhTest.Mock.TECH.Files).%New()
+	Set DummyList = ##class(%ListOfDataTypes).%New()
+	Do FilesMock.IndienMethodCall("GetFilesFromListOfDirectories",..Matches.List( DummyList ),"*.xml",20).DanReturn(FileIteratorStub)
+	
+	#dim FileApiStub As vhTest.Mock.TECH.File.FileAPI = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	Do FileApiStub.IndienMethodCall("GetFileList", $$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(FileIteratorStub)
+	Do FileApiStub.IndienMethodCall("GeefFileReader", RandomFullFileName).DanException(DummyException)
+	
+	#dim ExceptionLoggerMock As vhTest.Mock.AXimpl.MessageInProcessor.ExceptionLogger = ##class(vhTest.Mock.AXimpl.MessageInProcessor.ExceptionLogger).%New()
+	Do ExceptionLoggerMock.VerwachtMethodCall("LogException", RandomFullFileName, DummyException).DanDoeNiks()
+	
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ##class(AXimpl.MessageInProcessor).%New(FileApiStub,,,,,,ExceptionLoggerMock,AXUtilsMock,FilesMock)
+	Do MessageInProcessor.Verwerk()
+	
+	Do ExceptionLoggerMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="GeefFileList">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim Filename As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath") _"\SalesOrder\Create\File"
+	Set FileList = ##class(%ListOfDataTypes).%New()
+	Do FileList.Insert(Filename_"1.xml")
+	Do FileList.Insert(Filename_"2.xml")
+	Do FileList.Insert(Filename_"3.xml")
+	Quit FileList
+]]></Implementation>
+</Method>
+
 <Method name="InitResponseProcessor">
-<FormalSpec>FileAPI:TECH.File.FileAPI=..FileAPI,XmlCorrelater:TECH.XMLCorrelater=..XmlCorrelater,EventRaiser:AXimpl.EventRaiser=..EventRaiser,ConfigInMock:AXimpl.ConfigIn=""</FormalSpec>
+<FormalSpec>FileAPI:TECH.File.FileAPI=..FileAPI,XmlCorrelater:TECH.XMLCorrelater=..XmlCorrelater,EventRaiser:AXimpl.EventRaiser=..EventRaiser,ConfigInMock:AXimpl.ConfigIn="",VerwerkBestandOpnieuwAanvraagRepository:AXimpl.VerwerkBestandOpnieuwAanvraagRepository=..VerwerkBestandOpnieuwAanvraagRepository,MailAPI:TECH.Mail.MailAPI=..MailAPI,ExceptionLogger:AXimpl.MessageInProcessor.ExceptionLogger="",AXUtils:AXimpl.Utils,Files:TECH.Files</FormalSpec>
 <Private>1</Private>
 <ReturnType>AXimpl.MessageInProcessor</ReturnType>
-<Implementation><![CDATA[	Quit ##class(AXimpl.MessageInProcessor).%New(FileAPI,XmlCorrelater,EventRaiser,ConfigInMock)
+<Implementation><![CDATA[	Quit ##class(AXimpl.MessageInProcessor).%New(FileAPI,XmlCorrelater,EventRaiser,ConfigInMock,VerwerkBestandOpnieuwAanvraagRepository,MailAPI,ExceptionLogger,AXUtils,Files)
 ]]></Implementation>
 </Method>