[Android] Changes _RunJavaTests to accept filters

build/android/pylib/host_driven/test_case.py

 # Copyright 2013 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.
 
 """Base class for host-driven test cases.
 
 This test case is intended to serve as the base class for any host-driven
 test cases. It is similar to the Python unitttest module in that test cases
 inherit from this class and add methods which will be run as tests.
 
@@ skipping 58 matching lines @@
 
   def GetOutDir(self):
     return os.path.join(os.environ['CHROME_SRC'], 'out',
                         constants.GetBuildType())
 
   def Run(self):
     logging.info('Running host-driven test: %s', self.tagged_name)
     # Get the test method on the derived class and execute it
     return getattr(self, self.test_name)()
 
-  def __RunJavaTest(self, package_name, test_case, test_method):
-    """Runs a single Java test method with a Java TestRunner.
+  def __RunJavaTest(self, test, test_pkg):
+    """Runs a single Java test in a Java TestRunner.
 
     Args:
-      package_name: Package name in which the java tests live
-          (e.g. foo.bar.baz.tests)
-      test_case: Name of the Java test case (e.g. FooTest)
-      test_method: Name of the test method to run (e.g. testFooBar)
+      test: Fully qualified test name (ex. foo.bar.TestClass#testMethod)
+      test_pkg: TestPackage object.
 
     Returns:
       TestRunResults object with a single test result.
     """
-    test = '%s.%s#%s' % (package_name, test_case, test_method)
-    test_pkg = test_package.TestPackage(
-        self.instrumentation_options.test_apk_path,
-        self.instrumentation_options.test_apk_jar_path)
     java_test_runner = test_runner.TestRunner(self.instrumentation_options,
                                               self.device_id,
                                               self.shard_index, test_pkg,
                                               self.ports_to_forward)
     try:
       java_test_runner.SetUp()
       return java_test_runner.RunTest(test)[0]
     finally:
       java_test_runner.TearDown()
 
-  def _RunJavaTests(self, package_name, tests):
+  def _RunJavaTests(self, test_filters):

[bulach, 2013/08/20 11:08:07]

we should probably do this two-sided? keep the other method until it rolls, then
remove it later? it should be easy to just delegate from the old interface to
the new one anyways..

[gkanwar1, 2013/08/20 15:45:33]

By two-sided do you mean:
* Upstream: Create a new method, keep the old
* Downstream: Update tests to point at the new method
* Upstream: Remove the old method

or

* Upstream: Change this method
* Downstream: Wait for roll and land a patch updating all downstream tests

I was imagining the latter, but we could do the former as well, since it would
be a more straightforward process (if a little longer).

[bulach, 2013/08/20 15:53:10]

the former :)
requires less coordination between you and sheriffs / gardeners / CQ... I agree
it takes a bit longer, but you can fire and forget all of them independently...

if you prefer the latter, that's fine by me as well, just make sure you have the
downstream patch ready and sent to the appropriate sheriffs / gardeners (there's
a mailing list for that) so they can land that once it rolls.. assuming of
course this won't break the autoroller, not sure if we run these tests there: if
we do, then there's no way around, we'd have to do in 3 steps version.

[gkanwar, 2013/08/20 16:01:57]

Yeah, the only other problem I had with the former was that we are necessarily
required to change the method name. Since we're changing the function to use
filters anyway, that actually makes sense, so I'm happy to do it that way. I'll
upload a change for that shortly.

     """Calls a list of tests and stops at the first test failure.
 
     This method iterates until either it encounters a non-passing test or it
     exhausts the list of tests. Then it returns the appropriate overall result.
 
     Test cases may make use of this method internally to assist in running
     instrumentation tests. This function relies on instrumentation_options
     being defined.
 
     Args:
-      package_name: Package name in which the java tests live
-          (e.g. foo.bar.baz.tests)
-      tests: A list of Java test names which will be run
+      test_filters: A list of Java test filters.
 
     Returns:
       A TestRunResults object containing an overall result for this set of Java
       tests. If any Java tests do not pass, this is a fail overall.
     """
     test_type = base_test_result.ResultType.PASS
     log = ''
 
+    test_pkg = test_package.TestPackage(
+        self.instrumentation_options.test_apk_path,
+        self.instrumentation_options.test_apk_jar_path)
+
     start_ms = int(time.time()) * 1000
-    for test in tests:
-      # We're only running one test at a time, so this TestRunResults object
-      # will hold only one result.
-      suite, test_name = test.split('.')
-      java_result = self.__RunJavaTest(package_name, suite, test_name)
-      assert len(java_result.GetAll()) == 1
-      if not java_result.DidRunPass():
-        result = java_result.GetNotPass().pop()
-        log = result.GetLog()
-        test_type = result.GetType()
+    done = False
+    for test_filter in test_filters:
+      tests = test_pkg._GetAllMatchingTests(None, None, test_filter)
+      # Filters should always result in >= 1 test.
+      if len(tests) == 0:
+        raise Exception('Java test filter "%s" returned no tests.'
+                        % test_filter)
+      for test in tests:
+        # We're only running one test at a time, so this TestRunResults object
+        # will hold only one result.
+        java_result = self.__RunJavaTest(test, test_pkg)
+        assert len(java_result.GetAll()) == 1
+        if not java_result.DidRunPass():
+          result = java_result.GetNotPass().pop()
+          log = result.GetLog()
+          test_type = result.GetType()
+          done = True
+          break
+      if done:
         break
     duration_ms = int(time.time()) * 1000 - start_ms
 
     overall_result = base_test_result.TestRunResults()
     overall_result.AddResult(
         test_result.InstrumentationTestResult(
             self.tagged_name, test_type, start_ms, duration_ms, log=log))
     return overall_result
 
   def __str__(self):
     return self.tagged_name
 
   def __repr__(self):
     return self.tagged_name