Index: Tools/UnitTest/Manager.cls.xml
===================================================================
diff -u -r319 -r403
--- Tools/UnitTest/Manager.cls.xml	(.../Manager.cls.xml)	(revision 319)
+++ Tools/UnitTest/Manager.cls.xml	(.../Manager.cls.xml)	(revision 403)
@@ -65,18 +65,18 @@
 
 <Method name="RunTest">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>qualifiers:%String,package:%String=""</FormalSpec>
+<FormalSpec>qualifiers:%String,packagePrefix:%String="",methodPrefix:%String=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
- Set sc=..RunTestSuite(.qualifiers,,package)
+ #dim sc As %Status =..RunTestSuite(.qualifiers,,packagePrefix,methodPrefix)
  If $$$ISERR(sc) Do $system.Status.DisplayError(sc)
  Quit sc
 ]]></Implementation>
 </Method>
 
 <Method name="RunTestSuite">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>qualifiers:%String,userparam:%String="",package:%String=""</FormalSpec>
+<FormalSpec>qualifiers:%String,userparam:%String="",packagePrefix:%String="",methodPrefix:%String=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
  
@@ -85,10 +85,8 @@
  Set manager=..%New()
  If manager=$$$NULLOREF Quit %objlasterror
  
- set package=$G(package) 
- set:$L(package) package = "vhUnitTest."_package
+ set:$L(packagePrefix) packagePrefix = "vhUnitTest."_packagePrefix
  
- ;
  Do ..ParseQualifiers(.qualifiers,"/nodebug/display=errors/load/run/recursive/quiet/mailonerror=0/mailonsucces=0/force")
  Set manager.Debug=+qualifiers("debug")
  Set manager.Display=qualifiers("display")
@@ -99,29 +97,23 @@
 	 set ^vhUnitTest=$zdatetime($horolog,8)
  }
  
- Set testsuite="vhUnitTests"
- if $length(package) set testsuite = package
+ #dim testsuite As %String ="vhUnitTests"
+ if $length(packagePrefix) set testsuite = packagePrefix
  
- ;set classQuery=##class(%ResultSet).%New("%Dictionary.ClassDefinition:Summary")
  set classQuery=##class(%ResultSet).%New("%Dictionary.ClassDefinitionQuery:SubclassOf")
  $$$QuitOnError(classQuery.Execute("vhUnitTest.TestCase"))
  while (classQuery.Next() ) {
-	set className=classQuery.Data("Name")
-	if $L(package),'$$$StartsWithVar(className,package) continue
+	#dim className=classQuery.Data("Name")
+	if $L(packagePrefix),'$$$StartsWithVar(className,packagePrefix) continue
 	set isAbstract=##class(%Dictionary.ClassDefinition).%OpenId(className).Abstract
-	If ('isAbstract)
-	{
-		Set SkipInRegularCheck = $zobjclassmethod(className,"%GetParameter","SkipInRegularCheck")
-		If (('SkipInRegularCheck) || (qualifiers["force"))
-		{
-			If (manager.Debug)
-			{
-				do manager.RunOneTestCaseDebug(testsuite,className)
+	If ('isAbstract) {
+		#dim SkipInRegularCheck As %Boolean = $zobjclassmethod(className,"%GetParameter","SkipInRegularCheck")
+		If (('SkipInRegularCheck) || (qualifiers["force")){
+			If (manager.Debug){
+				do manager.RunOneTestCaseDebug(testsuite,className,methodPrefix)
+			} Else {
+				do manager.RunOneTestCase(testsuite,className,methodPrefix)
 			}
-			Else
-			{
-				do manager.RunOneTestCase(testsuite,className)
-			}
 		}
 	} 
  }
@@ -138,16 +130,16 @@
  }
  
  if (manager.MailOnError || manager.MailOnSucces){
-	Set Server = ##class(TECH.Context.RuntimeContext).Instance().GeefServerNaam() 
-	Set Namespace = ##class(TECH.Context.RuntimeContext).Instance().GeefNamespace()
- 	Set From = $$$SystemMail(Server_" - UnitTests")
- 	Set port=$get(^%SYS("SSPort"),1972)
-	set Message = "http://"_Server_"/csp/"_Namespace_"/vhUnitTest.Report.cls?NS="_##class(%CSP.Page).EscapeURL(Namespace)_"&INDEX="_manager.LogIndex_"&SUITE="_testsuite
+	#dim Server As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefServerNaam() 
+	#dim Namespace As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefNamespace()
+ 	#dim From As %String = $$$SystemMail(Server_" - UnitTests")
+ 	#dim port As %Integer =$get(^%SYS("SSPort"),1972)
+	#dim Message As %String = "http://"_Server_"/csp/"_Namespace_"/vhUnitTest.Report.cls?NS="_##class(%CSP.Page).EscapeURL(Namespace)_"&INDEX="_manager.LogIndex_"&SUITE="_testsuite
 	
    	if (manager.MailOnError && ('manager.IsSuccess(testsuite))) {	 
-    	Set MailTo = $listbuild(##class(TECH.Config.ConfigMgr).Instance().GetString("vhUnitTest.SendToWhenFailed"))
+    	#dim MailTo As %List = $listbuild(##class(TECH.Config.ConfigMgr).Instance().GetString("vhUnitTest.SendToWhenFailed"))
     	Set FalendeTesten = ##class(%ListOfDataTypes).%New()
-    	Set Case=$o(manager.TheLog(testsuite,""))
+    	#dim Case As %String =$o(manager.TheLog(testsuite,""))
     	While (Case'="")
     	{
 	    	Do:'manager.IsSuccess(testsuite,Case) FalendeTesten.Insert(Case)
@@ -188,7 +180,7 @@
 </Method>
 
 <Method name="RunOneTestCaseDebug">
-<FormalSpec>suite:%String,class:%String</FormalSpec>
+<FormalSpec>suite:%String,class:%String,MethodPrefix:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	Set ..TestCaseCount = ..TestCaseCount + 1
 	Do ..LogStateBegin(suite)
@@ -205,7 +197,7 @@
 	#dim Method As %String = $$$comMemberNext(class,$$$cCLASSmethod,"")
 	While (Method '= "")
 	{
-	 	If $Extract(Method,1,4)="Test"
+		If ..MustRunMethod(Method , MethodPrefix)
 	 	{
 		 	Set ..TestCount = ..TestCount + 1
 		 	Do ..LogStateBegin(suite,class,Method)
@@ -230,7 +222,7 @@
 </Method>
 
 <Method name="RunOneTestCase">
-<FormalSpec>suite:%String,class:%String</FormalSpec>
+<FormalSpec>suite:%String,class:%String,MethodPrefix:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	Set ..TestCaseCount = ..TestCaseCount + 1
 	Do ..LogStateBegin(suite)
@@ -250,7 +242,7 @@
 		#dim Method As %String = $$$comMemberNext(class,$$$cCLASSmethod,"")
 		While (Method '= "")
 		{
-		 	If $Extract(Method,1,4)="Test"
+		 	If ..MustRunMethod(Method , MethodPrefix)
 		 	{
 			 	Set ..TestCount = ..TestCount + 1
 			 	Do ..LogStateBegin(suite,class,Method)
@@ -294,6 +286,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="MustRunMethod">
+<FormalSpec>MethodName:%String,MethodPrefix:%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)
+	}
+	quit MustRun
+]]></Implementation>
+</Method>
+
 <Method name="LogStateBegin">
 <FormalSpec>testsuite:%String,testcase:%String,testmethod:%String</FormalSpec>
 <Implementation><![CDATA[