Add serialization for bool fields.

2 files changed, 15 insertions, 7 deletions

diff --git a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java
index e45da62353d..7d1992225e4 100644
--- a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java
@@ -4,6 +4,7 @@ package com.yahoo.document;
 import com.yahoo.compress.CompressionType;
 import com.yahoo.document.annotation.AbstractTypesTest;
 import com.yahoo.document.datatypes.Array;
+import com.yahoo.document.datatypes.BoolFieldValue;
 import com.yahoo.document.datatypes.ByteFieldValue;
 import com.yahoo.document.datatypes.DoubleFieldValue;
 import com.yahoo.document.datatypes.FloatFieldValue;
@@ -72,6 +73,7 @@ public class DocumentSerializationTestCase extends AbstractTypesTest {
         docType.addField(new Field("rawfield", DataType.RAW, false));
         docType.addField(new Field("doublefield", DataType.DOUBLE, false));
         docType.addField(new Field("bytefield", DataType.BYTE, false));
+        docType.addField(new Field("boolfield", DataType.BOOL, false));
         DataType arrayOfFloatDataType = new ArrayDataType(DataType.FLOAT);
         docType.addField(new Field("arrayoffloatfield", arrayOfFloatDataType, false));
         DataType arrayOfArrayOfFloatDataType = new ArrayDataType(arrayOfFloatDataType);
@@ -94,6 +96,7 @@ public class DocumentSerializationTestCase extends AbstractTypesTest {
             doc.setFieldValue("longfield", new LongFieldValue(398420092938472983l));
             doc.setFieldValue("doublefield", new DoubleFieldValue(98374532.398820));
             doc.setFieldValue("bytefield", new ByteFieldValue(254));
+            doc.setFieldValue("boolfield", new BoolFieldValue(true));
             byte[] rawData = "RAW DATA".getBytes();
             assertEquals(8, rawData.length);
             doc.setFieldValue(docType.getField("rawfield"),new Raw(ByteBuffer.wrap("RAW DATA".getBytes())));
@@ -176,12 +179,12 @@ public class DocumentSerializationTestCase extends AbstractTypesTest {
             assertEquals(new StringFieldValue("This is a string."), doc.getFieldValue("stringfield"));
             assertEquals(new LongFieldValue(398420092938472983l), doc.getFieldValue("longfield"));
             assertEquals(98374532.398820, ((DoubleFieldValue)doc.getFieldValue("doublefield")).getDouble(), 1E-6);
-            assertEquals(new ByteFieldValue((byte)254),
-                         doc.getFieldValue("bytefield"));
+            assertEquals(new ByteFieldValue((byte)254), doc.getFieldValue("bytefield"));
+            // Todo add cpp serialization
+            // assertEquals(new BoolFieldValue(true), doc.getFieldValue("boolfield"));
             ByteBuffer bbuffer = ((Raw)doc.getFieldValue("rawfield")).getByteBuffer();
             if (!Arrays.equals("RAW DATA".getBytes(), bbuffer.array())) {
-                System.err.println("Expected 'RAW DATA' but got '"
-                                   + new String(bbuffer.array()) + "'.");
+                System.err.println("Expected 'RAW DATA' but got '" + new String(bbuffer.array()) + "'.");
                 assertTrue(false);
             }
             if (test.version > 6) {
diff --git a/document/src/test/java/com/yahoo/document/DocumentTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
index 6a2147d6f15..3eebc4396e8 100644
--- a/document/src/test/java/com/yahoo/document/DocumentTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yahoo.compress.CompressionType;
 import com.yahoo.document.datatypes.Array;
+import com.yahoo.document.datatypes.BoolFieldValue;
 import com.yahoo.document.datatypes.ByteFieldValue;
 import com.yahoo.document.datatypes.DoubleFieldValue;
 import com.yahoo.document.datatypes.FieldPathIteratorHandler;
@@ -89,6 +90,7 @@ public class DocumentTestCase extends DocumentTestCaseBase {
             "  </item>\n" +
             " </mapfield>\n" +
             SERTEST_DOC_AS_XML_SUNNYVALE +
+            " <myboolfield>true</myboolfield>\n" +
             "</document>\n";
 
     static DocumentTypeManager setUpCppDocType() {
@@ -124,6 +126,7 @@ public class DocumentTestCase extends DocumentTestCaseBase {
         sertestDocType.addField(new Field("docindoc", 882, docInDocType, false));
         sertestDocType.addField(new Field("mapfield", 883, new MapDataType(DataType.STRING, DataType.STRING), false));
         sertestDocType.addField(new Field("myposfield", 884, PositionDataType.INSTANCE, false));
+        sertestDocType.addField(new Field("myboolfield", 885, DataType.BOOL, false));
 
         docMan.registerDocumentType(sertestDocType);
     }
@@ -165,6 +168,7 @@ public class DocumentTestCase extends DocumentTestCaseBase {
         map.put(new StringFieldValue("foo1"), new StringFieldValue("bar1"));
         map.put(new StringFieldValue("foo2"), new StringFieldValue("bar2"));
         doc.setFieldValue("mapfield", map);
+        doc.setFieldValue("myboolfield", new BoolFieldValue(true));
 
         return doc;
     }
@@ -776,12 +780,12 @@ public class DocumentTestCase extends DocumentTestCaseBase {
         doc.setFieldValue("wsfield", wset);
 
         MapFieldValue<StringFieldValue, StringFieldValue> map =
-                new MapFieldValue<>(
-                        (MapDataType)doc.getDataType().getField("mapfield").getDataType());
+                new MapFieldValue<>((MapDataType)doc.getDataType().getField("mapfield").getDataType());
         map.put(new StringFieldValue("foo1"), new StringFieldValue("bar1"));
         map.put(new StringFieldValue("foo2"), new StringFieldValue("bar2"));
         doc.setFieldValue("mapfield", map);
 
+        doc.setFieldValue("boolfield", new BoolFieldValue(true));
         doc.setFieldValue("bytefield", new ByteFieldValue((byte)254));
         doc.setFieldValue("rawfield", new Raw(ByteBuffer.wrap("RAW DATA".getBytes())));
         doc.setFieldValue("intfield", new IntegerFieldValue(5));
@@ -841,6 +845,7 @@ public class DocumentTestCase extends DocumentTestCaseBase {
 
         Document doc2 = docMan.createDocument(data);
 
+        assertEquals(doc.getFieldValue("myboolfield"), doc2.getFieldValue("myboolfield"));
         assertEquals(doc.getFieldValue("mailid"), doc2.getFieldValue("mailid"));
         assertEquals(doc.getFieldValue("date"), doc2.getFieldValue("date"));
         assertEquals(doc.getFieldValue("from"), doc2.getFieldValue("from"));
@@ -1229,7 +1234,7 @@ public class DocumentTestCase extends DocumentTestCaseBase {
             assertEquals(fields.get("date"), -2013512400);
             assertThat(fields.get("docindoc"), instanceOf(Map.class));
             assertThat(fields.keySet(),
-                    containsInAnyOrder("mailid", "date", "attachmentcount", "rawfield", "weightedfield", "docindoc", "mapfield"));
+                    containsInAnyOrder("mailid", "date", "attachmentcount", "rawfield", "weightedfield", "docindoc", "mapfield", "myboolfield"));
         }
     }