Index: vhUnitTest/AXimpl/MessageInProcessor/Verwerk/Test.cls.xml
===================================================================
diff -u -r51750 -r54725
--- vhUnitTest/AXimpl/MessageInProcessor/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 51750)
+++ vhUnitTest/AXimpl/MessageInProcessor/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 54725)
@@ -50,12 +50,20 @@
 
 <Method name="Test: Standaard gedrag">
 <Implementation><![CDATA[
-	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	
+	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)
-	Do FileAPIMock.VerwachtMethodCall("GetFileList",Path,"*.xml",1,0,20).DanReturn(##class(TECH.ListIterator).%New( FileList))
+	
+	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)
@@ -71,11 +79,12 @@
 	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)
+	#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>
@@ -92,12 +101,19 @@
 	Set DirectoryUtilsStub = ##class(vhTest.Mock.TECH.File.DirectoryUtils).%New()
 	Do DirectoryUtilsStub.IndienMethodCall("CreateIfNotExists",$$$ElkeWaarde).DanDoeNiks()
 	
-	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
-
+	
+	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)
-	Do FileAPIMock.VerwachtMethodCall("GetFileList",Path,"*.xml",1,0,20).DanReturn(##class(TECH.ListIterator).%New( FileList))
-
+	
+	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("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,)
+	#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,12 +143,20 @@
 	
 	Set DirectoryUtilsStub = ##class(vhTest.Mock.TECH.File.DirectoryUtils).%New()
 	Do DirectoryUtilsStub.IndienMethodCall("CreateIfNotExists",$$$ElkeWaarde).DanDoeNiks()
-	
-	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+
+
+	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)
-	Do FileAPIMock.VerwachtMethodCall("GetFileList",Path,"*.xml",1,0,20).DanReturn(##class(TECH.ListIterator).%New( FileList))
-
+	
+	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("GeefDirectoryUtils").DanReturn(DirectoryUtilsStub)
 	Do FileAPIMock.VerwachtMethodCall("GeefFileReader",Filename).DanReturn(FileReader)
 	Do FileAPIMock.IndienMethodCall("MoveFile",Filename,$$$ElkeWaarde).DanException(##class(TECH.Exceptions.GeneralErrorException).%New($$$DummyString))
@@ -142,7 +167,7 @@
 	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,)
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterStub,EventRaiserMock,,,,,AXUtilsMock,FilesMock)
 	do MessageInProcessor.Verwerk()
 	
 	do FileAPIMock.Verifieer()
@@ -152,10 +177,21 @@
 
 <Method name="Test Verwerk standaard gedrag verwerkt 1e xml bestand van de 3 bestanden">
 <Implementation><![CDATA[
-	#dim FileList as %ListOfDatypes = ..GeefFileList()
+	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.VerwachtMethodCall("GetFileList",Path,"*.xml",1,0,20).DanReturn(##class(TECH.ListIterator).%New( FileList))
 	Do FileAPIMock.IndienMethodCall("GeefFileReader",FileList.GetAt(1)).DanReturn(##class(vhTest.Fake.TECH.File.FileReader).%New())
 	Do FileAPIMock.VerwachtMethodCall("DeleteFile",FileList.GetAt(1)).DanDoeNiks()
 
@@ -170,23 +206,34 @@
 	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)
+	#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[
-	#dim FileList as %ListOfDatypes = ..GeefFileList()
+	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.VerwachtMethodCall("GetFileList",Path,"*.xml",1,0,20).DanReturn(##class(TECH.ListIterator).%New( FileList))
 	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()
@@ -212,7 +259,7 @@
 	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("Maak").DanReturn(Aanvraag)
 	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("Bewaar",Aanvraag).DanDoeNiks()
 	
-	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterMock,,ConfigInMock,VerwerkBestandOpnieuwAanvraagRepositoryMock)
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterMock,,ConfigInMock,VerwerkBestandOpnieuwAanvraagRepositoryMock,,,AXUtilsMock,FilesMock)
 	Do MessageInProcessor.Verwerk()
 	
 	Do $$$AssertEquals(Aanvraag.Teller,1)		
@@ -222,15 +269,27 @@
 	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[
-	#dim FileList as %ListOfDatypes = ..GeefFileList()
+	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.VerwachtMethodCall("GetFileList",Path,"*.xml",1,0,20).DanReturn(##class(TECH.ListIterator).%New( FileList))
 	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()
@@ -262,25 +321,34 @@
 	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("Maak").DanReturn(Aanvraag).ExactAantalKeer(2)
 	Do VerwerkBestandOpnieuwAanvraagRepositoryMock.VerwachtMethodCall("Bewaar",Aanvraag).DanDoeNiks()
 
-	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterMock,,ConfigInMock,VerwerkBestandOpnieuwAanvraagRepositoryMock)
+	#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 FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	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)
-	Do FileAPIMock.VerwachtMethodCall("GetFileList",Path,"*.xml",1,0,20).DanReturn(##class(TECH.ListIterator).%New( FileList))
+	
+	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)
@@ -303,7 +371,7 @@
 	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)
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterMock,,ConfigInMock,VerwerkBestandOpnieuwAanvraagRepositoryMock,,,AXUtilsMock,FilesMock)
 	Do MessageInProcessor.Verwerk()
 	
 	Do $$$AssertEquals(Aanvraag1.Teller,5)
@@ -314,15 +382,26 @@
 	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[
-	#dim FileList as %ListOfDatypes = ..GeefFileList()
+	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.VerwachtMethodCall("GetFileList",Path,"*.xml",1,0,20).DanReturn(##class(TECH.ListIterator).%New( FileList))
 	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()
@@ -376,7 +455,9 @@
 
 	Do MailAPIMock.VerwachtMethodCall("VerstuurMail",MailMock).DanDoeNiks().ExactAantalKeer(2)
 
-	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterMock,,ConfigInMock,VerwerkBestandOpnieuwAanvraagRepositoryMock,MailAPIMock)
+	;#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)		
@@ -389,6 +470,7 @@
 	Do XmlCorrelaterMock.Verifieer()
 	Do MailAPIMock.Verifieer()
 	Do FileAPIMock.Verifieer()
+	Do FilesMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -401,15 +483,27 @@
 	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)
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ##class(AXimpl.MessageInProcessor).%New(FileApiStub,,,,,,ExceptionLoggerMock,AXUtilsMock,FilesMock)
 	Do MessageInProcessor.Verwerk()
 	
 	Do ExceptionLoggerMock.Verifieer()
@@ -429,10 +523,10 @@
 </Method>
 
 <Method name="InitResponseProcessor">
-<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</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,VerwerkBestandOpnieuwAanvraagRepository,MailAPI)
+<Implementation><![CDATA[	Quit ##class(AXimpl.MessageInProcessor).%New(FileAPI,XmlCorrelater,EventRaiser,ConfigInMock,VerwerkBestandOpnieuwAanvraagRepository,MailAPI,ExceptionLogger,AXUtils,Files)
 ]]></Implementation>
 </Method>