Index: vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandScanner.Scan/Test/EénBestand/File.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandScanner.Scan/Test/EénBestand/File.txt	(revision 0)
+++ vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandScanner.Scan/Test/EénBestand/File.txt	(revision 32518)
@@ -0,0 +1 @@

\ No newline at end of file
Index: vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandScanner.Scan/Test/MeerdereBestanden/File002.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandScanner.Scan/Test/MeerdereBestanden/File002.txt	(revision 0)
+++ vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandScanner.Scan/Test/MeerdereBestanden/File002.txt	(revision 32518)
@@ -0,0 +1 @@

\ No newline at end of file
Index: EXT/Unishop/PurchaseOrder001/BestandScanner.cls.xml
===================================================================
diff -u
--- EXT/Unishop/PurchaseOrder001/BestandScanner.cls.xml	(revision 0)
+++ EXT/Unishop/PurchaseOrder001/BestandScanner.cls.xml	(revision 32518)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="EXT.Unishop.PurchaseOrder001.BestandScanner">
+<Super>APPS.common.EDI.impl.EDIBasisVerwerker</Super>
+
+<Method name="GeefSubPath">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ""
+]]></Implementation>
+</Method>
+
+<Method name="ProcessFileOrSubDir">
+<FormalSpec>DirRead:%String,FileOfSubDir:%String,DirTemp:%String,DirArchive:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	do ..Verwerker.VerwerkBestand(FileOfSubDir)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/EXT/Unishop/PurchaseOrder001/BestandScanner/Scan/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/EXT/Unishop/PurchaseOrder001/BestandScanner/Scan/Test.cls.xml	(revision 0)
+++ vhUnitTest/EXT/Unishop/PurchaseOrder001/BestandScanner/Scan/Test.cls.xml	(revision 32518)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.EXT.Unishop.PurchaseOrder001.BestandScanner.Scan.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	do ##super()
+	do ##class(vhTest.Fake.TECH.Process.ProcessAPI).Activeer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Lege directory kan verwerkt worden">
+<Implementation><![CDATA[
+	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("MSMGATEWAY",..GeefBestandLocatie("GeenBestand"),..#Applicatie)
+	set VerwerkerSpy = ##class(vhTest.Spy.APPS.common.EDI.EDIVerwerker).%New()
+	do ##class(EXT.Unishop.PurchaseOrder001.BestandScanner).Scan(VerwerkerSpy)
+	
+	do $$$AssertEquals(VerwerkerSpy.GeefBestanden().Count(),0)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Een bestand in de directory wordt goed verwerkt">
+<Implementation><![CDATA[
+	do ##class(vhTest.Fake.TECH.Process.ProcessAPI).Activeer()
+	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("MSMGATEWAY",..GeefBestandLocatie("EénBestand"),..#Applicatie)
+	set VerwerkerSpy = ##class(vhTest.Spy.APPS.common.EDI.EDIVerwerker).%New()
+	do ##class(EXT.Unishop.PurchaseOrder001.BestandScanner).Scan(VerwerkerSpy)
+	
+	if $$$AssertEquals(VerwerkerSpy.GeefBestanden().Count(),1) {
+		do $$$AssertContains(VerwerkerSpy.GeefBestanden().GetAt(1),"File.txt")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Test: Meerdere bestanden in een directory worden goed verwerkt">
+<Implementation><![CDATA[
+	do ##class(vhTest.Fake.TECH.Process.ProcessAPI).Activeer()
+	do ##class(TECH.Config.ConfigMgr).Instance().ZetString("MSMGATEWAY",..GeefBestandLocatie("MeerdereBestanden"),..#Applicatie)
+	set VerwerkerSpy = ##class(vhTest.Spy.APPS.common.EDI.EDIVerwerker).%New()
+	do ##class(EXT.Unishop.PurchaseOrder001.BestandScanner).Scan(VerwerkerSpy)
+	
+	if $$$AssertEquals(VerwerkerSpy.GeefBestanden().Count(),3) {
+		do $$$AssertContains(VerwerkerSpy.GeefBestanden().GetAt(1),"File001.txt")
+		do $$$AssertContains(VerwerkerSpy.GeefBestanden().GetAt(2),"File002.txt")
+		do $$$AssertContains(VerwerkerSpy.GeefBestanden().GetAt(3),"File003.txt")
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandScanner.Scan/Test/MeerdereBestanden/File001.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandScanner.Scan/Test/MeerdereBestanden/File001.txt	(revision 0)
+++ vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandScanner.Scan/Test/MeerdereBestanden/File001.txt	(revision 32518)
@@ -0,0 +1 @@

\ No newline at end of file
Index: vhTest/Spy/APPS/common/EDI/EDIVerwerker.cls.xml
===================================================================
diff -u
--- vhTest/Spy/APPS/common/EDI/EDIVerwerker.cls.xml	(revision 0)
+++ vhTest/Spy/APPS/common/EDI/EDIVerwerker.cls.xml	(revision 32518)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Spy.APPS.common.EDI.EDIVerwerker">
+<Super>TECH.RegisteredObject,APPS.common.EDI.EDIVerwerker</Super>
+
+<Property name="Bestanden">
+<Type>%String</Type>
+<Collection>list</Collection>
+<Private>1</Private>
+</Property>
+
+<Method name="VerwerkBestand">
+<FormalSpec>BestandNaam:%String</FormalSpec>
+<Implementation><![CDATA[	do ..Bestanden.Insert(BestandNaam)
+]]></Implementation>
+</Method>
+
+<Method name="GeefBestanden">
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	quit ..Bestanden
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/VKP/Korting/impl/EDIVerwerker.cls.xml
===================================================================
diff -u -r29059 -r32518
--- APPS/VKP/Korting/impl/EDIVerwerker.cls.xml	(.../EDIVerwerker.cls.xml)	(revision 29059)
+++ APPS/VKP/Korting/impl/EDIVerwerker.cls.xml	(.../EDIVerwerker.cls.xml)	(revision 32518)
@@ -14,12 +14,12 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>KortingFactory:APPS.VKP.Korting.KortingFactory</FormalSpec>
+<FormalSpec>Verwerker:APPS.common.EDI.EDIVerwerker,KortingFactory:APPS.VKP.Korting.KortingFactory</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Do ##super()
+	Do ##super(Verwerker)
 	Set ..KortingFactory = $$$Implementation(KortingFactory,##class(APPS.VKP.Korting.impl.KortingFactory).%New())
 	Quit $$$OK
 ]]></Implementation>
Index: vhTest/Mock/APPS/common/EDI/EDIVerwerker.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/common/EDI/EDIVerwerker.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/common/EDI/EDIVerwerker.cls.xml	(revision 32518)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.common.EDI.EDIVerwerker">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.common.EDI.EDIVerwerker,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="VerwerkBestand">
+<FormalSpec>BestandNaam:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkBestand",BestandNaam)
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkFolder">
+<FormalSpec>FolderNaam:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwerkFolder",FolderNaam)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/APPS/common/EDI/TestableEDIVerwerker.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/common/EDI/TestableEDIVerwerker.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/common/EDI/TestableEDIVerwerker.cls.xml	(revision 32518)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.common.EDI.TestableEDIVerwerker">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.common.EDI.TestableEDIVerwerker,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Verwerk">
+<FormalSpec>DirRead:%String,FileOfSubDir:%String,DirTemp:%String,DirArchive:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("Verwerk",DirRead,FileOfSubDir,DirTemp,DirArchive)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/common/EDI/EDIVerwerker.cls.xml
===================================================================
diff -u -r29059 -r32518
--- APPS/common/EDI/EDIVerwerker.cls.xml	(.../EDIVerwerker.cls.xml)	(revision 29059)
+++ APPS/common/EDI/EDIVerwerker.cls.xml	(.../EDIVerwerker.cls.xml)	(revision 32518)
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.common.EDI.EDIVerwerker">
+<Abstract>1</Abstract>
 <Super>TECH.Interface</Super>
 
-<Method name="Verwerk">
+<Method name="VerwerkBestand">
 <Abstract>1</Abstract>
+<FormalSpec>BestandNaam:%String</FormalSpec>
 </Method>
 
-<Method name="ProcessFileOrSubDir">
+<Method name="VerwerkFolder">
 <Abstract>1</Abstract>
-<FormalSpec>DirRead,FileOfSubDir,DirTemp,DirArchive</FormalSpec>
-<Private>1</Private>
+<FormalSpec>FolderNaam:%String</FormalSpec>
 </Method>
 </Class>
 
Index: vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandScanner.Scan/Test/MeerdereBestanden/File003.txt
===================================================================
diff -u
--- vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandScanner.Scan/Test/MeerdereBestanden/File003.txt	(revision 0)
+++ vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandScanner.Scan/Test/MeerdereBestanden/File003.txt	(revision 32518)
@@ -0,0 +1 @@

\ No newline at end of file
Index: APPS/common/EDI/impl/EDIBasisVerwerker.cls.xml
===================================================================
diff -u -r29059 -r32518
--- APPS/common/EDI/impl/EDIBasisVerwerker.cls.xml	(.../EDIBasisVerwerker.cls.xml)	(revision 29059)
+++ APPS/common/EDI/impl/EDIBasisVerwerker.cls.xml	(.../EDIBasisVerwerker.cls.xml)	(revision 32518)
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="24">
 <Class name="APPS.common.EDI.impl.EDIBasisVerwerker">
 <IncludeCode>BL.EC.Common</IncludeCode>
-<Super>APPS.common.EDI.EDIVerwerker,TECH.RegisteredObject</Super>
+<Super>TECH.RegisteredObject</Super>
 
 <Parameter name="EDILoggerGroep">
 <Default>EDI</Default>
@@ -31,31 +31,55 @@
 <Private>1</Private>
 </Property>
 
-<Method name="GeefSubPath">
-<Abstract>1</Abstract>
+<Property name="Verwerker">
+<Type>APPS.common.EDI.EDIVerwerker</Type>
 <Private>1</Private>
-<ReturnType>%String</ReturnType>
-</Method>
+</Property>
 
-<Method name="ProcessFileOrSubDir">
-<Abstract>1</Abstract>
+<Property name="ProcessAPI">
+<Type>TECH.Process.ProcessAPI</Type>
 <Private>1</Private>
+</Property>
+
+<Method name="Scan">
+<Description>
+Scans the incoming EDI mail watchfolder and processes every found file
+This method is (to be) called periodically from the Cache scheduler</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Verwerker:APPS.common.EDI.EDIVerwerker=""</FormalSpec>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Set blScan=..%New(Verwerker)
+	Do blScan.Verwerk()
+	Set blScan=""
+]]></Implementation>
 </Method>
 
 <Method name="%OnNew">
+<FormalSpec>Verwerker:APPS.common.EDI.EDIVerwerker</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	#dim MSMGATEWAY As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("MSMGATEWAY")
-	Set ..BasePathMSMGATEWAY=##class(TECH.Files).AppendFile(MSMGATEWAY,..GeefSubPath())	
-	Set ..DirArchive = ##class(TECH.Files).AppendFile(..BasePathMSMGATEWAY,..#ArchiveSubPath)
-    Set ..DirTemp = ##class(TECH.Files).AppendFile(..BasePathMSMGATEWAY,..#TempSubPath)
-    
-	Quit $$$OK
+	set ..Verwerker = $$$Implementation(Verwerker,..%New())
+	set ..ProcessAPI = ##class(TECH.Context).Instance().GeefProcessAPI()
+	do ..InitPaths(##class(TECH.Config.ConfigMgr).Instance().GetString("MSMGATEWAY"))
+	quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="ProcessFileOrSubDir">
+<Abstract>1</Abstract>
+<FormalSpec>DirRead:%String,FileOfSubDir:%String,DirTemp:%String,DirArchive:%String</FormalSpec>
+<Private>1</Private>
+</Method>
+
+<Method name="GeefSubPath">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+</Method>
+
 <Method name="Verwerk">
 <Final>1</Final>
 <Implementation><![CDATA[	Do ..ScanFilesAndSubDirs()
@@ -66,13 +90,13 @@
 <Final>1</Final>
 <Private>1</Private>
 <Implementation><![CDATA[
-	Lock +APPScommonEDIVerwerker:1 Else  Quit   ; exclusief gebruik 
+	Lock +^APPScommonEDIVerwerker:1 Else  Quit   ; exclusief gebruik 
 	
 	Do ..ScanSubDirs()
 	Do ..ScanFiles()	
 	Do ..ArchiveDirOpkuisen()	
 	
-	Lock -APPScommonEDIVerwerker
+	Lock -^APPScommonEDIVerwerker
 ]]></Implementation>
 </Method>
 
@@ -85,6 +109,7 @@
 	
 	Set LijstSubDirsIt=##class(TECH.ListIterator).%New(LijstSubDirs)
 	While (LijstSubDirsIt.HasNext()) {
+	
 		#dim SubDirNaam As %String = LijstSubDirsIt.Next()
 		Do ..ProcessFileOrSubDirInternal(DirRead,SubDirNaam)
 	}
@@ -100,10 +125,8 @@
 <Implementation><![CDATA[
 	#dim LijstSubDirs As %ListOfDataTypes = ..GeefLijstTeVerwerkenSubDirs(DirRead)
 	If LijstSubDirs.Count()>0 {   
-		// Na het verwerken zijn er nog subdirs aanwezig 
 		#dim msg As %String = "Er zijn nog subdirs aanwezig na verwerking in dir : "_DirRead
  		Do ##class(vhLib.Logger).%New(..#EDILoggerGroep).Error("ImportEDI",msg)
- 		;Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte","",msg)
 	}
 ]]></Implementation>
 </Method>
@@ -155,6 +178,7 @@
 <Method name="GeefLijstTeVerwerkenSubDirs">
 <Description>
 Geeft een lijst terug met namen van te verwerken subdirs (dus niet het full path van de dir) </Description>
+<Final>1</Final>
 <FormalSpec>DirRead:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%ListOfDataTypes</ReturnType>
@@ -192,6 +216,7 @@
 <Method name="SCANDIRvhDEV">
 <Description>
 ReturnArray als .local doorgeven </Description>
+<Final>1</Final>
 <FormalSpec><![CDATA[Dir:%String,WildCard:%String,&ReturnArray:%String,Optie:%String,DelDat:%String]]></FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>0</ProcedureBlock>
@@ -202,15 +227,15 @@
 </Method>
 
 <Method name="ProcessFileOrSubDirInternal">
+<Final>1</Final>
 <FormalSpec>DirRead:%String,FileOfSubDir:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	Do ##class(vhLib.Logger).%New(..#EDILoggerGroep).Info("ImportEDI","De file of subdir "_FileOfSubDir_" wordt verwerkt door '"_..%ClassName(1)_"' (dir="_DirRead_").")
-	
 	Try {
 		Do ..ProcessFileOrSubDir(DirRead,FileOfSubDir,..DirTemp,..DirArchive)
 		Do ..Archiveer(DirRead,FileOfSubDir,..DirArchive)
-		Hang 1
+		Do ..ProcessAPI.Sleep(1)
 		
 		Do ##class(vhLib.Logger).%New(..#EDILoggerGroep).Info("ImportEDI","De file of subdir "_FileOfSubDir_" is verwerkt.")
 	}Catch{
@@ -223,11 +248,14 @@
 		Set Melding = Melding_Exception.ToString()
 		
 		Do ##class(vhLib.Logger).%New(..#EDILoggerGroep).ErrorMail("ImportEDI : Verwerking niet gelukt "_..%ClassName(1),Melding)		
+		
+		W !,Exception.ToString(),!
 	}
 ]]></Implementation>
 </Method>
 
 <Method name="Archiveer">
+<Final>1</Final>
 <FormalSpec>DirRead:%String,FileOfSubDir:%String,DirArchive:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
@@ -241,6 +269,17 @@
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="InitPaths">
+<Final>1</Final>
+<FormalSpec>BasePath:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..BasePathMSMGATEWAY=##class(TECH.Files).AppendFile(BasePath,..GeefSubPath())	
+	Set ..DirArchive = ##class(TECH.Files).AppendFile(..BasePathMSMGATEWAY,..#ArchiveSubPath)
+    Set ..DirTemp = ##class(TECH.Files).AppendFile(..BasePathMSMGATEWAY,..#TempSubPath)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: BL/Flow/Offerte/ScanEDIMail.cls.xml
===================================================================
diff -u -r29059 -r32518
--- BL/Flow/Offerte/ScanEDIMail.cls.xml	(.../ScanEDIMail.cls.xml)	(revision 29059)
+++ BL/Flow/Offerte/ScanEDIMail.cls.xml	(.../ScanEDIMail.cls.xml)	(revision 32518)
@@ -34,21 +34,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Scan">
-<Description>
-Scans the incoming EDI mail watchfolder and processes every found file
-This method is (to be) called periodically from the Cache scheduler
-Oproepen via : 
-  d ##class(BL.Flow.Offerte.ScanEDIMail).Scan()</Description>
-<ClassMethod>1</ClassMethod>
-<ProcedureBlock>0</ProcedureBlock>
-<Implementation><![CDATA[
-	Set blScan=..%New()
-	Do blScan.Verwerk()
-	Set blScan=""
-]]></Implementation>
-</Method>
-
 <Method name="ProcessFileOrSubDir">
 <Description>
 FileName kan verwijzen naar een file of een directory </Description>