diff options
| author |  twerth <twerth@google.com> | 2018-06-14 05:17:15 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-14 05:18:39 -0700 |
| commit | 1615da781db78b7a910daf89720189c2b2e73dbe (patch) | |
| tree | afa7a839c1de159fde355f665736f92f8927e613 /src/test/java/com/google/devtools/build/lib/cmdline/LabelValidatorTest.java | |
| parent | 77459d98103f9fd788226539a3ab318f829b1017 (diff) | |
Allow @ in package names.
To disambiguate:
- @foo refers to the external dependency @foo//:foo (as before this change).
- //@foo refers to the target //@foo:@foo (i.e. in the default workspace).
RELNOTES[NEW]: Allow @ in package names.
PiperOrigin-RevId: 200541716
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.java | 9 |
1 files changed, 7 insertions, 2 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 fcb187f268..3ec7d0146a 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,6 +74,7 @@ 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(); @@ -91,8 +92,6 @@ 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); @@ -171,6 +170,12 @@ 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 |