diff options
4 files changed, 2 insertions, 42 deletions
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD index 439527d968..1969031574 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD +++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD @@ -21,7 +21,6 @@ java_library( "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding", "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api", "//src/java_tools/junitrunner/java/com/google/testing/junit/runner/util", - "//third_party:dagger", "//third_party:jsr305", "//third_party:jsr330_inject", "//third_party:junit4", diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4InstanceModules.java b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4InstanceModules.java index ab2ca4e275..0898dd2a18 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4InstanceModules.java +++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4InstanceModules.java @@ -14,8 +14,6 @@ package com.google.testing.junit.runner.junit4; -import dagger.Module; -import dagger.Provides; import java.util.Arrays; import java.util.List; import javax.inject.Singleton; @@ -30,7 +28,6 @@ public final class JUnit4InstanceModules { /** * A stateful dagger module that holds the supplied test suite class. */ - @Module public static final class SuiteClass { private final Class<?> suiteClass; @@ -38,13 +35,11 @@ public final class JUnit4InstanceModules { this.suiteClass = suiteClass; } - @Provides @TopLevelSuite Class<?> topLevelSuite() { return suiteClass; } - @Provides @TopLevelSuite static String topLevelSuiteName(@TopLevelSuite Class<?> suite) { return suite.getCanonicalName(); @@ -54,7 +49,6 @@ public final class JUnit4InstanceModules { /** * A module which supplies a JUnit4Config object, which can be overridden at test-time. */ - @Module public static final class Config { private final List<String> args; @@ -66,13 +60,11 @@ public final class JUnit4InstanceModules { this.args = Arrays.asList(args); } - @Provides @Singleton JUnit4Options options() { return JUnit4Options.parse(System.getenv(), args); } - @Provides @Singleton static JUnit4Config config(JUnit4Options options) { return new JUnit4Config(options.getTestIncludeFilter(), options.getTestExcludeFilter()); diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerBaseModule.java b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerBaseModule.java index d8eef27bd7..517abd88e5 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerBaseModule.java +++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerBaseModule.java @@ -18,15 +18,10 @@ import static com.google.testing.junit.runner.sharding.ShardingFilters.DEFAULT_S import com.google.testing.junit.junit4.runner.MemoizingRequest; import com.google.testing.junit.runner.internal.Stdout; -import com.google.testing.junit.runner.junit4.JUnit4InstanceModules.SuiteClass; import com.google.testing.junit.runner.model.TestSuiteModel; import com.google.testing.junit.runner.sharding.api.ShardingFilterFactory; import com.google.testing.junit.runner.util.MemoizingSupplier; import com.google.testing.junit.runner.util.Supplier; -import dagger.Module; -import dagger.Provides; -import dagger.multibindings.IntoSet; -import dagger.multibindings.Multibinds; import java.io.OutputStream; import java.io.PrintStream; import java.io.UnsupportedEncodingException; @@ -41,31 +36,23 @@ import org.junit.runner.notification.RunListener; * Dagger module for creating a {@link JUnit4Runner}. This contains the common bindings used when * either the runner runs actual tests or when we do integration tests of the runner itself. */ -@Module(includes = SuiteClass.class) public abstract class JUnit4RunnerBaseModule { - @Multibinds abstract Set<JUnit4Runner.Initializer> initializers(); - @Provides static ShardingFilterFactory shardingFilterFactory() { return DEFAULT_SHARDING_STRATEGY; } - @Provides - @IntoSet static RunListener textListener(TextListener impl) { return impl; } - - @Provides @Singleton static Supplier<TestSuiteModel> provideTestSuiteModelSupplier(JUnit4TestModelBuilder builder) { return new MemoizingSupplier<>(builder); } - @Provides @Singleton static TextListener provideTextListener(@Stdout PrintStream testRunnerOut) { return new TextListener(asUtf8PrintStream(testRunnerOut)); @@ -79,7 +66,6 @@ public abstract class JUnit4RunnerBaseModule { } } - @Provides @Singleton static Request provideRequest(@TopLevelSuite Class<?> suiteClass) { /* diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerModule.java b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerModule.java index af6bcdc562..1e2972bfa3 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerModule.java +++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerModule.java @@ -17,55 +17,38 @@ package com.google.testing.junit.runner.junit4; import com.google.testing.junit.runner.internal.SignalHandlers; import com.google.testing.junit.runner.util.TestNameProvider; import com.google.testing.junit.runner.util.Ticker; - -import dagger.Module; -import dagger.Provides; -import dagger.multibindings.IntoSet; - -import org.junit.runner.notification.RunListener; - import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.OutputStream; import java.nio.file.Path; import javax.annotation.Nullable; import javax.inject.Singleton; +import org.junit.runner.notification.RunListener; /** * Dagger module for real test runs. */ -@Module(includes = {JUnit4RunnerBaseModule.class, JUnit4InstanceModules.Config.class}) public final class JUnit4RunnerModule { - @Provides static Ticker ticker() { return Ticker.systemTicker(); } - @Provides static SignalHandlers.HandlerInstaller signalHandlerInstaller() { return SignalHandlers.createRealHandlerInstaller(); } - @Provides - @IntoSet static RunListener nameListener(JUnit4TestNameListener impl) { return impl; } - @Provides - @IntoSet static RunListener xmlListener(JUnit4TestXmlListener impl) { return impl; } - @Provides - @IntoSet static RunListener stackTraceListener(JUnit4TestStackTraceListener impl) { return impl; } - - @Provides @Singleton @Xml static OutputStream provideXmlStream(JUnit4Config config) { @@ -111,7 +94,7 @@ public final class JUnit4RunnerModule { }; } - @Provides @Singleton + @Singleton SettableCurrentRunningTest provideCurrentRunningTest() { return new SettableCurrentRunningTest() { @Override |