From 33aed483d1a42fc1cb2b87c8723b18e72080b623 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sun, 14 Sep 2025 23:39:11 +0100 Subject: [PATCH 1/3] Create XmlClassDeser734Test.java --- .../xml/deser/XmlClassDeser734Test.java | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XmlClassDeser734Test.java diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XmlClassDeser734Test.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XmlClassDeser734Test.java new file mode 100644 index 00000000..1633a3aa --- /dev/null +++ b/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XmlClassDeser734Test.java @@ -0,0 +1,50 @@ +package com.fasterxml.jackson.dataformat.xml.deser; + +import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import com.fasterxml.jackson.dataformat.xml.XmlTestUtil; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +// [dataformat-xml#734] +public class XmlClassDeser734Test extends XmlTestUtil +{ + public static class Amount { + @JacksonXmlText + private String value; + + @JacksonXmlProperty(isAttribute = true, localName = "Ccy") + private String currency; + + // Need default constructor for deserialization (failure without it) + public Amount() { + + } + + public Amount(String value, String currency) { + this.value = value; + this.currency = currency; + } + + public String getValue() { + return value; + } + + public String getCurrency() { + return currency; + } + } + + private final String XML = + a2q("1"); + + @Test + public void testDeser() throws Exception { + XmlMapper mapper = new XmlMapper(); + Amount amt = mapper.readValue(XML, Amount.class); + assertEquals("1", amt.value); + assertEquals("EUR", amt.currency); + } +} From 461cb8dd5853f2d56eebf2fecb2625fa04c0278b Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 15 Sep 2025 20:17:26 +0100 Subject: [PATCH 2/3] rename tests to ref issue 735 --- ...{XmlRecordDeser734Test.java => XmlRecordDeser735Test.java} | 4 ++-- .../{XmlClassDeser734Test.java => XmlClassDeser735Test.java} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/failing/{XmlRecordDeser734Test.java => XmlRecordDeser735Test.java} (92%) rename src/test/java/com/fasterxml/jackson/dataformat/xml/deser/{XmlClassDeser734Test.java => XmlClassDeser735Test.java} (94%) diff --git a/src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/failing/XmlRecordDeser734Test.java b/src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/failing/XmlRecordDeser735Test.java similarity index 92% rename from src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/failing/XmlRecordDeser734Test.java rename to src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/failing/XmlRecordDeser735Test.java index be9ffd3b..36a7e109 100644 --- a/src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/failing/XmlRecordDeser734Test.java +++ b/src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/failing/XmlRecordDeser735Test.java @@ -9,8 +9,8 @@ import static org.junit.jupiter.api.Assertions.*; -// [dataformat-xml#734] -public class XmlRecordDeser734Test extends XmlTestUtil +// [dataformat-xml#735] +public class XmlRecordDeser735Test extends XmlTestUtil { record Amount(@JacksonXmlText String value, @JacksonXmlProperty(isAttribute = true, localName = "Ccy") String currency) {} diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XmlClassDeser734Test.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XmlClassDeser735Test.java similarity index 94% rename from src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XmlClassDeser734Test.java rename to src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XmlClassDeser735Test.java index 1633a3aa..492f220d 100644 --- a/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XmlClassDeser734Test.java +++ b/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/XmlClassDeser735Test.java @@ -8,8 +8,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -// [dataformat-xml#734] -public class XmlClassDeser734Test extends XmlTestUtil +// [dataformat-xml#735] +public class XmlClassDeser735Test extends XmlTestUtil { public static class Amount { @JacksonXmlText From 0a34353d8d08a7083b99d6a9fbc5aeddd71a7cb8 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 17 Sep 2025 20:32:35 -0700 Subject: [PATCH 3/3] Move "failing" -> "tofix" (leftoevr from earlier refactoring) --- .../xml/records/{failing => tofix}/XmlRecordDeser735Test.java | 2 +- .../xml/records/{failing => tofix}/XmlWrapperRecord517Test.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/{failing => tofix}/XmlRecordDeser735Test.java (93%) rename src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/{failing => tofix}/XmlWrapperRecord517Test.java (96%) diff --git a/src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/failing/XmlRecordDeser735Test.java b/src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/tofix/XmlRecordDeser735Test.java similarity index 93% rename from src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/failing/XmlRecordDeser735Test.java rename to src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/tofix/XmlRecordDeser735Test.java index 36a7e109..1c6d9b1d 100644 --- a/src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/failing/XmlRecordDeser735Test.java +++ b/src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/tofix/XmlRecordDeser735Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.dataformat.xml.records.failing; +package com.fasterxml.jackson.dataformat.xml.records.tofix; import org.junit.jupiter.api.Test; diff --git a/src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/failing/XmlWrapperRecord517Test.java b/src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/tofix/XmlWrapperRecord517Test.java similarity index 96% rename from src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/failing/XmlWrapperRecord517Test.java rename to src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/tofix/XmlWrapperRecord517Test.java index aa632fe6..efe469eb 100644 --- a/src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/failing/XmlWrapperRecord517Test.java +++ b/src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/tofix/XmlWrapperRecord517Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.dataformat.xml.records.failing; +package com.fasterxml.jackson.dataformat.xml.records.tofix; import java.util.List;