Index: vhUnitTest/AXimpl/MessageInCollector/Test.cls.xml
===================================================================
diff -u -r52588 -r54723
--- vhUnitTest/AXimpl/MessageInCollector/Test.cls.xml	(.../Test.cls.xml)	(revision 52588)
+++ vhUnitTest/AXimpl/MessageInCollector/Test.cls.xml	(.../Test.cls.xml)	(revision 54723)
@@ -5,11 +5,16 @@
 
 <Method name="Test Process start een backgroundjob indien er minstens 1 bestand te verwerken is">
 <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)
+	
+	Set FilesMock = ##class(vhTest.Mock.TECH.Files).%New()
 	#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.xml"
 	#dim FileList as %ListOfDatypes = ##class(TECH.ListUtils).CreateListOfDataTypes(Filename)
-	Do FileAPIMock.VerwachtMethodCall("GetFileList",Path,"*.xml",1,0,1).DanReturn(##class(TECH.ListIterator).%New( FileList))
+	Set DummyList = ##class(%ListOfDataTypes).%New()
+	Do FilesMock.VerwachtMethodCall("GetFilesFromListOfDirectories",..Matches.List( DummyList ),"*.xml",1).DanReturn(##class(TECH.ListIterator).%New( FileList))
 
 	Set BackgroundProcesStarter = ##class(vhTest.Mock.TECH.impl.BackgroundProcessStarter).%New()
 	set DataBuilder = ##class(TECH.BackgroundProcess.impl.DataBuilder).%New()
@@ -19,23 +24,29 @@
 	Do BackgroundProcesStarter.VerwachtMethodCall("StartProcess",..Matches.Object(DataBuilder.GetData())).DanDoeNiks()
 	
 	
-	Set Processor = ##class(AXimpl.MessageInCollector).%New(FileAPIMock, BackgroundProcesStarter)
+	Set Collector = ##class(AXimpl.MessageInCollector).%New(FilesMock, BackgroundProcesStarter, AXUtilsMock)
 	
-	Do Processor.Process()
+	Do Collector.Process()
 
-	Do FileAPIMock.Verifieer()
+	Do FilesMock.Verifieer()
+	
 	Do BackgroundProcesStarter.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test Process start geen backgroundjob indien er minstens geen bestanden te verwerken zijn">
 <Implementation><![CDATA[
-	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
-	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
+	Set DirectoryList = ##class(%ListOfDataTypes).%New()
+	Set AXUtilsMock = ##class(vhTest.Mock.AXimpl.Utils).%New()
+	Do AXUtilsMock.IndienMethodCall("GeefAXRequestDirectoryList",$$$ElkeWaarde).DanReturn(DirectoryList)
 	
-	#dim FileList as %ListOfDatypes = ##class(%ListOfDataTypes).%New()
-	Do FileAPIMock.VerwachtMethodCall("GetFileList",Path,"*.xml",1,0,1).DanReturn(##class(TECH.ListIterator).%New( FileList))
+	Set FilesMock = ##class(vhTest.Mock.TECH.Files).%New()
+	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
 
+	#dim FileList as %ListOfDatypes = ##class(%ListOfDataTypes).%New()
+	Set DummyList = ##class(%ListOfDataTypes).%New()
+	Do FilesMock.VerwachtMethodCall("GetFilesFromListOfDirectories",..Matches.List( DummyList ),"*.xml",1).DanReturn(##class(TECH.ListIterator).%New( FileList))
+	
 	Set BackgroundProcesStarter = ##class(vhTest.Mock.TECH.impl.BackgroundProcessStarter).%New()
 	set DataBuilder = ##class(TECH.BackgroundProcess.impl.DataBuilder).%New()
 	do DataBuilder.SetClassName("AXimpl.MessageInProcessor")	
@@ -44,11 +55,11 @@
 	Do BackgroundProcesStarter.VerwachtMethodCall("StartProcess",..Matches.Object(DataBuilder.GetData())).Nooit()
 	
 	
-	Set Processor = ##class(AXimpl.MessageInCollector).%New(FileAPIMock, BackgroundProcesStarter)
+	Set Processor = ##class(AXimpl.MessageInCollector).%New(FilesMock, BackgroundProcesStarter, AXUtilsMock)
 	
 	Do Processor.Process()
 
-	Do FileAPIMock.Verifieer()
+	Do FilesMock.Verifieer()
 	Do BackgroundProcesStarter.Verifieer()
 ]]></Implementation>
 </Method>