List Java Instru Test Information From JUnit Runner

build/android/pylib/instrumentation/instrumentation_test_instance.py

 # Copyright 2015 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 copy
+import json
 import logging
 import os
 import pickle
 import re
 
 from devil.android import apk_helper
 from devil.android import md5sum
 from pylib import constants
 from pylib.base import base_test_result
 from pylib.base import test_exception
 from pylib.base import test_instance
 from pylib.constants import host_paths
 from pylib.instrumentation import test_result
 from pylib.instrumentation import instrumentation_parser
 from pylib.utils import dexdump
 from pylib.utils import proguard
 from pylib.utils import shared_preference_utils
+from py_utils import tempfile_ext
 
 with host_paths.SysPath(host_paths.BUILD_COMMON_PATH):
   import unittest_util # pylint: disable=import-error
 
 # Ref: http://developer.android.com/reference/android/app/Activity.html
 _ACTIVITY_RESULT_CANCELED = 0
 _ACTIVITY_RESULT_OK = -1
 
 _COMMAND_LINE_PARAMETER = 'cmdlinearg-parameter'
 _DEFAULT_ANNOTATIONS = [
@@ skipping 204 matching lines @@
       raise MissingSizeAnnotationError(GetTestName(t))
 
     if (not annotation_filter(t['annotations'])
         or not excluded_annotation_filter(t['annotations'])):
       continue
 
     filtered_tests.append(t)
 
   return filtered_tests
 
+
+def GetAllTestsFromRunner(device, test_apk_path, test_package, filename,
+                          test_runner=None, test_runner_junit4=None):
+  pickle_path = '%s-runner.pickle' % test_apk_path
+  try:
+    tests = _GetTestsFromPickle(pickle_path, test_apk_path)
+  except TestListPickleException as e:
+    logging.info('Could not get tests from pickle: %s', e)
+    logging.info('Getting tests by print tests in instrumentation runner')
+    tests = _GetAllTestsFromRunner(device, test_package, filename,
+                                   test_runner, test_runner_junit4)
+    _SaveTestsToPickle(pickle_path, test_apk_path, tests)
+  return tests
+
+
+# TODO(yolandyan): remove this once the tests are converted to junit4
 def GetAllTestsFromJar(test_jar):
   pickle_path = '%s-proguard.pickle' % test_jar
   try:
     tests = _GetTestsFromPickle(pickle_path, test_jar)
   except TestListPickleException as e:
     logging.info('Could not get tests from pickle: %s', e)
     logging.info('Getting tests from JAR via proguard.')
     tests = _GetTestsFromProguard(test_jar)
     _SaveTestsToPickle(pickle_path, test_jar, tests)
   return tests
@@ skipping 77 matching lines @@
     for class_name, class_info in package_info['classes'].iteritems():
       if class_name.endswith('Test'):
         tests.append({
             'class': '%s.%s' % (package_name, class_name),
             'annotations': {},
             'methods': get_test_methods(class_info['methods']),
             'superclass': class_info['superclass'],
         })
   return tests
 
+def _GetAllTestsFromRunner(device, test_package, filename,
+                          test_runner=None, test_runner_junit4=None):
+  device_path = os.path.join(device.GetExternalStoragePath(),
+                             'chromium_tests_root', filename)
+  device.RunShellCommand(['rm', device_path], check_return=False)
+  if test_runner is None and test_runner_junit4 is None:
+    raise Exception('Test runner does NOT exist for this test apk')
+  if test_runner_junit4:

[mikecase (-- gone --), 2017/07/11 21:14:51]

Question. Where are junit3 test listed out? I dont see it.

[the real yoland, 2017/07/14 03:15:46]

JUnit3 tests are now listed together with JUnit4 tests in the same run

+    extras = {}
+    extras['listAllTests'] = filename
+    extras['log'] = 'true'
+    extras['package'] = 'org.chromium'
+    target = '%s/%s' % (test_package, test_runner_junit4)
+    device.StartInstrumentation(
+        target, extras=extras, timeout=10000, retries=0)

[mikecase (-- gone --), 2017/07/11 21:14:51]

isnt timeout in seconds? 10000 seems intense!

[the real yoland, 2017/07/14 03:15:46]

Done

+  with tempfile_ext.NamedTemporaryDirectory() as host_dir:
+    host_file = os.path.join(host_dir, filename)
+    device.PullFile(device_path, host_dir)
+    with open(host_file, 'r') as f:
+      json_string = f.read()
+      return json.loads(json_string)
+
 
 def _SaveTestsToPickle(pickle_path, jar_path, tests):
   jar_md5 = md5sum.CalculateHostMd5Sums(jar_path)[jar_path]
   pickle_data = {
     'VERSION': _PICKLE_FORMAT_VERSION,
     'JAR_MD5SUM': jar_md5,
     'TEST_METHODS': tests,
   }
   with open(pickle_path, 'w') as pickle_file:
     pickle.dump(pickle_data, pickle_file)
@@ skipping 82 matching lines @@
     self._suite = None
     self._test_apk = None
     self._test_apk_incremental_install_script = None
     self._test_jar = None
     self._test_package = None
     self._test_runner = None
     self._test_runner_junit4 = None
     self._test_support_apk = None
     self._initializeApkAttributes(args, error_func)
 
+    self._tests_from_file = []
+
     self._data_deps = None
     self._data_deps_delegate = None
     self._runtime_deps_path = None
     self._initializeDataDependencyAttributes(args, data_deps_delegate)
 
     self._annotations = None
     self._excluded_annotations = None
     self._test_filter = None
     self._initializeTestFilterAttributes(args)
 
@@ skipping 332 matching lines @@
     return 'instrumentation'
 
   #override
   def SetUp(self):
     self._data_deps.extend(
         self._data_deps_delegate(self._runtime_deps_path))
 
   def GetDataDependencies(self):
     return self._data_deps
 
-  def GetTests(self):
-    if self.test_jar:
+  def GetTests(self, device=None):
+    filename = 'list_all_tests.json'
+    if self._test_runner_junit4 and device:
+      tests = GetAllTestsFromRunner(
+          device, self.test_apk.path, self.test_package, filename,
+          test_runner=self._test_runner,
+          test_runner_junit4=self.test_runner_junit4)
+    elif self.test_jar:
       tests = GetAllTestsFromJar(self.test_jar)
     else:
       tests = GetAllTestsFromApk(self.test_apk.path)
     inflated_tests = self._ParameterizeTestsWithFlags(self._InflateTests(tests))
     if self._test_runner_junit4 is None and any(
         t['is_junit4'] for t in inflated_tests):
       raise MissingJUnit4RunnerException()
     filtered_tests = FilterTests(
         inflated_tests, self._test_filter, self._annotations,
         self._excluded_annotations)
@@ skipping 55 matching lines @@
   @staticmethod
   def ParseAmInstrumentRawOutput(raw_output):
     return ParseAmInstrumentRawOutput(raw_output)
 
   @staticmethod
   def GenerateTestResults(
       result_code, result_bundle, statuses, start_ms, duration_ms):
     return GenerateTestResults(result_code, result_bundle, statuses,
                                start_ms, duration_ms)
 
+  def ReadAndSetTests(self, host_file):

[mikecase (-- gone --), 2017/07/11 21:14:51]

Is this used?

[the real yoland, 2017/07/14 03:15:46]

My bad, removed

+    with open(host_file, 'r') as f:
+      self._tests_from_file = f.readlines()
+
   #override
   def TearDown(self):
     pass