[Android] Revert 175082

build/android/pylib/run_java_tests.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.
 
 """Runs the Java tests. See more information on run_instrumentation_tests.py."""
 
 import fnmatch
 import logging
 import os
 import re
 import shutil
 import sys
 import time
 
 import android_commands
+import apk_info
 from base_test_runner import BaseTestRunner
 from base_test_sharder import BaseTestSharder, SetTestsContainer
 import cmd_helper
 import constants
 import errors
 from forwarder import Forwarder
 from json_perf_parser import GetAverageRunInfoFromJSONString
 from perf_tests_helper import PrintPerfResult
 import sharded_tests_queue
 from test_result import SingleTestResult, TestResults
-from utils import apk_and_jar_info
-from utils import jar_info
 import valgrind_tools
 
 _PERF_TEST_ANNOTATION = 'PerfTest'
 
 
 class FatalTestException(Exception):
   """A fatal test exception."""
   pass
 
 
@@ skipping 69 matching lines @@
             The default is ChromeTest.apk.
       ports_to_forward: A list of port numbers for which to set up forwarders.
                         Can be optionally requested by a test case.
     Raises:
       FatalTestException: if coverage metadata is not available.
     """
     BaseTestRunner.__init__(
         self, device, options.tool, shard_index, options.build_type)
 
     if not apks:
-      apks = [apk_and_jar_info.ApkAndJarInfo(options.test_apk_path,
-                                             options.test_apk_jar_path)]
+      apks = [apk_info.ApkInfo(options.test_apk_path,
+                               options.test_apk_jar_path)]
 
     self.build_type = options.build_type
     self.install_apk = options.install_apk
     self.test_data = options.test_data
     self.save_perf_json = options.save_perf_json
     self.screenshot_failures = options.screenshot_failures
     self.wait_for_debugger = options.wait_for_debugger
     self.disable_assertions = options.disable_assertions
 
     self.tests_iter = tests_iter
@@ skipping 405 matching lines @@
   default_size_annotation = 'SmallTest'
 
   def _GetTestsMissingAnnotation(test_apk):
     test_size_annotations = frozenset(['Smoke', 'SmallTest', 'MediumTest',
                                        'LargeTest', 'EnormousTest', 'FlakyTest',
                                        'DisabledTest', 'Manual', 'PerfTest'])
     tests_missing_annotations = []
     for test_method in test_apk.GetTestMethods():
       annotations = frozenset(test_apk.GetTestAnnotations(test_method))
       if (annotations.isdisjoint(test_size_annotations) and
-          not jar_info.JarInfo.IsPythonDrivenTest(test_method)):
+          not apk_info.ApkInfo.IsPythonDrivenTest(test_method)):
         tests_missing_annotations.append(test_method)
     return sorted(tests_missing_annotations)
 
   if options.annotation:
     available_tests = test_apk.GetAnnotatedTests(options.annotation)
     if options.annotation.count(default_size_annotation) > 0:
       tests_missing_annotations = _GetTestsMissingAnnotation(test_apk)
       if tests_missing_annotations:
         logging.warning('The following tests do not contain any annotation. '
                         'Assuming "%s":\n%s',
                         default_size_annotation,
                         '\n'.join(tests_missing_annotations))
         available_tests += tests_missing_annotations
   else:
     available_tests = [m for m in test_apk.GetTestMethods()
-                       if not jar_info.JarInfo.IsPythonDrivenTest(m)]
+                       if not apk_info.ApkInfo.IsPythonDrivenTest(m)]
   coverage = os.environ.get('EMMA_INSTRUMENT') == 'true'
 
   tests = []
   if options.test_filter:
     # |available_tests| are in adb instrument format: package.path.class#test.
     filter_without_hash = options.test_filter.replace('#', '.')
     tests = [t for t in available_tests
              if filter_without_hash in t.replace('#', '.')]
   else:
     tests = available_tests
@@ skipping 14 matching lines @@
 
   logging.info('Will run: %s', str(tests))
 
   if len(attached_devices) > 1 and (coverage or options.wait_for_debugger):
     logging.warning('Coverage / debugger can not be sharded, '
                     'using first available device')
     attached_devices = attached_devices[:1]
   sharder = TestSharder(attached_devices, options, tests, apks)
   test_results = sharder.RunShardedTests()
   return test_results