diff --git a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/MultipleRootValuesTest.java b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/MultipleDocumentsReadTest.java similarity index 94% rename from yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/MultipleRootValuesTest.java rename to yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/MultipleDocumentsReadTest.java index d6bf4ff8..16b60697 100644 --- a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/MultipleRootValuesTest.java +++ b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/MultipleDocumentsReadTest.java @@ -7,9 +7,9 @@ import com.fasterxml.jackson.databind.MappingIterator; -public class MultipleRootValuesTest extends ModuleTestBase +public class MultipleDocumentsReadTest extends ModuleTestBase { - private final YAMLMapper MAPPER = new YAMLMapper(); + private final YAMLMapper MAPPER = newObjectMapper(); private final YAMLFactory YAML_F = MAPPER.getFactory(); diff --git a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/CollectionReadTest.java b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/CollectionReadTest.java index bc3fa663..a675f257 100644 --- a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/CollectionReadTest.java +++ b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/CollectionReadTest.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.ModuleTestBase; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; // for [dataformat-yaml#26]: not sure if it's an actual bug, but adding for now. public class CollectionReadTest extends ModuleTestBase @@ -15,7 +14,7 @@ static class SetBean { public void testSet26() throws Exception { - ObjectMapper mapper = new ObjectMapper(new YAMLFactory()); + ObjectMapper mapper = newObjectMapper(); final String YAML = "---\n" +"sets: !!set\n" +" ? a\n" diff --git a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/MultipleDocumentsWriteTest.java b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/MultipleDocumentsWriteTest.java new file mode 100644 index 00000000..a73efd2a --- /dev/null +++ b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/MultipleDocumentsWriteTest.java @@ -0,0 +1,50 @@ +package com.fasterxml.jackson.dataformat.yaml.failing; + +import java.io.StringWriter; +import java.util.Collections; + +import com.fasterxml.jackson.databind.*; + +import com.fasterxml.jackson.dataformat.yaml.ModuleTestBase; + +// for [dataformats-text#163] +public class MultipleDocumentsWriteTest extends ModuleTestBase +{ + static class POJO163 { + public int value; + + public POJO163(int v) { value = v; } + } + + public void testWriteMultipleDocsBeans() throws Exception + { + ObjectMapper mapper = newObjectMapper(); + StringWriter w = new StringWriter(); + try (SequenceWriter seqW = mapper.writer().writeValues(w)) { + seqW.write(new POJO163(42)); + seqW.write(new POJO163(28)); + } + w.close(); + + String yaml = w.toString(); + + // !!! TODO: actual expected multi-doc contents: + assertEquals("foo", yaml); + } + + public void testWriteMultipleDocsLists() throws Exception + { + ObjectMapper mapper = newObjectMapper(); + StringWriter w = new StringWriter(); + try (SequenceWriter seqW = mapper.writer().writeValues(w)) { + seqW.write(Collections.singleton(42)); + seqW.write(Collections.singleton(28)); + } + w.close(); + + String yaml = w.toString(); + + // !!! TODO: actual expected multi-doc contents: + assertEquals("foo", yaml); + } +}