| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 """Class for running uiautomator tests on a single device.""" | 5 """Class for running uiautomator tests on a single device.""" |
| 6 | 6 |
| 7 from pylib import constants | 7 from pylib import constants |
| 8 from pylib import flag_changer | 8 from pylib import flag_changer |
| 9 from pylib.instrumentation import test_options as instr_test_options | 9 from pylib.instrumentation import test_options as instr_test_options |
| 10 from pylib.instrumentation import test_runner as instr_test_runner | 10 from pylib.instrumentation import test_runner as instr_test_runner |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 coverage_dir=None, | 37 coverage_dir=None, |
| 38 test_apk=None, | 38 test_apk=None, |
| 39 test_apk_path=None, | 39 test_apk_path=None, |
| 40 test_apk_jar_path=None) | 40 test_apk_jar_path=None) |
| 41 super(TestRunner, self).__init__(instrumentation_options, device, | 41 super(TestRunner, self).__init__(instrumentation_options, device, |
| 42 shard_index, test_pkg) | 42 shard_index, test_pkg) |
| 43 | 43 |
| 44 cmdline_file = constants.PACKAGE_INFO[test_options.package].cmdline_file | 44 cmdline_file = constants.PACKAGE_INFO[test_options.package].cmdline_file |
| 45 self.flags = None | 45 self.flags = None |
| 46 if cmdline_file: | 46 if cmdline_file: |
| 47 self.flags = flag_changer.FlagChanger(self.adb, cmdline_file) | 47 self.flags = flag_changer.FlagChanger(self.device, cmdline_file) |
| 48 self._package = constants.PACKAGE_INFO[test_options.package].package | 48 self._package = constants.PACKAGE_INFO[test_options.package].package |
| 49 self._activity = constants.PACKAGE_INFO[test_options.package].activity | 49 self._activity = constants.PACKAGE_INFO[test_options.package].activity |
| 50 | 50 |
| 51 #override | 51 #override |
| 52 def InstallTestPackage(self): | 52 def InstallTestPackage(self): |
| 53 self.test_pkg.Install(self.adb) | 53 self.test_pkg.Install(self.device) |
| 54 | 54 |
| 55 #override | 55 #override |
| 56 def PushDataDeps(self): | 56 def PushDataDeps(self): |
| 57 pass | 57 pass |
| 58 | 58 |
| 59 #override | 59 #override |
| 60 def _RunTest(self, test, timeout): | 60 def _RunTest(self, test, timeout): |
| 61 self.adb.ClearApplicationState(self._package) | 61 self.device.old_interface.ClearApplicationState(self._package) |
| 62 if self.flags: | 62 if self.flags: |
| 63 if 'Feature:FirstRunExperience' in self.test_pkg.GetTestAnnotations(test): | 63 if 'Feature:FirstRunExperience' in self.test_pkg.GetTestAnnotations(test): |
| 64 self.flags.RemoveFlags(['--disable-fre']) | 64 self.flags.RemoveFlags(['--disable-fre']) |
| 65 else: | 65 else: |
| 66 self.flags.AddFlags(['--disable-fre']) | 66 self.flags.AddFlags(['--disable-fre']) |
| 67 self.adb.StartActivity(self._package, | 67 self.device.old_interface.StartActivity(self._package, |
| 68 self._activity, | 68 self._activity, |
| 69 wait_for_completion=True, | 69 wait_for_completion=True, |
| 70 action='android.intent.action.MAIN', | 70 action='android.intent.action.MAIN', |
| 71 force_stop=True) | 71 force_stop=True) |
| 72 return self.adb.RunUIAutomatorTest( | 72 return self.device.old_interface.RunUIAutomatorTest( |
| 73 test, self.test_pkg.GetPackageName(), timeout) | 73 test, self.test_pkg.GetPackageName(), timeout) |
| OLD | NEW |