diff --git a/csv/src/test/java/tools/jackson/dataformat/csv/failing/MappingIteratorEnd9Test.java b/csv/src/test/java/tools/jackson/dataformat/csv/tofix/MappingIteratorEnd9Test.java similarity index 79% rename from csv/src/test/java/tools/jackson/dataformat/csv/failing/MappingIteratorEnd9Test.java rename to csv/src/test/java/tools/jackson/dataformat/csv/tofix/MappingIteratorEnd9Test.java index 18427b2e..c87bdf86 100644 --- a/csv/src/test/java/tools/jackson/dataformat/csv/failing/MappingIteratorEnd9Test.java +++ b/csv/src/test/java/tools/jackson/dataformat/csv/tofix/MappingIteratorEnd9Test.java @@ -1,15 +1,17 @@ -package tools.jackson.dataformat.csv.failing; +package tools.jackson.dataformat.csv.tofix; import org.junit.jupiter.api.Test; -import tools.jackson.databind.*; +import tools.jackson.databind.MappingIterator; import tools.jackson.dataformat.csv.*; +import tools.jackson.dataformat.csv.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.*; public class MappingIteratorEnd9Test extends ModuleTestBase { // for [dataformats-text#9] (was [dataformat-csv#119]) + @JacksonTestFailureExpected @Test public void testDefaultSimpleQuotes() throws Exception { diff --git a/csv/src/test/java/tools/jackson/dataformat/csv/failing/MissingNullsOnObjectArrayWrite10Test.java b/csv/src/test/java/tools/jackson/dataformat/csv/tofix/MissingNullsOnObjectArrayWrite10Test.java similarity index 88% rename from csv/src/test/java/tools/jackson/dataformat/csv/failing/MissingNullsOnObjectArrayWrite10Test.java rename to csv/src/test/java/tools/jackson/dataformat/csv/tofix/MissingNullsOnObjectArrayWrite10Test.java index 5a66b228..bbc46f04 100644 --- a/csv/src/test/java/tools/jackson/dataformat/csv/failing/MissingNullsOnObjectArrayWrite10Test.java +++ b/csv/src/test/java/tools/jackson/dataformat/csv/tofix/MissingNullsOnObjectArrayWrite10Test.java @@ -1,4 +1,4 @@ -package tools.jackson.dataformat.csv.failing; +package tools.jackson.dataformat.csv.tofix; import java.io.StringWriter; @@ -7,6 +7,7 @@ import tools.jackson.databind.ObjectWriter; import tools.jackson.databind.SequenceWriter; import tools.jackson.dataformat.csv.*; +import tools.jackson.dataformat.csv.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -15,6 +16,7 @@ public class MissingNullsOnObjectArrayWrite10Test extends ModuleTestBase private final CsvMapper MAPPER = mapperForCsv(); // for [dataformats-text#10] + @JacksonTestFailureExpected @Test public void testNullsOnObjectArrayWrites2Col() throws Exception { diff --git a/csv/src/test/java/tools/jackson/dataformat/csv/failing/NullWriting116Test.java b/csv/src/test/java/tools/jackson/dataformat/csv/tofix/NullWriting116Test.java similarity index 83% rename from csv/src/test/java/tools/jackson/dataformat/csv/failing/NullWriting116Test.java rename to csv/src/test/java/tools/jackson/dataformat/csv/tofix/NullWriting116Test.java index 45d1f378..a01fd5a7 100644 --- a/csv/src/test/java/tools/jackson/dataformat/csv/failing/NullWriting116Test.java +++ b/csv/src/test/java/tools/jackson/dataformat/csv/tofix/NullWriting116Test.java @@ -1,11 +1,13 @@ -package tools.jackson.dataformat.csv.failing; +package tools.jackson.dataformat.csv.tofix; import java.io.StringWriter; import org.junit.jupiter.api.Test; -import tools.jackson.databind.*; +import tools.jackson.databind.ObjectWriter; +import tools.jackson.databind.SequenceWriter; import tools.jackson.dataformat.csv.*; +import tools.jackson.dataformat.csv.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -14,6 +16,7 @@ public class NullWriting116Test extends ModuleTestBase private final CsvMapper csv = mapperForCsv(); // [dataformat#116] + @JacksonTestFailureExpected @Test public void testWithObjectArray() throws Exception { diff --git a/csv/src/test/java/tools/jackson/dataformat/csv/failing/ParserQuotes19Test.java b/csv/src/test/java/tools/jackson/dataformat/csv/tofix/ParserQuotes19Test.java similarity index 88% rename from csv/src/test/java/tools/jackson/dataformat/csv/failing/ParserQuotes19Test.java rename to csv/src/test/java/tools/jackson/dataformat/csv/tofix/ParserQuotes19Test.java index d51e928a..90ea77ca 100644 --- a/csv/src/test/java/tools/jackson/dataformat/csv/failing/ParserQuotes19Test.java +++ b/csv/src/test/java/tools/jackson/dataformat/csv/tofix/ParserQuotes19Test.java @@ -1,10 +1,11 @@ -package tools.jackson.dataformat.csv.failing; +package tools.jackson.dataformat.csv.tofix; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import tools.jackson.dataformat.csv.*; +import tools.jackson.dataformat.csv.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -23,6 +24,7 @@ protected static class ThreeString { */ // For #19: need to handle spaces outside quotes, even if not trimming? + @JacksonTestFailureExpected @Test public void testSimpleQuotesWithSpaces() throws Exception { diff --git a/csv/src/test/java/tools/jackson/dataformat/csv/failing/UnicodeCSVRead497Test.java b/csv/src/test/java/tools/jackson/dataformat/csv/tofix/UnicodeCSVRead497Test.java similarity index 82% rename from csv/src/test/java/tools/jackson/dataformat/csv/failing/UnicodeCSVRead497Test.java rename to csv/src/test/java/tools/jackson/dataformat/csv/tofix/UnicodeCSVRead497Test.java index 0af4248d..32e1b012 100644 --- a/csv/src/test/java/tools/jackson/dataformat/csv/failing/UnicodeCSVRead497Test.java +++ b/csv/src/test/java/tools/jackson/dataformat/csv/tofix/UnicodeCSVRead497Test.java @@ -1,12 +1,13 @@ -package tools.jackson.dataformat.csv.failing; +package tools.jackson.dataformat.csv.tofix; import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.Test; -import tools.jackson.databind.*; +import tools.jackson.databind.JsonNode; import tools.jackson.dataformat.csv.*; +import tools.jackson.dataformat.csv.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.*; @@ -16,6 +17,7 @@ public class UnicodeCSVRead497Test extends ModuleTestBase private final CsvMapper MAPPER = mapperForCsv(); // [dataformats-text#497] + @JacksonTestFailureExpected @Test public void testUnicodeAtEnd() throws Exception { diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/SimpleGeneration215Test.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/SimpleGeneration215Test.java index 111c01e1..4b2c115b 100644 --- a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/SimpleGeneration215Test.java +++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/SimpleGeneration215Test.java @@ -4,10 +4,7 @@ import org.junit.jupiter.api.Test; -import tools.jackson.dataformat.yaml.ModuleTestBase; -import tools.jackson.dataformat.yaml.YAMLFactory; -import tools.jackson.dataformat.yaml.YAMLMapper; -import tools.jackson.dataformat.yaml.YAMLWriteFeature; +import tools.jackson.dataformat.yaml.*; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -15,7 +12,8 @@ public class SimpleGeneration215Test extends ModuleTestBase { // [dataformats-text#215]: trying to disable WRITE_DOC_START_MARKER - // via ObjectWriter does not work + // (works for 3.0, fails with 2.x like 2.19) + //@JacksonTestFailureExpected @Test public void testStartMarkerViaWriter() throws Exception { diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/failing/ObjectIdWithTree2Test.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/ObjectIdWithTree2Test.java similarity index 87% rename from yaml/src/test/java/tools/jackson/dataformat/yaml/failing/ObjectIdWithTree2Test.java rename to yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/ObjectIdWithTree2Test.java index d906c30e..19c3943b 100644 --- a/yaml/src/test/java/tools/jackson/dataformat/yaml/failing/ObjectIdWithTree2Test.java +++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/ObjectIdWithTree2Test.java @@ -1,13 +1,16 @@ -package tools.jackson.dataformat.yaml.failing; +package tools.jackson.dataformat.yaml.tofix; import org.junit.jupiter.api.Test; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonIdentityInfo; +import com.fasterxml.jackson.annotation.ObjectIdGenerators; import tools.jackson.databind.JsonNode; import tools.jackson.databind.ObjectMapper; import tools.jackson.dataformat.yaml.ModuleTestBase; +import tools.jackson.dataformat.yaml.testutil.failure.JacksonTestFailureExpected; + import static org.junit.jupiter.api.Assertions.*; /** * Although native Object Ids work in general, Tree Model currently @@ -44,6 +47,7 @@ public Node(String name) { ; // [dataformats-text#2] + @JacksonTestFailureExpected @Test public void testRoundtripViaTree() throws Exception { diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/failing/PolymorphicWithObjectId25Test.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/PolymorphicWithObjectId25Test.java similarity index 86% rename from yaml/src/test/java/tools/jackson/dataformat/yaml/failing/PolymorphicWithObjectId25Test.java rename to yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/PolymorphicWithObjectId25Test.java index 5458c94a..df58509f 100644 --- a/yaml/src/test/java/tools/jackson/dataformat/yaml/failing/PolymorphicWithObjectId25Test.java +++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/PolymorphicWithObjectId25Test.java @@ -1,15 +1,13 @@ -package tools.jackson.dataformat.yaml.failing; +package tools.jackson.dataformat.yaml.tofix; import org.junit.jupiter.api.Test; -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; +import com.fasterxml.jackson.annotation.*; import tools.jackson.databind.ObjectMapper; import tools.jackson.dataformat.yaml.ModuleTestBase; +import tools.jackson.dataformat.yaml.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.*; @@ -44,6 +42,7 @@ static class SubNodeWithStringId extends NodeWithStringId { } private final ObjectMapper MAPPER = newObjectMapper(); // [dataformats-text#25] + @JacksonTestFailureExpected @Test public void testPolymorphicAndObjectId25() throws Exception { diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/failing/SimpleGeneration366Test.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/SimpleGeneration366Test.java similarity index 91% rename from yaml/src/test/java/tools/jackson/dataformat/yaml/failing/SimpleGeneration366Test.java rename to yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/SimpleGeneration366Test.java index 7df326b8..1ac55409 100644 --- a/yaml/src/test/java/tools/jackson/dataformat/yaml/failing/SimpleGeneration366Test.java +++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/SimpleGeneration366Test.java @@ -1,4 +1,4 @@ -package tools.jackson.dataformat.yaml.failing; +package tools.jackson.dataformat.yaml.tofix; import java.util.HashMap; import java.util.Map; @@ -6,6 +6,7 @@ import org.junit.jupiter.api.Test; import tools.jackson.dataformat.yaml.*; +import tools.jackson.dataformat.yaml.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -13,6 +14,7 @@ public class SimpleGeneration366Test extends ModuleTestBase { // [dataformats-text#366]: multiline literal block with trailing spaces does not work + @JacksonTestFailureExpected @Test public void testLiteralBlockStyleMultilineWithTrailingSpace() throws Exception { diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/failing/UnicodeYAMLRead497Test.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/UnicodeYAMLRead497Test.java similarity index 83% rename from yaml/src/test/java/tools/jackson/dataformat/yaml/failing/UnicodeYAMLRead497Test.java rename to yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/UnicodeYAMLRead497Test.java index 77ee26dc..de99189d 100644 --- a/yaml/src/test/java/tools/jackson/dataformat/yaml/failing/UnicodeYAMLRead497Test.java +++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/tofix/UnicodeYAMLRead497Test.java @@ -1,4 +1,4 @@ -package tools.jackson.dataformat.yaml.failing; +package tools.jackson.dataformat.yaml.tofix; import java.nio.charset.StandardCharsets; @@ -8,6 +8,7 @@ import tools.jackson.core.JsonToken; import tools.jackson.dataformat.yaml.*; +import tools.jackson.dataformat.yaml.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -17,15 +18,16 @@ public class UnicodeYAMLRead497Test extends ModuleTestBase private final YAMLMapper MAPPER = newObjectMapper(); // [dataformats-text#497] + @JacksonTestFailureExpected @Test public void testUnicodeAtEnd() throws Exception { // Had to find edge condition, these would do: // (NOTE: off-by-one-per-1k compared to Jackson 2.x) - _testUnicodeAtEnd(1023); - _testUnicodeAtEnd(2046); - _testUnicodeAtEnd(3069); - _testUnicodeAtEnd(4092); + _testUnicodeAtEnd(1025); + _testUnicodeAtEnd(2050); + _testUnicodeAtEnd(3075); + _testUnicodeAtEnd(4100); } void _testUnicodeAtEnd(int LEN) throws Exception