commit be10218ec6644feb1a462658c1865c61d77faa19
author Luis Fernando Pino Duque <lpino@google.com> Mon May 23 14:03:55 2016 +0000
committer Yue Gan <yueg@google.com> Mon May 23 15:27:38 2016 +0000
tree fd3075f8da0ebb136561fc6ecb0740582fb3af64
parent 23c274dcd0174a9bf0f62f028ab62084e9ea440f

Replace the occurrences of Constants.PRODUCT_NAME for a call to
BlazeRuntime#getProductName() or a reference to TestConstants.PRODUCT_NAME for tests.

This CL prepares the codebase in order to delete the constant.

--
MOS_MIGRATED_REVID=122993568

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 053c5eb..32497bd 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
@@ -42,6 +42,7 @@
 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;
@@ -468,7 +469,8 @@
       skyframeExecutor =
           SequencedSkyframeExecutor.create(
               new PackageFactory(TestRuleClassProvider.getRuleClassProvider()),
-              new BlazeDirectories(fs.getPath("/install"), fs.getPath("/output"), workspace),
+              new BlazeDirectories(fs.getPath("/install"), fs.getPath("/output"), workspace,
+                  TestConstants.PRODUCT_NAME),
               null, /* BinTools */
               null, /* workspaceStatusActionFactory */
               TestRuleClassProvider.getRuleClassProvider().getBuildInfoFactories(),
@@ -477,7 +479,8 @@
               supplier,
               ImmutableMap.<SkyFunctionName, SkyFunction>of(),
               ImmutableList.<PrecomputedValue.Injected>of(),
-              ImmutableList.<SkyValueDirtinessChecker>of());
+              ImmutableList.<SkyValueDirtinessChecker>of(),
+              TestConstants.PRODUCT_NAME);
       skyframeExecutor.preparePackageLoading(
           new PathPackageLocator(outputBase, ImmutableList.of(workspace)),
           ConstantRuleVisibility.PUBLIC, true, 7, "",

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

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 6cb511d..5c94f04 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
@@ -629,7 +629,8 @@
       PackageCacheOptions options = Options.getDefaults(PackageCacheOptions.class);
       storedErrors = new StoredEventHandler();
       BlazeDirectories directories =
-          new BlazeDirectories(fs.getPath("/install"), fs.getPath("/output"), workspace);
+          new BlazeDirectories(fs.getPath("/install"), fs.getPath("/output"), workspace,
+              TestConstants.PRODUCT_NAME);
       skyframeExecutor = SequencedSkyframeExecutor.create(pkgFactory,
           directories,
           null,  /* binTools -- not used */
@@ -640,7 +641,8 @@
           Preprocessor.Factory.Supplier.NullSupplier.INSTANCE,
           AnalysisMock.get().getSkyFunctions(),
           ImmutableList.<PrecomputedValue.Injected>of(),
-          ImmutableList.<SkyValueDirtinessChecker>of());
+          ImmutableList.<SkyValueDirtinessChecker>of(),
+          TestConstants.PRODUCT_NAME);
       PathPackageLocator pkgLocator = PathPackageLocator.create(
           null, options.packagePath, storedErrors, workspace, workspace);
       skyframeExecutor.preparePackageLoading(

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

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 d3abf77..5873114 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
@@ -82,7 +82,8 @@
   @Before
   public final void initializeSkyframeExecutor() throws Exception {
     ruleClassProvider = TestRuleClassProvider.getRuleClassProvider();
-    BlazeDirectories directories = new BlazeDirectories(outputBase, outputBase, rootDirectory);
+    BlazeDirectories directories = new BlazeDirectories(outputBase, outputBase, rootDirectory,
+        TestConstants.PRODUCT_NAME);
     skyframeExecutor =
         SequencedSkyframeExecutor.create(
             new PackageFactory(ruleClassProvider),
@@ -95,7 +96,8 @@
             Preprocessor.Factory.Supplier.NullSupplier.INSTANCE,
             AnalysisMock.get().getSkyFunctions(),
             ImmutableList.<PrecomputedValue.Injected>of(),
-            ImmutableList.<SkyValueDirtinessChecker>of());
+            ImmutableList.<SkyValueDirtinessChecker>of(),
+            TestConstants.PRODUCT_NAME);
     setUpSkyframe(parsePackageCacheOptions());
   }