Add InstrumentationRunListener#setInstrumentation

Change-Id: I5ef349654aac8772b70afeb6caabb648d4e478c0

5 files changed, 18 insertions, 18 deletions

diff --git a/support/src/android/support/test/internal/runner/listener/CoverageListener.java b/support/src/android/support/test/internal/runner/listener/CoverageListener.java
index cd1e63e..1064aad 100644
--- a/support/src/android/support/test/internal/runner/listener/CoverageListener.java
+++ b/support/src/android/support/test/internal/runner/listener/CoverageListener.java
@@ -44,13 +44,16 @@ public class CoverageListener extends InstrumentationRunListener {
     /**
      * Creates a {@link CoverageListener).
      *
-     * @param instr the {@link Instrumentation} that the test is running under
      * @param customCoverageFilePath an optional user specified path for the coverage file
      *         If null, file will be generated in test app's file directory.
      */
-    public CoverageListener(Instrumentation instr, String customCoverageFilePath) {
-        super(instr);
+    public CoverageListener(String customCoverageFilePath) {
         mCoverageFilePath = customCoverageFilePath;
+    }
+    
+    @Override 
+    public void setInstrumentation(Instrumentation instr) {
+        super.setInstrumentation(instr);
         if (mCoverageFilePath == null) {
             mCoverageFilePath = instr.getTargetContext().getFilesDir().getAbsolutePath() +
                     File.separator + DEFAULT_COVERAGE_FILE_NAME;
diff --git a/support/src/android/support/test/internal/runner/listener/InstrumentationResultPrinter.java b/support/src/android/support/test/internal/runner/listener/InstrumentationResultPrinter.java
index 65b4edf..c913abc 100644
--- a/support/src/android/support/test/internal/runner/listener/InstrumentationResultPrinter.java
+++ b/support/src/android/support/test/internal/runner/listener/InstrumentationResultPrinter.java
@@ -92,8 +92,7 @@ public class InstrumentationResultPrinter extends InstrumentationRunListener {
     int mTestResultCode = 0;
     String mTestClass = null;
 
-    public InstrumentationResultPrinter(Instrumentation i) {
-        super(i);
+    public InstrumentationResultPrinter() {
         mResultTemplate = new Bundle();
     }
 
diff --git a/support/src/android/support/test/internal/runner/listener/InstrumentationRunListener.java b/support/src/android/support/test/internal/runner/listener/InstrumentationRunListener.java
index 5785cfc..705f871 100644
--- a/support/src/android/support/test/internal/runner/listener/InstrumentationRunListener.java
+++ b/support/src/android/support/test/internal/runner/listener/InstrumentationRunListener.java
@@ -28,15 +28,15 @@ import java.io.PrintStream;
  */
 public abstract class InstrumentationRunListener extends RunListener {
 
-    private final Instrumentation mInstr;
-
-    public InstrumentationRunListener(Instrumentation instr) {
-        mInstr = instr;
-    }
+    private Instrumentation mInstr;
 
     public Instrumentation getInstrumentation() {
         return mInstr;
     }
+    
+    public void setInstrumentation(Instrumentation instr) {
+        mInstr = instr;
+    }
 
     /**
      * Convenience method for {@link #getInstrumentation()#sendStatus()}
diff --git a/support/src/android/support/test/internal/runner/listener/SuiteAssignmentPrinter.java b/support/src/android/support/test/internal/runner/listener/SuiteAssignmentPrinter.java
index 5d77935..798e252 100644
--- a/support/src/android/support/test/internal/runner/listener/SuiteAssignmentPrinter.java
+++ b/support/src/android/support/test/internal/runner/listener/SuiteAssignmentPrinter.java
@@ -16,7 +16,6 @@
 
 package android.support.test.internal.runner.listener;
 
-import android.app.Instrumentation;
 import android.support.test.internal.runner.TestRequestBuilder;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -44,10 +43,6 @@ public class SuiteAssignmentPrinter extends InstrumentationRunListener {
      */
     private static final float MEDIUM_SUITE_MAX_RUNTIME = 1000;
 
-    public SuiteAssignmentPrinter(Instrumentation i) {
-        super(i);
-    }
-
     private long mStartTime;
     private boolean mTimingValid;
 
diff --git a/support/src/android/support/test/runner/AndroidJUnitRunner.java b/support/src/android/support/test/runner/AndroidJUnitRunner.java
index bffd0c1..6abf44a 100644
--- a/support/src/android/support/test/runner/AndroidJUnitRunner.java
+++ b/support/src/android/support/test/runner/AndroidJUnitRunner.java
@@ -255,11 +255,11 @@ public class AndroidJUnitRunner extends Instrumentation {
     private void addListeners(List<RunListener> listeners, JUnitCore testRunner,
             PrintStream writer) {
         if (getBooleanArgument(ARGUMENT_SUITE_ASSIGNMENT)) {
-            listeners.add(new SuiteAssignmentPrinter(this));
+            listeners.add(new SuiteAssignmentPrinter());
         } else {
             listeners.add(new TextListener(writer));
             listeners.add(new LogRunListener());
-            listeners.add(new InstrumentationResultPrinter(this));
+            listeners.add(new InstrumentationResultPrinter());
             addDelayListener(listeners);
             addCoverageListener(listeners);
         }
@@ -269,13 +269,16 @@ public class AndroidJUnitRunner extends Instrumentation {
 
         for (RunListener listener : listeners) {
             testRunner.addListener(listener);
+            if (listener instanceof InstrumentationRunListener) {
+                ((InstrumentationRunListener)listener).setInstrumentation(this);
+            }
         }
     }
 
     private void addCoverageListener(List<RunListener> list) {
         if (getBooleanArgument(ARGUMENT_COVERAGE)) {
             String coverageFilePath = getArguments().getString(ARGUMENT_COVERAGE_PATH);
-            list.add(new CoverageListener(this, coverageFilePath));
+            list.add(new CoverageListener(coverageFilePath));
         }
     }