Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger/Ontvang/Test.cls.xml
===================================================================
diff -u -r37139 -r43051
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 37139)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 43051)
@@ -3,25 +3,18 @@
 <Class name="vhUnitTest.APPS.AKP.AankoopControle.BLUM.impl.FactuurBerichtOntvanger.Ontvang.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Property name="ImportXML">
-<Type>%Boolean</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	do ##super()
-	Set ..ImportXML = ##class(TECH.Config.ConfigMgr).Instance().GetString("AankoopOrderResponse.BLUM.ImportXML")
-	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportXML",1)
+	Do ##super()
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportXML",1,..#Applicatie)
 ]]></Implementation>
 </Method>
 
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	do ##super()
-	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportXML",..ImportXML)
+	Do ##super(aTestName)
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("MSMGATEWAY",..GeefBestandLocatie(),..#Applicatie)
 ]]></Implementation>
 </Method>
 
@@ -31,12 +24,11 @@
 	#dim FileUtilsFake As vhTest.Fake.TECH.File.FileUtils = ##class(vhTest.Fake.TECH.File.FileUtils).%New()
 	Do FileUtilsFake.VoegToeFileInfo(VolledigeBestandNaam1)
 
-	#dim VerwerkerMock as vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%New()
-	;#dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).%New().GeefCSBSO()
+	#dim VerwerkerMock As vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%New()
 	do VerwerkerMock.VerwachtMethodCall("Verwerk",$$$ElkeWaarde).DanDoeNiks()
 
-	#dim ClassName As %String = ##class(APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02).%ClassName(1)
-	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
+	#dim ClassName As %String = ##class(APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02).%ClassName($$$True)
+	Set XMLCorrelaterStub =  ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"INVOIC02").DanDoeNiks()
 	
 	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.FactuurBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.FactuurBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,VerwerkerMock)
@@ -52,12 +44,8 @@
 	#dim FileUtilsFake As vhTest.Fake.TECH.File.FileUtils = ##class(vhTest.Fake.TECH.File.FileUtils).%New()
 	Do FileUtilsFake.VoegToeFileInfo(VolledigeBestandNaam1)
 
-	;#dim ConverteerderMock as vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder).%New()
-	;#dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).%New().GeefCSBSO()
-	;do ConverteerderMock.IndienMethodCall("Converteer",$$$ElkeWaarde).DanReturn(CSBSO)
-
-	#dim ClassName As %String = ##class(APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02).%ClassName(1)
-	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
+	#dim ClassName As %String = ##class(APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02).%ClassName($$$True)
+	Set XMLCorrelaterStub =  ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterStub.VerwachtMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"INVOIC02").DanDoeNiks()
 	
 	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.FactuurBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.FactuurBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub)
@@ -73,12 +61,11 @@
 	#dim FileUtilsFake As vhTest.Fake.TECH.File.FileUtils = ##class(vhTest.Fake.TECH.File.FileUtils).%New()
 	Do FileUtilsFake.VoegToeFileInfo(VolledigeBestandNaam1)
 
-	#dim ClassName As %String = ##class(APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02).%ClassName(1)
-	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
+	#dim ClassName As %String = ##class(APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02).%ClassName($$$True)
+	Set XMLCorrelaterStub =  ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"INVOIC02").DanException($$$DummyException)
 	
-	#dim VerwerkerClassname as %String = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%ClassName()
-	#dim VerwerkerMock as vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%New()
+	#dim VerwerkerMock As vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%New()
 	do VerwerkerMock.IndienMethodCall("Verwerk",$$$ElkeWaarde).DanDoeNiks()
 		
 	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.FactuurBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.FactuurBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub)	
@@ -96,12 +83,11 @@
 	#dim FileUtilsFake As vhTest.Fake.TECH.File.FileUtils = ##class(vhTest.Fake.TECH.File.FileUtils).%New()
 	Do FileUtilsFake.VoegToeFileInfo(VolledigeBestandNaam1)
 
-	#dim ClassName As %String = ##class(APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02).%ClassName(1)
-	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
+	#dim ClassName As %String = ##class(APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02).%ClassName($$$True)
+	Set XMLCorrelaterStub =  ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"INVOIC02").DanDoeNiks()
 
-	#dim VerwerkerClassname as %String = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%ClassName()
-	#dim VerwerkerMock as vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%New()
+	#dim VerwerkerMock As vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%New()
 	do VerwerkerMock.IndienMethodCall("Verwerk",$$$ElkeWaarde).DanReturn(1)
 	
 	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.FactuurBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.FactuurBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,VerwerkerMock)	
@@ -119,12 +105,12 @@
 	#dim FileUtilsFake As vhTest.Fake.TECH.File.FileUtils = ##class(vhTest.Fake.TECH.File.FileUtils).%New()
 	Do FileUtilsFake.VoegToeFileInfo(VolledigeBestandNaam1)
 
-	#dim ClassName As %String = ##class(APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02).%ClassName(1)
-	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
+	#dim ClassName As %String = ##class(APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02).%ClassName($$$True)
+	Set XMLCorrelaterStub =  ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"INVOIC02").DanDoeNiks()
 
-	#dim VerwerkerClassname as %String = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%ClassName()
-	#dim VerwerkerMock as vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%New()
+	#dim VerwerkerClassname As %String = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%ClassName()
+	#dim VerwerkerMock As vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%New()
 	do VerwerkerMock.IndienMethodCall("Verwerk",$$$ElkeWaarde).DanReturn(0)
 	
 	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.FactuurBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.FactuurBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,VerwerkerMock)	
@@ -134,14 +120,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="OnBeforeOneTest">
-<FormalSpec>aTestName:%String</FormalSpec>
-<Implementation><![CDATA[
-	Do ##super(aTestName)
-	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("MSMGATEWAY",..GeefBestandLocatie(),..#Applicatie)
-]]></Implementation>
-</Method>
-
 <Method name="GeefFactuurBestandLocatie">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>