Update test infra, remove deprecated hacks

square · Apr 14, 2022 · 7152d6e · 7152d6e
1 parent 6493726
commit 7152d6e
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 441 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -43,8 +43,7 @@ androidX-startup = { module = "androidx.startup:startup-runtime", version = "1.0
 androidX-test-core = { module = "androidx.test:core", version = "1.4.0" }
 androidX-test-rules = { module = "androidx.test:rules", version.ref = "androidXTest" }
 # Exposed transitively, avoid increasing
-androidX-test-runner = { module = "androidx.test:runner", version = "1.1.0" }
-androidX-test-runner-internal = { module = "androidx.test:runner", version = "1.4.0" }
+androidX-test-runner = { module = "androidx.test:runner", version = "1.4.0" }
 androidX-test-orchestrator = { module = "androidx.test:orchestrator", version = "1.4.1" }
 androidX-test-espresso = { module = "androidx.test.espresso:espresso-core", version = "3.4.0" }
 androidX-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidXJunit" }

diff --git a/leakcanary-android-instrumentation/api/leakcanary-android-instrumentation.api b/leakcanary-android-instrumentation/api/leakcanary-android-instrumentation.api
@@ -21,27 +21,6 @@ public final class leakcanary/DetectLeaksAssert$Companion {
 	public final fun update (Lleakcanary/DetectLeaksAssert;)V
 }
 
-public final class leakcanary/FailAnnotatedTestOnLeakRunListener : leakcanary/FailTestOnLeakRunListener {
-	public fun <init> ()V
-}
-
-public abstract interface annotation class leakcanary/FailTestOnLeak : java/lang/annotation/Annotation {
-}
-
-public class leakcanary/FailTestOnLeakRunListener : org/junit/runner/notification/RunListener {
-	public fun <init> ()V
-	protected final fun failTest (Ljava/lang/String;)V
-	protected fun onAnalysisPerformed (Lshark/HeapAnalysis;)V
-	protected fun skipLeakDetectionReason (Lorg/junit/runner/Description;)Ljava/lang/String;
-	public fun testAssumptionFailure (Lorg/junit/runner/notification/Failure;)V
-	public fun testFailure (Lorg/junit/runner/notification/Failure;)V
-	public fun testFinished (Lorg/junit/runner/Description;)V
-	public fun testIgnored (Lorg/junit/runner/Description;)V
-	public fun testRunFinished (Lorg/junit/runner/Result;)V
-	public fun testRunStarted (Lorg/junit/runner/Description;)V
-	public fun testStarted (Lorg/junit/runner/Description;)V
-}
-
 public abstract interface class leakcanary/HeapAnalysisReporter {
 	public abstract fun reportHeapAnalysis (Lshark/HeapAnalysis;)V
 }

diff --git a/leakcanary-android-instrumentation/build.gradle b/leakcanary-android-instrumentation/build.gradle
@@ -10,8 +10,6 @@ dependencies {
   implementation libs.androidX.test.runner
   implementation libs.kotlin.stdlib
 
-  // Using a more recent version (without enforcing that on consumers)
-  androidTestImplementation libs.androidX.test.runner.internal
   // AppWatcher auto installer for running tests
   androidTestImplementation project(':leakcanary-object-watcher-android')
   // Plumber auto installer for running tests

diff --git a/...instrumentation/src/androidTest/java/leakcanary/FailAnnotatedTestOnLeakRunListenerTest.kt b/...instrumentation/src/androidTest/java/leakcanary/FailAnnotatedTestOnLeakRunListenerTest.kt
diff --git a/...roidx/test/orchestrator/instrumentationlistener/OrchestratedInstrumentationListenerSpy.kt b/...roidx/test/orchestrator/instrumentationlistener/OrchestratedInstrumentationListenerSpy.kt
diff --git a/...ry-android-instrumentation/src/main/java/leakcanary/FailAnnotatedTestOnLeakRunListener.kt b/...ry-android-instrumentation/src/main/java/leakcanary/FailAnnotatedTestOnLeakRunListener.kt
diff --git a/leakcanary-android-instrumentation/src/main/java/leakcanary/FailTestOnLeak.kt b/leakcanary-android-instrumentation/src/main/java/leakcanary/FailTestOnLeak.kt
diff --git a/leakcanary-android-instrumentation/src/main/java/leakcanary/FailTestOnLeakRunListener.kt b/leakcanary-android-instrumentation/src/main/java/leakcanary/FailTestOnLeakRunListener.kt
diff --git a/...d-instrumentation/src/main/java/leakcanary/internal/InstrumentationTestResultPublisher.kt b/...d-instrumentation/src/main/java/leakcanary/internal/InstrumentationTestResultPublisher.kt