Index: Tools/UnitTest/TestCase.cls.xml
===================================================================
diff -u -r332 -r356
--- Tools/UnitTest/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 332)
+++ Tools/UnitTest/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 356)
@@ -56,12 +56,9 @@
 <FormalSpec>aTestName:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	set ##class(TECH.Context.RuntimeContext).Instance().Applicatie = "UnitTest"
-	set %VarsInMemoryBefore = 0
-	/// JBL : om vorige niet opgevangen exceptions niet te krijgen in huidige test, deze leeg maken.
-	Set %Exception = "" 
-	set Var = "%" for  set Var = $order(@Var) quit:Var=""  if ..ValidVar(Var) set %VarsInMemoryBefore=$i(%VarsInMemoryBefore)
+	do ..SetRuntimeContext()
 	
+	;do ..StoreVariabelenInMemory()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -70,20 +67,102 @@
 <FormalSpec>aTestName:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	set ##class(TECH.Context.RuntimeContext).Instance().Applicatie = ""
-	set %VarsInMemoryAfter = 0
-	set Var = "%" for  set Var = $order(@Var) quit:Var=""  if ..ValidVar(Var) set %VarsInMemoryAfter=$i(%VarsInMemoryAfter)
-	 
-	;if %VarsInMemoryAfter'=%VarsInMemoryBefore do ..Fail("Vars niet mooi opgekuisd")
-	
+	do ..ResetRuntimeContext()
+
+	;do ..CheckVariabelenInMemory()
+	do ..CheckOpenExceptions()
+	do ..CheckOpenTransactions()
+
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ResetRuntimeContext">
+<Final>1</Final>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim RuntimeContext As TECH.Context.RuntimeContext = ##class(TECH.Context.RuntimeContext).Instance()
+	set RuntimeContext.Applicatie = ""
+	do RuntimeContext.ZetGebruikerID("4682||1000")
+]]></Implementation>
+</Method>
+
+<Method name="SetRuntimeContext">
+<Final>1</Final>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim RuntimeContext As TECH.Context.RuntimeContext = ##class(TECH.Context.RuntimeContext).Instance()
+	set RuntimeContext.Applicatie = "UnitTest"
+	do RuntimeContext.ZetGebruikerID("4682||1000")
+]]></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>
+<Implementation><![CDATA[
+	#dim GebruikerID As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerID()
+	if GebruikerID '= "" {
+		Do ..Fail("GebruikerID is niet leeg ! : "_GebruikerID)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="CheckOpenTransactions">
+<Final>1</Final>
+<Private>1</Private>
+<Implementation><![CDATA[
 	While (0 '= $TLevel) {
 		TRollback
 		Do ..Fail("Een openstaande transactie werd niet gesloten!")
 	}
-	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="CheckOpenExceptions">
+<Final>1</Final>
+<Private>1</Private>
+<Implementation><![CDATA[
+	if $get(%Exception)'="" {
+		do ..Fail("er is nog een openstaande Exception "_##class(TECH.ExceptionHandler).Catch().ToString())
+	}
+]]></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</FormalSpec>
 <ReturnType>%Boolean</ReturnType>