Add raw attributes to config model.

2 files changed, 74 insertions, 50 deletions

diff --git a/config-model/src/test/java/com/yahoo/schema/processing/BoolAttributeValidatorTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/BoolAttributeValidatorTestCase.java
deleted file mode 100644
index f19b1f43115..00000000000
--- a/config-model/src/test/java/com/yahoo/schema/processing/BoolAttributeValidatorTestCase.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.schema.processing;
-
-import com.yahoo.schema.parser.ParseException;
-import org.junit.jupiter.api.Test;
-
-import static com.yahoo.schema.ApplicationBuilder.createFromString;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static com.yahoo.config.model.test.TestUtil.joinLines;
-import static org.junit.jupiter.api.Assertions.fail;
-
-/**
- * @author geirst
- */
-public class BoolAttributeValidatorTestCase {
-
-    @Test
-    void array_of_bool_attribute_is_not_supported() throws ParseException {
-        try {
-            createFromString(getSd("field b type array<bool> { indexing: attribute }"));
-            fail("Expected exception");
-        }
-        catch (IllegalArgumentException e) {
-            assertEquals("For schema 'test', field 'b': Only single value bool attribute fields are supported",
-                    e.getMessage());
-        }
-    }
-
-    @Test
-    void weigtedset_of_bool_attribute_is_not_supported() throws ParseException {
-        try {
-            createFromString(getSd("field b type weightedset<bool> { indexing: attribute }"));
-            fail("Expected exception");
-        }
-        catch (IllegalArgumentException e) {
-            assertEquals("For schema 'test', field 'b': Only single value bool attribute fields are supported",
-                    e.getMessage());
-        }
-    }
-
-    private String getSd(String field) {
-        return joinLines(
-                "schema test {",
-                "  document test {",
-                "    " + field,
-                "  }",
-                "}");
-    }
-
-}
diff --git a/config-model/src/test/java/com/yahoo/schema/processing/SingleValueOnlyAttributeValidatorTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/SingleValueOnlyAttributeValidatorTestCase.java
new file mode 100644
index 00000000000..a53843d97e0
--- /dev/null
+++ b/config-model/src/test/java/com/yahoo/schema/processing/SingleValueOnlyAttributeValidatorTestCase.java
@@ -0,0 +1,74 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.schema.processing;
+
+import com.yahoo.schema.parser.ParseException;
+import org.junit.jupiter.api.Test;
+
+import static com.yahoo.schema.ApplicationBuilder.createFromString;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static com.yahoo.config.model.test.TestUtil.joinLines;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * @author geirst
+ */
+public class SingleValueOnlyAttributeValidatorTestCase {
+
+    private static void array_attribute_is_not_supported(String type) throws ParseException {
+        try {
+            createFromString(getSd("field b type array<" + type + "> { indexing: attribute }"));
+            fail("Expected exception");
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals("For schema 'test', field 'b': Only single value " + type + " attribute fields are supported",
+                    e.getMessage());
+        }
+    }
+
+    @Test
+    private static void weightedset_attribute_is_not_supported(String type) throws ParseException {
+        try {
+            createFromString(getSd("field b type weightedset<" + type + "> { indexing: attribute }"));
+            fail("Expected exception");
+        }
+        catch (IllegalArgumentException e) {
+            if (type.equals("raw")) {
+                assertEquals("weightedset of complex type '[type BUILTIN] {raw}' is not supported",
+                        e.getMessage());
+            } else {
+                assertEquals("For schema 'test', field 'b': Only single value " + type + " attribute fields are supported",
+                        e.getMessage());
+            }
+        }
+    }
+
+    @Test
+    void array_of_bool_attribute_is_not_supported() throws ParseException {
+        array_attribute_is_not_supported("bool");
+    }
+
+    @Test
+    void weightedset_of_bool_attribute_is_not_supported() throws ParseException {
+        weightedset_attribute_is_not_supported("bool");
+    }
+
+    @Test
+    void array_of_raw_attribute_is_not_supported() throws ParseException {
+        array_attribute_is_not_supported("raw");
+    }
+
+    @Test
+    void weightedset_of_raw_attribute_is_not_supported() throws ParseException {
+        weightedset_attribute_is_not_supported("raw");
+    }
+
+    private static String getSd(String field) {
+        return joinLines(
+                "schema test {",
+                "  document test {",
+                "    " + field,
+                "  }",
+                "}");
+    }
+
+}