DeviceUtils.StartInstrumentation: Shrink command-line

build/android/devil/android/device_utils_test.py

Index: build/android/devil/android/device_utils_test.py
diff --git a/build/android/devil/android/device_utils_test.py b/build/android/devil/android/device_utils_test.py
index 4cb4591843ea85c3302d756871f1ce45bdc2ebff..2c347e7e44622fd3fef529376d6ae252cd3dccb1 100755
--- a/build/android/devil/android/device_utils_test.py
+++ b/build/android/devil/android/device_utils_test.py
@@ -1180,7 +1180,7 @@ class DeviceUtilsStartInstrumentationTest(DeviceUtilsTest):
   def testStartInstrumentation_nothing(self):
     with self.assertCalls(
         self.call.device.RunShellCommand(
-            ['am', 'instrument', 'test.package/.TestInstrumentation'],
+            'p=test.package;am instrument $p/.TestInstrumentation',
             check_return=True, large_output=True)):
       self.device.StartInstrumentation(
           'test.package/.TestInstrumentation',
@@ -1189,7 +1189,7 @@ class DeviceUtilsStartInstrumentationTest(DeviceUtilsTest):
   def testStartInstrumentation_finish(self):
     with self.assertCalls(
         (self.call.device.RunShellCommand(
-            ['am', 'instrument', '-w', 'test.package/.TestInstrumentation'],
+            'p=test.package;am instrument -w $p/.TestInstrumentation',
             check_return=True, large_output=True),
          ['OK (1 test)'])):
       output = self.device.StartInstrumentation(
@@ -1200,7 +1200,7 @@ class DeviceUtilsStartInstrumentationTest(DeviceUtilsTest):
   def testStartInstrumentation_raw(self):
     with self.assertCalls(
         self.call.device.RunShellCommand(
-            ['am', 'instrument', '-r', 'test.package/.TestInstrumentation'],
+            'p=test.package;am instrument -r $p/.TestInstrumentation',
             check_return=True, large_output=True)):
       self.device.StartInstrumentation(
           'test.package/.TestInstrumentation',
@@ -1209,12 +1209,13 @@ class DeviceUtilsStartInstrumentationTest(DeviceUtilsTest):
   def testStartInstrumentation_extras(self):
     with self.assertCalls(
         self.call.device.RunShellCommand(
-            ['am', 'instrument', '-e', 'foo', 'Foo', '-e', 'bar', 'Bar',
-             'test.package/.TestInstrumentation'],
+            "p=test.package;am instrument -e $p.foo Foo -e bar 'Val '$p "
+            "$p/.TestInstrumentation",
             check_return=True, large_output=True)):
       self.device.StartInstrumentation(
           'test.package/.TestInstrumentation',
-          finish=False, raw=False, extras={'foo': 'Foo', 'bar': 'Bar'})
+          finish=False, raw=False, extras={'test.package.foo': 'Foo',
+                                           'bar': 'Val test.package'})
 
 
 class DeviceUtilsBroadcastIntentTest(DeviceUtilsTest):