[Android] Rewrite base test result classes.

build/android/run_monkey_test.py

 #!/usr/bin/env python
 # 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 Monkey tests on one or more devices."""
 import logging
 import optparse
 import random
 import sys
-import time
 
 from pylib import android_commands
-from pylib.base import test_result
+from pylib.base import base_test_result
 from pylib.host_driven import python_test_base
 from pylib.host_driven import python_test_sharder
+from pylib.utils import report_results
 from pylib.utils import test_options_parser
 
 
 class MonkeyTest(python_test_base.PythonTestBase):
   def testMonkey(self):
-    start_ms = int(time.time()) * 1000
-
     # Launch and wait for Chrome to launch.
     self.adb.StartActivity(self.options.package_name,
                            self.options.activity_name,
                            wait_for_completion=True,
                            action='android.intent.action.MAIN',
                            force_stop=True)
 
     # Chrome crashes are not always caught by Monkey test runner.
     # Verify Chrome has the same PID before and after the test.
     before_pids = self.adb.ExtractPid(self.options.package_name)
 
     # Run the test.
     output = ''
-    duration_ms = 0
     if before_pids:
       output = '\n'.join(self._LaunchMonkeyTest())
-      duration_ms = int(time.time()) * 1000 - start_ms
       after_pids = self.adb.ExtractPid(self.options.package_name)
 
     crashed = (not before_pids or not after_pids
                or after_pids[0] != before_pids[0])
-    result = test_result.SingleTestResult(self.qualified_name, start_ms,
-                                          duration_ms, log=output)
-    results = test_result.TestResults()
 
+    results = base_test_result.TestRunResults()
     if 'Monkey finished' in output and not crashed:
-      results.ok = [result]
+      result = base_test_result.BaseTestResult(
+          self.qualified_name, base_test_result.TestType.PASS, log=output)
     else:
-      results.crashed = [result]
+      result = base_test_result.BaseTestResult(
+          self.qualified_name, base_test_result.TestType.FAIL, log=output)
+    results.AddResult(result)
 

[craigdh, 2013/03/25 19:08:45]

nit: no blank line

[frankf, 2013/03/25 22:37:39]

Done.

     return results
 
   def _LaunchMonkeyTest(self):
     """Runs monkey test for a given package.
 
     Looks at the following parameters in the options object provided
     in class initializer:
       package_name: Allowed package.
       category: A list of allowed categories.
       throttle: Delay between events (ms).
@@ skipping 36 matching lines @@
   attached_devices = android_commands.GetAttachedDevices()
   if not attached_devices:
     raise Exception('You have no devices attached or visible!')
 
   # Actually run the tests.
   logging.debug('Running monkey tests.')
   available_tests *= len(attached_devices)
   options.ensure_value('shard_retries', 1)
   sharder = python_test_sharder.PythonTestSharder(
       attached_devices, available_tests, options)
-  result = sharder.RunShardedTests()
-  result.LogFull(
+  results = sharder.RunShardedTests()
+  report_results.LogFull(
+      results=results,
       test_type='Monkey',
       test_package='Monkey',
       build_type=options.build_type)
-  result.PrintAnnotation()
+  report_results.PrintAnnotation(results)
 
 
 def main():
   desc = 'Run the Monkey tests on 1 or more devices.'
   parser = optparse.OptionParser(description=desc)
   test_options_parser.AddBuildTypeOption(parser)
   parser.add_option('--package-name', help='Allowed package.')
   parser.add_option('--activity-name',
                     default='com.google.android.apps.chrome.Main',
                     help='Name of the activity to start [default: %default].')
@@ skipping 23 matching lines @@
     parser.error('Missing package name')
 
   if options.category:
     options.category = options.category.split(',')
 
   DispatchPythonTests(options)
 
 
 if __name__ == '__main__':
   main()