Add CommandLineArgumentParameter and use it for WebView tests

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 logging
 import os
 import pickle
 import re
 import sys
+from collections import namedtuple
 
 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_instance
 from pylib.instrumentation import test_result
 from pylib.instrumentation import instrumentation_parser
 from pylib.utils import proguard
 
@@ skipping 14 matching lines @@
     'org.chromium.chrome.test.ChromeInstrumentationTestRunner.'
         + 'EnableTestHttpServer')
 _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')
+_PARAMETERIZED_TEST_ANNOTATION = 'ParameterizedTest'
+_PARAMETERIZED_TEST_SET_ANNOTATION = 'ParameterizedTest$Set'
+_COMMAND_LINE_PARAMETER = 'cmdlinearg-parameter'
 _NATIVE_CRASH_RE = re.compile('native crash', re.IGNORECASE)
 _PICKLE_FORMAT_VERSION = 10
 
 
 # TODO(jbudorick): Make these private class methods of
 # InstrumentationTestInstance once the instrumentation test_runner is
 # deprecated.
 def ParseAmInstrumentRawOutput(raw_output):
   """Parses the output of an |am instrument -r| call.
 
@@ skipping 73 matching lines @@
                  and any(_NATIVE_CRASH_RE.search(l)
                          for l in result_bundle.itervalues()))
       if crashed:
         current_result.SetType(base_test_result.ResultType.CRASH)
 
     results.append(current_result)
 
   return results
 
 
+def ParseCommandLineFlagParameters(annotations):
+  """Determines whether the test is parameterized to be run with different
+     command-line flags.
+
+  Args:
+    annotations: The annotations of the test.
+
+  Returns:
+    If the test is parameterized, returns a list of named tuples
+    with lists of flags, e.g.:
+
+      [(add=['--flag-to-add']), (remove=['--flag-to-remove']), ()]
+
+    That means, the test must be run three times, the first time with
+    "--flag-to-add" added to command-line, the second time with
+    "--flag-to-remove" to be removed from command-line, and the third time
+    with default command-line args. If the same flag is listed both for adding
+    and for removing, it is left unchanged.
+
+    If the test is not parametrized, returns None.
+
+  """
+  ParamsTuple = namedtuple('ParamsTuple', ['add', 'remove'])
+  parameterized_tests = []
+  if _PARAMETERIZED_TEST_ANNOTATION in annotations:
+    parameterized_tests = [annotations[_PARAMETERIZED_TEST_ANNOTATION]]
+  elif _PARAMETERIZED_TEST_SET_ANNOTATION in annotations:
+    if annotations[_PARAMETERIZED_TEST_SET_ANNOTATION]:
+      parameterized_tests = annotations[
+        _PARAMETERIZED_TEST_SET_ANNOTATION].get('tests', [])
+  else:
+    return None
+
+  result = []
+  for pt in parameterized_tests:
+    if not pt:
+      continue
+    for p in pt['parameters']:
+      if p['tag'] == _COMMAND_LINE_PARAMETER:
+        to_add = []
+        to_remove = []
+        if 'arguments' in p:

[jbudorick, 2015/11/02 14:49:46]

nit: combine these two lines into

  for a in p.get('arguments', []):

[mnaganov (inactive), 2015/11/02 19:03:54]

Done.

+          for a in p['arguments']:
+            if a['name'] == 'add':
+              to_add = [('--' + f) for f in a['stringArray']]

[jbudorick, 2015/11/02 14:49:46]

nit: ['--%s' % f for f in a['stringArray']]

[mnaganov (inactive), 2015/11/02 19:03:53]

Done.

+            elif a['name'] == 'remove':
+              to_remove = [('--' + f) for f in a['stringArray']]

[jbudorick, 2015/11/02 14:49:46]

nit: same

[mnaganov (inactive), 2015/11/02 19:03:53]

Done.

+        result.append(ParamsTuple(to_add, to_remove))
+  return result if result else None
+
+
 class InstrumentationTestInstance(test_instance.TestInstance):
 
   def __init__(self, args, isolate_delegate, error_func):
     super(InstrumentationTestInstance, self).__init__()
 
     self._additional_apks = []
     self._apk_under_test = None
     self._apk_under_test_permissions = None
     self._package_info = None
     self._suite = None
@@ skipping 238 matching lines @@
     return self._data_deps
 
   def GetTests(self):
     pickle_path = '%s-proguard.pickle' % self.test_jar
     try:
       tests = self._GetTestsFromPickle(pickle_path, self.test_jar)
     except self.ProguardPickleException as e:
       logging.info('Getting tests from JAR via proguard. (%s)', str(e))
       tests = self._GetTestsFromProguard(self.test_jar)
       self._SaveTestsToPickle(pickle_path, self.test_jar, tests)
     return self._InflateTests(self._FilterTests(tests))

[jbudorick, 2015/11/02 14:49:45]

re below: add the separate function call here.

[mnaganov (inactive), 2015/11/02 19:03:54]

Done.

 
   class ProguardPickleException(Exception):
     pass
 
   def _GetTestsFromPickle(self, pickle_path, jar_path):
     if not os.path.exists(pickle_path):
       raise self.ProguardPickleException('%s does not exist.' % pickle_path)
     if os.path.getmtime(pickle_path) <= os.path.getmtime(jar_path):
       raise self.ProguardPickleException(
           '%s newer than %s.' % (jar_path, pickle_path))
@@ skipping 97 matching lines @@
         filtered_classes.append(filtered_class)
 
     return filtered_classes
 
   def _InflateTests(self, tests):
     inflated_tests = []
     for c in tests:
       for m in c['methods']:
         a = dict(c['annotations'])
         a.update(m['annotations'])
-        inflated_tests.append({
+        parameters = ParseCommandLineFlagParameters(a)

[jbudorick, 2015/11/02 14:49:46]

Do this in a separate function.

[mnaganov (inactive), 2015/11/02 19:03:53]

Done.

+        if parameters:
+          for p in parameters:
+            inflated_tests.append({
+              'class': c['class'],
+              'method': m['method'],
+              'annotations': a,
+              'flags': p,
+            })
+        else:
+          inflated_tests.append({
             'class': c['class'],
             'method': m['method'],
             'annotations': a,
-        })
+          })
     return inflated_tests
 
   @staticmethod
   def GetHttpServerEnvironmentVars():
     return {
       _EXTRA_ENABLE_HTTP_SERVER: None,
     }
 
   def GetDriverEnvironmentVars(
       self, test_list=None, test_list_file_path=None):
@@ skipping 19 matching lines @@
   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):
     if self._isolate_delegate:
       self._isolate_delegate.Clear()