diff options
Diffstat (limited to 'src/test/java/com')
4 files changed, 0 insertions, 24 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java index 51311121cc..ad149eab70 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java @@ -19,14 +19,12 @@ import com.google.common.base.Functions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; -import com.google.devtools.build.lib.analysis.ConfigurationCollectionFactory; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.PlatformConfigurationLoader; import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory; import com.google.devtools.build.lib.analysis.featurecontrol.FeaturePolicyLoader; import com.google.devtools.build.lib.analysis.util.AnalysisMock; import com.google.devtools.build.lib.bazel.rules.BazelConfiguration; -import com.google.devtools.build.lib.bazel.rules.BazelConfigurationCollection; import com.google.devtools.build.lib.bazel.rules.python.BazelPythonConfiguration; import com.google.devtools.build.lib.packages.util.BazelMockCcSupport; import com.google.devtools.build.lib.packages.util.MockCcSupport; @@ -255,11 +253,6 @@ public final class BazelAnalysisMock extends AnalysisMock { } @Override - public ConfigurationCollectionFactory createConfigurationCollectionFactory() { - return new BazelConfigurationCollection(); - } - - @Override public ConfiguredRuleClassProvider createRuleClassProvider() { return TestRuleClassProvider.getRuleClassProvider(); } diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java index 4c1d1d5b4c..ba14b25232 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java @@ -15,7 +15,6 @@ package com.google.devtools.build.lib.analysis.util; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.devtools.build.lib.analysis.ConfigurationCollectionFactory; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory; import com.google.devtools.build.lib.bazel.rules.android.AndroidNdkRepositoryFunction; @@ -98,8 +97,6 @@ public abstract class AnalysisMock extends LoadingMock { */ public abstract void setupMockWorkspaceFiles(Path embeddedBinariesRoot) throws IOException; - public abstract ConfigurationCollectionFactory createConfigurationCollectionFactory(); - /** Returns the default factories for configuration fragments used in tests. */ public abstract List<ConfigurationFragmentFactory> getDefaultConfigurationFragmentFactories(); @@ -155,11 +152,6 @@ public abstract class AnalysisMock extends LoadingMock { } @Override - public ConfigurationCollectionFactory createConfigurationCollectionFactory() { - return delegate.createConfigurationCollectionFactory(); - } - - @Override public List<ConfigurationFragmentFactory> getDefaultConfigurationFragmentFactories() { return delegate.getDefaultConfigurationFragmentFactories(); } diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java index 3d6288d406..5e99114e1b 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java @@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.devtools.build.lib.analysis.BlazeDirectories; -import com.google.devtools.build.lib.analysis.ConfigurationCollectionFactory; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; @@ -47,7 +46,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import org.mockito.Mockito; /** Tests the handling of rc-options in {@link BlazeCommandDispatcher}. */ @RunWith(JUnit4.class) @@ -155,8 +153,6 @@ public class BlazeCommandDispatcherRcoptionsTest { builder.addConfigurationOptions(MockFragmentOptions.class); // The tools repository is needed for createGlobals builder.setToolsRepository(TestConstants.TOOLS_REPOSITORY); - builder.setConfigurationCollectionFactory( - Mockito.mock(ConfigurationCollectionFactory.class)); } }) .build(); diff --git a/src/test/java/com/google/devtools/build/lib/runtime/CommandInterruptionTest.java b/src/test/java/com/google/devtools/build/lib/runtime/CommandInterruptionTest.java index 8d8e8d651a..b254c4ebe5 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/CommandInterruptionTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/CommandInterruptionTest.java @@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assertWithMessage; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.SettableFuture; import com.google.devtools.build.lib.analysis.BlazeDirectories; -import com.google.devtools.build.lib.analysis.ConfigurationCollectionFactory; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.ServerDirectories; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; @@ -52,7 +51,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import org.mockito.Mockito; /** Tests of CommandEnvironment's command-interrupting exit functionality. */ @RunWith(JUnit4.class) @@ -364,9 +362,6 @@ public final class CommandInterruptionTest { public void initializeRuleClasses(ConfiguredRuleClassProvider.Builder builder) { // Can't create a Skylark environment without a tools repository! builder.setToolsRepository(TestConstants.TOOLS_REPOSITORY); - // Can't create a runtime without a configuration collection factory! - builder.setConfigurationCollectionFactory( - Mockito.mock(ConfigurationCollectionFactory.class)); // Can't create a defaults package without the base options in there! builder.addConfigurationOptions(BuildConfiguration.Options.class); } |