commit 015aad979fc44e6477b07a4861314f2a8c15d054
author Ulf Adams <ulfjack@google.com> Wed Jul 13 16:49:40 2016 +0000
committer Kristina Chodorow <kchodorow@google.com> Thu Jul 14 11:12:32 2016 +0000
tree 24658b9a4e7b3a5370ecdbd24f89d71a9837d63d
parent 5ca52f7771eb36c1bf135655f7d665179eb7b4db

Move more things from TestConstants to AnalysisMock and LoadingMock.

Also remove other uses of TestConstants.

--
MOS_MIGRATED_REVID=127327339

src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java

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, "",