Index: Tools/Test/TestCase.cls.xml
===================================================================
diff -u -r526 -r537
--- Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 526)
+++ Tools/Test/TestCase.cls.xml	(.../TestCase.cls.xml)	(revision 537)
@@ -25,11 +25,20 @@
 <Type>%ArrayOfDataTypes</Type>
 </Property>
 
-<Parameter name="SkipInRegularCheck">
+<Parameter name="SkipTestCase">
+<Description>
+Indien true wordt de gehele testcase niet uitgevoerd</Description>
 <Type>%Boolean</Type>
 <Default>0</Default>
 </Parameter>
 
+<Parameter name="SkipTestMethods">
+<Description>
+Delimited lijst van Methods die niet moeten uitgevoerd worden
+Eerste karakter bepaald delimiter</Description>
+<Type>%String</Type>
+</Parameter>
+
 <Parameter name="Applicatie">
 <Type>%String</Type>
 </Parameter>
@@ -236,6 +245,35 @@
 ]]></Implementation>
 </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
+	 
+	 Set aMessage=$g(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
+		
+	 }
+	 set aMessage = aMessage _ "["_..ParseAutoQuoted(aAutoQuoted,"Exception")_"]"
+	 Do manager.LogAssert(success,"AssertException",aMessage)
+	 Quit success
+]]></Implementation>
+</Method>
+
 <Method name="AssertTrueViaMacro">
 <FormalSpec>aAutoQuoted:%String,aValue:%String,aMessage:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>