Changes argument passing to use options objects

build/android/pylib/test_options.py

Index: build/android/pylib/test_options.py
diff --git a/build/android/pylib/test_options.py b/build/android/pylib/test_options.py
new file mode 100644
index 0000000000000000000000000000000000000000..3c008bea377f6f1ee908224fa4b1d4980ab9fed8
--- /dev/null
+++ b/build/android/pylib/test_options.py
@@ -0,0 +1,61 @@
+# 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.
+
+"""Defines named tuples of contains options relevant to each test type."""

[frankf, 2013/07/31 00:14:00]

Just move these to test_runner

[gkanwar1, 2013/07/31 18:07:06]

The problem with that is that we need to import this file in
pylib/uiautomator/test_runner.py, since it creates an InstrumentationOptions
object to pass to the super method.

+
+import collections
+
+
+COMMON_OPTIONS = [
+    'build_type',
+    'tool',
+    'cleanup_test_files',
+    'push_deps',
+]
+
+COMMON_JAVA_OPTIONS = [
+    'annotations',
+    'exclude_annotations',
+    'test_filter',
+    'test_data',
+    'save_perf_json',
+    'screenshot_failures',
+    'disable_assertions',
+]
+
+UIAUTOMATOR_OPTIONS = [
+    'uiautomator_jar',
+    'uiautomator_info_jar',
+    'package_name',
+]
+
+INSTRUMENTATION_OPTIONS = [
+    'wait_for_debugger',
+    'install_apk',
+    'test_apk',
+    'test_apk_path',
+    'test_apk_jar_path',
+]
+
+GTEST_FRAMEWORK_OPTIONS = [
+    'gtest_filter',
+    'test_arguments',
+    'exe',
+    'timeout',
+    'suite_name',
+]
+
+UIAutomatorOptions = collections.namedtuple('UIAutomatorOptions',
+                                            COMMON_OPTIONS +
+                                            COMMON_JAVA_OPTIONS +
+                                            UIAUTOMATOR_OPTIONS)
+
+InstrumentationOptions = collections.namedtuple('InstrumentationOptions',
+                                                COMMON_OPTIONS +
+                                                COMMON_JAVA_OPTIONS +
+                                                INSTRUMENTATION_OPTIONS)
+
+GTestOptions = collections.namedtuple('GTestOptions',
+                                      COMMON_OPTIONS +
+                                      GTEST_FRAMEWORK_OPTIONS)