Ensure repository names are valid workspace names

RELNOTES: Repository rules must use names that are valid workspace names.

--
MOS_MIGRATED_REVID=113197588

2 files changed, 15 insertions, 6 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/packages/ExternalPackageTest.java b/src/test/java/com/google/devtools/build/lib/packages/ExternalPackageTest.java
index 12898477d4..d431290358 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/ExternalPackageTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/ExternalPackageTest.java
@@ -41,35 +41,35 @@ public class ExternalPackageTest extends BuildViewTestCase {
   public void testMultipleRulesWithSameName() throws Exception {
     FileSystemUtils.writeIsoLatin1(workspacePath,
         "local_repository(",
-        "    name = 'my-rule',",
+        "    name = 'my_rule',",
         "    path = '/foo/bar',",
         ")",
         "new_local_repository(",
-        "    name = 'my-rule',",
+        "    name = 'my_rule',",
         "    path = '/foo/bar',",
         "    build_file = 'baz',",
         ")");
 
     invalidatePackages();
     // Make sure the second rule "wins."
-    assertEquals("new_local_repository rule", getTarget("//external:my-rule").getTargetKind());
+    assertEquals("new_local_repository rule", getTarget("//external:my_rule").getTargetKind());
   }
 
   @Test
   public void testOverridingBindRules() throws Exception {
     FileSystemUtils.writeIsoLatin1(workspacePath,
         "bind(",
-        "    name = 'my-rule',",
+        "    name = 'my_rule',",
         "    actual = '//foo:bar',",
         ")",
         "new_local_repository(",
-        "    name = 'my-rule',",
+        "    name = 'my_rule',",
         "    path = '/foo/bar',",
         "    build_file = 'baz',",
         ")");
 
     invalidatePackages();
     // Make sure the second rule "wins."
-    assertEquals("new_local_repository rule", getTarget("//external:my-rule").getTargetKind());
+    assertEquals("new_local_repository rule", getTarget("//external:my_rule").getTargetKind());
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTest.java b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTest.java
index d2d8b7c78e..db5e867df1 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTest.java
@@ -69,6 +69,15 @@ public class WorkspaceFactoryTest {
     assertThat(helper.getParserError()).contains("a.b.c is not a legal workspace name");
   }
 
+  @Test
+  public void testIllegalRepoName() throws Exception {
+    WorkspaceFactoryHelper helper = parse("local_repository(",
+        "    name = 'foo/bar',",
+        "    path = '/foo/bar',",
+        ")");
+    assertThat(helper.getParserError()).contains("foo/bar is not a legal workspace name");
+  }
+
   private WorkspaceFactoryHelper parse(String... args) {
     return new WorkspaceFactoryHelper(args);
   }