unit test multiple attribute settings

2 files changed, 24 insertions, 3 deletions

diff --git a/config-model/src/test/examples/attributesettings.sd b/config-model/src/test/examples/attributesettings.sd
index 2b83f137b96..e7bb2062227 100644
--- a/config-model/src/test/examples/attributesettings.sd
+++ b/config-model/src/test/examples/attributesettings.sd
@@ -33,12 +33,17 @@ search attributesettings {
       indexing: attribute
       weightedset: remove-if-zero
       weightedset: create-if-nonexistent
+      attribute: fast-search
+      attribute: fast-access
+      attribute: paged
     }
 
     field f6 type weightedset<string> {
       weightedset: remove-if-zero
       indexing: attribute
       weightedset: create-if-nonexistent
+      attribute: enable-bit-vectors
+      attribute: enable-only-bit-vector
     }
 
     field f7 type weightedset<string> {
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java
index 7b2ed2d7a7f..2a58618e11f 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/AttributeSettingsTestCase.java
@@ -74,6 +74,14 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase {
         assertWeightedSet(schema, "f8", true, false);
         assertWeightedSet(schema, "f9", false, true);
         assertWeightedSet(schema, "f10", false, true);
+
+        assertAttrSettings(schema, "f4", false, false, false);
+        assertAttrSettings(schema, "f5", true, true, true);
+        assertAttrSettings(schema, "f6", false, false, false);
+        assertAttrSettings(schema, "f7", false, false, false);
+        assertAttrSettings(schema, "f8", false, false, false);
+        assertAttrSettings(schema, "f9", false, false, false);
+        assertAttrSettings(schema, "f10", false, false, false);
     }
 
     private void assertWeightedSet(Schema schema, String name, boolean createIfNonExistent, boolean removeIfZero) {
@@ -82,13 +90,21 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase {
         Attribute a4 = f4.getAttributes().get(f4.getName());
         assertEquals(Attribute.Type.STRING, a4.getType());
         assertEquals(Attribute.CollectionType.WEIGHTEDSET, a4.getCollectionType());
-        assertFalse(a4.isHuge());
-        assertFalse(a4.isFastSearch());
-        assertFalse(a4.isFastAccess());
         assertEquals(a4.isRemoveIfZero(), removeIfZero);
         assertEquals(a4.isCreateIfNonExistent(), createIfNonExistent);
     }
 
+    private void assertAttrSettings(Schema schema, String name, boolean fastAccess, boolean fastSearch, boolean paged) {
+        SDField f4 = (SDField) schema.getDocument().getField(name);
+        assertEquals(1, f4.getAttributes().size());
+        Attribute a4 = f4.getAttributes().get(f4.getName());
+        assertEquals(Attribute.Type.STRING, a4.getType());
+        assertEquals(Attribute.CollectionType.WEIGHTEDSET, a4.getCollectionType());
+        assertEquals(a4.isFastSearch(), fastSearch);
+        assertEquals(a4.isFastAccess(), fastAccess);
+        assertEquals(a4.isPaged(), paged);
+    }
+
     @Test
     public void requireThatFastAccessCanBeSet() throws IOException, ParseException {
         Schema schema = ApplicationBuilder.buildFromFile("src/test/examples/attributesettings.sd");