commit 7fcc17d9e969d75b69022c8245c7e4e7756d0c34
author Brett Chabot <brettchabot@android.com> Wed Oct 20 20:08:19 2010 -0700
committer Brett Chabot <brettchabot@android.com> Mon Oct 25 13:00:45 2010 -0700
tree 6ab9b1ac5c73e87a7caacf4aed898159f90f759b
parent e3e0586d8e119edad5442b4bdcf162e78ec154c0

Make CTS host capture JUnit errors too.

Bug 3125695

Change-Id: Id33205f3761f09d97eab9287a6a9ed953e4db09a

tools/host/src/com/android/cts/CtsTestResult.java

diff --git a/tools/host/src/com/android/cts/CtsTestResult.java b/tools/host/src/com/android/cts/CtsTestResult.java
index 0aea74b3..851b07d 100644
--- a/tools/host/src/com/android/cts/CtsTestResult.java
+++ b/tools/host/src/com/android/cts/CtsTestResult.java
@@ -157,7 +157,7 @@
         int resCode = CODE_PASS;
         String failedMessage = null;
         String stackTrace = null;
-        if ((testResult != null) && (testResult.failureCount() > 0)) {
+        if ((testResult != null) && (testResult.failureCount() > 0 || testResult.errorCount() > 0)) {
             resCode = CODE_FAIL;
             Enumeration<TestFailure> failures = testResult.failures();
             while (failures.hasMoreElements()) {
@@ -165,6 +165,12 @@
                 failedMessage += failure.exceptionMessage();
                 stackTrace += failure.trace();
             }
+            Enumeration<TestFailure> errors = testResult.errors();
+            while (errors.hasMoreElements()) {
+                TestFailure failure = errors.nextElement();
+                failedMessage += failure.exceptionMessage();
+                stackTrace += failure.trace();
+            }
         }
         mResultCode = resCode;
         mFailedMessage = failedMessage;