Index: Tools/UnitTest/Manager.cls.xml
===================================================================
diff -u -r403 -r495
--- Tools/UnitTest/Manager.cls.xml	(.../Manager.cls.xml)	(revision 403)
+++ Tools/UnitTest/Manager.cls.xml	(.../Manager.cls.xml)	(revision 495)
@@ -63,6 +63,12 @@
 <InitialExpression>0</InitialExpression>
 </Property>
 
+<Property name="Fails">
+<Type>%String</Type>
+<Collection>list</Collection>
+<Private>1</Private>
+</Property>
+
 <Method name="RunTest">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>qualifiers:%String,packagePrefix:%String="",methodPrefix:%String=""</FormalSpec>
@@ -97,7 +103,7 @@
 	 set ^vhUnitTest=$zdatetime($horolog,8)
  }
  
- #dim testsuite As %String ="vhUnitTests"
+ #dim testsuite As %String = "vhUnitTests"
  if $length(packagePrefix) set testsuite = packagePrefix
  
  set classQuery=##class(%ResultSet).%New("%Dictionary.ClassDefinitionQuery:SubclassOf")
@@ -465,54 +471,71 @@
 ]]></Implementation>
 </Method>
 
+<Method name="CollectFails">
+<FormalSpec>suite:%String,case:%String,method:%String,action:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim success As %Boolean = 1
+ 	If $d(action) {
+    	if 'i%TheLog(suite,case,method,action) {
+	   		do ..Fails.Insert(i%TheLog(suite,case,method,action))
+    	}
+ 	} Elseif $d(method) {
+    	If 'i%TheLog(suite,case,method) do ..Fails.Insert(i%TheLog(suite,case,method))
+    	Set action="" For  Set action = $order(i%TheLog(suite,case,method,action)) Quit:action=""  Do  Quit:success=0
+    	. Set success=..CollectFails(suite,case,method,action)
+    	Quit success
+ 	} Elseif $d(case) {
+		If 'i%TheLog(suite,case) do ..Fails.Insert(i%TheLog(suite,case))
+    	Set method="" For  Set method = $order(i%TheLog(suite,case,method)) Quit:method=""  Do  Quit:success=0
+    	. Set success=..CollectFails(suite,case,method)
+    	Quit success
+ 	} Elseif $d(suite) {
+    	Set case="" For  Set case=$o(i%TheLog(suite,case)) Quit:case=""  Do  Quit:success=0
+    	. Set success=..CollectFails(suite,case)
+    	Quit success
+ 	} Else {
+    	Quit 1
+ 	}
+ 	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="GetFails">
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[	quit ..Fails
+]]></Implementation>
+</Method>
+
 <Method name="DisplayFails">
 <FormalSpec>suite:%String,case:%String,method:%String,action:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
- Set success=1
- If $d(action) {
-    if 'i%TheLog(suite,case,method,action) {
-	    write i%TheLog(suite,case,method,action),!,!
-    }
- } Elseif $d(method) {
-    If 'i%TheLog(suite,case,method) write i%TheLog(suite,case,method),!,!
-    Set action="" For  Set action=$o(i%TheLog(suite,case,method,action)) Quit:action=""  Do  Quit:success=0
-    . Set success=..DisplayFails(suite,case,method,action)
-    Quit success
- } Elseif $d(case) {
-	If 'i%TheLog(suite,case) write i%TheLog(suite,case),!,!
-    Set method="" For  Set method=$o(i%TheLog(suite,case,method)) Quit:method=""  Do  Quit:success=0
-    . Set success=..DisplayFails(suite,case,method)
-    Quit success
- } Elseif $d(suite) {
-    Set case="" For  Set case=$o(i%TheLog(suite,case)) Quit:case=""  Do  Quit:success=0
-    . Set success=..DisplayFails(suite,case)
-    Quit success
- } Else {
-    Quit 1
- }
- Quit ""
+	do ..CollectFails(.suite,.case,.method,.action)
+	set itFails = ##class(TECH.ListIterator).%New(..Fails)
+	while itFails.HasNext() {
+		write itFails.Next(),!!
+	}
 ]]></Implementation>
 </Method>
 
 <Method name="PrintURL">
 <Implementation><![CDATA[
- Set port=$get(^%SYS("WebServer","Port"),1972)
- Do ..PrintLine("Use the following URL to view the result:")
- Do ..PrintLine("http://"_$$$Server_"/csp/"_$znspace_"/vhUnitTest.Report.cls?NS="_##class(%CSP.Page).EscapeURL($znspace)_"&INDEX="_i%LogIndex)
- Quit
+ 	#dim port As %Integer = $get(^%SYS("WebServer","Port"),1972)
+ 	Do ..PrintLine("Use the following URL to view the result:")
+ 	Do ..PrintLine("http://"_$$$Server_"/csp/"_$znspace_"/vhUnitTest.Report.cls?NS="_##class(%CSP.Page).EscapeURL($znspace)_"&INDEX="_i%LogIndex)
+ 	Quit
 ]]></Implementation>
 </Method>
 
 <Method name="SaveLog">
 <Implementation><![CDATA[
- Lock +^LOG.UnitTestLog
- Set i%LogIndex=$o(^LOG.UnitTestLog(""),-1)+1
- Lock -^LOG.UnitTestLog
- Merge ^LOG.UnitTestLog(i%LogIndex)=i%TheLog
- Merge ^LOG.UnitTestTime(i%LogIndex)=..TheExecutionTime
- Set ^LOG.UnitTestLog(i%LogIndex)=$H
- Quit
+	 Lock +^LOG.UnitTestLog
+	 Set i%LogIndex=$o(^LOG.UnitTestLog(""),-1)+1
+	 Lock -^LOG.UnitTestLog
+	 Merge ^LOG.UnitTestLog(i%LogIndex)=i%TheLog
+	 Merge ^LOG.UnitTestTime(i%LogIndex)=..TheExecutionTime
+	 Set ^LOG.UnitTestLog(i%LogIndex)=$H
+	 Quit
 ]]></Implementation>
 </Method>