Revert of 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 logging
 import os
 import pickle
 import re
 
@@ skipping 18 matching lines @@
 _ACTIVITY_RESULT_CANCELED = 0
 _ACTIVITY_RESULT_OK = -1
 
 _COMMAND_LINE_PARAMETER = 'cmdlinearg-parameter'
 _DEFAULT_ANNOTATIONS = [
     'SmallTest', 'MediumTest', 'LargeTest', 'EnormousTest', 'IntegrationTest']
 _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS = [
     'DisabledTest', 'FlakyTest']
 _VALID_ANNOTATIONS = set(['Manual'] + _DEFAULT_ANNOTATIONS +
                          _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS)
-
-# These test methods are inherited from android.test base test class and
-# should be permitted for not having size annotation. For more, please check
-# https://developer.android.com/reference/android/test/AndroidTestCase.html
-# https://developer.android.com/reference/android/test/ServiceTestCase.html
-_TEST_WITHOUT_SIZE_ANNOTATIONS = [
-    'testAndroidTestCaseSetupProperly', 'testServiceTestCaseSetUpProperly']
-
 _EXTRA_DRIVER_TEST_LIST = (
     'org.chromium.test.driver.OnDeviceInstrumentationDriver.TestList')
 _EXTRA_DRIVER_TEST_LIST_FILE = (
     'org.chromium.test.driver.OnDeviceInstrumentationDriver.TestListFile')
 _EXTRA_DRIVER_TARGET_PACKAGE = (
     'org.chromium.test.driver.OnDeviceInstrumentationDriver.TargetPackage')
 _EXTRA_DRIVER_TARGET_CLASS = (
     'org.chromium.test.driver.OnDeviceInstrumentationDriver.TargetClass')
 _EXTRA_TIMEOUT_SCALE = (
     'org.chromium.test.driver.OnDeviceInstrumentationDriver.TimeoutScale')
@@ skipping 11 matching lines @@
     super(MissingSizeAnnotationError, self).__init__(class_name +
         ': Test method is missing required size annotation. Add one of: ' +
         ', '.join('@' + a for a in _VALID_ANNOTATIONS))
 
 
 class TestListPickleException(test_exception.TestException):
   pass
 
 
 # TODO(jbudorick): Make these private class methods of
