Index: Tools/Test/TestCase.cls.xml
===================================================================
diff -u -r1823 -r1900
--- Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 1823)
+++ Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 1900)
@@ -99,7 +99,7 @@
 <FormalSpec>AManager:Tools.Test.Manager</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	 Set r%Manager=AManager
+	 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)
@@ -187,10 +187,9 @@
 <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)
-	}
+	#Dim GebruikerID As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerID()
+	
+	Do:($$$Not(GebruikerID = "")) ..Fail("GebruikerID is niet leeg ! : "_GebruikerID)
 ]]></Implementation>
 </Method>
 
@@ -208,10 +207,7 @@
 <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><![CDATA[	Do:($$$Not($Get(%Exception) = "")) ..Fail("er is nog een openstaande Exception "_##class(TECH.ExceptionHandler).Catch().ToString())
 ]]></Implementation>
 </Method>
 
@@ -239,53 +235,59 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefBestandLocatie">
-<Abstract>1</Abstract>
-<ReturnType>%String</ReturnType>
-</Method>
-
 <Method name="VerwijderBestanden">
 <Final>1</Final>
 <Implementation><![CDATA[	do ##class(TECH.Context).Instance().GeefFileAPI().GeefDirectoryUtils().Delete(..GeefBestandLocatie())
 ]]></Implementation>
 </Method>
 
+<Method name="GeefBestandLocatie">
+<Abstract>1</Abstract>
+<FormalSpec>SubPath:TECH.String=..LopendeTestMethode</FormalSpec>
+<ReturnType>%String</ReturnType>
+</Method>
+
 <Method name="AssertExceptionViaMacro">
 <FormalSpec>aAutoQuoted:%String,Method:%String,ExceptionClass:%String,ExceptionMessage:%String="",aMessage:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	 #dim success As %Boolean = 1
-	  Set manager=r%Manager
+	#Dim Success As %Boolean = $$$True
+	#Dim Manager As Tools.Test.Manager = r%Manager
 	 
-	 Set aMessage=$g(aMessage)_":"
+	Set aMessage = $Get(aMessage) _ ":"
 	 
-	 try {
-	 	do $zobjmethod(##this,Method)
-	 	set success = 0
-	 	set aMessage = aMessage _ "no exception was raised"
-	 } catch {
-		#dim Exception As TECH.ExceptionHandler = ##class(TECH.ExceptionHandler).Catch()
-		set success = ( Exception.%ClassName(1) = ExceptionClass )
-		if 'success set aMessage = aMessage _ Exception.%ClassName(1) _ " = "_ ExceptionClass _$$$CRLF
-		if ( success ) {
-			set success = ( Exception.GeefOmschrijving() [ ExceptionMessage )
-		}
-		if 'success set aMessage = aMessage _ Exception.GeefOmschrijving() _ " = "_ ExceptionMessage _$$$CRLF
+	Try {
+		Do $zobjmethod(##this, Method)
+	 	
+	 	Set Success = $$$False
+	 	Set aMessage = aMessage _ "no exception was raised"
+	} Catch {
+		#Dim Exception As TECH.ExceptionHandler = ##class(TECH.ExceptionHandler).Catch()
 		
-	 }
-	 set aMessage = aMessage _ "["_..Asserter.ParseAutoQuoted(aAutoQuoted,"Exception")_"]"
-	 Do manager.LogAssert(success,"AssertException",aMessage)
-	 Quit success
+		Set Success = (Exception.%ClassName(1) = ExceptionClass)
+		
+		Set:($$$Not(Success)) aMessage = aMessage _ Exception.%ClassName(1) _ " = "_ ExceptionClass _$$$CRLF
+		Set:(Success) Success = (Exception.GeefOmschrijving() [ ExceptionMessage)
+		Set:($$$Not(Success)) aMessage = aMessage _ Exception.GeefOmschrijving() _ " = "_ ExceptionMessage _$$$CRLF
+	}
+	 
+	Set aMessage = aMessage _ "[" _ ..Asserter.ParseAutoQuoted(aAutoQuoted, "Exception") _ "]"
+	 
+	Do Manager.LogAssert(Success, "AssertException", aMessage)
+	 
+	Quit Success
 ]]></Implementation>
 </Method>
 
 <Method name="Fail">
 <FormalSpec>aMessage:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	 Set manager=r%Manager
-	 Do manager.LogAssert(0,"FAIL",$g(aMessage))
-	 Quit $$$OK
+	#Dim Manager As Tools.Test.Manager = r%Manager
+	 
+	Do Manager.LogAssert(0, "FAIL", $Get(aMessage))
+	 
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
@@ -294,6 +296,7 @@
 <Implementation><![CDATA[
 	#dim Query As %String = "SELECT EventType,RespondingClass,RespondingMethod FROM TECH_PubSub.EventSubscription WHERE EventType = ?"
 	#dim RS As %ResultSet = $$ExecDynQuery^vhLib.Query(Query,$LB(EventType))
+	
 	While RS.Next(){
 		Do ..UitgeschakeldeEvents.SetAt($LB(RS.Data("RespondingClass"),RS.Data("RespondingMethod")),RS.Data("EventType"))
 	}
@@ -305,9 +308,9 @@
 
 <Method name="SchakelInAlleEvents">
 <Implementation><![CDATA[
-	#dim UitgeschakeldeEventIt As TECH.Iterator = ##class(TECH.ListIterator).%New(..UitgeschakeldeEvents)
-	While UitgeschakeldeEventIt.HasNext()
-	{
+	#Dim UitgeschakeldeEventIt As TECH.Iterator = ##class(TECH.ListIterator).%New(..UitgeschakeldeEvents)
+	
+	While UitgeschakeldeEventIt.HasNext() {
 		#dim UitgeschakeldeEvent As %List = UitgeschakeldeEventIt.Next()
 		Set Subscription = ##class(TECH.PubSub.EventSubscription).%New(UitgeschakeldeEventIt.Key(),$LG(UitgeschakeldeEvent,1),$LG(UitgeschakeldeEvent,2))
 		Do Subscription.%Save()	
@@ -318,7 +321,7 @@
 <Method name="ControleBestandNodigOpRecenteAanpassing">
 <FormalSpec>FileInfo:TECH.FileInfo</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit 1
+<Implementation><![CDATA[	quit $$$True
 ]]></Implementation>
 </Method>