[Android] Rewrite base test result classes.

build/android/pylib/utils/flakiness_dashboard_results_uploader.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.
 
 """Uploads the results to the flakiness dashboard server."""
 
 import logging
 import os
 import shutil
 import subprocess
@@ skipping 135 matching lines @@
       buildbot_branch = os.environ.get('BUILDBOT_BRANCH')
       if not buildbot_branch:
         buildbot_branch = 'master'
       self._master_name = '%s-%s' % (self._build_name, buildbot_branch)
 
     self._test_results_map = {}
 
   def AddResults(self, test_results):
     # TODO(frankf): Differentiate between fail/crash/timeouts.
     conversion_map = [
-        (test_results.ok, False,
+        (test_results.GetPass(), False,
             json_results_generator.JSONResultsGeneratorBase.PASS_RESULT),
-        (test_results.failed, True,
+        (test_results.GetFail(), True,
             json_results_generator.JSONResultsGeneratorBase.FAIL_RESULT),
-        (test_results.crashed, True,
+        (test_results.GetCrash(), True,
             json_results_generator.JSONResultsGeneratorBase.FAIL_RESULT),
-        (test_results.timed_out, True,
+        (test_results.GetTimeout(), True,
             json_results_generator.JSONResultsGeneratorBase.FAIL_RESULT),
-        (test_results.unknown, True,
+        (test_results.GetUnknown(), True,
             json_results_generator.JSONResultsGeneratorBase.NO_DATA_RESULT),
         ]
 
     for results_list, failed, modifier in conversion_map:
       for single_test_result in results_list:
         test_result = json_results_generator.TestResult(
-            test=single_test_result.name,
+            test=single_test_result.GetName(),
             failed=failed,
-            elapsed_time=single_test_result.dur / 1000)
+            elapsed_time=single_test_result.GetDur() / 1000)
         # The WebKit TestResult object sets the modifier it based on test name.
         # Since we don't use the same test naming convention as WebKit the
         # modifier will be wrong, so we need to overwrite it.
         test_result.modifier = modifier
 
-        self._test_results_map[single_test_result.name] = test_result
+        self._test_results_map[single_test_result.GetName()] = test_result
 
   def Upload(self, test_results_server):
     if not self._test_results_map:
       return
 
     tmp_folder = tempfile.mkdtemp()
 
     try:
       results_generator = JSONResultsGenerator(
           port=PortDummy(),
           builder_name=self._builder_name,
           build_name=self._build_name,
           build_number=self._build_number,
           tmp_folder=tmp_folder,
           test_results_map=self._test_results_map,
           test_results_server=test_results_server,
           test_type=self._tests_type,
           master_name=self._master_name)
 
       json_files = ["incremental_results.json", "times_ms.json"]
       results_generator.generate_json_output()
       results_generator.generate_times_ms_file()
       results_generator.upload_json_files(json_files)
     except Exception as e:
       logging.error("Uploading results to test server failed: %s." % e);
     finally:
       shutil.rmtree(tmp_folder)
 
 
-def Upload(flakiness_dashboard_server, test_type, results):
+def Upload(results, flakiness_dashboard_server, test_type):
   """Reports test results to the flakiness dashboard for Chrome for Android.
 
   Args:
+    results: test results.
     flakiness_dashboard_server: the server to upload the results to.
     test_type: the type of the tests (as displayed by the flakiness dashboard).
-    results: test results.
   """
   uploader = ResultsUploader(test_type)
   uploader.AddResults(results)
   uploader.Upload(flakiness_dashboard_server)