From 7329fa33954740d789809535b26e6d3a06ce4a46 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 29 Aug 2019 13:05:56 +0200 Subject: 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(). --- .../java/com/yahoo/vespa/config/DocumentGenPluginTest.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'documentgen-test/src') 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> it = book.iterator(); it.hasNext(); numIteratedValues++) { + Map.Entry 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)); } } -- cgit v1.2.3