Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: tools/chrome_remote_control/chrome_remote_control/android_browser_finder_unittest.py

Issue 10945043: [chrome_remote_control] Use monkey patching for stubs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/chrome_remote_control/chrome_remote_control/android_browser_finder_unittest.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/android_browser_finder_unittest.py b/tools/chrome_remote_control/chrome_remote_control/android_browser_finder_unittest.py
index e8658a570d543573d7e70c9969d050d2ddb731b5..cf602c17255acc2a1e3a3e272ed944c7166e454f 100644
--- a/tools/chrome_remote_control/chrome_remote_control/android_browser_finder_unittest.py
+++ b/tools/chrome_remote_control/chrome_remote_control/android_browser_finder_unittest.py
@@ -9,42 +9,6 @@ from chrome_remote_control import browser_options
from system_stub import *
-# adb not even found
-# android_browser_finder not returning
-class ADBCommandsStub(object):
- def __init__(self, module, device):
- self._module = module
- self._device = device
- self.is_root_enabled = True
-
- def RunShellCommand(self, args):
- if isinstance(args, basestring):
- import shlex
- args = shlex.split(args)
- handler = self._module.shell_command_handlers[args[0]]
- return handler(args)
-
- def IsRootEnabled(self):
- return self.is_root_enabled
-
-class ADBCommandsModuleStub(object):
- def __init__(self):
- self.attached_devices = []
- self.shell_command_handlers = {}
-
- def ADBCommandsStubConstructor(device=None):
- return ADBCommandsStub(self, device)
- self.ADBCommands = ADBCommandsStubConstructor
-
- def IsAndroidSupported(self):
- return True
-
- def GetAttachedDevices(self):
- return self.attached_devices
-
- def HasForwarder(self, adb):
- return True
-
class AndroidBrowserFinderTest(unittest.TestCase):
def test_no_adb(self):
options = browser_options.BrowserOptions()
@@ -53,8 +17,8 @@ class AndroidBrowserFinderTest(unittest.TestCase):
def NoADB(*args, **kargs):
raise OSError('not found')
subprocess_stub.Popen_hook = NoADB
- browsers = android_browser_finder.FindAllAvailableBrowsers(
- options, subprocess_stub)
+ with Override(android_browser_finder, subprocess=subprocess_stub):
+ browsers = android_browser_finder.FindAllAvailableBrowsers(options)
self.assertEquals(0, len(browsers))
def test_adb_no_devices(self):
@@ -65,8 +29,10 @@ class AndroidBrowserFinderTest(unittest.TestCase):
subprocess_stub.Popen_result = popen_stub
adb_commands_module_stub = ADBCommandsModuleStub()
- browsers = android_browser_finder.FindAllAvailableBrowsers(
- options, subprocess_stub, adb_commands_module_stub)
+ with Override(android_browser_finder,
+ subprocess=subprocess_stub,
+ adb_commands=adb_commands_module_stub):
+ browsers = android_browser_finder.FindAllAvailableBrowsers(options)
self.assertEquals(0, len(browsers))
@@ -95,8 +61,10 @@ class AndroidBrowserFinderTest(unittest.TestCase):
logger = logging.getLogger()
logger.addFilter(temp_filter)
- browsers = android_browser_finder.FindAllAvailableBrowsers(
- options, subprocess_stub, adb_commands_module_stub)
+ with Override(android_browser_finder,
+ subprocess=subprocess_stub,
+ adb_commands=adb_commands_module_stub):
+ browsers = android_browser_finder.FindAllAvailableBrowsers(options)
finally:
logger.removeFilter(temp_filter)
self.assertEquals(3, len(warnings))
@@ -124,8 +92,10 @@ class AndroidBrowserFinderTest(unittest.TestCase):
logger = logging.getLogger()
logger.addFilter(temp_filter)
- browsers = android_browser_finder.FindAllAvailableBrowsers(
- options, subprocess_stub, adb_commands_module_stub)
+ with Override(android_browser_finder,
+ subprocess=subprocess_stub,
+ adb_commands=adb_commands_module_stub):
+ browsers = android_browser_finder.FindAllAvailableBrowsers(options)
finally:
logger.removeFilter(temp_filter)
self.assertEquals(1, len(warnings))
@@ -149,6 +119,8 @@ class AndroidBrowserFinderTest(unittest.TestCase):
adb_commands_module_stub.shell_command_handlers['pm'] = OnPM
- browsers = android_browser_finder.FindAllAvailableBrowsers(
- options, subprocess_stub, adb_commands_module_stub)
+ with Override(android_browser_finder,
+ subprocess=subprocess_stub,
+ adb_commands=adb_commands_module_stub):
+ browsers = android_browser_finder.FindAllAvailableBrowsers(options)
self.assertEquals(1, len(browsers))

Powered by Google App Engine
This is Rietveld 408576698