Skip to content

Commit aafa91f

Browse files
cowtowncodercowtowncoder
committed
Fix test warnings
1 parent 597a043 commit aafa91f

3 files changed

Lines changed: 22 additions & 21 deletions

File tree

‎src/test/java/tools/jackson/dataformat/xml/deser/XmlTextWhitespace565Test.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@
99
import tools.jackson.dataformat.xml.XmlTestUtil;
1010
import tools.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
1111
import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty;
12-
import tools.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
1312
import tools.jackson.dataformat.xml.annotation.JacksonXmlText;
1413

14+
import com.fasterxml.jackson.annotation.JsonRootName;
15+
1516
import static org.junit.jupiter.api.Assertions.assertEquals;
1617
import static org.junit.jupiter.api.Assertions.assertNotNull;
1718

1819
// [dataformat-xml#565] Whitespace-only text content ignored with @JacksonXmlText
1920
public class XmlTextWhitespace565Test extends XmlTestUtil
2021
{
21-
@JacksonXmlRootElement(localName = "replacements")
22+
@JsonRootName("replacements")
2223
static class ClangFormatResponse {
2324
@JacksonXmlProperty(localName = "replacement")
2425
@JacksonXmlElementWrapper(useWrapping = false)

‎src/test/java/tools/jackson/dataformat/xml/deser/XmlTokenBufferTest.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public void testWrappingRepeatedStrings() throws Exception
4747
assertToken(JsonToken.START_ARRAY, p.nextToken());
4848
assertTrue(p.isExpectedStartArrayToken());
4949
assertToken(JsonToken.VALUE_STRING, p.nextToken());
50-
assertEquals("a", p.getText());
50+
assertEquals("a", p.getString());
5151
assertToken(JsonToken.VALUE_STRING, p.nextToken());
52-
assertEquals("b", p.getText());
52+
assertEquals("b", p.getString());
5353
assertToken(JsonToken.END_ARRAY, p.nextToken());
5454
assertToken(JsonToken.END_OBJECT, p.nextToken());
5555
assertNull(p.nextToken());
@@ -125,13 +125,13 @@ public void testWrappingSingleElement() throws Exception
125125
assertEquals("item", p.currentName());
126126
assertToken(JsonToken.START_ARRAY, p.nextToken());
127127
assertToken(JsonToken.VALUE_STRING, p.nextToken());
128-
assertEquals("a", p.getText());
128+
assertEquals("a", p.getString());
129129
assertToken(JsonToken.END_ARRAY, p.nextToken());
130130
// non-wrapped property follows
131131
assertToken(JsonToken.PROPERTY_NAME, p.nextToken());
132132
assertEquals("other", p.currentName());
133133
assertToken(JsonToken.VALUE_STRING, p.nextToken());
134-
assertEquals("b", p.getText());
134+
assertEquals("b", p.getString());
135135
assertToken(JsonToken.END_OBJECT, p.nextToken());
136136
assertNull(p.nextToken());
137137
}
@@ -157,14 +157,14 @@ public void testWrappedPropertyAtEnd() throws Exception
157157
assertToken(JsonToken.PROPERTY_NAME, p.nextToken());
158158
assertEquals("other", p.currentName());
159159
assertToken(JsonToken.VALUE_STRING, p.nextToken());
160-
assertEquals("x", p.getText());
160+
assertEquals("x", p.getString());
161161
assertToken(JsonToken.PROPERTY_NAME, p.nextToken());
162162
assertEquals("item", p.currentName());
163163
assertToken(JsonToken.START_ARRAY, p.nextToken());
164164
assertToken(JsonToken.VALUE_STRING, p.nextToken());
165-
assertEquals("a", p.getText());
165+
assertEquals("a", p.getString());
166166
assertToken(JsonToken.VALUE_STRING, p.nextToken());
167-
assertEquals("b", p.getText());
167+
assertEquals("b", p.getString());
168168
assertToken(JsonToken.END_ARRAY, p.nextToken());
169169
assertToken(JsonToken.END_OBJECT, p.nextToken());
170170
assertNull(p.nextToken());
@@ -201,18 +201,18 @@ public void testTwoDifferentWrappedProperties() throws Exception
201201
assertEquals("a", p.currentName());
202202
assertToken(JsonToken.START_ARRAY, p.nextToken());
203203
assertToken(JsonToken.VALUE_STRING, p.nextToken());
204-
assertEquals("1", p.getText());
204+
assertEquals("1", p.getString());
205205
assertToken(JsonToken.VALUE_STRING, p.nextToken());
206-
assertEquals("2", p.getText());
206+
assertEquals("2", p.getString());
207207
assertToken(JsonToken.END_ARRAY, p.nextToken());
208208
// second wrapped: b
209209
assertToken(JsonToken.PROPERTY_NAME, p.nextToken());
210210
assertEquals("b", p.currentName());
211211
assertToken(JsonToken.START_ARRAY, p.nextToken());
212212
assertToken(JsonToken.VALUE_STRING, p.nextToken());
213-
assertEquals("3", p.getText());
213+
assertEquals("3", p.getString());
214214
assertToken(JsonToken.VALUE_STRING, p.nextToken());
215-
assertEquals("4", p.getText());
215+
assertEquals("4", p.getString());
216216
assertToken(JsonToken.END_ARRAY, p.nextToken());
217217
assertToken(JsonToken.END_OBJECT, p.nextToken());
218218
assertNull(p.nextToken());
@@ -242,9 +242,9 @@ public void testCaseInsensitiveWrapping() throws Exception
242242
assertEquals("Item", p.currentName());
243243
assertToken(JsonToken.START_ARRAY, p.nextToken());
244244
assertToken(JsonToken.VALUE_STRING, p.nextToken());
245-
assertEquals("a", p.getText());
245+
assertEquals("a", p.getString());
246246
assertToken(JsonToken.VALUE_STRING, p.nextToken());
247-
assertEquals("b", p.getText());
247+
assertEquals("b", p.getString());
248248
assertToken(JsonToken.END_ARRAY, p.nextToken());
249249
assertToken(JsonToken.END_OBJECT, p.nextToken());
250250
assertNull(p.nextToken());
@@ -274,11 +274,11 @@ public void testNonWrappedNamesPassThrough() throws Exception
274274
assertToken(JsonToken.PROPERTY_NAME, p.nextToken());
275275
assertEquals("x", p.currentName());
276276
assertToken(JsonToken.VALUE_STRING, p.nextToken());
277-
assertEquals("1", p.getText());
277+
assertEquals("1", p.getString());
278278
assertToken(JsonToken.PROPERTY_NAME, p.nextToken());
279279
assertEquals("y", p.currentName());
280280
assertToken(JsonToken.VALUE_STRING, p.nextToken());
281-
assertEquals("2", p.getText());
281+
assertEquals("2", p.getString());
282282
assertToken(JsonToken.END_OBJECT, p.nextToken());
283283
assertNull(p.nextToken());
284284
}
@@ -303,11 +303,11 @@ public void testNoWrappingBeforeConfiguration() throws Exception
303303
assertToken(JsonToken.PROPERTY_NAME, p.nextToken());
304304
assertEquals("item", p.currentName());
305305
assertToken(JsonToken.VALUE_STRING, p.nextToken());
306-
assertEquals("a", p.getText());
306+
assertEquals("a", p.getString());
307307
assertToken(JsonToken.PROPERTY_NAME, p.nextToken());
308308
assertEquals("item", p.currentName());
309309
assertToken(JsonToken.VALUE_STRING, p.nextToken());
310-
assertEquals("b", p.getText());
310+
assertEquals("b", p.getString());
311311
assertToken(JsonToken.END_OBJECT, p.nextToken());
312312
assertNull(p.nextToken());
313313
p.close();

‎src/test/java/tools/jackson/dataformat/xml/lists/Issue627NullListTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import tools.jackson.dataformat.xml.XmlMapper;
99
import tools.jackson.dataformat.xml.XmlTestUtil;
10-
import tools.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
10+
import com.fasterxml.jackson.annotation.JsonRootName;
1111

1212
import static org.junit.jupiter.api.Assertions.*;
1313

@@ -16,7 +16,7 @@
1616
*/
1717
public class Issue627NullListTest extends XmlTestUtil
1818
{
19-
@JacksonXmlRootElement(localName = "Parent")
19+
@JsonRootName("Parent")
2020
static class Parent {
2121
private List<Child> children;
2222

0 commit comments

Comments
 (0)