[Android] Rewrite base test result classes.

build/android/pylib/instrumentation/test_runner.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Runs the Java tests. See more information on run_instrumentation_tests.py."""
 
 import logging
 import os
 import re
 import shutil
 import sys
 import time
 
 from pylib import android_commands
 from pylib import cmd_helper
 from pylib import constants
 from pylib import forwarder
 from pylib import json_perf_parser
 from pylib import perf_tests_helper
 from pylib import valgrind_tools
+from pylib.base import base_test_result
 from pylib.base import base_test_runner
-from pylib.base import test_result
+
+import test_result
 
 
 _PERF_TEST_ANNOTATION = 'PerfTest'
 
 
 class TestRunner(base_test_runner.BaseTestRunner):
   """Responsible for running a series of tests connected to a single device."""
 
   _DEVICE_DATA_DIR = 'chrome/test/data'
   _EMMA_JAR = os.path.join(os.environ.get('ANDROID_BUILD_TOP', ''),
@@ skipping 331 matching lines @@
     if 'Manual' in annotations:
       return 600 * 60
     if 'External' in annotations:
       return 10 * 60
     if 'LargeTest' in annotations or _PERF_TEST_ANNOTATION in annotations:
       return 5 * 60
     if 'MediumTest' in annotations:
       return 3 * 60
     return 1 * 60
 
+  #override.
   def RunTest(self, test):
-    """Runs the test, generating the coverage if needed.
-
-    Returns:
-      A test_result.TestResults object.
-    """
     raw_result = None
     start_date_ms = None
-    test_results = test_result.TestResults()
+    results = base_test_result.TestRunResults()
     timeout=(self._GetIndividualTestTimeoutSecs(test) *
              self._GetIndividualTestTimeoutScale(test) *
              self.tool.GetTimeoutScale())
     try:
       self.TestSetup(test)
       start_date_ms = int(time.time()) * 1000
 
       if self.is_uiautomator_test:
         self.adb.ClearApplicationState(self.package_name)
         # TODO(frankf): Stop-gap solution. Should use annotations.
         if 'FirstRun' in test:
           self.flags.RemoveFlags(['--disable-fre'])
         else:
           self.flags.AddFlags(['--disable-fre'])
         raw_result = self.adb.RunUIAutomatorTest(
             test, self.test_pkg.GetPackageName(), timeout)
       else:
         raw_result = self.adb.RunInstrumentationTest(
             test, self.test_pkg.GetPackageName(),
             self._GetInstrumentationArgs(), timeout)
 
       duration_ms = int(time.time()) * 1000 - start_date_ms
       status_code = raw_result.GetStatusCode()
       if status_code:
         log = raw_result.GetFailureReason()
         if not log:
           log = 'No information.'
         if self.screenshot_failures or log.find('INJECT_EVENTS perm') >= 0:
           self._TakeScreenshot(test)
-        test_results.failed = [test_result.SingleTestResult(
-            test, start_date_ms, duration_ms, log)]
+        result = test_result.InstrumentationTestResult(
+            test, base_test_result.ResultType.FAIL, start_date_ms, duration_ms,
+            log=log)
       else:
-        test_results.ok = [test_result.SingleTestResult(test, start_date_ms,
-                                                        duration_ms)]
+        result = test_result.InstrumentationTestResult(
+            test, base_test_result.ResultType.PASS, start_date_ms, duration_ms)
+      results.AddResult(result)
     # Catch exceptions thrown by StartInstrumentation().
     # See ../../third_party/android/testrunner/adb_interface.py
     except (android_commands.errors.WaitForResponseTimedOutError,
             android_commands.errors.DeviceUnresponsiveError,
             android_commands.errors.InstrumentationError), e:
       if start_date_ms:
         duration_ms = int(time.time()) * 1000 - start_date_ms
       else:
         start_date_ms = int(time.time()) * 1000
         duration_ms = 0
       message = str(e)
       if not message:
         message = 'No information.'
-      test_results.crashed = [test_result.SingleTestResult(
-          test, start_date_ms, duration_ms, message)]
+      results.AddResult(test_result.InstrumentationTestResult(
+          test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms,
+          log=message))
       raw_result = None
     self.TestTeardown(test, raw_result)
-    return (test_results, None if test_results.ok else test)
+    return (results, None if results.DidRunPass() else test)