-# InstrumentationTestInstance once the instrumentation junit3_runner_class is
+# InstrumentationTestInstance once the instrumentation test_runner is
 # deprecated.
 def ParseAmInstrumentRawOutput(raw_output):
   """Parses the output of an |am instrument -r| call.
 
   Args:
     raw_output: the output of an |am instrument -r| call as a list of lines
   Returns:
     A 3-tuple containing:
       - the instrumentation code as an integer
       - the instrumentation result as a list of lines
@@ skipping 75 matching lines @@
 
   return results
 
 
 def FilterTests(tests, test_filter=None, annotations=None,
                 excluded_annotations=None):
   """Filter a list of tests
 
   Args:
     tests: a list of tests. e.g. [
-           {'annotations": {}, 'class': 'com.example.TestA', 'method':'test1'},
-           {'annotations": {}, 'class': 'com.example.TestB', 'method':'test2'}]
+           {'annotations": {}, 'class': 'com.example.TestA', 'methods':[]},
+           {'annotations": {}, 'class': 'com.example.TestB', 'methods':[]}]
     test_filter: googletest-style filter string.
     annotations: a dict of wanted annotations for test methods.
     exclude_annotations: a dict of annotations to exclude.
 
   Return:
     A list of filtered tests
   """
   def gtest_filter(t):
     if not test_filter:
       return True
     # Allow fully-qualified name as well as an omitted package.
     unqualified_class_test = {
       'class': t['class'].split('.')[-1],
       'method': t['method']
     }
     names = [
       GetTestName(t, sep='.'),
       GetTestName(unqualified_class_test, sep='.'),
       GetUniqueTestName(t, sep='.')
     ]
 
-    if t['is_junit4']:
-      names += [
-          GetTestNameWithoutParameterPostfix(t, sep='.'),
-          GetTestNameWithoutParameterPostfix(unqualified_class_test, sep='.')
-      ]
-
     pattern_groups = test_filter.split('-')
     if len(pattern_groups) > 1:
       negative_filter = pattern_groups[1]
       if unittest_util.FilterTestNames(names, negative_filter):
         return []
 
     positive_filter = pattern_groups[0]
     return unittest_util.FilterTestNames(names, positive_filter)
 
   def annotation_filter(all_annotations):
@@ skipping 22 matching lines @@
       return filter_av in av
     return filter_av == av
 
   filtered_tests = []
   for t in tests:
     # Gtest filtering
     if not gtest_filter(t):
       continue
 
     # Enforce that all tests declare their size.
-    if (not any(a in _VALID_ANNOTATIONS for a in t['annotations'])
-        and t['method'] not in _TEST_WITHOUT_SIZE_ANNOTATIONS):
+    if not any(a in _VALID_ANNOTATIONS for a in t['annotations']):
       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
 
 
-# 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)
+    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)
+    _SaveTestsToPickle(pickle_path, test_jar, tests)
   return tests
 
 
 def GetAllTestsFromApk(test_apk):
   pickle_path = '%s-dexdump.pickle' % test_apk
   try:
-    tests = GetTestsFromPickle(pickle_path, test_apk)
+    tests = _GetTestsFromPickle(pickle_path, test_apk)
   except TestListPickleException as e:
     logging.info('Could not get tests from pickle: %s', e)
     logging.info('Getting tests from dex via dexdump.')
     tests = _GetTestsFromDexdump(test_apk)
-    SaveTestsToPickle(pickle_path, test_apk, tests)
+    _SaveTestsToPickle(pickle_path, test_apk, tests)
   return tests
 
-def GetTestsFromPickle(pickle_path, jar_path):
+def _GetTestsFromPickle(pickle_path, jar_path):
   if not os.path.exists(pickle_path):
     raise TestListPickleException('%s does not exist.' % pickle_path)
   if os.path.getmtime(pickle_path) <= os.path.getmtime(jar_path):
     raise TestListPickleException(
         '%s newer than %s.' % (jar_path, pickle_path))
 
   with open(pickle_path, 'r') as f:
     pickle_data = pickle.load(f)
   jar_md5 = md5sum.CalculateHostMd5Sums(jar_path)[jar_path]
 
@@ skipping 54 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 SaveTestsToPickle(pickle_path, jar_path, tests):
+
+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 21 matching lines @@
 
   Args:
     test: the instrumentation test dict.
     sep: the character(s) that should join the class name and the method name.
   Returns:
     The test name as a string.
   """
   return '%s%s%s' % (test['class'], sep, test['method'])
 
 
-def GetTestNameWithoutParameterPostfix(
-      test, sep='#', parameterization_sep='__'):
-  """Gets the name of the given JUnit4 test without parameter postfix.
-
-  For most WebView JUnit4 javatests, each test is parameterizatized with
-  "__sandboxed_mode" to run in both non-sandboxed mode and sandboxed mode.
-
-  This function returns the name of the test without parameterization
-  so test filters can match both parameterized and non-parameterized tests.
-
-  Args:
-    test: the instrumentation test dict.
-    sep: the character(s) that should join the class name and the method name.
-    parameterization_sep: the character(s) that seperate method name and method
-                          parameterization postfix.
-  Returns:
-    The test name without parameter postfix as a string.
-  """
-  name = GetTestName(test, sep=sep)
-  return name.split(parameterization_sep)[0]
-
-
 def GetUniqueTestName(test, sep='#'):
   """Gets the unique name of the given test.
 
   This will include text to disambiguate between tests for which GetTestName
   would return the same name.
 
   Args:
     test: the instrumentation test dict.
     sep: the character(s) that should join the class name and the method name.
   Returns:
@@ skipping 12 matching lines @@
 
     self._additional_apks = []
     self._apk_under_test = None
     self._apk_under_test_incremental_install_script = None
     self._package_info = None
     self._suite = None
     self._test_apk = None
     self._test_apk_incremental_install_script = None
     self._test_jar = None
     self._test_package = None
-    self._junit3_runner_class = None
-    self._junit4_runner_class = None
+    self._test_runner = None
+    self._test_runner_junit4 = None
     self._test_support_apk = None
     self._initializeApkAttributes(args, error_func)
 
     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
@@ skipping 86 matching lines @@
       error_func('Unable to find test APK: %s' % self._test_apk.path)
     if not self._test_jar:
       logging.warning('Test jar not specified. Test runner will not have '
                       'Java annotation info available. May not handle test '
                       'timeouts correctly.')
     elif not os.path.exists(self._test_jar):
       error_func('Unable to find test JAR: %s' % self._test_jar)
 
     self._test_package = self._test_apk.GetPackageName()
     all_instrumentations = self._test_apk.GetAllInstrumentations()
-    all_junit3_runner_classes = [
+    test_runners = [
         x for x in all_instrumentations if ('true' not in x.get(
             'chromium-junit4', ''))]
-    all_junit4_test_runner_classes = [
+    test_runners_junit4 = [
         x for x in all_instrumentations if ('true' in x.get(
             'chromium-junit4', ''))]
 
-    if len(all_junit3_runner_classes) > 1:
+    if len(test_runners) > 1:
       logging.warning('This test apk has more than one JUnit3 instrumentation')
-    if len(all_junit4_test_runner_classes) > 1:
+    if len(test_runners_junit4) > 1:
       logging.warning('This test apk has more than one JUnit4 instrumentation')
 
-    self._junit3_runner_class = (
-      all_junit3_runner_classes[0]['android:name']
-      if all_junit3_runner_classes else self.test_apk.GetInstrumentationName())
-
-    self._junit4_runner_class = (
-      all_junit4_test_runner_classes[0]['android:name']
-      if all_junit4_test_runner_classes else None)
+    self._test_runner = (
+      test_runners[0]['android:name'] if test_runners else
+      self.test_apk.GetInstrumentationName())
+    self._test_runner_junit4 = (
+      test_runners_junit4[0]['android:name'] if test_runners_junit4 else None)
 
     self._package_info = None
     if self._apk_under_test:
       package_under_test = self._apk_under_test.GetPackageName()
       for package_info in constants.PACKAGE_INFO.itervalues():
         if package_under_test == package_info.package:
           self._package_info = package_info
           break
     if not self._package_info:
       logging.warning('Unable to find package info for %s', self._test_package)
@@ skipping 133 matching lines @@
 
   @property
   def flags(self):
     return self._flags
 
   @property
   def gs_results_bucket(self):
     return self._gs_results_bucket
 
   @property
-  def junit3_runner_class(self):
-    return self._junit3_runner_class
-
-  @property
-  def junit4_runner_class(self):
-    return self._junit4_runner_class
-
-  @property
   def should_save_logcat(self):
     return self._should_save_logcat
 
   @property
   def package_info(self):
     return self._package_info
 
   @property
   def render_results_dir(self):
     return self._render_results_dir
@@ skipping 28 matching lines @@
 
   @property
   def test_support_apk(self):
     return self._test_support_apk
 
   @property
   def test_package(self):
     return self._test_package
 
   @property
+  def test_runner(self):
+    return self._test_runner
+
+  @property
+  def test_runner_junit4(self):
+    return self._test_runner_junit4
+
+  @property
   def timeout_scale(self):
     return self._timeout_scale
 
   @property
   def total_external_shards(self):
     return self._total_external_shards
 
   @property
   def ui_screenshot_dir(self):
     return self._ui_screenshot_dir
 
   #override
   def TestType(self):
     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:
-      raw_tests = GetAllTestsFromJar(self.test_jar)
+      tests = GetAllTestsFromJar(self.test_jar)
     else:
-      raw_tests = GetAllTestsFromApk(self.test_apk.path)
-    return self.ProcessRawTests(raw_tests)
-
-  def ProcessRawTests(self, raw_tests):
-    inflated_tests = self._ParameterizeTestsWithFlags(
-        self._InflateTests(raw_tests))
-    if self._junit4_runner_class is None and any(
+      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)
     if self._test_filter and not filtered_tests:
       for t in inflated_tests:
         logging.debug('  %s', GetUniqueTestName(t))
       raise UnmatchedFilterException(self._test_filter)
     return filtered_tests
@@ skipping 26 matching lines @@
         for p in parameters[1:]:
           parameterized_t = copy.copy(t)
           parameterized_t['flags'] = ['--%s' % p]
           new_tests.append(parameterized_t)
     return tests + new_tests
 
   def GetDriverEnvironmentVars(
       self, test_list=None, test_list_file_path=None):
     env = {
       _EXTRA_DRIVER_TARGET_PACKAGE: self.test_package,
-      _EXTRA_DRIVER_TARGET_CLASS: self.junit3_runner_class,
+      _EXTRA_DRIVER_TARGET_CLASS: self.test_runner,
       _EXTRA_TIMEOUT_SCALE: self._timeout_scale,
     }
 
     if test_list:
       env[_EXTRA_DRIVER_TEST_LIST] = ','.join(test_list)
 
     if test_list_file_path:
       env[_EXTRA_DRIVER_TEST_LIST_FILE] = (
           os.path.basename(test_list_file_path))
 
     return env
 
   @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)
 
   #override
   def TearDown(self):
     pass