RELNOTES: Allow dots in package names.

--
MOS_MIGRATED_REVID=105512492

2 files changed, 31 insertions, 18 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/cmdline/LabelValidatorTest.java b/src/test/java/com/google/devtools/build/lib/cmdline/LabelValidatorTest.java
index daf5853534..feceda346d 100644
--- a/src/test/java/com/google/devtools/build/lib/cmdline/LabelValidatorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/cmdline/LabelValidatorTest.java
@@ -33,9 +33,6 @@ import org.junit.runners.JUnit4;
 @RunWith(JUnit4.class)
 public class LabelValidatorTest {
 
-  private static final String BAD_PACKAGE_CHARS =
-      "package names may contain only A-Z, a-z, 0-9, '/', '-' and '_'";
-
   private PackageAndTarget newFooTarget() {
     return new PackageAndTarget("foo", "foo");
   }
@@ -54,22 +51,38 @@ public class LabelValidatorTest {
     assertNull(LabelValidator.validatePackageName("foo-bar"));
     assertNull(LabelValidator.validatePackageName("Foo-Bar"));
     assertNull(LabelValidator.validatePackageName("FOO-BAR"));
+    assertNull(LabelValidator.validatePackageName("bar.baz"));
+    assertNull(LabelValidator.validatePackageName("a/..b"));
+    assertNull(LabelValidator.validatePackageName("a/.b"));
+    assertNull(LabelValidator.validatePackageName("a/b."));
+    assertNull(LabelValidator.validatePackageName("a/b.."));
 
     // Bad:
-    assertEquals("package names may not start with '/'",
-        LabelValidator.validatePackageName("/foo"));
-    assertEquals("package names may not end with '/'",
-                 LabelValidator.validatePackageName("foo/"));
-    assertEquals(BAD_PACKAGE_CHARS,
-                 LabelValidator.validatePackageName("bar baz"));
-    assertEquals(BAD_PACKAGE_CHARS,
-                 LabelValidator.validatePackageName("foo:bar"));
-    assertEquals(BAD_PACKAGE_CHARS,
-                 LabelValidator.validatePackageName("baz@12345"));
-    assertEquals(BAD_PACKAGE_CHARS,
-                 LabelValidator.validatePackageName("baz(foo)"));
-    assertEquals(BAD_PACKAGE_CHARS,
-                 LabelValidator.validatePackageName("bazfoo)"));
+    assertEquals(
+        "package names may not start with '/'", LabelValidator.validatePackageName("/foo"));
+    assertEquals("package names may not end with '/'", LabelValidator.validatePackageName("foo/"));
+    assertEquals(LabelValidator.PACKAGE_NAME_ERROR, LabelValidator.validatePackageName("bar baz"));
+    assertEquals(LabelValidator.PACKAGE_NAME_ERROR, LabelValidator.validatePackageName("foo:bar"));
+    assertEquals(
+        LabelValidator.PACKAGE_NAME_ERROR, LabelValidator.validatePackageName("baz@12345"));
+    assertEquals(LabelValidator.PACKAGE_NAME_ERROR, LabelValidator.validatePackageName("baz(foo)"));
+    assertEquals(LabelValidator.PACKAGE_NAME_ERROR, LabelValidator.validatePackageName("bazfoo)"));
+
+    assertEquals(
+        LabelValidator.PACKAGE_NAME_DOT_ERROR, LabelValidator.validatePackageName("bar/../baz"));
+    assertEquals(
+        LabelValidator.PACKAGE_NAME_DOT_ERROR, LabelValidator.validatePackageName("bar/.."));
+    assertEquals(
+        LabelValidator.PACKAGE_NAME_DOT_ERROR, LabelValidator.validatePackageName("../bar"));
+    assertEquals(
+        LabelValidator.PACKAGE_NAME_DOT_ERROR, LabelValidator.validatePackageName("bar/..."));
+
+    assertEquals(
+        LabelValidator.PACKAGE_NAME_DOT_ERROR, LabelValidator.validatePackageName("bar/./baz"));
+    assertEquals(
+        LabelValidator.PACKAGE_NAME_DOT_ERROR, LabelValidator.validatePackageName("bar/."));
+    assertEquals(
+        LabelValidator.PACKAGE_NAME_DOT_ERROR, LabelValidator.validatePackageName("./bar"));
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/cmdline/TargetPatternTest.java b/src/test/java/com/google/devtools/build/lib/cmdline/TargetPatternTest.java
index 8efb04086a..dd62d999bd 100644
--- a/src/test/java/com/google/devtools/build/lib/cmdline/TargetPatternTest.java
+++ b/src/test/java/com/google/devtools/build/lib/cmdline/TargetPatternTest.java
@@ -57,7 +57,7 @@ public class TargetPatternTest {
   @Test
   public void testInvalidPatterns() throws TargetParsingException {
     try {
-      parse("Bar.java");
+      parse("Bar&&&java");
       fail();
     } catch (TargetParsingException expected) {
     }