Move more things from TestConstants to AnalysisMock and LoadingMock.
Also remove other uses of TestConstants.
--
MOS_MIGRATED_REVID=127327339
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/AbstractTargetPatternEvaluatorTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/AbstractTargetPatternEvaluatorTest.java
index f4ba91e..8464cef 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/AbstractTargetPatternEvaluatorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/AbstractTargetPatternEvaluatorTest.java
@@ -24,7 +24,6 @@
import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.packages.util.PackageLoadingTestCase;
-import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.util.Pair;
import org.junit.Before;
@@ -74,9 +73,7 @@
@Before
public final void initializeParser() throws Exception {
- setUpSkyframe(
- ConstantRuleVisibility.PRIVATE,
- ruleClassProvider.getDefaultsPackageContent(TestConstants.TEST_INVOCATION_POLICY));
+ setUpSkyframe(ConstantRuleVisibility.PRIVATE, loadingMock.getDefaultsPackageContent());
parser = skyframeExecutor.getPackageManager().newTargetPatternEvaluator();
parsingListener = new RecordingParsingListener(reporter);
}
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/IOExceptionsTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/IOExceptionsTest.java
index 8203ab3..901e0bf 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/IOExceptionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/IOExceptionsTest.java
@@ -23,7 +23,6 @@
import com.google.devtools.build.lib.packages.ConstantRuleVisibility;
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.packages.util.PackageLoadingTestCase;
-import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.util.BlazeClock;
import com.google.devtools.build.lib.vfs.FileStatus;
import com.google.devtools.build.lib.vfs.FileSystem;
@@ -64,9 +63,7 @@
@Before
public final void initializeVisitor() throws Exception {
- setUpSkyframe(
- ConstantRuleVisibility.PRIVATE,
- ruleClassProvider.getDefaultsPackageContent(TestConstants.TEST_INVOCATION_POLICY));
+ setUpSkyframe(ConstantRuleVisibility.PRIVATE, loadingMock.getDefaultsPackageContent());
this.visitor = skyframeExecutor.pkgLoader();
}
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
index 76ce0b4..3a2798f 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
@@ -34,6 +34,7 @@
import com.google.devtools.build.lib.packages.Preprocessor;
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.packages.Target;
+import com.google.devtools.build.lib.packages.util.LoadingMock;
import com.google.devtools.build.lib.skyframe.DiffAwareness;
import com.google.devtools.build.lib.skyframe.PrecomputedValue;
import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor;
@@ -41,8 +42,6 @@
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
import com.google.devtools.build.lib.syntax.GlobList;
import com.google.devtools.build.lib.testutil.ManualClock;
-import com.google.devtools.build.lib.testutil.TestConstants;
-import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.util.BlazeClock;
import com.google.devtools.build.lib.util.Preconditions;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
@@ -465,22 +464,27 @@
outputBase.createDirectory();
addFile("WORKSPACE");
+ LoadingMock loadingMock = LoadingMock.get();
skyframeExecutor =
SequencedSkyframeExecutor.create(
- TestConstants.PACKAGE_FACTORY_FACTORY_FOR_TESTING.create(
- TestRuleClassProvider.getRuleClassProvider(), fs),
- new BlazeDirectories(fs.getPath("/install"), fs.getPath("/output"), workspace,
- TestConstants.PRODUCT_NAME),
+ loadingMock
+ .getPackageFactoryForTesting()
+ .create(loadingMock.createRuleClassProvider(), fs),
+ new BlazeDirectories(
+ fs.getPath("/install"),
+ fs.getPath("/output"),
+ workspace,
+ loadingMock.getProductName()),
null, /* BinTools */
null, /* workspaceStatusActionFactory */
- TestRuleClassProvider.getRuleClassProvider().getBuildInfoFactories(),
+ loadingMock.createRuleClassProvider().getBuildInfoFactories(),
ImmutableList.of(new ManualDiffAwarenessFactory()),
Predicates.<PathFragment>alwaysFalse(),
supplier,
ImmutableMap.<SkyFunctionName, SkyFunction>of(),
ImmutableList.<PrecomputedValue.Injected>of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
- TestConstants.PRODUCT_NAME);
+ loadingMock.getProductName());
skyframeExecutor.preparePackageLoading(
new PathPackageLocator(outputBase, ImmutableList.of(workspace)),
ConstantRuleVisibility.PUBLIC, true, 7, "",
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
index 3bc277b..4800781 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
@@ -32,6 +32,7 @@
import com.google.common.eventbus.Subscribe;
import com.google.devtools.build.lib.analysis.BlazeDirectories;
import com.google.devtools.build.lib.analysis.BuildView;
+import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
import com.google.devtools.build.lib.analysis.util.AnalysisMock;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
@@ -51,8 +52,6 @@
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
import com.google.devtools.build.lib.testutil.ManualClock;
import com.google.devtools.build.lib.testutil.MoreAsserts;
-import com.google.devtools.build.lib.testutil.TestConstants;
-import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.util.Preconditions;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
import com.google.devtools.build.lib.vfs.FileSystem;
@@ -71,11 +70,9 @@
import org.junit.runners.JUnit4;
import java.io.IOException;
-import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.logging.Level;
@@ -595,14 +592,11 @@
return loadingResult;
}
- private <K, V> Map.Entry<K, V> entryFor(K key, V value) {
- return new AbstractMap.SimpleImmutableEntry<>(key, value);
- }
-
private static class LoadingPhaseTester {
private final ManualClock clock = new ManualClock();
private final Path workspace;
+ private final AnalysisMock analysisMock;
private final SkyframeExecutor skyframeExecutor;
private final List<Path> changes = new ArrayList<>();
@@ -622,28 +616,35 @@
this.workspace = fs.getPath("/workspace");
workspace.createDirectory();
mockToolsConfig = new MockToolsConfig(workspace);
- AnalysisMock.get().setupMockClient(mockToolsConfig);
+ analysisMock = AnalysisMock.get();
+ analysisMock.setupMockClient(mockToolsConfig);
FileSystemUtils.deleteTree(workspace.getRelative("base"));
- PackageFactory pkgFactory = TestConstants.PACKAGE_FACTORY_FACTORY_FOR_TESTING.create(
- TestRuleClassProvider.getRuleClassProvider(), fs);
+ ConfiguredRuleClassProvider ruleClassProvider = analysisMock.createRuleClassProvider();
+ PackageFactory pkgFactory =
+ analysisMock.getPackageFactoryForTesting().create(ruleClassProvider, fs);
PackageCacheOptions options = Options.getDefaults(PackageCacheOptions.class);
storedErrors = new StoredEventHandler();
BlazeDirectories directories =
- new BlazeDirectories(fs.getPath("/install"), fs.getPath("/output"), workspace,
- TestConstants.PRODUCT_NAME);
- skyframeExecutor = SequencedSkyframeExecutor.create(pkgFactory,
- directories,
- null, /* binTools -- not used */
- null, /* workspaceStatusActionFactory -- not used */
- TestRuleClassProvider.getRuleClassProvider().getBuildInfoFactories(),
- ImmutableList.<DiffAwareness.Factory>of(),
- Predicates.<PathFragment>alwaysFalse(),
- Preprocessor.Factory.Supplier.NullSupplier.INSTANCE,
- AnalysisMock.get().getSkyFunctions(),
- ImmutableList.<PrecomputedValue.Injected>of(),
- ImmutableList.<SkyValueDirtinessChecker>of(),
- TestConstants.PRODUCT_NAME);
+ new BlazeDirectories(
+ fs.getPath("/install"),
+ fs.getPath("/output"),
+ workspace,
+ analysisMock.getProductName());
+ skyframeExecutor =
+ SequencedSkyframeExecutor.create(
+ pkgFactory,
+ directories,
+ null, /* binTools -- not used */
+ null, /* workspaceStatusActionFactory -- not used */
+ ruleClassProvider.getBuildInfoFactories(),
+ ImmutableList.<DiffAwareness.Factory>of(),
+ Predicates.<PathFragment>alwaysFalse(),
+ Preprocessor.Factory.Supplier.NullSupplier.INSTANCE,
+ analysisMock.getSkyFunctions(),
+ ImmutableList.<PrecomputedValue.Injected>of(),
+ ImmutableList.<SkyValueDirtinessChecker>of(),
+ analysisMock.getProductName());
PathPackageLocator pkgLocator = PathPackageLocator.create(
null, options.packagePath, storedErrors, workspace, workspace);
skyframeExecutor.preparePackageLoading(
@@ -651,8 +652,7 @@
ConstantRuleVisibility.PRIVATE,
true,
7,
- TestRuleClassProvider.getRuleClassProvider()
- .getDefaultsPackageContent(TestConstants.TEST_INVOCATION_POLICY),
+ analysisMock.getDefaultsPackageContent(),
UUID.randomUUID(),
new TimestampGranularityMonitor(clock));
loadingPhaseRunner = skyframeExecutor.getLoadingPhaseRunner(
@@ -732,9 +732,7 @@
}
private void sync() throws InterruptedException {
- String pkgContents =
- TestRuleClassProvider.getRuleClassProvider()
- .getDefaultsPackageContent(TestConstants.TEST_INVOCATION_POLICY);
+ String pkgContents = analysisMock.getDefaultsPackageContent();
skyframeExecutor.setupDefaultPackage(pkgContents);
clock.advanceMillis(1);
ModifiedFileSet.Builder builder = ModifiedFileSet.builder();
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
index 1e2034b..9afcce1 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PackageCacheTest.java
@@ -48,8 +48,6 @@
import com.google.devtools.build.lib.syntax.BuildFileAST;
import com.google.devtools.build.lib.testutil.FoundationTestCase;
import com.google.devtools.build.lib.testutil.MoreAsserts;
-import com.google.devtools.build.lib.testutil.TestConstants;
-import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.util.BlazeClock;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
import com.google.devtools.build.lib.vfs.ModifiedFileSet;
@@ -75,19 +73,21 @@
@RunWith(JUnit4.class)
public class PackageCacheTest extends FoundationTestCase {
+ private AnalysisMock analysisMock;
private ConfiguredRuleClassProvider ruleClassProvider;
private SkyframeExecutor skyframeExecutor;
@Before
public final void initializeSkyframeExecutor() throws Exception {
- ruleClassProvider = TestRuleClassProvider.getRuleClassProvider();
- BlazeDirectories directories = new BlazeDirectories(outputBase, outputBase, rootDirectory,
- TestConstants.PRODUCT_NAME);
+ analysisMock = AnalysisMock.get();
+ ruleClassProvider = analysisMock.createRuleClassProvider();
+ BlazeDirectories directories =
+ new BlazeDirectories(outputBase, outputBase, rootDirectory, analysisMock.getProductName());
skyframeExecutor =
SequencedSkyframeExecutor.create(
- TestConstants.PACKAGE_FACTORY_FACTORY_FOR_TESTING.create(
- ruleClassProvider,
- scratch.getFileSystem()),
+ analysisMock
+ .getPackageFactoryForTesting()
+ .create(ruleClassProvider, scratch.getFileSystem()),
directories,
null, /* BinTools */
null, /* workspaceStatusActionFactory */
@@ -98,7 +98,7 @@
AnalysisMock.get().getSkyFunctions(),
ImmutableList.<PrecomputedValue.Injected>of(),
ImmutableList.<SkyValueDirtinessChecker>of(),
- TestConstants.PRODUCT_NAME);
+ analysisMock.getProductName());
setUpSkyframe(parsePackageCacheOptions());
}
@@ -110,7 +110,7 @@
packageCacheOptions.defaultVisibility,
true,
7,
- ruleClassProvider.getDefaultsPackageContent(TestConstants.TEST_INVOCATION_POLICY),
+ analysisMock.getDefaultsPackageContent(),
UUID.randomUUID(),
new TimestampGranularityMonitor(BlazeClock.instance()));
skyframeExecutor.setDeletedPackages(ImmutableSet.copyOf(packageCacheOptions.getDeletedPackages()));
@@ -121,8 +121,7 @@
parser.parse(new String[] { "--default_visibility=public" });
parser.parse(options);
- InvocationPolicyEnforcer optionsPolicyEnforcer =
- new InvocationPolicyEnforcer(TestConstants.TEST_INVOCATION_POLICY);
+ InvocationPolicyEnforcer optionsPolicyEnforcer = analysisMock.getInvocationPolicyEnforcer();
try {
optionsPolicyEnforcer.enforce(parser);
} catch (OptionsParsingException e) {
