Index: build/android/pylib/base/test_run_factory.py |
diff --git a/build/android/pylib/base/test_run_factory.py b/build/android/pylib/base/test_run_factory.py |
index 550b4cf1df8f7f08b3ec143bf6da0d614cb6dfb7..c8e0582034a500bf7c9a759967aa2fb2885a7b18 100644 |
--- a/build/android/pylib/base/test_run_factory.py |
+++ b/build/android/pylib/base/test_run_factory.py |
@@ -2,17 +2,30 @@ |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
+from pylib.gtest import gtest_test_instance |
+from pylib.gtest import local_device_gtest_run |
+from pylib.local.device import local_device_environment |
+from pylib.remote.device import remote_device_environment |
from pylib.remote.device import remote_device_gtest_run |
from pylib.remote.device import remote_device_uirobot_run |
+from pylib.uirobot import uirobot_test_instance |
+ |
+ |
+def CreateTestRun(_args, env, test_instance, error_func): |
+ if isinstance(env, local_device_environment.LocalDeviceEnvironment): |
+ if isinstance(test_instance, gtest_test_instance.GtestTestInstance): |
+ return local_device_gtest_run.LocalDeviceGtestRun(env, test_instance) |
+ |
+ if isinstance(env, remote_device_environment.RemoteDeviceEnvironment): |
+ if isinstance(test_instance, gtest_test_instance.GtestTestInstance): |
+ return remote_device_gtest_run.RemoteDeviceGtestRun(env, test_instance) |
+ if isinstance(test_instance, uirobot_test_instance.UirobotTestInstance): |
+ return remote_device_uirobot_run.RemoteDeviceUirobotRun( |
+ env, test_instance) |
+ |
+ # TODO(jbudorick): Add local instrumentation test runs. |
+ # TODO(rnephew): Add remote_device instrumentation test runs. |
+ |
+ error_func('Unable to create test run for %s tests in %s environment' |
+ % (str(test_instance), str(env))) |
-def CreateTestRun(args, env, test_instance, error_func): |
- if args.environment == 'remote_device': |
- if test_instance.TestType() == 'gtest': |
- return remote_device_gtest_run.RemoteDeviceGtestRun(env, test_instance) |
- if test_instance.TestType() == 'uirobot': |
- return remote_device_uirobot_run.RemoteDeviceUirobotRun( |
- env, test_instance) |
- # TODO(jbudorick) Add local gtest test runs |
- # TODO(jbudorick) Add local instrumentation test runs. |
- error_func('Unable to create %s test run in %s environment' % ( |
- test_instance.TestType(), args.environment)) |