aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/cmdline/LabelValidatorTest.java
diff options
context:
space:
mode:
authorGravatar twerth <twerth@google.com>2018-06-22 08:12:56 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-06-22 08:14:03 -0700
commit732dc512801c32207c252a76ca8d9e5544560339 (patch)
tree5c5301d766b78194d2d7e89bd103b565b53d236d /src/test/java/com/google/devtools/build/lib/cmdline/LabelValidatorTest.java
parentdc97fd15dc53489211ca65fbbf85131853a559fc (diff)
Automated rollback of commit 5a9befc5602e71f7512074c303afbdcff5617cca.
RELNOTES: None *** Reason for rollback *** PiperOrigin-RevId: 201686843
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/cmdline/LabelValidatorTest.java')
-rw-r--r--src/test/java/com/google/devtools/build/lib/cmdline/LabelValidatorTest.java9
1 files changed, 2 insertions, 7 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 3ec7d0146a..fcb187f268 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
@@ -74,7 +74,6 @@ public class LabelValidatorTest {
assertThat(LabelValidator.validatePackageName("foo=bar")).isNull();
assertThat(LabelValidator.validatePackageName("foo>bar")).isNull();
assertThat(LabelValidator.validatePackageName("foo?bar")).isNull();
- assertThat(LabelValidator.validatePackageName("foo@bar")).isNull();
assertThat(LabelValidator.validatePackageName("foo[bar")).isNull();
assertThat(LabelValidator.validatePackageName("foo]bar")).isNull();
assertThat(LabelValidator.validatePackageName("foo^bar")).isNull();
@@ -92,6 +91,8 @@ public class LabelValidatorTest {
.isEqualTo("package names may not end with '/'");
assertThat(LabelValidator.validatePackageName("foo:bar"))
.isEqualTo(LabelValidator.PACKAGE_NAME_ERROR);
+ assertThat(LabelValidator.validatePackageName("baz@12345"))
+ .isEqualTo(LabelValidator.PACKAGE_NAME_ERROR);
assertThat(LabelValidator.validatePackageName("bar/../baz"))
.isEqualTo(LabelValidator.PACKAGE_NAME_DOT_ERROR);
@@ -170,12 +171,6 @@ public class LabelValidatorTest {
.isEqualTo(new PackageAndTarget("f$( )oo", "b$() ar"));
assertThat(LabelValidator.validateAbsoluteLabel("@//f$( )oo:b$() ar"))
.isEqualTo(new PackageAndTarget("f$( )oo", "b$() ar"));
- assertThat(LabelValidator.validateAbsoluteLabel("//f@oo"))
- .isEqualTo(new PackageAndTarget("f@oo", "f@oo"));
- assertThat(LabelValidator.validateAbsoluteLabel("//@foo"))
- .isEqualTo(new PackageAndTarget("@foo", "@foo"));
- assertThat(LabelValidator.validateAbsoluteLabel("//@foo:@bar"))
- .isEqualTo(new PackageAndTarget("@foo", "@bar"));
}
@Test