Remove uses of TestConstants. -- MOS_MIGRATED_REVID=127331186
diff --git a/src/test/java/com/google/devtools/build/lib/buildtool/SymlinkForestTest.java b/src/test/java/com/google/devtools/build/lib/buildtool/SymlinkForestTest.java index b3a66c5..fec327e 100644 --- a/src/test/java/com/google/devtools/build/lib/buildtool/SymlinkForestTest.java +++ b/src/test/java/com/google/devtools/build/lib/buildtool/SymlinkForestTest.java
@@ -27,7 +27,6 @@ import com.google.devtools.build.lib.cmdline.PackageIdentifier; import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.testutil.ManualClock; -import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.vfs.FileSystem; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; @@ -189,7 +188,7 @@ Path linkRoot = fileSystem.getPath("/linkRoot"); createDirectoryAndParents(linkRoot); - new SymlinkForest(packageRootMap, linkRoot, TestConstants.PRODUCT_NAME).plantSymlinkForest(); + new SymlinkForest(packageRootMap, linkRoot, "mock-product-name").plantSymlinkForest(); assertLinksTo(linkRoot, rootA, "pkgA"); assertIsDir(linkRoot, "dir1"); @@ -216,7 +215,7 @@ .put(createPkg(rootX, rootY, "foo"), rootX) .build(); - new SymlinkForest(packageRootMap, linkRoot, TestConstants.PRODUCT_NAME).plantSymlinkForest(); + new SymlinkForest(packageRootMap, linkRoot, "mock-product-name").plantSymlinkForest(); assertLinksTo(linkRoot, rootX, "file"); } @@ -240,7 +239,7 @@ .put(createPkg(outputBase, "w", ""), outputBase) .build(); - new SymlinkForest(packageRootMap, linkRoot, TestConstants.PRODUCT_NAME).plantSymlinkForest(); + new SymlinkForest(packageRootMap, linkRoot, "mock-product-name").plantSymlinkForest(); assertFalse(linkRoot.getRelative(Label.EXTERNAL_PATH_PREFIX + "/y/file").exists()); assertLinksTo( linkRoot.getRelative(Label.EXTERNAL_PATH_PREFIX + "/y/w"), rootY.getRelative("w")); @@ -262,7 +261,7 @@ .put(Label.EXTERNAL_PACKAGE_IDENTIFIER, root) .build(); - new SymlinkForest(packageRootMap, linkRoot, TestConstants.PRODUCT_NAME).plantSymlinkForest(); + new SymlinkForest(packageRootMap, linkRoot, "mock-product-name").plantSymlinkForest(); assertThat(linkRoot.getRelative(Label.EXTERNAL_PATH_PREFIX).exists()).isFalse(); } }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java index 07fdb53..c7f862a 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java
@@ -21,7 +21,6 @@ import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.FileProvider; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; -import com.google.devtools.build.lib.testutil.TestConstants; import org.junit.Test; import org.junit.runner.RunWith; @@ -69,9 +68,9 @@ linkAction, "-shared", "-o", - TestConstants.PRODUCT_NAME + "-out/.+/genrule/thebinary.so", + analysisMock.getProductName() + "-out/.+/genrule/thebinary.so", "-Wl,-whole-archive", - TestConstants.PRODUCT_NAME + "-out/.+/genrule/genlib.a", + analysisMock.getProductName() + "-out/.+/genrule/genlib.a", "-Wl,-no-whole-archive"); }
diff --git a/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategyTestCase.java b/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategyTestCase.java index 771162f..b97e396 100644 --- a/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategyTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategyTestCase.java
@@ -28,7 +28,6 @@ import com.google.devtools.build.lib.events.Reporter; import com.google.devtools.build.lib.exec.ExecutionOptions; import com.google.devtools.build.lib.testutil.BlazeTestUtils; -import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.testutil.TestFileOutErr; import com.google.devtools.build.lib.testutil.TestUtils; import com.google.devtools.build.lib.util.BlazeClock; @@ -79,8 +78,7 @@ fakeSandboxDir = testRoot.getRelative("sandbox"); fakeSandboxDir.createDirectory(); - blazeDirs = new BlazeDirectories(outputBase, outputBase, workspaceDir, - TestConstants.PRODUCT_NAME); + blazeDirs = new BlazeDirectories(outputBase, outputBase, workspaceDir, "mock-product-name"); BlazeTestUtils.getIntegrationBinTools(blazeDirs); OptionsParser optionsParser = @@ -108,7 +106,7 @@ MoreExecutors.newDirectExecutorService(), true, false, - TestConstants.PRODUCT_NAME)), + "mock-product-name")), ImmutableList.<ActionContextProvider>of()); }
diff --git a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java index 7b269dd..57543d8 100644 --- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java +++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
@@ -38,7 +38,6 @@ import com.google.devtools.build.lib.exec.SingleBuildFileCache; import com.google.devtools.build.lib.rules.apple.AppleConfiguration; import com.google.devtools.build.lib.testutil.BlazeTestUtils; -import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.testutil.TestFileOutErr; import com.google.devtools.build.lib.testutil.TestUtils; import com.google.devtools.build.lib.util.BlazeClock; @@ -89,27 +88,29 @@ Path outputBase = testRoot.getRelative("outputBase"); outputBase.createDirectory(); - BlazeDirectories directories = new BlazeDirectories(outputBase, outputBase, workspaceDir, - TestConstants.PRODUCT_NAME); + BlazeDirectories directories = + new BlazeDirectories(outputBase, outputBase, workspaceDir, "mock-product-name"); BlazeTestUtils.getIntegrationBinTools(directories); OptionsParser optionsParser = OptionsParser.newOptionsParser(ExecutionOptions.class); optionsParser.parse("--verbose_failures"); EventBus bus = new EventBus(); - this.executor = new BlazeExecutor( - directories.getExecRoot(), - directories.getOutputPath(), - reporter, bus, - BlazeClock.instance(), - optionsParser, - /* verboseFailures */ false, - /* showSubcommands */ false, - ImmutableList.<ActionContext>of(), - ImmutableMap.<String, SpawnActionContext>of("", - new StandaloneSpawnStrategy(directories.getExecRoot(), false, - TestConstants.PRODUCT_NAME)), - ImmutableList.<ActionContextProvider>of()); + this.executor = + new BlazeExecutor( + directories.getExecRoot(), + directories.getOutputPath(), + reporter, + bus, + BlazeClock.instance(), + optionsParser, + /* verboseFailures */ false, + /* showSubcommands */ false, + ImmutableList.<ActionContext>of(), + ImmutableMap.<String, SpawnActionContext>of( + "", + new StandaloneSpawnStrategy(directories.getExecRoot(), false, "mock-product-name")), + ImmutableList.<ActionContextProvider>of()); executor.getExecRoot().createDirectory(); }