Relax requirement for instrumentation test runners.

Currently ADT checks that a specified instrumentation test runner
is actually a subclass of android.test.InstrumentationTestRunner.
This doesn't work for Google Instrumentation Test Runner since it
is a subclass of Google Instrumentation.

This CL relaxes the requirement that a runner has to implement
InstrumentationTestRunner: now it only has to implement
Instrumentation.

Fixes https://code.google.com/p/android/issues/detail?id=68575

Change-Id: I4500016941137bb98b90b5407c3e17d705ec2af9

1 files changed, 5 insertions, 3 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/InstrumentationRunnerValidator.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/InstrumentationRunnerValidator.java
index b494f62..54fd207 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/InstrumentationRunnerValidator.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/InstrumentationRunnerValidator.java
@@ -134,13 +134,15 @@ class InstrumentationRunnerValidator {
         }
         // check if this instrumentation is the standard test runner
         if (!instrumentation.equals(SdkConstants.CLASS_INSTRUMENTATION_RUNNER)) {
-            // check if it extends the standard test runner
+            // Ideally, we'd check if the class extends instrumentation test runner.
+            // However, the Google Instrumentation Test Runner extends Google Instrumentation, and not a test runner,
+            // so we just check that the super class is Instrumentation.
             String result = BaseProjectHelper.testClassForManifest(mJavaProject,
-                    instrumentation, SdkConstants.CLASS_INSTRUMENTATION_RUNNER, true);
+                    instrumentation, SdkConstants.CLASS_INSTRUMENTATION, true);
              if (result != BaseProjectHelper.TEST_CLASS_OK) {
                 return String.format(
                         LaunchMessages.InstrValidator_WrongRunnerTypeMsg_s,
-                        SdkConstants.CLASS_INSTRUMENTATION_RUNNER);
+                        SdkConstants.CLASS_INSTRUMENTATION);
              }
         }
         return INSTRUMENTATION_OK;