Skip to content

Commit 3951a95

Browse files
committed
yet more test tweaks
1 parent 19330ce commit 3951a95

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

src/test/java/com/fasterxml/jackson/dataformat/xml/lists/ListDeser469Test.java

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,28 @@ protected InnerBean2() { }
5252
public InnerBean2(String s) { str2 = s; }
5353
}
5454

55+
// also wrt [dataformat-xml#469]
56+
static class OuterNoWrappers {
57+
public List<InnerNoWrappers> inner;
58+
}
59+
60+
static class InnerNoWrappers {
61+
@JacksonXmlProperty(isAttribute = true)
62+
public String str;
63+
64+
protected InnerNoWrappers() { }
65+
public InnerNoWrappers(String s) { str = s; }
66+
}
67+
68+
/*
69+
/**********************************************************************
70+
/* Test methods
71+
/**********************************************************************
72+
*/
73+
5574
public void testIssue469WithDefaults() throws Exception
5675
{
57-
// Here we just use default settings (which defaults to wrappers)
76+
// Here we just use default settings (which defaults to using wrappers)
5877
final XmlMapper mapper = newMapper();
5978

6079
// First: create POJO value to test round-trip:
@@ -95,18 +114,6 @@ public void testIssue469WithDefaults() throws Exception
95114
assertEquals("aaaa", mid.inner2.get(0).str2);
96115
}
97116

98-
static class OuterNoWrappers {
99-
public List<InnerNoWrappers> inner;
100-
}
101-
102-
static class InnerNoWrappers {
103-
@JacksonXmlProperty(isAttribute = true)
104-
public String str;
105-
106-
protected InnerNoWrappers() { }
107-
public InnerNoWrappers(String s) { str = s; }
108-
}
109-
110117
// But alternatively can try setting default to "no wrappers":
111118
public void testIssue469WithNoWrapper() throws Exception
112119
{

src/test/java/com/fasterxml/jackson/dataformat/xml/lists/UnwrappedListsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public Optional() { }
5656

5757
/*
5858
/**********************************************************************
59-
/* Unit tests
59+
/* Test methods
6060
/**********************************************************************
6161
*/
6262

0 commit comments

Comments
 (0)