diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-21 07:59:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-21 07:59:11 +0200 |
commit | 415e9e002e4207809247b6bd5f9419960ab43ed1 (patch) | |
tree | 0111e27fb0b3e494401a98279d36c58b48c3d265 /document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java | |
parent | be5759f30affe0e38ea4c442586a457f9cb698f8 (diff) |
Revert "doc: -> id:"
Diffstat (limited to 'document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java')
-rw-r--r-- | document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java index bc1224ca8ea..8ff168adc4b 100644 --- a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java @@ -89,7 +89,7 @@ public class DocumentSerializationTestCase extends AbstractTypesTest { String path = "src/test/serializeddocuments/"; { - Document doc = new Document(docType, "id:ns:serializetest::http://test.doc.id/"); + Document doc = new Document(docType, "doc:serializetest:http://test.doc.id/"); doc.setFieldValue("intfield", 5); doc.setFieldValue("floatfield", -9.23); doc.setFieldValue("stringfield", "This is a string."); @@ -100,7 +100,7 @@ public class DocumentSerializationTestCase extends AbstractTypesTest { byte[] rawData = "RAW DATA".getBytes(); assertEquals(8, rawData.length); doc.setFieldValue(docType.getField("rawfield"),new Raw(ByteBuffer.wrap("RAW DATA".getBytes()))); - Document docInDoc = new Document(docInDocType, "id:ns:docindoc::http://doc.in.doc/"); + Document docInDoc = new Document(docInDocType, "doc:serializetest:http://doc.in.doc/"); docInDoc.setFieldValue("stringindocfield", "Elvis is dead"); doc.setFieldValue(docType.getField("docfield"), docInDoc); Array<FloatFieldValue> floatArray = new Array<>(arrayOfFloatDataType); @@ -146,12 +146,16 @@ public class DocumentSerializationTestCase extends AbstractTypesTest { String cpppath = "src/tests/data/"; List<TestDoc> tests = new ArrayList<>(); - tests.add(new TestDoc(path + "document-java-currentversion-uncompressed.dat", Document.SERIALIZED_VERSION)); - tests.add(new TestDoc(path + "document-java-currentversion-lz4-9.dat", Document.SERIALIZED_VERSION)); + tests.add(new TestDoc(path + "document-java-currentversion-uncompressed.dat", + Document.SERIALIZED_VERSION)); + tests.add(new TestDoc(path + "document-java-currentversion-lz4-9.dat", + Document.SERIALIZED_VERSION)); tests.add(new TestDoc(path + "document-java-v8-uncompressed.dat", 8)); tests.add(new TestDoc(cpppath + "document-cpp-currentversion-uncompressed.dat", 7)); tests.add(new TestDoc(cpppath + "document-cpp-currentversion-lz4-9.dat", 7)); tests.add(new TestDoc(cpppath + "document-cpp-v8-uncompressed.dat", 7)); + tests.add(new TestDoc(cpppath + "document-cpp-v7-uncompressed.dat", 7)); + tests.add(new TestDoc(cpppath + "serializev6.dat", 6)); for (TestDoc test : tests) { File f = new File(test.testFile); FileInputStream fin = new FileInputStream(f); @@ -202,7 +206,7 @@ public class DocumentSerializationTestCase extends AbstractTypesTest { @Test public void testSerializeDeserializeWithAnnotations() throws IOException { - Document doc = new Document(docType, "id:ns:dokk::bar"); + Document doc = new Document(docType, "doc:foo:bar"); doc.setFieldValue("age", (byte)123); doc.setFieldValue("story", getAnnotatedString()); |