Fix 'e log true' test runs.

The test suite used to just output a list of test names to run,
instead of executing them was mistakenly skipping the entire
test run.

Change-Id: Ifc2ff9f47a204b06524670a0eb5d39f2ad6455ad

3 files changed, 16 insertions, 5 deletions

diff --git a/support/src/android/support/test/internal/runner/junit3/AndroidTestSuite.java b/support/src/android/support/test/internal/runner/junit3/AndroidTestSuite.java
index d468791..5cfed8f 100644
--- a/support/src/android/support/test/internal/runner/junit3/AndroidTestSuite.java
+++ b/support/src/android/support/test/internal/runner/junit3/AndroidTestSuite.java
@@ -48,6 +48,6 @@ class AndroidTestSuite extends DelegatingFilterableTestSuite {
     @Override
     public void run(TestResult result) {
         // wrap the result in a new AndroidTestResult to do the bundle and instrumentation injection
-        mWrappedSuite.run(new AndroidTestResult(mBundle, mInstr, result));
+        super.run(new AndroidTestResult(mBundle, mInstr, result));
     }
 }
diff --git a/support/src/android/support/test/internal/runner/junit3/DelegatingFilterableTestSuite.java b/support/src/android/support/test/internal/runner/junit3/DelegatingFilterableTestSuite.java
index 7d2b417..ae9b38d 100644
--- a/support/src/android/support/test/internal/runner/junit3/DelegatingFilterableTestSuite.java
+++ b/support/src/android/support/test/internal/runner/junit3/DelegatingFilterableTestSuite.java
@@ -36,7 +36,7 @@ class DelegatingFilterableTestSuite extends DelegatingTestSuite implements Filte
 
     @Override
     public void filter(Filter filter) throws NoTestsRemainException {
-        TestSuite suite = mWrappedSuite;
+        TestSuite suite = getDelegateSuite();
         TestSuite filtered = new TestSuite(suite.getName());
         int n = suite.testCount();
         for (int i = 0; i < n; i++) {
@@ -45,7 +45,7 @@ class DelegatingFilterableTestSuite extends DelegatingTestSuite implements Filte
                 filtered.addTest(test);
             }
         }
-        mWrappedSuite = filtered;
+        setDelegateSuite(filtered);
         if (filtered.testCount() == 0) {
             throw new NoTestsRemainException();
         }
@@ -55,5 +55,4 @@ class DelegatingFilterableTestSuite extends DelegatingTestSuite implements Filte
         // delegate to JUnit38ClassRunner copy.
         return JUnit38ClassRunner.makeDescription(test);
     }
-
 }
diff --git a/support/src/android/support/test/internal/runner/junit3/DelegatingTestSuite.java b/support/src/android/support/test/internal/runner/junit3/DelegatingTestSuite.java
index 85ec1f9..4df4fa0 100644
--- a/support/src/android/support/test/internal/runner/junit3/DelegatingTestSuite.java
+++ b/support/src/android/support/test/internal/runner/junit3/DelegatingTestSuite.java
@@ -30,7 +30,7 @@ import java.util.Enumeration;
 @Ignore
 class DelegatingTestSuite extends TestSuite {
 
-    protected TestSuite mWrappedSuite;
+    private TestSuite mWrappedSuite;
 
     public DelegatingTestSuite(TestSuite suiteDelegate) {
         super();
@@ -38,6 +38,13 @@ class DelegatingTestSuite extends TestSuite {
     }
 
     /**
+     * Return the suite to delegate to
+     */
+    public TestSuite getDelegateSuite() {
+        return mWrappedSuite;
+    }
+
+    /**
      * Replace the suite to delegate to
      *
      * @param newSuiteDelegate
@@ -90,4 +97,9 @@ class DelegatingTestSuite extends TestSuite {
     public String toString() {
         return mWrappedSuite.toString();
     }
+
+    @Override
+    public void run(TestResult result) {
+        mWrappedSuite.run(result);
+    }
 }