commit ffa73addaf80ab7a9cf9f98e5d4414b152ae6cb6
author Lukacs Berki <lberki@google.com> Fri Sep 18 11:40:12 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Mon Sep 21 08:56:51 2015 +0000
tree f498621bb8634d934815dbaddf90400eda0ce28d
parent 29ad862a5bd45d2fdbb921f36bbb95816cf47acc

Separate build-specific types and types inherent to Skylark.

--
MOS_MIGRATED_REVID=103374106

src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java

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 c15e9ac..5682bc6 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 @@
 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 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 @@
 
   @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 @@
    */
   @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());
   }
 }