Index: Tools/Test/TestCase.cls.xml
===================================================================
diff -u -r1331 -r1349
--- Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 1331)
+++ Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 1349)
@@ -48,6 +48,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="VariableChecker">
+<Type>Tools.Test.VariableChecker</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Asserter">
 <Type>Tools.Test.Asserter</Type>
 </Property>
@@ -102,6 +107,7 @@
 	 Set r%Manager=AManager
 	 set ..DataExporteerder = ##class(Tools.Test.DataExporteerder).%New($this)
 	 set ..Asserter = ##class(Tools.Test.Asserter).%New($this,AManager)
+	 set ..VariableChecker = ##class(Tools.Test.VariableChecker).%New($this)
 	 Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -123,15 +129,15 @@
 <Implementation><![CDATA[
 	set ..VerwachteExceptie = ""
 	do ..SetRuntimeContext()
-	;do ..StoreVariabelenInMemory()
+	do ..VariableChecker.StoreVariabelenInMemory()
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	do ..ResetRuntimeContext()
-	;do ..CheckVariabelenInMemory()
+	do ..VariableChecker.CheckVariabelenInMemory()
 	do ..CheckOpenExceptions()
 	do ..CheckOpenTransactions()
 ]]></Implementation>
@@ -177,16 +183,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="StoreVariabelenInMemory">
-<Final>1</Final>
-<Private>1</Private>
-<Implementation><![CDATA[
-	set %VarsInMemoryBefore = ##class(%ListOfDataTypes).%New()
-	#dim Var As %String = "%"
-	for  set Var = $order(@Var) quit:Var=""  if ..ValidVar(Var) do %VarsInMemoryBefore.Insert(Var)
-]]></Implementation>
-</Method>
-
 <Method name="CheckRuntimeContextGebruikerID">
 <Final>1</Final>
 <Private>1</Private>
@@ -219,42 +215,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="CheckVariabelenInMemory">
-<Final>1</Final>
-<Private>1</Private>
-<Implementation><![CDATA[
-	set %VarsInMemoryAfter = ##class(%ListOfDataTypes).%New()
-	set %VarsInMemoryBefore = $get(%VarsInMemoryBefore,##class(%ListOfDataTypes).%New())
-	
-	#dim Var As %String = "%"
-	for  set Var = $order(@Var) quit:Var=""  if ..ValidVar(Var) do %VarsInMemoryAfter.Insert(Var)
-	
-	if %VarsInMemoryAfter.Size '= %VarsInMemoryBefore.Size {
-		set List = ##class(%ListOfDataTypes).%New()
-		set List = ##class(TECH.ListUtils).CopyListOfDataTypes(%VarsInMemoryAfter,List)
-		set List = ##class(TECH.ListUtils).CopyListOfDataTypes(%VarsInMemoryBefore,List)
-		set List = ##class(TECH.ListUtils).RemoveDuplicateItems(List)
-		do ..Fail( "Variabelen probleem : " _ $$$CRLF _ 
-				   "aantal voor test : "_%VarsInMemoryBefore.Size_" - aantal na test : "_%VarsInMemoryAfter.Size _ $$$CRLF _
-				   ##class(TECH.ListUtils).ListToPieces(List,";") )
-	}
-	Kill %VarsInMemoryAfter
-	Kill %VarsInMemoryBefore
-]]></Implementation>
-</Method>
-
-<Method name="ValidVar">
-<FormalSpec>Var:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	quit:$extract(Var)="%" 0
-	quit:Var="SQLCODE" 0
-	quit:Var="sc" 0
-	
-	quit 1
-]]></Implementation>
-</Method>
-
 <Method name="GeefLopendeTestMethode">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	quit ..LopendeTestMethode