Merge "Make InstrumentationResultParser less chatty on unexpected output."

2 files changed, 23 insertions, 2 deletions

diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/InstrumentationResultParser.java b/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/InstrumentationResultParser.java
index 22648a9..cbb1c5a 100644
--- a/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/InstrumentationResultParser.java
+++ b/ddms/libs/ddmlib/src/com/android/ddmlib/testrunner/InstrumentationResultParser.java
@@ -327,7 +327,7 @@ public class InstrumentationResultParser extends MultiLineReceiver {
                     try {
                         testInfo.mNumTests = Integer.parseInt(statusValue);
                     } catch (NumberFormatException e) {
-                        Log.e(LOG_TAG, "Unexpected integer number of tests, received "
+                        Log.w(LOG_TAG, "Unexpected integer number of tests, received "
                                 + statusValue);
                     }
                 } else if (mCurrentKey.equals(StatusKeys.ERROR)) {
@@ -404,7 +404,8 @@ public class InstrumentationResultParser extends MultiLineReceiver {
         try {
             testInfo.mCode = Integer.parseInt(value);
         } catch (NumberFormatException e) {
-            Log.e(LOG_TAG, "Expected integer status code, received: " + value);
+            Log.w(LOG_TAG, "Expected integer status code, received: " + value);
+            testInfo.mCode = StatusCodes.ERROR;
         }
         if (testInfo.mCode != StatusCodes.IN_PROGRESS) {
             // this means we're done with current test result bundle
diff --git a/ddms/libs/ddmlib/tests/src/com/android/ddmlib/testrunner/InstrumentationResultParserTest.java b/ddms/libs/ddmlib/tests/src/com/android/ddmlib/testrunner/InstrumentationResultParserTest.java
index 650e79c..0bbb20e 100644
--- a/ddms/libs/ddmlib/tests/src/com/android/ddmlib/testrunner/InstrumentationResultParserTest.java
+++ b/ddms/libs/ddmlib/tests/src/com/android/ddmlib/testrunner/InstrumentationResultParserTest.java
@@ -208,6 +208,26 @@ public class InstrumentationResultParserTest extends TestCase {
     }
 
     /**
+     * Test parsing output when a status code cannot be parsed
+     */
+    public void testParse_invalidCode() {
+        StringBuilder output = new StringBuilder();
+        addLine(output, "android.util.AndroidException: INSTRUMENTATION_FAILED: foo/foo");
+        addLine(output, "INSTRUMENTATION_STATUS: id=ActivityManagerService");
+        addLine(output, "INSTRUMENTATION_STATUS: Error=Unable to find instrumentation target package: foo");
+        addLine(output, "INSTRUMENTATION_STATUS_CODE: -1at com.android.commands.am.Am.runInstrument(Am.java:532)");
+        addLine(output, "");
+        addLine(output, "        at com.android.commands.am.Am.run(Am.java:111)");
+        addLineBreak(output);
+
+        mMockListener.testRunStarted(RUN_NAME, 0);
+        mMockListener.testRunFailed((String)EasyMock.anyObject());
+        mMockListener.testRunEnded(0, Collections.EMPTY_MAP);
+
+        injectAndVerifyTestString(output.toString());
+    }
+
+    /**
      * Test parsing output for a test run failure, where an instrumentation component failed to
      * load.
      * <p/>