Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml
===================================================================
diff -u -r38653 -r43050
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 38653)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 43050)
@@ -3,34 +3,21 @@
 <Class name="vhUnitTest.APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger.Ontvang.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Property name="ImportXML">
-<Type>%Boolean</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="SAPBasedXML">
-<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 ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportXML",1,..#Applicatie)
 	
-	Set ..SAPBasedXML = ##class(TECH.Config.ConfigMgr).Instance().GetString("AankoopOrderResponse.BLUM.ImportSAPBasedXML")
-	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportSAPBasedXML",0)
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportSAPBasedXML",0,..#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 ##class(TECH.Config.ConfigMgr).Instance().ZetString("AankoopOrderResponse.BLUM.ImportSAPBasedXML",..SAPBasedXML)
+	Do ##super(aTestName)
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("MSMGATEWAY",..GeefBestandLocatie(),..#Applicatie)
 ]]></Implementation>
 </Method>
 
@@ -40,15 +27,15 @@
 	#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()
+	Set ConverteerderMock  = ##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).GeefCSBSO()
 	do ConverteerderMock.VerwachtMethodCall("Converteer",$$$ElkeWaarde).DanReturn(CSBSO)
 
 	#dim ClassName As %String = "APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03"
 	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"DELVRY03").DanDoeNiks()
 
-	#dim BewaarderFake as vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+	#dim BewaarderFake As vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
 
 	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock,BewaarderFake)
 	
@@ -68,7 +55,7 @@
 	#dim XMLCorrelaterMock As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterMock.VerwachtMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"DELVRY03").DanDoeNiks()
 
-	#dim BewaarderFake as vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+	#dim BewaarderFake As vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
 
 	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterMock,BewaarderFake)
 	
@@ -85,16 +72,16 @@
 	Do FileUtilsFake.VoegToeFileInfo(VolledigeBestandNaam1)
 	Do FileUtilsFake.VoegToeFileInfo(VolledigeBestandNaam2)
 
-	#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()
+	Set ConverteerderMock  = ##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).GeefCSBSO()
 	do ConverteerderMock.IndienMethodCall("Converteer",$$$ElkeWaarde).DanReturn(CSBSO)
 
 	#dim ClassName As %String = "APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03"
 	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"DELVRY03").DanException($$$DummyException)
 	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam2,ClassName,"DELVRY03").DanDoeNiks()
 
-	#dim BewaarderFake as vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+	#dim BewaarderFake As vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
 
 	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock,BewaarderFake)
 
@@ -115,15 +102,15 @@
 	#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()
+	Set ConverteerderMock  = ##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).GeefCSBSO()
 	do ConverteerderMock.IndienMethodCall("Converteer",$$$ElkeWaarde).DanReturn(CSBSO)
 
 	#dim ClassName As %String = "APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03"
 	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"DELVRY03").DanException($$$DummyException)
 
-	#dim BewaarderFake as vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+	#dim BewaarderFake As vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
 
 	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock,BewaarderFake)
 	
@@ -141,15 +128,15 @@
 	#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()
+	Set ConverteerderMock  = ##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).GeefCSBSO()
 	do ConverteerderMock.IndienMethodCall("Converteer",$$$ElkeWaarde).DanReturn(CSBSO)
 
 	#dim ClassName As %String = "APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03"
 	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"DELVRY03").DanDoeNiks()
 	
-	#dim BewaarderFake as vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+	#dim BewaarderFake As vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
 
 	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock,BewaarderFake)
 	
@@ -167,11 +154,11 @@
 	#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()
+	Set ConverteerderMock  = ##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).GeefCSBSO()
 	do ConverteerderMock.IndienMethodCall("Converteer",$$$ElkeWaarde).DanReturn(CSBSO)
 		 
-	#dim BewaarderFake as vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+	#dim BewaarderFake As vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(vhTest.Fake.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
 
 	#dim ClassName As %String = "APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03"
 	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
@@ -192,20 +179,6 @@
 	Quit ##class(TECH.Files).AppendSubPath(BestandLocatie,"\EDI_BLUM_XML_IN\")
 ]]></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="OnAfterOneTest">
-<FormalSpec>aTestCase:%String</FormalSpec>
-<Implementation><![CDATA[	do ##super(aTestCase)
-]]></Implementation>
-</Method>
 </Class>