[Android] Fix UIAutomator test running.

build/android/pylib/instrumentation/test_runner_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 instrumentation.TestRunner."""
 
 # pylint: disable=W0212
 
@@ skipping 233 matching lines @@
         'class': ['test.package.TestClass'],
         'test': ['testMethod'],
         'stack': ['', 'foo/bar.py (27)', 'hello/world.py (42)'],
       }),
     ]
     result = self.instance._GenerateTestResult(
         'test.package.TestClass#testMethod', statuses, 0, 1000)
     self.assertEqual(base_test_result.ResultType.CRASH, result.GetType())
     self.assertEqual('\nfoo/bar.py (27)\nhello/world.py (42)', result.GetLog())
 
-  def testRunInstrumentationTest_verifyAdbShellCommand(self):
+  def test_RunTest_verifyAdbShellCommand(self):
     self.instance.options.test_runner = 'MyTestRunner'
     self.instance.device.RunShellCommand = mock.Mock()
-    self.instance._GenerateTestResult = mock.Mock()
-    with mock.patch('pylib.instrumentation.test_runner.'
-                        'TestRunner._ParseAmInstrumentRawOutput',
-                    return_value=(mock.Mock(), mock.Mock(), mock.Mock())):
-      self.instance.RunInstrumentationTest(
-          'test.package.TestClass#testMethod',
-          'test.package',
-          {'test_arg_key': 'test_arg_value'},
-          100)
+    self.instance.test_pkg.GetPackageName = mock.Mock(
+        return_value='test.package')
+    self.instance._GetInstrumentationArgs = mock.Mock(
+        return_value={'test_arg_key': 'test_arg_value'})
+    self.instance._RunTest('test.package.TestClass#testMethod', 100)
     self.instance.device.RunShellCommand.assert_called_with(
         ['am', 'instrument', '-r',
          '-e', 'test_arg_key', "'test_arg_value'",
          '-e', 'class', "'test.package.TestClass#testMethod'",
          '-w', 'test.package/MyTestRunner'],
         timeout=100, retries=0)
 
 if __name__ == '__main__':
   unittest.main(verbosity=2)