diff options
Diffstat (limited to 'document/src/test/java')
24 files changed, 70 insertions, 207 deletions
diff --git a/document/src/test/java/com/yahoo/document/DocInDocTestCase.java b/document/src/test/java/com/yahoo/document/DocInDocTestCase.java index cdc868af987..f5c158595d2 100644 --- a/document/src/test/java/com/yahoo/document/DocInDocTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocInDocTestCase.java @@ -37,13 +37,13 @@ public class DocInDocTestCase { Document outer = new Document(manager.getDocumentType("outerdoc"), "doc:outer:the:only:one"); outer.setFieldValue("innerdocuments", innerArray); - DocumentSerializer serializer = DocumentSerializerFactory.create42(); + DocumentSerializer serializer = DocumentSerializerFactory.create6(); serializer.write(outer); GrowableByteBuffer buf = serializer.getBuf(); buf.flip(); - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(manager, buf); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(manager, buf); Document outerDeserialized = new Document(deserializer); assertEquals(outer, outerDeserialized); diff --git a/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java index ce55a5a501c..d5fc1386900 100755 --- a/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java @@ -581,9 +581,9 @@ public class DocumentPathUpdateTestCase { docUp.addFieldPathUpdate(ass); GrowableByteBuffer buffer = new GrowableByteBuffer(); - docUp.serialize(DocumentSerializerFactory.createHead(buffer)); + docUp.serialize(DocumentSerializerFactory.create6(buffer)); buffer.flip(); - DocumentUpdate docUp2 = new DocumentUpdate(DocumentDeserializerFactory.createHead(docMan, buffer)); + DocumentUpdate docUp2 = new DocumentUpdate(DocumentDeserializerFactory.create6(docMan, buffer)); assertEquals(docUp, docUp2); } @@ -599,9 +599,9 @@ public class DocumentPathUpdateTestCase { docUp.addFieldPathUpdate(add); GrowableByteBuffer buffer = new GrowableByteBuffer(); - docUp.serialize(DocumentSerializerFactory.createHead(buffer)); + docUp.serialize(DocumentSerializerFactory.create6(buffer)); buffer.flip(); - DocumentUpdate docUp2 = new DocumentUpdate(DocumentDeserializerFactory.createHead(docMan, buffer)); + DocumentUpdate docUp2 = new DocumentUpdate(DocumentDeserializerFactory.create6(docMan, buffer)); assertEquals(docUp, docUp2); } @@ -613,9 +613,9 @@ public class DocumentPathUpdateTestCase { docUp.addFieldPathUpdate(remove); GrowableByteBuffer buffer = new GrowableByteBuffer(); - docUp.serialize(DocumentSerializerFactory.createHead(buffer)); + docUp.serialize(DocumentSerializerFactory.create6(buffer)); buffer.flip(); - DocumentUpdate docUp2 = new DocumentUpdate(DocumentDeserializerFactory.createHead(docMan, buffer)); + DocumentUpdate docUp2 = new DocumentUpdate(DocumentDeserializerFactory.create6(docMan, buffer)); assertEquals(docUp, docUp2); } @@ -658,7 +658,7 @@ public class DocumentPathUpdateTestCase { DocumentUpdate docUp = createDocumentUpdateForSerialization(); GrowableByteBuffer buffer = new GrowableByteBuffer(); - docUp.serialize(DocumentSerializerFactory.createHead(buffer)); + docUp.serialize(DocumentSerializerFactory.create6(buffer)); int size = buffer.position(); buffer.position(0); @@ -672,7 +672,7 @@ public class DocumentPathUpdateTestCase { public void testReadSerializedFile() throws IOException { docMan = DocumentTestCase.setUpCppDocType(); byte[] data = DocumentTestCase.readFile("src/tests/data/serialize-fieldpathupdate-cpp.dat"); - DocumentDeserializer buf = DocumentDeserializerFactory.createHead(docMan, GrowableByteBuffer.wrap(data)); + DocumentDeserializer buf = DocumentDeserializerFactory.create6(docMan, GrowableByteBuffer.wrap(data)); DocumentUpdate upd = new DocumentUpdate(buf); diff --git a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java index 7d1992225e4..8ff168adc4b 100644 --- a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java @@ -170,7 +170,7 @@ public class DocumentSerializationTestCase extends AbstractTypesTest { } System.err.println("Checking doc from file " + test.testFile); - Document doc = new Document(DocumentDeserializerFactory.create42(docMan, GrowableByteBuffer.wrap(buffer))); + Document doc = new Document(DocumentDeserializerFactory.create6(docMan, GrowableByteBuffer.wrap(buffer))); System.err.println("Id: " + doc.getId()); @@ -214,7 +214,7 @@ public class DocumentSerializationTestCase extends AbstractTypesTest { doc.setFieldValue("friend", 2384L); GrowableByteBuffer buffer = new GrowableByteBuffer(1024); - DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); + DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer); serializer.write(doc); buffer.flip(); @@ -222,7 +222,7 @@ public class DocumentSerializationTestCase extends AbstractTypesTest { fos.write(buffer.array(), 0, buffer.limit()); fos.close(); - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(man, buffer); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(man, buffer); Document doc2 = new Document(deserializer); assertEquals(doc, doc2); diff --git a/document/src/test/java/com/yahoo/document/DocumentTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTestCase.java index 3eebc4396e8..28267a22a56 100644 --- a/document/src/test/java/com/yahoo/document/DocumentTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentTestCase.java @@ -708,54 +708,6 @@ public class DocumentTestCase extends DocumentTestCaseBase { } @Test - public void testCppDocSplit() throws IOException { - docMan = setUpCppDocType(); - byte[] headerData = readFile("src/test/document/serializecppsplit_header.dat"); - byte[] bodyData = readFile("src/test/document/serializecppsplit_body.dat"); - - DocumentDeserializer header = DocumentDeserializerFactory.create42(docMan, GrowableByteBuffer.wrap(headerData), - GrowableByteBuffer.wrap(bodyData)); - - Document doc = new Document(header); - - assertEquals("doc:serializetest:http://test.doc.id/", doc.getId().toString()); - assertEquals(new IntegerFieldValue(5), doc.getFieldValue("intfield")); - assertEquals(new FloatFieldValue((float)-9.23), doc.getFieldValue("floatfield")); - assertEquals(new StringFieldValue("This is a string."), doc.getFieldValue("stringfield")); - assertEquals(new LongFieldValue(398420092938472983L), doc.getFieldValue("longfield")); - assertEquals(new DoubleFieldValue(98374532.398820d), doc.getFieldValue("doublefield")); - assertEquals(new StringFieldValue("http://this.is.a.test/"), doc.getFieldValue("urifield")); - //NOTE: The value really is unsigned 254, which becomes signed -2: - assertEquals(new ByteFieldValue((byte)-2), doc.getFieldValue("bytefield")); - ByteBuffer raw = ByteBuffer.wrap("RAW DATA".getBytes()); - assertEquals(new Raw(raw), doc.getFieldValue("rawfield")); - - Document docindoc = (Document)doc.getFieldValue("docfield"); - assertEquals(docMan.getDocumentType("docindoc"), docindoc.getDataType()); - assertEquals(new DocumentId("doc:docindoc:http://embedded"), docindoc.getId()); - - WeightedSet wset = (WeightedSet)doc.getFieldValue("wsfield"); - assertEquals(Integer.valueOf(50), wset.get(new StringFieldValue("Weighted 0"))); - assertEquals(Integer.valueOf(199), wset.get(new StringFieldValue("Weighted 1"))); - } - - @Test - public void testCppDocSplitNoBody() throws IOException { - docMan = setUpCppDocType(); - byte[] headerData = readFile("src/test/document/serializecppsplit_header.dat"); - - DocumentDeserializer header = DocumentDeserializerFactory.create42(docMan, GrowableByteBuffer.wrap(headerData)); - - Document doc = new Document(header); - - assertEquals("doc:serializetest:http://test.doc.id/", doc.getId().toString()); - assertEquals(new FloatFieldValue((float)-9.23), doc.getFieldValue("floatfield")); - assertEquals(new StringFieldValue("This is a string."), doc.getFieldValue("stringfield")); - assertEquals(new LongFieldValue(398420092938472983L), doc.getFieldValue("longfield")); - assertEquals(new StringFieldValue("http://this.is.a.test/"), doc.getFieldValue("urifield")); - } - - @Test @SuppressWarnings("deprecation") public void testGenerateSerializedFile() throws IOException { @@ -862,48 +814,6 @@ public class DocumentTestCase extends DocumentTestCaseBase { } assertEquals(doc.getFieldValue("weightedfield"), doc2.getFieldValue("weightedfield")); assertEquals(doc.getFieldValue("mapfield"), doc2.getFieldValue("mapfield")); - // Do the same thing, splitting document in two - DocumentSerializer header = DocumentSerializerFactory.create42(new GrowableByteBuffer(), true); - DocumentSerializer body = DocumentSerializerFactory.create42(new GrowableByteBuffer()); - doc.serializeHeader(header); - doc.serializeBody(body); - header.getBuf().flip(); - body.getBuf().flip(); - - try { - FileOutputStream fos = new FileOutputStream("src/test/files/testser-split.header.dat"); - fos.write(header.getBuf().array(), 0, header.getBuf().remaining()); - fos.close(); - fos = new FileOutputStream("src/test/files/testser-split.body.dat"); - fos.write(body.getBuf().array(), 0, body.getBuf().remaining()); - fos.close(); - } catch (Exception e) { - } - - DocumentDeserializer deser = DocumentDeserializerFactory.create42(docMan, header.getBuf(), body.getBuf()); - - doc2 = new Document(deser); - - assertEquals(doc.getFieldValue("mailid"), doc2.getFieldValue("mailid")); - assertEquals(doc.getFieldValue("date"), doc2.getFieldValue("date")); - assertEquals(doc.getFieldValue("from"), doc2.getFieldValue("from")); - assertEquals(doc.getFieldValue("to"), doc2.getFieldValue("to")); - assertEquals(doc.getFieldValue("subject"), doc2.getFieldValue("subject")); - assertEquals(doc.getFieldValue("body"), doc2.getFieldValue("body")); - assertEquals(doc.getFieldValue("attachmentcount"), doc2.getFieldValue("attachmentcount")); - assertEquals(doc.getFieldValue("attachments"), doc2.getFieldValue("attachments")); - docRawBytes = ((Raw)doc.getFieldValue("rawfield")).getByteBuffer().array(); - doc2RawBytes = ((Raw)doc2.getFieldValue("rawfield")).getByteBuffer().array(); - assertEquals(docRawBytes.length, doc2RawBytes.length); - for (int i = 0; i < docRawBytes.length; i++) { - assertEquals(docRawBytes[i], doc2RawBytes[i]); - } - assertEquals(doc.getFieldValue("weightedfield"), doc2.getFieldValue("weightedfield")); - assertEquals(doc.getFieldValue("mapfield"), doc2.getFieldValue("mapfield")); - - Document docInDoc = (Document)doc.getFieldValue("docindoc"); - assert (docInDoc != null); - assertEquals(new StringFieldValue("ball"), docInDoc.getFieldValue("tull")); } @Test @@ -953,45 +863,6 @@ public class DocumentTestCase extends DocumentTestCaseBase { } assertEquals(doc.getFieldValue("weightedfield"), doc2.getFieldValue("weightedfield")); assertEquals(doc.getFieldValue("mapfield"), doc2.getFieldValue("mapfield")); - - // Do the same thing, splitting document in two - BufferSerializer header = new BufferSerializer(new GrowableByteBuffer()); - BufferSerializer body = new BufferSerializer(new GrowableByteBuffer()); - doc.serializeHeader(header); - doc.serializeBody(body); - header.getBuf().flip(); - body.getBuf().flip(); - - try { - FileOutputStream fos = new FileOutputStream("src/test/files/testser-split.header.dat"); - fos.write(header.getBuf().array(), 0, header.getBuf().remaining()); - fos.close(); - fos = new FileOutputStream("src/test/files/testser-split.body.dat"); - fos.write(body.getBuf().array(), 0, body.getBuf().remaining()); - fos.close(); - } catch (Exception e) { - } - - DocumentDeserializer deser = DocumentDeserializerFactory.create42(docMan, header.getBuf(), body.getBuf()); - - doc2 = new Document(deser); - - assertEquals(doc.getFieldValue("mailid"), doc2.getFieldValue("mailid")); - assertEquals(doc.getFieldValue("date"), doc2.getFieldValue("date")); - assertEquals(doc.getFieldValue("from"), doc2.getFieldValue("from")); - assertEquals(doc.getFieldValue("to"), doc2.getFieldValue("to")); - assertEquals(doc.getFieldValue("subject"), doc2.getFieldValue("subject")); - assertEquals(doc.getFieldValue("body"), doc2.getFieldValue("body")); - assertEquals(doc.getFieldValue("attachmentcount"), doc2.getFieldValue("attachmentcount")); - assertEquals(doc.getFieldValue("attachments"), doc2.getFieldValue("attachments")); - docRawBytes = ((Raw)doc.getFieldValue("rawfield")).getByteBuffer().array(); - doc2RawBytes = ((Raw)doc2.getFieldValue("rawfield")).getByteBuffer().array(); - assertEquals(docRawBytes.length, doc2RawBytes.length); - for (int i = 0; i < docRawBytes.length; i++) { - assertEquals(docRawBytes[i], doc2RawBytes[i]); - } - assertEquals(doc.getFieldValue("weightedfield"), doc2.getFieldValue("weightedfield")); - assertEquals(doc.getFieldValue("mapfield"), doc2.getFieldValue("mapfield")); } @Test @@ -1000,7 +871,7 @@ public class DocumentTestCase extends DocumentTestCaseBase { BufferSerializer buf = new BufferSerializer(); try { - new Document(DocumentDeserializerFactory.create42(docMan, buf.getBuf())); + new Document(DocumentDeserializerFactory.create6(docMan, buf.getBuf())); assertTrue(false); } catch (Exception e) { assertTrue(true); @@ -1008,7 +879,7 @@ public class DocumentTestCase extends DocumentTestCaseBase { buf = BufferSerializer.wrap("Hello world".getBytes()); try { - new Document(DocumentDeserializerFactory.create42(docMan, buf.getBuf())); + new Document(DocumentDeserializerFactory.create6(docMan, buf.getBuf())); assertTrue(false); } catch (Exception e) { assertTrue(true); @@ -1450,11 +1321,11 @@ public class DocumentTestCase extends DocumentTestCaseBase { } public void serialize(String docId) { new Document(docType, DocumentId.createFromSerialized(docId)) - .serialize(DocumentSerializerFactory.createHead(buffer)); + .serialize(DocumentSerializerFactory.create6(buffer)); buffer.flip(); } public Document deserialize() { - return new Document(DocumentDeserializerFactory.createHead(docMan, buffer)); + return new Document(DocumentDeserializerFactory.create6(docMan, buffer)); } } diff --git a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java index a9f77cb5eb0..b86094e5a4d 100644 --- a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java @@ -299,13 +299,13 @@ public class DocumentUpdateTestCase { docUp.addFieldUpdate(assignSingle); docUp.addFieldUpdate(addMultiList); - DocumentDeserializer buf = DocumentDeserializerFactory.create42(docMan, new GrowableByteBuffer()); - docUp.serialize((DocumentUpdateWriter)buf); - buf.getBuf().flip(); + GrowableByteBuffer buf = new GrowableByteBuffer(); + docUp.serialize(DocumentSerializerFactory.create42(buf)); + buf.flip(); try { FileOutputStream fos = new FileOutputStream("src/test/files/updateser.dat"); - fos.write(buf.getBuf().array(), 0, buf.getBuf().remaining()); + fos.write(buf.array(), 0, buf.remaining()); fos.close(); } catch (Exception e) { } @@ -330,10 +330,9 @@ public class DocumentUpdateTestCase { + (4 //valueUpdateClassID + (4 + 4 + 4 + (1 + 1 + 2 + 1) + 4 + (1 + 1 + 2 + 1) + 4 + (1 + 1 + 2 + 1))))) //value - , buf.getBuf().remaining()); - - DocumentUpdate docUpDeser = new DocumentUpdate(buf); + , buf.remaining()); + DocumentUpdate docUpDeser = new DocumentUpdate(DocumentDeserializerFactory.create42(docMan, buf)); assertEquals(docUp.getDocumentType(), docUpDeser.getDocumentType()); assertEquals(docUp, docUpDeser); } @@ -402,7 +401,7 @@ public class DocumentUpdateTestCase { upd.addFieldUpdate(serAdd); GrowableByteBuffer buf = new GrowableByteBuffer(100, 2.0f); - upd.serialize(buf); + upd.serialize(DocumentSerializerFactory.create42(buf)); int size = buf.position(); buf.position(0); @@ -630,11 +629,11 @@ public class DocumentUpdateTestCase { public void testRequireThatCreateIfNonExistentFlagIsSerializedAndDeserialized() { docUp.setCreateIfNonExistent(true); - DocumentSerializer serializer = DocumentSerializerFactory.createHead(new GrowableByteBuffer()); + DocumentSerializer serializer = DocumentSerializerFactory.create6(new GrowableByteBuffer()); docUp.serialize(serializer); serializer.getBuf().flip(); - DocumentDeserializer deserializer = DocumentDeserializerFactory.createHead(docMan, serializer.getBuf()); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(docMan, serializer.getBuf()); DocumentUpdate deserialized = new DocumentUpdate(deserializer); assertEquals(docUp, deserialized); assertTrue(deserialized.getCreateIfNonExistent()); @@ -655,11 +654,11 @@ public class DocumentUpdateTestCase { @Test public void testThatAssignValueUpdateForTensorFieldCanBeSerializedAndDeserialized() { DocumentUpdate serializedUpdate = createTensorAssignUpdate(); - DocumentSerializer serializer = DocumentSerializerFactory.createHead(new GrowableByteBuffer()); + DocumentSerializer serializer = DocumentSerializerFactory.create6(new GrowableByteBuffer()); serializedUpdate.serialize(serializer); serializer.getBuf().flip(); - DocumentDeserializer deserializer = DocumentDeserializerFactory.createHead(docMan, serializer.getBuf()); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(docMan, serializer.getBuf()); DocumentUpdate deserializedUpdate = new DocumentUpdate(deserializer); assertEquals(serializedUpdate, deserializedUpdate); } diff --git a/document/src/test/java/com/yahoo/document/annotation/AlternateSpanListTestCase.java b/document/src/test/java/com/yahoo/document/annotation/AlternateSpanListTestCase.java index 47e514d74f5..186766f799b 100755 --- a/document/src/test/java/com/yahoo/document/annotation/AlternateSpanListTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/AlternateSpanListTestCase.java @@ -57,7 +57,7 @@ public class AlternateSpanListTestCase extends AbstractTypesTest { GrowableByteBuffer buffer; { buffer = new GrowableByteBuffer(1024); - DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); + DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer); StringFieldValue value = new StringFieldValue("lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lk"); SpanTree tree = new SpanTree("bababa", alternateSpanList); value.setSpanTree(tree); @@ -66,7 +66,7 @@ public class AlternateSpanListTestCase extends AbstractTypesTest { } AlternateSpanList alternateSpanList2; { - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(man, buffer); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(man, buffer); StringFieldValue value = new StringFieldValue(); deserializer.read(null, value); alternateSpanList2 = (AlternateSpanList)value.getSpanTree("bababa").getRoot(); diff --git a/document/src/test/java/com/yahoo/document/annotation/AnnotationTestCase.java b/document/src/test/java/com/yahoo/document/annotation/AnnotationTestCase.java index de674aa3cca..cb04ca1de62 100644 --- a/document/src/test/java/com/yahoo/document/annotation/AnnotationTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/AnnotationTestCase.java @@ -115,11 +115,11 @@ public class AnnotationTestCase extends AbstractTypesTest { private void serializeAndAssert(Annotation annotation) { GrowableByteBuffer buffer = new GrowableByteBuffer(1024); - DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); + DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer); serializer.write(annotation); buffer.flip(); - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(man, buffer); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(man, buffer); Annotation annotation2 = new Annotation(); deserializer.read(annotation2); diff --git a/document/src/test/java/com/yahoo/document/annotation/Bug6394548TestCase.java b/document/src/test/java/com/yahoo/document/annotation/Bug6394548TestCase.java index 18f19030c9e..8b9649d697f 100644 --- a/document/src/test/java/com/yahoo/document/annotation/Bug6394548TestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/Bug6394548TestCase.java @@ -43,11 +43,11 @@ public class Bug6394548TestCase { String annotationsBefore = dumpAllAnnotations(tree); GrowableByteBuffer buffer = new GrowableByteBuffer(); - DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); + DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer); serializer.write(doc); buffer.flip(); - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(manager, buffer); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(manager, buffer); Document doc2 = new Document(deserializer); System.out.println(doc2.toXml()); diff --git a/document/src/test/java/com/yahoo/document/annotation/Bug6425939TestCase.java b/document/src/test/java/com/yahoo/document/annotation/Bug6425939TestCase.java index 8f071650382..82b730ae4ca 100644 --- a/document/src/test/java/com/yahoo/document/annotation/Bug6425939TestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/Bug6425939TestCase.java @@ -37,13 +37,13 @@ public class Bug6425939TestCase { emptyString.setSpanTree(createSpanTree()); GrowableByteBuffer buffer = new GrowableByteBuffer(1024); - DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); + DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer); Field strField = new Field("flarn", DataType.STRING); serializer.write(strField, emptyString); buffer.flip(); // Should not throw exception if bug 6425939 is fixed: - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(man, buffer); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(man, buffer); StringFieldValue deserializedString = new StringFieldValue(); deserializer.read(strField, deserializedString); diff --git a/document/src/test/java/com/yahoo/document/annotation/SpanListTestCase.java b/document/src/test/java/com/yahoo/document/annotation/SpanListTestCase.java index 887bfec5059..6f338fc47a3 100755 --- a/document/src/test/java/com/yahoo/document/annotation/SpanListTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/SpanListTestCase.java @@ -46,7 +46,7 @@ public class SpanListTestCase extends AbstractTypesTest { GrowableByteBuffer buffer; { buffer = new GrowableByteBuffer(1024); - DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); + DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer); StringFieldValue value = new StringFieldValue("lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lk"); SpanTree tree = new SpanTree("bababa", spanList); value.setSpanTree(tree); @@ -55,7 +55,7 @@ public class SpanListTestCase extends AbstractTypesTest { } SpanList spanList2; { - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(man, buffer); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(man, buffer); StringFieldValue value = new StringFieldValue(); deserializer.read(null, value); spanList2 = (SpanList)value.getSpanTree("bababa").getRoot(); diff --git a/document/src/test/java/com/yahoo/document/annotation/SpanTestCase.java b/document/src/test/java/com/yahoo/document/annotation/SpanTestCase.java index 701f6917ecd..23d62cae239 100755 --- a/document/src/test/java/com/yahoo/document/annotation/SpanTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/SpanTestCase.java @@ -79,7 +79,7 @@ public class SpanTestCase extends AbstractTypesTest { GrowableByteBuffer buffer; { buffer = new GrowableByteBuffer(1024); - DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); + DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer); StringFieldValue value = new StringFieldValue("lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lk"); SpanTree tree = new SpanTree("bababa", span); value.setSpanTree(tree); @@ -88,7 +88,7 @@ public class SpanTestCase extends AbstractTypesTest { } Span span2; { - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(man, buffer); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(man, buffer); StringFieldValue value = new StringFieldValue(); deserializer.read(null, value); span2 = (Span)value.getSpanTree("bababa").getRoot(); diff --git a/document/src/test/java/com/yahoo/document/annotation/SpanTreeTestCase.java b/document/src/test/java/com/yahoo/document/annotation/SpanTreeTestCase.java index 393fe8b6688..b200e72514d 100755 --- a/document/src/test/java/com/yahoo/document/annotation/SpanTreeTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/SpanTreeTestCase.java @@ -865,12 +865,12 @@ public class SpanTreeTestCase extends AbstractTypesTest { GrowableByteBuffer buffer = new GrowableByteBuffer(1024); - DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); + DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer); serializer.write(new Field("stringfield", DataType.STRING), strfval); buffer.flip(); - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(docMan, buffer); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(docMan, buffer); StringFieldValue stringFieldValue2 = new StringFieldValue(); deserializer.read(new Field("stringfield", DataType.STRING), stringFieldValue2); diff --git a/document/src/test/java/com/yahoo/document/annotation/SystemTestCase.java b/document/src/test/java/com/yahoo/document/annotation/SystemTestCase.java index ffa71ea7939..9163b773bcf 100755 --- a/document/src/test/java/com/yahoo/document/annotation/SystemTestCase.java +++ b/document/src/test/java/com/yahoo/document/annotation/SystemTestCase.java @@ -124,10 +124,10 @@ public class SystemTestCase { annotate(inDocument); GrowableByteBuffer buffer = new GrowableByteBuffer(); - DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); + DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer); serializer.write(inDocument); buffer.flip(); - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(manager, buffer); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(manager, buffer); Document outDocument = new Document(deserializer); consume(outDocument); diff --git a/document/src/test/java/com/yahoo/document/datatypes/MapTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/MapTestCase.java index c4441910f2a..eb47fb1425d 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/MapTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/MapTestCase.java @@ -144,10 +144,10 @@ public class MapTestCase { DocumentTypeManager man = new DocumentTypeManager(); man.register(mapType); GrowableByteBuffer buffer = new GrowableByteBuffer(1024); - DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); + DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer); serializer.write(f, map); buffer.flip(); - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(man, buffer); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(man, buffer); MapFieldValue<FieldValue, FieldValue> map2 = new MapFieldValue<FieldValue, FieldValue>(mapType); deserializer.read(f, map2); assertNotSame(map, map2); diff --git a/document/src/test/java/com/yahoo/document/datatypes/StringTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/StringTestCase.java index e9fce35ed01..296ab1ac3fc 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/StringTestCase.java +++ b/document/src/test/java/com/yahoo/document/datatypes/StringTestCase.java @@ -50,7 +50,7 @@ public class StringTestCase extends AbstractTypesTest { data.position(0); StringFieldValue tmp = new StringFieldValue(); - DocumentDeserializer deser = DocumentDeserializerFactory.create42(null, data); + DocumentDeserializer deser = DocumentDeserializerFactory.create6(null, data); tmp.deserialize(deser); java.lang.String foo2 = tmp.getString(); @@ -111,7 +111,7 @@ public class StringTestCase extends AbstractTypesTest { tmp = new StringFieldValue(); - deser = DocumentDeserializerFactory.create42(null, data); + deser = DocumentDeserializerFactory.create6(null, data); tmp.deserialize(deser); java.lang.String blah2 = tmp.getString(); @@ -129,7 +129,7 @@ public class StringTestCase extends AbstractTypesTest { data.getBuf().position(0); StringFieldValue tmp = new StringFieldValue(); - DocumentDeserializer deser = DocumentDeserializerFactory.create42(null, data.getBuf()); + DocumentDeserializer deser = DocumentDeserializerFactory.create6(null, data.getBuf()); tmp.deserialize(deser); java.lang.String test2 = tmp.getString(); assertEquals(test, test2); @@ -146,11 +146,11 @@ public class StringTestCase extends AbstractTypesTest { Field f = new Field("text", DataType.STRING); GrowableByteBuffer buffer = new GrowableByteBuffer(1024); - DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); + DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer); serializer.write(f, stringFieldValue); buffer.flip(); - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(man, buffer); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(man, buffer); StringFieldValue stringFieldValue2 = new StringFieldValue(); deserializer.read(f, stringFieldValue2); @@ -183,7 +183,7 @@ public class StringTestCase extends AbstractTypesTest { innerTree.annotate(innerSpan, new Annotation(type)); GrowableByteBuffer buffer = new GrowableByteBuffer(1024); - DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); + DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer); try { serializer.write(null, outerString); @@ -216,11 +216,11 @@ public class StringTestCase extends AbstractTypesTest { private Document serializeAndDeserialize(Document doc, DocumentTypeManager manager) { GrowableByteBuffer buffer = new GrowableByteBuffer(1024); - DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer); + DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer); serializer.write(doc); buffer.flip(); - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(manager, buffer); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(manager, buffer); return new Document(deserializer); } diff --git a/document/src/test/java/com/yahoo/document/datatypes/blog.sd b/document/src/test/java/com/yahoo/document/datatypes/blog.sd index 545c46cb149..1723e942370 100644 --- a/document/src/test/java/com/yahoo/document/datatypes/blog.sd +++ b/document/src/test/java/com/yahoo/document/datatypes/blog.sd @@ -4,26 +4,19 @@ search blog { document blog { field title type string { - header indexing: summary | index - # index-to: default } field author type string { - header indexing: summary | index - # index-to: default } field body type string { - header indexing: summary | index } field url type uri { - header indexing: index | summary - # index-to: default } } diff --git a/document/src/test/java/com/yahoo/document/docindoc.sd b/document/src/test/java/com/yahoo/document/docindoc.sd index 8b6acd71f47..b05f8d71c89 100644 --- a/document/src/test/java/com/yahoo/document/docindoc.sd +++ b/document/src/test/java/com/yahoo/document/docindoc.sd @@ -1,7 +1,7 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search docindoc { document docindoc { - field name type string { header } - field content type string { body } + field name type string { } + field content type string { } } } diff --git a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java index b3d502ea56f..d82935e3c3b 100644 --- a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java +++ b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java @@ -323,7 +323,7 @@ public class JsonReaderTestCase { assertEquals(2, s.getFieldCount()); assertEquals(new StringFieldValue("person"), s.getFieldValue(s.getField("sandra"))); GrowableByteBuffer buf = new GrowableByteBuffer(); - DocumentSerializer serializer = DocumentSerializerFactory.createHead(buf); + DocumentSerializer serializer = DocumentSerializerFactory.create6(buf); put.serialize(serializer); assertEquals(107, buf.position()); } @@ -345,7 +345,7 @@ public class JsonReaderTestCase { Struct s = (Struct) avu.getValue(); assertEquals(0, s.getFieldCount()); GrowableByteBuffer buf = new GrowableByteBuffer(); - DocumentSerializer serializer = DocumentSerializerFactory.createHead(buf); + DocumentSerializer serializer = DocumentSerializerFactory.create6(buf); put.serialize(serializer); assertEquals(69, buf.position()); } diff --git a/document/src/test/java/com/yahoo/document/outerdoc.sd b/document/src/test/java/com/yahoo/document/outerdoc.sd index 6fdbd402ffe..57a1bda323a 100644 --- a/document/src/test/java/com/yahoo/document/outerdoc.sd +++ b/document/src/test/java/com/yahoo/document/outerdoc.sd @@ -1,6 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. search outerdoc { document outerdoc { - field innerdocuments type array<docindoc> { body } + field innerdocuments type array<docindoc> { } } } diff --git a/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java b/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java index 38cf2b0e9d1..25021b0d2f8 100644 --- a/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java +++ b/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java @@ -24,7 +24,7 @@ public class SerializationTestUtils { public static byte[] serializeDocument(Document doc) { GrowableByteBuffer out = new GrowableByteBuffer(); - DocumentSerializerFactory.create42(out).write(doc); + DocumentSerializerFactory.create6(out).write(doc); out.flip(); byte[] buf = new byte[out.remaining()]; out.get(buf); @@ -33,7 +33,7 @@ public class SerializationTestUtils { public static Document deserializeDocument(byte[] buf, TestDocumentFactory factory) { Document document = factory.createDocument(); - DocumentDeserializerFactory.create42(factory.typeManager(), new GrowableByteBuffer(ByteBuffer.wrap(buf))).read(document); + DocumentDeserializerFactory.create6(factory.typeManager(), new GrowableByteBuffer(ByteBuffer.wrap(buf))).read(document); return document; } diff --git a/document/src/test/java/com/yahoo/document/serialization/SerializeAnnotationsTestCase.java b/document/src/test/java/com/yahoo/document/serialization/SerializeAnnotationsTestCase.java index 30db0af6607..653f121b2d4 100644 --- a/document/src/test/java/com/yahoo/document/serialization/SerializeAnnotationsTestCase.java +++ b/document/src/test/java/com/yahoo/document/serialization/SerializeAnnotationsTestCase.java @@ -79,7 +79,7 @@ public class SerializeAnnotationsTestCase { assertEquals(serialized.limit(), serializedFromFile.limit()); StringFieldValue valueFromFile = new StringFieldValue(); - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(docMan, new GrowableByteBuffer(serializedFromFile)); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(docMan, new GrowableByteBuffer(serializedFromFile)); deserializer.read(null, valueFromFile); assertEquals(value, valueFromFile); } @@ -182,7 +182,7 @@ public class SerializeAnnotationsTestCase { assertEquals(serialized.limit(), serializedFromFile.limit()); StringFieldValue valueFromFile = new StringFieldValue(); - DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(docMan, new GrowableByteBuffer(serializedFromFile)); + DocumentDeserializer deserializer = DocumentDeserializerFactory.create6(docMan, new GrowableByteBuffer(serializedFromFile)); deserializer.read(null, valueFromFile); assertEquals(value, valueFromFile); } diff --git a/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java b/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java index 4f34431c729..5a8d458c74b 100644 --- a/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java +++ b/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java @@ -53,7 +53,7 @@ public class VespaDocumentSerializerTestCase { PredicateFieldValue predicate = Mockito.mock(PredicateFieldValue.class); doc.setFieldValue("my_predicate", predicate); - DocumentSerializerFactory.create42(new GrowableByteBuffer()).write(doc); + DocumentSerializerFactory.create6(new GrowableByteBuffer()).write(doc); Mockito.verify(predicate, Mockito.times(1)).serialize(Mockito.same(field), Mockito.any(FieldWriter.class)); } diff --git a/document/src/test/java/com/yahoo/document/update/FieldUpdateTestCase.java b/document/src/test/java/com/yahoo/document/update/FieldUpdateTestCase.java index 3cf0fab80ae..11e0cc783af 100644 --- a/document/src/test/java/com/yahoo/document/update/FieldUpdateTestCase.java +++ b/document/src/test/java/com/yahoo/document/update/FieldUpdateTestCase.java @@ -186,10 +186,10 @@ public class FieldUpdateTestCase { // Copy all field updates using serialization to verify that it is supported private FieldUpdate serializedCopy(FieldUpdate source, DocumentType docType) { - DocumentSerializer buffer = DocumentSerializerFactory.create42(); + DocumentSerializer buffer = DocumentSerializerFactory.create6(); source.serialize(buffer); buffer.getBuf().flip(); - FieldUpdate copy = new FieldUpdate(DocumentDeserializerFactory.create42(docman, buffer.getBuf()), docType, Document.SERIALIZED_VERSION); + FieldUpdate copy = new FieldUpdate(DocumentDeserializerFactory.create6(docman, buffer.getBuf()), docType, Document.SERIALIZED_VERSION); assertEquals(source, copy); return copy; } diff --git a/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java b/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java index f1cce1e4c4a..05492d41b09 100644 --- a/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java +++ b/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java @@ -30,7 +30,7 @@ public class SerializationTestCase { @Test public void testAddSerialization() { FieldUpdate update = FieldUpdate.createAdd(field, new StringFieldValue("value1")); - DocumentSerializer buffer = DocumentSerializerFactory.create42(); + DocumentSerializer buffer = DocumentSerializerFactory.create6(); update.serialize(buffer); buffer.getBuf().rewind(); @@ -41,18 +41,18 @@ public class SerializationTestCase { fos.close(); } catch (Exception e) {} - FieldUpdate deserializedUpdate = new FieldUpdate(DocumentDeserializerFactory.create42(new DocumentTypeManager(), buffer.getBuf()), documentType, Document.SERIALIZED_VERSION); + FieldUpdate deserializedUpdate = new FieldUpdate(DocumentDeserializerFactory.create6(new DocumentTypeManager(), buffer.getBuf()), documentType, Document.SERIALIZED_VERSION); assertEquals("'field1' [add value1 1]", deserializedUpdate.toString()); } @Test public void testClearSerialization() { FieldUpdate update = FieldUpdate.createClear(field); - DocumentSerializer buffer = DocumentSerializerFactory.create42(); + DocumentSerializer buffer = DocumentSerializerFactory.create6(); update.serialize(buffer); buffer.getBuf().rewind(); - FieldUpdate deserializedUpdate = new FieldUpdate(DocumentDeserializerFactory.create42(new DocumentTypeManager(), buffer.getBuf()), documentType, Document.SERIALIZED_VERSION); + FieldUpdate deserializedUpdate = new FieldUpdate(DocumentDeserializerFactory.create6(new DocumentTypeManager(), buffer.getBuf()), documentType, Document.SERIALIZED_VERSION); assertEquals("'field1' [clear]", deserializedUpdate.toString()); } |