Convert to gtest-style filtering in instrumentation tests.

build/android/pylib/host_driven/test_info_collection.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.
 
 """Module containing information about the host-driven tests."""
 
 import logging
 import os
+import sys
 
 import tests_annotations
 
+from pylib import constants
+
+sys.path.insert(0,
+                os.path.join(constants.DIR_SOURCE_ROOT,
+                             'build', 'util', 'lib', 'common'))
+
+import unittest_util
 
 class TestInfo(object):
   """An object containing and representing a test function, plus metadata."""
 
   def __init__(self, runnable, set_up=None, tear_down=None):
     # The actual test function/method.
     self.runnable = runnable
     # Qualified name of test function/method (e.g. FooModule.testBar).
     self.qualified_name = self._GetQualifiedName(runnable)
     # setUp and teardown functions, if any.
@@ skipping 68 matching lines @@
               t.qualified_name)]
       test_names = [t.qualified_name for t in tests_without_annotation]
       logging.warning('The following tests do not contain any annotation. '
                       'Assuming "SmallTest":\n%s',
                       '\n'.join(test_names))
       available_tests += tests_without_annotation
     if exclude_annotations:
       excluded_tests = [t for t in available_tests if
                         self._AnnotationIncludesTest(t, exclude_annotations)]
       available_tests = list(set(available_tests) - set(excluded_tests))
-    available_tests = [t for t in available_tests if
-                       self._NameFilterIncludesTest(t, name_filter)]
 
+    if name_filter:
+      available_test_names = unittest_util.FilterTestNames(
+          [t.qualified_name for t in available_tests], name_filter)
+      available_tests = [
+          t for t in available_tests if
+          t.qualified_name in available_test_names]
     return available_tests
 
   def _AnnotationIncludesTest(self, test_info, annotation_filter_list):
     """Checks whether a given test represented by test_info matches annotation.
 
     Args:
       test_info: TestInfo object representing the test
       annotation_filter_list: list of annotation filters to match (e.g. Smoke)
 
     Returns:
       True if no annotation was supplied or the test matches; false otherwise.
     """
     if not annotation_filter_list:
       return True
     for annotation_filter in annotation_filter_list:
       filters = annotation_filter.split('=')
       if len(filters) == 2:
         key = filters[0]
         value_list = filters[1].split(',')
         for value in value_list:
           if tests_annotations.AnnotatedFunctions.IsAnnotated(
               key + ':' + value, test_info.qualified_name):
             return True
       elif tests_annotations.AnnotatedFunctions.IsAnnotated(
           annotation_filter, test_info.qualified_name):
         return True
     return False
 
-  def _NameFilterIncludesTest(self, test_info, name_filter):
-    """Checks whether a name filter matches a given test_info's method name.
-
-    This is a case-sensitive, substring comparison: 'Foo' will match methods
-    Foo.testBar and Bar.testFoo. 'foo' would not match either.
-
-    Args:
-      test_info: TestInfo object representing the test
-      name_filter: substring to check for in the qualified name of the test
-
-    Returns:
-      True if no name filter supplied or it matches; False otherwise.
-    """
-    return not name_filter or name_filter in test_info.qualified_name