From 14748271c3df4c82f3cc03fafff301e9f9aba8aa Mon Sep 17 00:00:00 2001 From: Cowtowncoder Date: Wed, 15 Apr 2015 09:16:22 -0700 Subject: [PATCH] Reorganizing tests, adding failing test for #74 (not yet certain of its validity, but to keep it around) --- ...serQuotes.java => ParserQuotes19Test.java} | 3 +- .../csv/failing/PropertyOrder74Test.java | 30 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) rename src/test/java/com/fasterxml/jackson/dataformat/csv/failing/{TestParserQuotes.java => ParserQuotes19Test.java} (93%) create mode 100644 src/test/java/com/fasterxml/jackson/dataformat/csv/failing/PropertyOrder74Test.java diff --git a/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/TestParserQuotes.java b/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/ParserQuotes19Test.java similarity index 93% rename from src/test/java/com/fasterxml/jackson/dataformat/csv/failing/TestParserQuotes.java rename to src/test/java/com/fasterxml/jackson/dataformat/csv/failing/ParserQuotes19Test.java index 87b8ae7..ce57760 100644 --- a/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/TestParserQuotes.java +++ b/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/ParserQuotes19Test.java @@ -4,7 +4,8 @@ import com.fasterxml.jackson.dataformat.csv.*; -public class TestParserQuotes extends ModuleTestBase +// for [dataformat-csv#19] +public class ParserQuotes19Test extends ModuleTestBase { @JsonPropertyOrder({"s1", "s2", "s3"}) protected static class ThreeString { diff --git a/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/PropertyOrder74Test.java b/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/PropertyOrder74Test.java new file mode 100644 index 0000000..4755b01 --- /dev/null +++ b/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/PropertyOrder74Test.java @@ -0,0 +1,30 @@ +package com.fasterxml.jackson.dataformat.csv.failing; + +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +import com.fasterxml.jackson.dataformat.csv.CsvMapper; +import com.fasterxml.jackson.dataformat.csv.CsvSchema; +import com.fasterxml.jackson.dataformat.csv.ModuleTestBase; + +// For [dataformat-csv#74]: problems applying default do-sort handling +public class PropertyOrder74Test extends ModuleTestBase +{ + static class Point { + public int y; + public int x; + } + + @JsonPropertyOrder() + public static class PointWithAnnotation extends Point {} + + private final CsvMapper MAPPER = new CsvMapper(); + + public void testSchemaWithOrdering() throws Exception + { + CsvSchema schema1 = MAPPER.schemaFor(Point.class); + CsvSchema schema2 = MAPPER.schemaFor(PointWithAnnotation.class); + + assertEquals(schema1.size(), schema2.size()); + assertEquals(schema1.column(0).getName(), schema2.column(0).getName()); + } +}