Inline TestConstants.TEST_WORKSPACE_DIRECTORY.

--
MOS_MIGRATED_REVID=90984191

3 files changed, 5 insertions, 11 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 46210c39be..faade0d605 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -612,7 +612,7 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
    */
   protected Rule scratchRule(String packageName, String ruleName, String... lines)
       throws Exception {
-    scratchFile("/" + TestConstants.TEST_WORKSPACE_DIRECTORY + "/" + packageName + "/BUILD", lines);
+    scratchFile(packageName + "/BUILD", lines);
     return (Rule) getTarget("//" + packageName + ":" + ruleName);
   }
 
@@ -745,9 +745,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase {
     return view.getArtifactFactory().getSourceArtifact(rootRelativePath, root);
   }
 
-  protected Artifact getSourceArtifact(String name) throws IOException {
-    return getSourceArtifact(new PathFragment(name),
-        Root.asSourceRoot(scratch.dir("/" + TestConstants.TEST_WORKSPACE_DIRECTORY)));
+  protected Artifact getSourceArtifact(String name) {
+    return getSourceArtifact(new PathFragment(name), Root.asSourceRoot(rootDirectory));
   }
 
   /**
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java b/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java
index 8f480f88f2..1b802f7a7b 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java
@@ -74,7 +74,7 @@ public abstract class FoundationTestCase extends TestCase {
     super.setUp();
     scratch = new Scratch(createFileSystem());
     outputBase = scratch.dir("/usr/local/google/_blaze_jrluser/FAKEMD5/");
-    rootDirectory = scratch.dir("/" + TestConstants.TEST_WORKSPACE_DIRECTORY);
+    rootDirectory = scratch.dir("/workspace");
     scratchFile(rootDirectory.getRelative("WORKSPACE").getPathString(),
         "bind(",
         "  name = 'objc_proto_lib',",
@@ -142,7 +142,7 @@ public abstract class FoundationTestCase extends TestCase {
 
   private String workspaceRelative(String pathName) {
     if (!pathName.startsWith("/")) {
-      return "/" + TestConstants.TEST_WORKSPACE_DIRECTORY + "/" + pathName;
+      return "/workspace/" + pathName;
     }
     return pathName;
   }
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
index b577e55012..66c8a1cf22 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/TestConstants.java
@@ -53,11 +53,6 @@ public class TestConstants {
    */
   public static final String JAVATESTS_ROOT = "src/test/java/";
 
-  /**
-   * The directory in InMemoryFileSystem where workspaces created during unit tests reside.
-   */
-  public static final String TEST_WORKSPACE_DIRECTORY = "bazel";
-
   public static final String TEST_RULE_CLASS_PROVIDER =
       "com.google.devtools.build.lib.bazel.rules.BazelRuleClassProvider";
   public static final ImmutableList<String> IGNORED_MESSAGE_PREFIXES = ImmutableList.<String>of();