Skip to content

Commit 1bebf0b

Browse files
committed
Fix test for #403, move to non-failing
1 parent 2226bd7 commit 1bebf0b

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.fasterxml.jackson.dataformat.xml.failing;
1+
package com.fasterxml.jackson.dataformat.xml.deser;
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
44
import com.fasterxml.jackson.databind.json.JsonMapper;
55
import com.fasterxml.jackson.dataformat.xml.XmlTestBase;
66

7-
public class JsonNodeMixedContent402Test extends XmlTestBase
7+
public class JsonNodeMixedContent403Test extends XmlTestBase
88
{
99
final private ObjectMapper XML_MAPPER = newMapper();
1010

@@ -13,28 +13,29 @@ public class JsonNodeMixedContent402Test extends XmlTestBase
1313
public void testMixedContentBefore() throws Exception
1414
{
1515
// First, before elements:
16-
assertEquals(JSON_MAPPER.readTree(a2q("{'':'before','a':1,'b':'2'}")),
16+
assertEquals(JSON_MAPPER.readTree(a2q("{'':'before','a':'1','b':'2'}")),
1717
XML_MAPPER.readTree("<root>before<a>1</a><b>2</b></root>"));
1818
}
1919

2020
public void testMixedContentBetween() throws Exception
2121
{
2222
// Second, between
23-
assertEquals(JSON_MAPPER.readTree(a2q("{'a':1,'':'between','b':'2'}")),
23+
assertEquals(JSON_MAPPER.readTree(a2q("{'a':'1','':'between','b':'2'}")),
2424
XML_MAPPER.readTree("<root><a>1</a>between<b>2</b></root>"));
2525
}
2626

2727
public void testMixedContentAfter() throws Exception
2828
{
2929
// and then after
30-
assertEquals(JSON_MAPPER.readTree(a2q("{'a':1,'b':'2','':'after'}")),
30+
assertEquals(JSON_MAPPER.readTree(a2q("{'a':'1','b':'2','':'after'}")),
3131
XML_MAPPER.readTree("<root><a>1</a><b>2</b>after</root>"));
3232
}
3333

3434
public void testMultipleMixedContent() throws Exception
3535
{
3636
// and then after
37-
assertEquals(JSON_MAPPER.readTree(a2q("{'':['first','second','third'],'a':1,'b':'2','':'after'}")),
38-
XML_MAPPER.readTree("<root>first<a>1</a>second<b>2</b>this</root>"));
37+
assertEquals(JSON_MAPPER.readTree(
38+
a2q("{'':['first','second','third'],'a':'1','b':'2'}")),
39+
XML_MAPPER.readTree("<root>first<a>1</a>second<b>2</b>third</root>"));
3940
}
4041
}

0 commit comments

Comments
 (0)