Changes argument passing to use options objects

build/android/pylib/uiautomator/setup.py

Index: build/android/pylib/uiautomator/setup.py
diff --git a/build/android/pylib/uiautomator/setup.py b/build/android/pylib/uiautomator/setup.py
index ee7b2f955377dca666de7081567d19d32675c135..24bc465beb2f0e3a7198ffaa386026c89b91f3ba 100644
--- a/build/android/pylib/uiautomator/setup.py
+++ b/build/android/pylib/uiautomator/setup.py
@@ -5,54 +5,31 @@
 """Generates test runner factory and tests for uiautomator tests."""
 
 import logging
-import os
-
-from pylib import android_commands
-from pylib import constants
-from pylib.base import base_test_result
-from pylib.utils import report_results
 
 import test_package
 import test_runner
 
 
-def Setup(uiautomator_jar, uiautomator_info_jar, annotations,
-          exclude_annotations, test_filter, package_name, build_type, test_data,
-          save_perf_json, screenshot_failures, tool, disable_assertions,
-          push_deps, cleanup_test_files):
+def Setup(test_options):
   """Runs uiautomator tests on connected device(s).
 
   Args:
-    uiautomator_jar: Location of the jar file with the uiautomator test suite.
-    uiautomator_info_jar: Info jar accompanying the jar.
-    annotations: Annotations for the tests.
-    exclude_annotations: Any annotations to exclude from running.
-    test_filter: Filter string for tests.
-    package_name: Application package name under test.
-    build_type: 'Release' or 'Debug'.
-    test_data: Location of the test data.
-    save_perf_json: Whether or not to save the JSON file from UI perf tests.
-    screenshot_failures: Take a screenshot for a test failure
-    tool: Name of the Valgrind tool.
-    disable_assertions: Whether to disable java assertions on the device.
-    push_deps: If True, push all dependencies to the device.
-    cleanup_test_files: Whether or not to cleanup test files on device.
+    test_options: A UIAutomatorOptions object.
 
   Returns:
     A tuple of (TestRunnerFactory, tests).
   """
-  test_pkg = test_package.TestPackage(
-      uiautomator_jar, uiautomator_info_jar)
-  tests = test_pkg._GetAllMatchingTests(
-      annotations, exclude_annotations, test_filter)
+  test_pkg = test_package.TestPackage(test_options.uiautomator_jar,
+                                      test_options.uiautomator_info_jar)
+  tests = test_pkg._GetAllMatchingTests(test_options.annotations,
+                                        test_options.exclude_annotations,
+                                        test_options.test_filter)
 
   if not tests:
     logging.error('No uiautomator tests to run with current args.')
 
   def TestRunnerFactory(device, shard_index):
     return test_runner.TestRunner(
-        package_name, build_type, test_data, save_perf_json,
-        screenshot_failures, tool, False, disable_assertions, push_deps,
-        cleanup_test_files, device, shard_index, test_pkg, [])
+        test_options, device, shard_index, test_pkg, [])
 
   return (TestRunnerFactory, tests)