[Android] Rewrite base test result classes.

build/android/pylib/gtest/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.
 
 import glob
 import logging
 import os
 
 from pylib import android_commands
 from pylib import constants
 from pylib import perf_tests_helper
 from pylib.android_commands import errors
+from pylib.base import base_test_result
 from pylib.base import base_test_runner
-from pylib.base import test_result
 from pylib.utils import run_tests_helper
 
 import test_package_apk
 import test_package_executable
 
 
 def _GetDataFilesForTestSuite(test_suite_basename):
   """Returns a list of data files/dirs needed by the test suite.
 
   Args:
@@ skipping 210 matching lines @@
     disabled_tests = run_tests_helper.GetExpectations(
        gtest_filter_base_path + '_disabled')
     if self._running_on_emulator:
       # Append emulator's filter file.
       disabled_tests.extend(run_tests_helper.GetExpectations(
           gtest_filter_base_path + '_emulator_additional_disabled'))
     return disabled_tests
 
   #override
   def RunTest(self, test):
-    """Runs a test on a single device.
-
-    Args:
-      test: a gtest filter string to run.
-
-    Returns:
-      Tuple: (TestResults, test to retry or None)
-    """
-    test_results = test_result.TestResults()
+    test_results = base_test_result.TestRunResults()
     if not test:
       return test_results, None
 
     try:
       self.test_package.ClearApplicationState()
       self.test_package.CreateTestRunnerScript(test, self._test_arguments)
       test_results = self.test_package.RunTestsAndListResults()
     except errors.DeviceUnresponsiveError as e:
       # Make sure this device is not attached
       logging.warning(e)
       if android_commands.IsDeviceAttached(self.device):
         raise
     finally:
       self.CleanupSpawningServerState()
     # Calculate unknown test results.
-    # TODO(frankf): Do not break TestResults encapsulation.
     all_tests = set(test.split(':'))
-    all_tests_ran = set([t.name for t in test_results.GetAll()])
+    all_tests_ran = set([t.GetName() for t in test_results.GetAll()])
     unknown_tests = all_tests - all_tests_ran
-    test_results.unknown = [test_result.BaseTestResult(t, '') for t in
-                            unknown_tests]
-    retry = ':'.join([t.name for t in test_results.GetAllBroken()])
+    test_results.AddResults(
+        [base_test_result.BaseTestResult(t, base_test_result.ResultType.UNKNOWN)
+         for t in unknown_tests])
+    retry = ':'.join([t.GetName() for t in test_results.GetNotPass()])
     return test_results, retry
 
   #override
   def SetUp(self):
     """Sets up necessary test enviroment for the test suite."""
     super(TestRunner, self).SetUp()
     self.StripAndCopyFiles()
     if _TestSuiteRequiresMockTestServer(self.test_package.test_suite_basename):
       self.LaunchChromeTestServerSpawner()
     self.tool.SetupEnvironment()
 
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.tool.CleanUpEnvironment()
     if self._cleanup_test_files:
       self.adb.RemovePushedFiles()
     super(TestRunner, self).TearDown()