[Android] Change object types from AndroidCommands to DeviceUtils in build/android/.

build/android/pylib/host_driven/test_case.py

 # Copyright 2013 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.
 
 """Base class for host-driven test cases.
 
 This test case is intended to serve as the base class for any host-driven
 test cases. It is similar to the Python unitttest module in that test cases
 inherit from this class and add methods which will be run as tests.
 
 When a HostDrivenTestCase object is instantiated, its purpose is to run only one
 test method in the derived class. The test runner gives it the name of the test
 method the instance will run. The test runner calls SetUp with the device ID
 which the test method will run against. The test runner runs the test method
 itself, collecting the result, and calls TearDown.
 
 Tests can perform arbitrary Python commands and asserts in test methods. Tests
 that run instrumentation tests can make use of the _RunJavaTestFilters helper
 function to trigger Java tests and convert results into a single host-driven
 test result.
 """
 
 import logging
 import os
 import time
 
-from pylib import android_commands
 from pylib import constants
 from pylib import forwarder
 from pylib import valgrind_tools
 from pylib.base import base_test_result
+from pylib.device import device_utils
 from pylib.instrumentation import test_package
 from pylib.instrumentation import test_result
 from pylib.instrumentation import test_runner
 
 # aka the parent of com.google.android
 BASE_ROOT = 'src' + os.sep
 
 
 class HostDrivenTestCase(object):
   """Base class for host-driven test cases."""
 
   _HOST_DRIVEN_TAG = 'HostDriven'
 
   def __init__(self, test_name, instrumentation_options=None):
     """Create a test case initialized to run |test_name|.
 
     Args:
       test_name: The name of the method to run as the test.
       instrumentation_options: An InstrumentationOptions object.
     """
     class_name = self.__class__.__name__
-    self.adb = None
     self.cleanup_test_files = False
+    self.device = None
     self.device_id = ''
     self.has_forwarded_ports = False
     self.instrumentation_options = instrumentation_options
     self.ports_to_forward = []
     self.push_deps = False
     self.shard_index = 0
 
     # Use tagged_name when creating results, so that we can identify host-driven
     # tests in the overall results.
     self.test_name = test_name
     self.qualified_name = '%s.%s' % (class_name, self.test_name)
     self.tagged_name = '%s_%s' % (self._HOST_DRIVEN_TAG, self.qualified_name)
 
   # TODO(bulach): make ports_to_forward not optional and move the Forwarder
   # mapping here.
   def SetUp(self, device, shard_index, push_deps,
             cleanup_test_files, ports_to_forward=None):
     if not ports_to_forward:
       ports_to_forward = []
     self.device_id = device
     self.shard_index = shard_index
-    self.adb = android_commands.AndroidCommands(self.device_id)
+    self.device = device_utils.DeviceUtils(self.device_id)
     self.push_deps = push_deps
     self.cleanup_test_files = cleanup_test_files
     if ports_to_forward:
       self.ports_to_forward = ports_to_forward
 
   def TearDown(self):
     pass
 
   # TODO(craigdh): Remove GetOutDir once references have been removed
   # downstream.
@@ skipping 10 matching lines @@
   def __GetHostForwarderLog():
     return ('-- Begin Full HostForwarder log\n'
             '%s\n'
             '--End Full HostForwarder log\n' % forwarder.Forwarder.GetHostLog())
 
   def __StartForwarder(self):
     logging.warning('Forwarding %s %s', self.ports_to_forward,
                     self.has_forwarded_ports)
     if self.ports_to_forward and not self.has_forwarded_ports:
       self.has_forwarded_ports = True
-      tool = valgrind_tools.CreateTool(None, self.adb)
+      tool = valgrind_tools.CreateTool(None, self.device)
       forwarder.Forwarder.Map([(port, port) for port in self.ports_to_forward],
-                              self.adb, tool)
+                              self.device, tool)
 
   def __RunJavaTest(self, test, test_pkg, additional_flags=None):
     """Runs a single Java test in a Java TestRunner.
 
     Args:
       test: Fully qualified test name (ex. foo.bar.TestClass#testMethod)
       test_pkg: TestPackage object.
       additional_flags: A list of additional flags to add to the command line.
 
     Returns:
@@ skipping 65 matching lines @@
     overall_result.AddResult(
         test_result.InstrumentationTestResult(
             self.tagged_name, test_type, start_ms, duration_ms, log=log))
     return overall_result
 
   def __str__(self):
     return self.tagged_name
 
   def __repr__(self):
     return self.tagged_name