Index: Tools/UnitTest.inc.rou
===================================================================
diff -u -r480 -r537
--- Tools/UnitTest.inc.rou	(.../UnitTest.inc.rou)	(revision 480)
+++ Tools/UnitTest.inc.rou	(.../UnitTest.inc.rou)	(revision 537)
@@ -1,4 +1,5 @@
 #def1arg AssertAlmostEquals(%args)      ..AssertAlmostEqualsViaMacro(##quote(%args),%args)
+#def1arg AssertException(%args)         ..AssertExceptionViaMacro(##quote(%args),%args)
 #def1arg AssertFalse(%args)				..AssertNotTrueViaMacro(##quote(%args),%args) 
 #def1arg AssertError(%args)				..AssertNotTrueViaMacro(1,%args)
 #def1arg AssertContains(%args)			..AssertContainsViaMacro(##quote(%args),%args)
Index: Tools/Test/Manager.cls.xml
===================================================================
diff -u -r505 -r537
--- Tools/Test/Manager.cls.xml	(.../Manager.cls.xml)	(revision 505)
+++ Tools/Test/Manager.cls.xml	(.../Manager.cls.xml)	(revision 537)
@@ -196,12 +196,16 @@
 	if $L(packagePrefix),'$$$StartsWithVar(className,packagePrefix) continue
 	set isAbstract=##class(%Dictionary.ClassDefinition).%OpenId(className).Abstract
 	If ('isAbstract) {
-		#dim SkipInRegularCheck As %Boolean = $zobjclassmethod(className,"%GetParameter","SkipInRegularCheck")
-		If (('SkipInRegularCheck) || (qualifiers["force")){
+		#dim SkipTestCase As %Boolean = +$zobjclassmethod(className,"%GetParameter","SkipTestCase")
+		If (('SkipTestCase) || (qualifiers["force")){
+			#dim SkipTestMethods As %String = ""
+			if $$$Not(qualifiers["force") {
+			 	set SkipTestMethods = $classmethod(className,"%GetParameter","SkipTestMethods")
+			}
 			If (..Debug){
-				do ..RunOneTestCaseDebug(..TestSuite,className,methodPrefix)
+				do ..RunOneTestCaseDebug(..TestSuite,className,methodPrefix,SkipTestMethods)
 			} Else {
-				do ..RunOneTestCase(..TestSuite,className,methodPrefix)
+				do ..RunOneTestCase(..TestSuite,className,methodPrefix,SkipTestMethods)
 			}
 		}
 	} 
@@ -235,7 +239,7 @@
 
 <Method name="RunOneTestCaseDebug">
 <Final>1</Final>
-<FormalSpec>suite:%String,class:%String,MethodPrefix:%String=""</FormalSpec>
+<FormalSpec>suite:%String,class:%String,MethodPrefix:%String="",SkipTestMethods:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	Set ..TestCaseCount = ..TestCaseCount + 1
 	Do ..LogStateBegin(suite)
@@ -252,7 +256,7 @@
 	#dim Method As %String = $$$comMemberNext(class,$$$cCLASSmethod,"")
 	While (Method '= "")
 	{
-		If ..MustRunMethod(Method , MethodPrefix)
+		If ..MustRunMethod(class, Method , MethodPrefix, SkipTestMethods)
 	 	{
 		 	Set ..TestCount = ..TestCount + 1
 		 	Do ..LogStateBegin(suite,class,Method)
@@ -278,7 +282,7 @@
 
 <Method name="RunOneTestCase">
 <Final>1</Final>
-<FormalSpec>suite:%String,class:%String,MethodPrefix:%String=""</FormalSpec>
+<FormalSpec>suite:%String,class:%String,MethodPrefix:%String="",SkipTestMethods:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	Set ..TestCaseCount = ..TestCaseCount + 1
 	Do ..LogStateBegin(suite)
@@ -298,7 +302,7 @@
 		#dim Method As %String = $$$comMemberNext(class,$$$cCLASSmethod,"")
 		While (Method '= "")
 		{
-		 	If ..MustRunMethod(Method , MethodPrefix)
+		 	If ..MustRunMethod(class , Method , MethodPrefix, SkipTestMethods)
 		 	{
 			 	Set ..TestCount = ..TestCount + 1
 			 	Do ..LogStateBegin(suite,class,Method)
@@ -344,12 +348,18 @@
 
 <Method name="MustRunMethod">
 <Final>1</Final>
-<FormalSpec>MethodName:%String,MethodPrefix:%String=""</FormalSpec>
+<FormalSpec>ClassName:%String,MethodName:%String,MethodPrefix:%String="",SkipTestMethods:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	#dim MustRun As %Boolean = $Extract(MethodName,1,4)="Test" 	
 	if ( MustRun ) && ( $length(MethodPrefix) ) {
 		set MustRun = ##class(TECH.StringUtils).StartsWith(MethodName,MethodPrefix)
 	}
+	if ( MustRun ) {
+		#dim Delimiter As %String = $extract(SkipTestMethods,1)
+		set MustRun = $$$Not(( SkipTestMethods _Delimiter) [ ( Delimiter_ MethodName _Delimiter ))
+	}
+		
+	
 	quit MustRun
 ]]></Implementation>
 </Method>
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>