Index: vhUnitTest/AXimpl/MessageInProcessor/Verwerk/Test.cls.xml
===================================================================
diff -u -r49403 -r49618
--- vhUnitTest/AXimpl/MessageInProcessor/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 49403)
+++ vhUnitTest/AXimpl/MessageInProcessor/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 49618)
@@ -37,9 +37,12 @@
 
 <Method name="Test: Standaard gedrag">
 <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")
 	#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").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)
@@ -56,7 +59,7 @@
 	Do ConfigInMock.VerwachtMethodCall("GetConverter", "SalesOrder/Create").DanReturn(SalesOrderConverterMock)
 	
 	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterMock,,ConfigInMock)
-	Do MessageInProcessor.Verwerk(Filename)
+	Do MessageInProcessor.Verwerk()
 	
 	Do ConfigInMock.Verifieer()
 	Do FileAPIMock.Verifieer()
@@ -65,26 +68,6 @@
 ]]></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)
@@ -97,7 +80,11 @@
 	Do DirectoryUtilsStub.IndienMethodCall("CreateIfNotExists",$$$ElkeWaarde).DanDoeNiks()
 	
 	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
-	Do FileAPIMock.IndienMethodCall("FileExists",Filename).DanReturn($$$True)
+
+	#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").DanReturn(##class(TECH.ListIterator).%New( FileList))
+
 	Do FileAPIMock.IndienMethodCall("GeefDirectoryUtils").DanReturn(DirectoryUtilsStub)
 	Do FileAPIMock.VerwachtMethodCall("GeefFileReader",Filename).DanReturn(FileReader)
 	Do FileAPIMock.IndienMethodCall("MoveFile",Filename,$$$ElkeWaarde).DanDoeNiks()
@@ -109,7 +96,7 @@
 	Do EventRaiserMock.VerwachtMethodCall("RaiseCorruptedRequestReceivedEvent",Filename,..Matches.Stream(Stream))
 	
 	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterStub,EventRaiserMock,)
-	do MessageInProcessor.Verwerk(Filename)
+	do MessageInProcessor.Verwerk()
 	
 	do FileAPIMock.Verifieer()
 	do EventRaiserMock.Verifieer()
@@ -128,7 +115,10 @@
 	Do DirectoryUtilsStub.IndienMethodCall("CreateIfNotExists",$$$ElkeWaarde).DanDoeNiks()
 	
 	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
-	Do FileAPIMock.IndienMethodCall("FileExists",Filename).DanReturn($$$True)
+	#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").DanReturn(##class(TECH.ListIterator).%New( FileList))
+
 	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))
@@ -140,13 +130,120 @@
 	Do EventRaiserMock.VerwachtMethodCall("RaiseCorruptedRequestReceivedEvent",Filename,..Matches.Stream(Stream))
 	
 	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterStub,EventRaiserMock,)
-	do MessageInProcessor.Verwerk(Filename)
+	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[
+	#dim FileList as %ListOfDatypes = ..GeefFileList()
+	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
+	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	Do FileAPIMock.VerwachtMethodCall("GetFileList",Path,"*.xml").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()
+
+	#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)
+	Do MessageInProcessor.Verwerk()
+	
+	
+	Do ConfigInMock.Verifieer()
+	Do SalesOrderConverterMock.Verifieer()
+	Do XmlCorrelaterMock.Verifieer()
+	Do FileAPIMock.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()
+	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
+	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	Do FileAPIMock.VerwachtMethodCall("GetFileList",Path,"*.xml").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()
+
+	#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)
+	
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterMock,,ConfigInMock)
+	Do MessageInProcessor.Verwerk()
+		
+	Do ConfigInMock.Verifieer()
+	Do SalesOrderConverterMock.Verifieer()
+	Do XmlCorrelaterMock.Verifieer()
+	Do FileAPIMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test Verwerk gedrag indien alle files een VerwerkAXBerichtLaterOpnieuwException gooien">
+<Implementation><![CDATA[
+	#dim FileList as %ListOfDatypes = ..GeefFileList()
+	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
+	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	Do FileAPIMock.VerwachtMethodCall("GetFileList",Path,"*.xml").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()
+	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)
+	
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterMock,,ConfigInMock)
+	Do MessageInProcessor.Verwerk()
+		
+	Do FileAPIMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="GeefFileList">
+<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>
 <Private>1</Private>