diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-06-08 17:13:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-08 17:13:31 +0200 |
commit | e14f7006a20d14f2445bcf22a7445267ffaaed40 (patch) | |
tree | fad36a022136edb9bcbbca1b2d0348640557d274 /config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java | |
parent | 8232481e8cf9c1df4c6f98fa8e3dacd0f226cf0e (diff) | |
parent | 8170cbe91308e4789f2a35f00d79af900beb0b20 (diff) |
Merge pull request #6141 from vespa-engine/geirst/add-support-for-primitive-map-attribute-fields
Geirst/add support for primitive map attribute fields
Diffstat (limited to 'config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java')
-rw-r--r-- | config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java index c3cfcae66e6..bd762c64c00 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java @@ -70,7 +70,7 @@ public class AttributeListTestCase extends SearchDefinitionTestCase { } @Test - public void array_of_struct_field_is_derived_into_array_attributes() throws IOException, ParseException { + public void fields_in_array_of_struct_are_derived_into_array_attributes() throws IOException, ParseException { Search search = SearchBuilder.buildFromFile("src/test/derived/array_of_struct_attribute/test.sd"); Iterator<Attribute> attributes = new AttributeFields(search).attributeIterator(); @@ -80,13 +80,15 @@ public class AttributeListTestCase extends SearchDefinitionTestCase { } @Test - public void map_of_struct_field_is_derived_into_array_attributes() throws IOException, ParseException { + public void fields_in_map_of_struct_are_derived_into_array_attributes() throws IOException, ParseException { Search search = SearchBuilder.buildFromFile("src/test/derived/map_of_struct_attribute/test.sd"); Iterator<Attribute> attributes = new AttributeFields(search).attributeIterator(); - assertAttribute("elem_map.key", Attribute.Type.STRING, Attribute.CollectionType.ARRAY, attributes.next()); - assertAttribute("elem_map.value.name", Attribute.Type.STRING, Attribute.CollectionType.ARRAY, attributes.next()); - assertAttribute("elem_map.value.weight", Attribute.Type.INTEGER, Attribute.CollectionType.ARRAY, attributes.next()); + assertAttribute("str_elem_map.key", Attribute.Type.STRING, Attribute.CollectionType.ARRAY, attributes.next()); + assertAttribute("str_elem_map.value.name", Attribute.Type.STRING, Attribute.CollectionType.ARRAY, attributes.next()); + assertAttribute("str_elem_map.value.weight", Attribute.Type.INTEGER, Attribute.CollectionType.ARRAY, attributes.next()); + assertAttribute("int_elem_map.key", Attribute.Type.INTEGER, Attribute.CollectionType.ARRAY, attributes.next()); + assertAttribute("int_elem_map.value.name", Attribute.Type.STRING, Attribute.CollectionType.ARRAY, attributes.next()); assertTrue(!attributes.hasNext()); } @@ -112,4 +114,15 @@ public class AttributeListTestCase extends SearchDefinitionTestCase { assertTrue(!attributes.hasNext()); } + @Test + public void fields_in_map_of_primitive_are_derived_into_array_attributes() throws IOException, ParseException { + Search search = SearchBuilder.buildFromFile("src/test/derived/map_attribute/test.sd"); + Iterator<Attribute> attributes = new AttributeFields(search).attributeIterator(); + + assertAttribute("str_map.key", Attribute.Type.STRING, Attribute.CollectionType.ARRAY, attributes.next()); + assertAttribute("str_map.value", Attribute.Type.STRING, Attribute.CollectionType.ARRAY, attributes.next()); + assertAttribute("int_map.key", Attribute.Type.INTEGER, Attribute.CollectionType.ARRAY, attributes.next()); + assertTrue(!attributes.hasNext()); + } + } |