Fix android_action_runner.InputSwipe and InputText

devil/devil/android/device_utils_test.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """
 Unit tests for the contents of device_utils.py (mostly DeviceUtils).
 """
 
 # pylint: disable=protected-access
@@ skipping 1520 matching lines @@
          'Starting: Intent { act=android.intent.action.MAIN }\r\n'''),
         (self.call.device.RunShellCommand(
             ['dumpsys', 'window', 'windows'], check_return=True,
             large_output=True),
          ['mCurrentFocus Launcher'])):
       self.device.GoHome()
 
 
 class DeviceUtilsForceStopTest(DeviceUtilsTest):
 
+  def testForceStop_sdkGreaterThanNougatMR1(self):
+    with self.patch_call(self.call.device.build_version_sdk,
+                         return_value=(version_codes.NOUGAT_MR1 + 1)):
+      with self.patch_call(self.call.device.build_id, return_value='ZZZ99Z'):
+        with self.assertCall(
+            self.call.adb.Shell('p=test.package;if [[ "$(ps -e)" = *$p* ]]; '
+                                'then am force-stop $p; fi'),
+            ''):
+          self.device.ForceStop('test.package')
+
   def testForceStop(self):
-    with self.assertCall(
-        self.call.adb.Shell('p=test.package;if [[ "$(ps)" = *$p* ]]; then '
-                            'am force-stop $p; fi'),
-        ''):
-      self.device.ForceStop('test.package')
+    with self.patch_call(self.call.device.build_version_sdk,
+                         return_value=(version_codes.LOLLIPOP)):
+      with self.assertCall(
+          self.call.adb.Shell('p=test.package;if [[ "$(ps)" = *$p* ]]; then '
+                              'am force-stop $p; fi'),
+          ''):
+        self.device.ForceStop('test.package')
 
 
 class DeviceUtilsClearApplicationStateTest(DeviceUtilsTest):
 
   def testClearApplicationState_setPermissions(self):
     with self.assertCalls(
         (self.call.device.GetProp('ro.build.version.sdk', cache=True), '17'),
         (self.call.device._GetApplicationPathsInternal('this.package.exists'),
          ['/data/app/this.package.exists.apk']),
         (self.call.device.RunShellCommand(
@@ skipping 1334 matching lines @@
     with self.assertCalls(
         self.EnsureCacheInitialized()):
       data = json.loads(self.device.DumpCacheData())
       data['token'] = 'TOKEN'
       self.assertTrue(self.device.LoadCacheData(json.dumps(data)))
 
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)