Index: Tools/Test/Manager.cls.xml
===================================================================
diff -u -r499 -r505
--- Tools/Test/Manager.cls.xml	(.../Manager.cls.xml)	(revision 499)
+++ Tools/Test/Manager.cls.xml	(.../Manager.cls.xml)	(revision 505)
@@ -61,47 +61,134 @@
 <Private>1</Private>
 </Property>
 
+<Property name="TestSuite">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Parameter name="PackagePrefix">
 <Type>%String</Type>
 </Parameter>
 
 <Method name="RunTest">
+<Final>1</Final>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>qualifiers:%String,packagePrefix:%String="",methodPrefix:%String=""</FormalSpec>
-<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[ 	Do ..RunTestSuite(.qualifiers,,packagePrefix,methodPrefix)
+]]></Implementation>
+</Method>
+
+<Method name="RunTests">
+<Final>1</Final>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>qualifiers:%String,PackagePrefixes:%ListOfDataTypes</FormalSpec>
 <Implementation><![CDATA[
- #dim sc As %Status =..RunTestSuite(.qualifiers,,packagePrefix,methodPrefix)
- If $$$ISERR(sc) Do $system.Status.DisplayError(sc)
- Quit sc
+	Do ##class(vhLib.OldSchool).InitVars()
+	Set manager = ..%New()
+	do manager.SetTestSuite("Test "_PackagePrefixes.Count())
+	set itPackagePrefix = ##class(TECH.ListIterator).%New(.PackagePrefixes)
+	while itPackagePrefix.HasNext() {
+		#dim PackagePrefix As %String = itPackagePrefix.Next()
+		write !,"do ##class("_manager.%ClassName(1)_").RunTest("""","""_PackagePrefix_""")"
+		do manager.RunSuite(qualifiers,,PackagePrefix)
+	}
+ 	do manager.DumpFails()
+ 	do manager.MailResult()
+
+	quit
 ]]></Implementation>
 </Method>
 
 <Method name="RunTestSuite">
+<Final>1</Final>
 <ClassMethod>1</ClassMethod>
+<FormalSpec>qualifiers:%String,userparam:%String="",PackagePrefix:%String="",methodPrefix:%String=""</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+ 	Do ##class(vhLib.OldSchool).InitVars()
+ 	Set manager=..%New()
+ 	do manager.SetTestSuite(PackagePrefix)
+ 	do manager.RunSuite(qualifiers,userparam,PackagePrefix,methodPrefix)
+ 	do manager.DumpFails()
+ 	do manager.MailResult()
+ 	
+ 	quit
+]]></Implementation>
+</Method>
+
+<Method name="SetTestSuite">
+<Final>1</Final>
+<FormalSpec>PackagePrefix:%String=""</FormalSpec>
+<Implementation><![CDATA[
+	Set ..TestSuite = ..#PackagePrefix
+ 	if $length(PackagePrefix) set ..TestSuite = PackagePrefix
+]]></Implementation>
+</Method>
+
+<Method name="MailResult">
+<Final>1</Final>
+<Implementation><![CDATA[
+	
+ if (..MailOnError || ..MailOnSucces){
+	#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_" - "_..#PackagePrefix)
+ 	#dim port As %Integer =$get(^%SYS("SSPort"),1972)
+	#dim Message As %String = "http://"_Server_"/csp/"_Namespace_"/"_..#PackagePrefix_".Report.cls?NS="_##class(%CSP.Page).EscapeURL(Namespace)_"&INDEX="_..LogIndex_"&SUITE="_..TestSuite
+	
+   	if (..MailOnError && ('..IsSuccess(..TestSuite))) {	 
+    	#dim MailTo As %List = $listbuild(##class(TECH.Config.ConfigMgr).Instance().GetString(..#PackagePrefix_".SendToWhenFailed"))
+    	Set FalendeTesten = ##class(%ListOfDataTypes).%New()
+    	#dim Case As %String =$o(..TheLog(..TestSuite,""))
+    	While (Case'="")
+    	{
+	    	Do:'..IsSuccess(..TestSuite,Case) FalendeTesten.Insert(Case)
+	    	Set Case = $o(..TheLog(..TestSuite,Case))
+    	}
+    	If (FalendeTesten.Count()>0) Set Message = Message_"<br><br><b>Falende unit testen:</b><br><br>"_##class(TECH.ListUtils).ListToPieces(FalendeTesten,"<br>")
+    	Do SendMiniMailForced^vhLib.Mail(From,MailTo,..#PackagePrefix_..LogIndex_" Failed on ["_Server_" => "_Namespace_"]",Message,0,1) 
+	} 
+	if (..MailOnSucces && ..IsSuccess(..TestSuite)){
+		Set MailTo = $listbuild(##class(TECH.Config.ConfigMgr).Instance().GetString(..#PackagePrefix_".SendToWhenSucceeded"))
+    	Do SendMiniMailForced^vhLib.Mail(From,MailTo,..#PackagePrefix_..LogIndex_" Succeeded on ["_Server_" => "_Namespace_"]",Message,0) 
+	}
+ }
+]]></Implementation>
+</Method>
+
+<Method name="DumpFails">
+<Final>1</Final>
+<Implementation><![CDATA[
+ 	write !," -- Test cases: " , ..TestCaseCount, "; Methods: ",..TestCount , !
+ 	if '..IsSuccess(..TestSuite) {
+	 	write !," ===== ERRORS: ===== "
+	 	do ..DisplayFails(..TestSuite)	 
+	 	write !
+ 	}
+ 
+ 	if '..Debug {
+ 		Do ..SaveLog()
+ 		Set ..Display="all"
+ 		Do ..PrintURL()
+ 	}
+]]></Implementation>
+</Method>
+
+<Method name="RunSuite">
+<Final>1</Final>
 <FormalSpec>qualifiers:%String,userparam:%String="",packagePrefix:%String="",methodPrefix:%String=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+ if '##class(TECH.StringUtils).StartsWith(packagePrefix,..#PackagePrefix) {
+ 	set:$L(packagePrefix) packagePrefix = ..#PackagePrefix_"."_packagePrefix
+ }
  
- Do ##class(vhLib.OldSchool).InitVars()
- 
- Set manager=..%New()
- If manager=$$$NULLOREF Quit %objlasterror
- 
- set:$L(packagePrefix) packagePrefix = ..#PackagePrefix_"."_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")
- Set manager.MailOnError=qualifiers("mailonerror")
- Set manager.MailOnSucces=qualifiers("mailonsucces")
+ Set ..Debug=+qualifiers("debug")
+ Set ..Display=qualifiers("display")
+ Set ..MailOnError=qualifiers("mailonerror")
+ Set ..MailOnSucces=qualifiers("mailonsucces")
  
- if manager.MailOnError {
-	 ;set ^vhUnitTest=$zdatetime($horolog,8)
- }
- 
- #dim testsuite As %String = ..#PackagePrefix
- if $length(packagePrefix) set testsuite = packagePrefix
- 
  set classQuery=##class(%ResultSet).%New("%Dictionary.ClassDefinitionQuery:SubclassOf")
  $$$QuitOnError(classQuery.Execute(..#PackagePrefix_".TestCase"))
  while (classQuery.Next() ) {
@@ -111,56 +198,21 @@
 	If ('isAbstract) {
 		#dim SkipInRegularCheck As %Boolean = $zobjclassmethod(className,"%GetParameter","SkipInRegularCheck")
 		If (('SkipInRegularCheck) || (qualifiers["force")){
-			If (manager.Debug){
-				do manager.RunOneTestCaseDebug(testsuite,className,methodPrefix)
+			If (..Debug){
+				do ..RunOneTestCaseDebug(..TestSuite,className,methodPrefix)
 			} Else {
-				do manager.RunOneTestCase(testsuite,className,methodPrefix)
+				do ..RunOneTestCase(..TestSuite,className,methodPrefix)
 			}
 		}
 	} 
  }
- write !," -- Test cases: " , manager.TestCaseCount, "; Methods: ",manager.TestCount , !
- if 'manager.IsSuccess(testsuite) {
-	 write !,!," ===== ERRORS: ===== ",!,!
-	 do manager.DisplayFails(testsuite)	 
- }
- 
- if 'manager.Debug {
- 	Do manager.SaveLog()
- 	Set manager.Display="all"
- 	Do manager.PrintURL()
- }
- 
- if (manager.MailOnError || manager.MailOnSucces){
-	#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_" - "_..#PackagePrefix)
- 	#dim port As %Integer =$get(^%SYS("SSPort"),1972)
-	#dim Message As %String = "http://"_Server_"/csp/"_Namespace_"/"_..#PackagePrefix_".Report.cls?NS="_##class(%CSP.Page).EscapeURL(Namespace)_"&INDEX="_manager.LogIndex_"&SUITE="_testsuite
-	
-   	if (manager.MailOnError && ('manager.IsSuccess(testsuite))) {	 
-    	#dim MailTo As %List = $listbuild(##class(TECH.Config.ConfigMgr).Instance().GetString(..#PackagePrefix_".SendToWhenFailed"))
-    	Set FalendeTesten = ##class(%ListOfDataTypes).%New()
-    	#dim Case As %String =$o(manager.TheLog(testsuite,""))
-    	While (Case'="")
-    	{
-	    	Do:'manager.IsSuccess(testsuite,Case) FalendeTesten.Insert(Case)
-	    	Set Case = $o(manager.TheLog(testsuite,Case))
-    	}
-    	If (FalendeTesten.Count()>0) Set Message = Message_"<br><br><b>Falende unit testen:</b><br><br>"_##class(TECH.ListUtils).ListToPieces(FalendeTesten,"<br>")
-    	Do SendMiniMailForced^vhLib.Mail(From,MailTo,..#PackagePrefix_manager.LogIndex_" Failed on ["_Server_" => "_Namespace_"]",Message,0,1) 
-	} 
-	if (manager.MailOnSucces && manager.IsSuccess(testsuite)){
-		Set MailTo = $listbuild(##class(TECH.Config.ConfigMgr).Instance().GetString(..#PackagePrefix_".SendToWhenSucceeded"))
-    	Do SendMiniMailForced^vhLib.Mail(From,MailTo,..#PackagePrefix_manager.LogIndex_" Succeeded on ["_Server_" => "_Namespace_"]",Message,0) 
-	}
- }
 
  Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="ParseQualifiers">
+<Final>1</Final>
 <ClassMethod>1</ClassMethod>
 <FormalSpec><![CDATA[&qualifiers:%String,defaults:%String]]></FormalSpec>
 <Implementation><![CDATA[
@@ -182,6 +234,7 @@
 </Method>
 
 <Method name="RunOneTestCaseDebug">
+<Final>1</Final>
 <FormalSpec>suite:%String,class:%String,MethodPrefix:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	Set ..TestCaseCount = ..TestCaseCount + 1
@@ -224,6 +277,7 @@
 </Method>
 
 <Method name="RunOneTestCase">
+<Final>1</Final>
 <FormalSpec>suite:%String,class:%String,MethodPrefix:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	Set ..TestCaseCount = ..TestCaseCount + 1
@@ -289,6 +343,7 @@
 </Method>
 
 <Method name="MustRunMethod">
+<Final>1</Final>
 <FormalSpec>MethodName:%String,MethodPrefix:%String=""</FormalSpec>
 <Implementation><![CDATA[
 	#dim MustRun As %Boolean = $Extract(MethodName,1,4)="Test" 	
@@ -300,6 +355,7 @@
 </Method>
 
 <Method name="LogStateBegin">
+<Final>1</Final>
 <FormalSpec>testsuite:%String,testcase:%String,testmethod:%String</FormalSpec>
 <Implementation><![CDATA[
  Set i%TheStack=$g(i%TheStack)+1
@@ -323,6 +379,7 @@
 </Method>
 
 <Method name="LogStateEnd">
+<Final>1</Final>
 <FormalSpec>testsuite:%String,testcase:%String,testmethod:%String</FormalSpec>
 <Implementation><![CDATA[
  Kill i%TheStack(i%TheStack)
@@ -341,6 +398,7 @@
 </Method>
 
 <Method name="LogStateStatus">
+<Final>1</Final>
 <FormalSpec>status:%String,action:%String</FormalSpec>
 <Implementation><![CDATA[
 	If $$$ISOK(status) Quit
@@ -350,6 +408,7 @@
 </Method>
 
 <Method name="LogErrorMessage">
+<Final>1</Final>
 <FormalSpec>errortext:%String,action:%String</FormalSpec>
 <Implementation><![CDATA[
 	Set suite=i%TheStack(i%TheStack,"suite")
@@ -369,6 +428,7 @@
 </Method>
 
 <Method name="LogExceptie">
+<Final>1</Final>
 <FormalSpec>Exceptie:%Exception.AbstractException,action:%String</FormalSpec>
 <Implementation><![CDATA[
 	#dim Bericht As %String
@@ -387,6 +447,7 @@
 </Method>
 
 <Method name="LogAssert">
+<Final>1</Final>
 <FormalSpec>success:%String,action:%String,description:%String</FormalSpec>
 <Implementation><![CDATA[
  Set suite=i%TheStack(i%TheStack,"suite")
@@ -403,6 +464,7 @@
 </Method>
 
 <Method name="LogMessage">
+<Final>1</Final>
 <FormalSpec>message:%String</FormalSpec>
 <Implementation><![CDATA[
  Set suite=i%TheStack(i%TheStack,"suite")
@@ -417,8 +479,10 @@
 </Method>
 
 <Method name="PrintLine">
+<Final>1</Final>
 <FormalSpec>text:%String,level:%String</FormalSpec>
 <Implementation><![CDATA[
+ 
  If ..Display'="all" Quit
  Write !
  For i=2:1:$g(level) Write "  "
@@ -428,6 +492,7 @@
 </Method>
 
 <Method name="PrintErrorLine">
+<Final>1</Final>
 <FormalSpec>text:%String</FormalSpec>
 <Implementation><![CDATA[
  If ..Display'="error" Quit
@@ -441,6 +506,7 @@
 </Method>
 
 <Method name="IsSuccess">
+<Final>1</Final>
 <FormalSpec>suite:%String,case:%String,method:%String,action:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
@@ -468,6 +534,7 @@
 </Method>
 
 <Method name="CollectFails">
+<Final>1</Final>
 <FormalSpec>suite:%String,case:%String,method:%String,action:%String</FormalSpec>
 <Implementation><![CDATA[
 	#dim success As %Boolean = 1
@@ -497,24 +564,27 @@
 </Method>
 
 <Method name="GetFails">
+<Final>1</Final>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[	quit ..Fails
 ]]></Implementation>
 </Method>
 
 <Method name="DisplayFails">
+<Final>1</Final>
 <FormalSpec>suite:%String,case:%String,method:%String,action:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	do ..CollectFails(.suite,.case,.method,.action)
 	set itFails = ##class(TECH.ListIterator).%New(..Fails)
 	while itFails.HasNext() {
-		write itFails.Next(),!!
+		write !,itFails.Next()
 	}
 ]]></Implementation>
 </Method>
 
 <Method name="PrintURL">
+<Final>1</Final>
 <Implementation><![CDATA[
  	#dim port As %Integer = $get(^%SYS("WebServer","Port"),1972)
  	Do ..PrintLine("Use the following URL to view the result:")
@@ -524,6 +594,7 @@
 </Method>
 
 <Method name="SaveLog">
+<Final>1</Final>
 <Implementation><![CDATA[
 	
 	#dim GlobalForLogging As %String = ..GetGlobalForLogging()	
@@ -539,6 +610,7 @@
 </Method>
 
 <Method name="PurgeLog">
+<Final>1</Final>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>AantalDagen:%Integer=30</FormalSpec>
 <Implementation><![CDATA[