diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java index c15e9ac5fe..5682bc6e3b 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java @@ -16,11 +16,11 @@ package com.google.devtools.build.lib.packages; import static com.google.common.truth.Truth.assertThat; import static com.google.devtools.build.lib.packages.Attribute.ConfigurationTransition.HOST; import static com.google.devtools.build.lib.packages.Attribute.attr; -import static com.google.devtools.build.lib.packages.Type.INTEGER; -import static com.google.devtools.build.lib.packages.Type.LABEL; -import static com.google.devtools.build.lib.packages.Type.LABEL_LIST; -import static com.google.devtools.build.lib.packages.Type.STRING; -import static com.google.devtools.build.lib.packages.Type.STRING_LIST; +import static com.google.devtools.build.lib.packages.BuildType.LABEL; +import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST; +import static com.google.devtools.build.lib.syntax.Type.INTEGER; +import static com.google.devtools.build.lib.syntax.Type.STRING; +import static com.google.devtools.build.lib.syntax.Type.STRING_LIST; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -28,6 +28,7 @@ import static org.junit.Assert.fail; import com.google.common.base.Predicates; import com.google.devtools.build.lib.syntax.Label; +import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.util.FileType; import com.google.devtools.build.lib.util.FileTypeSet; @@ -77,9 +78,9 @@ public class AttributeTest { @Test public void testNonEmpty() throws Exception { - Attribute attr = attr("foo", Type.LABEL_LIST).nonEmpty().legacyAllowAnyFileType().build(); + Attribute attr = attr("foo", BuildType.LABEL_LIST).nonEmpty().legacyAllowAnyFileType().build(); assertEquals("foo", attr.getName()); - assertEquals(Type.LABEL_LIST, attr.getType()); + assertEquals(BuildType.LABEL_LIST, attr.getType()); assertTrue(attr.isNonEmpty()); } @@ -240,9 +241,9 @@ public class AttributeTest { */ @Test public void testConfigurability() { - assertTrue(attr("foo_configurable", Type.LABEL_LIST).legacyAllowAnyFileType().build() + assertTrue(attr("foo_configurable", BuildType.LABEL_LIST).legacyAllowAnyFileType().build() .isConfigurable()); - assertFalse(attr("foo_nonconfigurable", Type.LABEL_LIST).legacyAllowAnyFileType() + assertFalse(attr("foo_nonconfigurable", BuildType.LABEL_LIST).legacyAllowAnyFileType() .nonconfigurable("test").build().isConfigurable()); } } |