diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-29 13:05:56 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-29 13:05:56 +0200 |
commit | 7329fa33954740d789809535b26e6d3a06ce4a46 (patch) | |
tree | 974793c619d158ed14e07422bfb289a97f6df9b2 /documentgen-test | |
parent | 61b0981510ad66d75496a7e1b6618d69ba90f7b0 (diff) |
Call addFieldSets for genrated document types in order for fieldSet and fieldSetAll to work.
Verify that _zcurve generated fields are not exposet in the default fieldSet().
Diffstat (limited to 'documentgen-test')
-rw-r--r-- | documentgen-test/etc/complex/music4.sd | 4 | ||||
-rw-r--r-- | documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/documentgen-test/etc/complex/music4.sd b/documentgen-test/etc/complex/music4.sd index eab0018360d..5c41e1af4fe 100644 --- a/documentgen-test/etc/complex/music4.sd +++ b/documentgen-test/etc/complex/music4.sd @@ -2,10 +2,10 @@ search music4 { document music4 inherits music3 { field mu4 type string { - + indexing:attribute|summary } field pos type position { - + indexing:attribute|summary } } } diff --git a/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java b/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java index 59b8d3b1e70..4cc8703b954 100644 --- a/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java +++ b/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java @@ -15,6 +15,7 @@ import com.yahoo.document.DocumentTypeManager; import com.yahoo.document.Field; import com.yahoo.document.Generated; import com.yahoo.document.MapDataType; +import com.yahoo.document.PositionDataType; import com.yahoo.document.ReferenceDataType; import com.yahoo.document.StructDataType; import com.yahoo.document.WeightedSetDataType; @@ -1014,6 +1015,18 @@ public class DocumentGenPluginTest { Music4 book = new Music4(new DocumentId("id:music4:music4::0")); book.setPos(new Music4.Position().setX(7).setY(8)); assertEquals(new Music4.Position().setX(7).setY(8), book.getPos()); + assertEquals(1, book.getFieldCount()); + int numIteratedValues = 0; + for (Iterator<Map.Entry<Field, FieldValue>> it = book.iterator(); it.hasNext(); numIteratedValues++) { + Map.Entry<Field, FieldValue> entry = it.next(); + } + assertEquals(book.getFieldCount(), numIteratedValues); + Field posZcurve = book.getField(PositionDataType.getZCurveFieldName("pos")); + assertNotNull(posZcurve); + assertNotEquals(book.getDataType().fieldSet(), book.getDataType().fieldSetAll()); + assertFalse(book.getDataType().fieldSet().contains(posZcurve)); + assertTrue(book.getDataType().fieldSetAll().contains(posZcurve)); + assertTrue(book.getDataType().getFields().contains(posZcurve)); } } |