This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 8cc92e716 Unit test modernization.
8cc92e716 is described below
commit 8cc92e716e8687cb7c338b394fcf8281ee9de0ac
Author: James Bognar <james.bog...@salesforce.com>
AuthorDate: Thu Aug 7 13:55:57 2025 -0400
Unit test modernization.
---
.../a/rttests/RoundTripBeanInheritanceTest.java | 7 +--
.../apache/juneau/a/rttests/RoundTripDTOsTest.java | 7 +--
.../juneau/a/rttests/RoundTripTrimStringsTest.java | 19 +++----
.../java/org/apache/juneau/cp/BeanStore_Test.java | 4 +-
.../java/org/apache/juneau/dto/atom/AtomTest.java | 9 ++--
.../java/org/apache/juneau/html/Common_Test.java | 10 ++--
.../java/org/apache/juneau/json/CommonTest.java | 10 ++--
.../java/org/apache/juneau/oapi/OpenApiTest.java | 63 +++++++++++-----------
.../client/RestClient_Config_RestClient_Test.java | 30 +++++------
.../java/org/apache/juneau/uon/Common_UonTest.java | 10 ++--
.../juneau/urlencoding/Common_UrlEncodingTest.java | 10 ++--
.../java/org/apache/juneau/xml/CommonTest.java | 10 ++--
.../org/apache/juneau/xml/XmlCollapsedTest.java | 11 ++--
.../java/org/apache/juneau/xml/XmlContentTest.java | 51 +++++++++---------
.../apache/juneau/xml/XmlIgnoreCommentsTest.java | 11 ++--
15 files changed, 132 insertions(+), 130 deletions(-)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanInheritanceTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanInheritanceTest.java
index e4d8dee07..8fce4d50b 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanInheritanceTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanInheritanceTest.java
@@ -12,7 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.a.rttests;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.AssertionHelpers.*;
+import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.parser.*;
@@ -43,7 +44,7 @@ public class RoundTripBeanInheritanceTest extends
RoundTripTest {
A2 t1 = new A2(), t2;
t1.init();
t2 = roundTrip(t1, A2.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
A3 t3 = new A3();
t3.init();
@@ -143,7 +144,7 @@ public class RoundTripBeanInheritanceTest extends
RoundTripTest {
public void testBeanInheritance2() throws Exception {
B1 t1 = new B1().init(), t2;
t2 = roundTrip(t1, B1.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
}
public static class B1 extends B2 {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripDTOsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripDTOsTest.java
index 82cd2ea9a..3005baff1 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripDTOsTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripDTOsTest.java
@@ -12,7 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.a.rttests;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.AssertionHelpers.*;
+import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.bean.jsonschema.*;
@@ -39,13 +40,13 @@ public class RoundTripDTOsTest extends RoundTripTest {
public void testJsonSchema1() throws Exception {
JsonSchema s = JsonSchemaTest.getTest1();
JsonSchema s2 = roundTrip(s, JsonSchema.class);
- assertObject(s).isSameJsonAs(s2);
+ assertEquals(json(s2), json(s));
}
@Test
public void testJsonSchema2() throws Exception {
JsonSchema s = JsonSchemaTest.getTest2();
JsonSchema s2 = roundTrip(s, JsonSchema.class);
- assertObject(s).isSameJsonAs(s2);
+ assertEquals(json(s2), json(s));
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTrimStringsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTrimStringsTest.java
index 41c3d70a1..c479c19a7 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTrimStringsTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTrimStringsTest.java
@@ -12,7 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.a.rttests;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.AssertionHelpers.*;
+import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.collections.*;
@@ -47,30 +48,30 @@ public class RoundTripTrimStringsTest extends RoundTripTest
{
in = " foo bar ";
e = "foo bar";
a = p.parse(s2.serialize(in), String.class);
- assertObject(e).isSameJsonAs(a);
+ assertEquals(json(a), json(e));
a = p2.parse(s.serialize(in), String.class);
- assertObject(e).isSameJsonAs(a);
+ assertEquals(json(a), json(e));
in = JsonMap.ofJson("{' foo ': ' bar '}");
e = JsonMap.ofJson("{foo:'bar'}");
a = p.parse(s2.serialize(in), JsonMap.class);
- assertObject(e).isSameJsonAs(a);
+ assertEquals(json(a), json(e));
a = p2.parse(s.serialize(in), JsonMap.class);
- assertObject(e).isSameJsonAs(a);
+ assertEquals(json(a), json(e));
in = new JsonList("[' foo ', {' foo ': ' bar '}]");
e = new JsonList("['foo',{foo:'bar'}]");
a = p.parse(s2.serialize(in), JsonList.class);
- assertObject(e).isSameJsonAs(a);
+ assertEquals(json(a), json(e));
a = p2.parse(s.serialize(in), JsonList.class);
- assertObject(e).isSameJsonAs(a);
+ assertEquals(json(a), json(e));
in = new A().init1();
e = new A().init2();
a = p.parse(s2.serialize(in), A.class);
- assertObject(e).isSameJsonAs(a);
+ assertEquals(json(a), json(e));
a = p2.parse(s.serialize(in), A.class);
- assertObject(e).isSameJsonAs(a);
+ assertEquals(json(a), json(e));
}
public static class A {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
index 66cf24630..9b0a64947 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
@@ -826,8 +826,8 @@ class BeanStore_Test extends SimpleTestBase {
@Test void d04_createBean_staticCreator_invalidSignatures() {
BeanStore bs = BeanStore.INSTANCE;
- assertObject(bs.createBean(D4a.class).run()).isNotAny(d4a1,
d4a2, d4a3, d4a4);
- assertObject(bs.createBean(D4b.class).run()).isNotAny(d4b1,
d4b2);
+ assertNotEqualsAny(bs.createBean(D4a.class).run(), d4a1, d4a2,
d4a3, d4a4);
+ assertNotEqualsAny(bs.createBean(D4b.class).run(), d4b1, d4b2);
assertNotNull(bs.createBean(D4c.class).run());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/atom/AtomTest.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/atom/AtomTest.java
index 633e0d0ed..eaf14d749 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/dto/atom/AtomTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/dto/atom/AtomTest.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.dto.atom;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.bean.atom.AtomBuilder.*;
import static org.junit.Assert.*;
import java.net.*;
@@ -99,7 +98,7 @@ class AtomTest extends SimpleTestBase {
r = s.serialize(f);
assertEquals(expected, r);
f2 = p.parse(r, Feed.class);
- assertObject(f).isSameJsonAs(f2);
+ assertEquals(json(f2), json(f));
}
@Test void testWithNamespaces() throws Exception {
@@ -143,7 +142,7 @@ class AtomTest extends SimpleTestBase {
r = s.serialize(f);
assertEquals(expected, r);
f2 = p.parse(r, Feed.class);
- assertObject(f).isSameJsonAs(f2);
+ assertEquals(json(f2), json(f));
}
@Test void testWithNamespacesWithAtomAsDefault() throws Exception {
@@ -187,7 +186,7 @@ class AtomTest extends SimpleTestBase {
r = s.serialize(f);
assertEquals(expected, r);
f2 = p.parse(r, Feed.class);
- assertObject(f).isSameJsonAs(f2);
+ assertEquals(json(f2), json(f));
}
@Test void testToString() throws Exception {
@@ -196,6 +195,6 @@ class AtomTest extends SimpleTestBase {
Feed f = createFeed(), f2;
r = f.toString();
f2 = p.parse(r, Feed.class);
- assertObject(f).isSameJsonAs(f2);
+ assertEquals(json(f2), json(f));
}
}
\ No newline at end of file
diff --git a/juneau-utest/src/test/java/org/apache/juneau/html/Common_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/html/Common_Test.java
index c224ff5eb..1ffbec361 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/html/Common_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/html/Common_Test.java
@@ -41,13 +41,13 @@ class Common_Test extends SimpleTestBase {
String r = s.build().serialize(t1);
assertEquals("<table><tr><th>key</th><th>value</th></tr><tr><td>s1</td><td><null/></td></tr><tr><td>s2</td><td>s2</td></tr></table>",
r);
t2 = p.parse(r, A.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s = HtmlSerializer.create().sq().addKeyValueTableHeaders();
r = s.build().serialize(t1);
assertEquals("<table><tr><th>key</th><th>value</th></tr><tr><td>s2</td><td>s2</td></tr></table>",
r);
t2 = p.parse(r, A.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
}
public static class A {
@@ -72,7 +72,7 @@ class Common_Test extends SimpleTestBase {
r = s.build().serialize(t1);
assertEquals("<table><tr><th>key</th><th>value</th></tr><tr><td>f1</td><td><table><tr><th>key</th><th>value</th></tr></table></td></tr><tr><td>f2</td><td><table><tr><th>key</th><th>value</th></tr><tr><td>f2a</td><td><null/></td></tr><tr><td>f2b</td><td><table><tr><th>key</th><th>value</th></tr><tr><td>s2</td><td>s2</td></tr></table></td></tr></table></td></tr></table>",
r);
t2 = p.parse(r, B.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.trimEmptyMaps();
r = s.build().serialize(t1);
@@ -104,7 +104,7 @@ class Common_Test extends SimpleTestBase {
r = s.build().serialize(t1);
assertEquals("<table><tr><th>key</th><th>value</th></tr><tr><td>f1</td><td><ul></ul></td></tr><tr><td>f2</td><td><table
_type='array'><tr><th>s1</th><th>s2</th></tr><tr><null/></tr><tr><td><null/></td><td>s2</td></tr></table></td></tr></table>",
r);
t2 = p.parse(r, C.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.trimEmptyCollections();
r = s.build().serialize(t1);
@@ -155,7 +155,7 @@ class Common_Test extends SimpleTestBase {
r);
t2 = p.parse(r, D.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.trimEmptyCollections();
r = s.build().serialize(t1);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/json/CommonTest.java
b/juneau-utest/src/test/java/org/apache/juneau/json/CommonTest.java
index 3a6adc96f..7deb48c4f 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/json/CommonTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/json/CommonTest.java
@@ -38,13 +38,13 @@ class CommonTest extends SimpleTestBase{
String r = s.build().serialize(t1);
assertEquals("{s2:'s2'}", r);
t2 = p.parse(r, A.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.keepNullProperties();
r = s.build().serialize(t1);
assertEquals("{s1:null,s2:'s2'}", r);
t2 = p.parse(r, A.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
}
public static class A {
@@ -69,7 +69,7 @@ class CommonTest extends SimpleTestBase{
r = s.build().serialize(t1);
assertEquals("{f1:{},f2:{f2a:null,f2b:{s2:'s2'}}}", r);
t2 = p.parse(r, B.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.trimEmptyMaps();
r = s.build().serialize(t1);
@@ -101,7 +101,7 @@ class CommonTest extends SimpleTestBase{
r = s.build().serialize(t1);
assertEquals("{f1:[],f2:[null,{s2:'s2'}]}", r);
t2 = p.parse(r, C.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.trimEmptyCollections();
r = s.build().serialize(t1);
@@ -133,7 +133,7 @@ class CommonTest extends SimpleTestBase{
r = s.build().serialize(t1);
assertEquals("{f1:[],f2:[null,{s2:'s2'}]}", r);
t2 = p.parse(r, D.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.trimEmptyCollections();
r = s.build().serialize(t1);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java
b/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java
index 9eaae8fed..65e75fcad 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/oapi/OpenApiTest.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.oapi;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.httppart.HttpPartSchema.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.DateUtils.*;
@@ -590,13 +589,13 @@ public class OpenApiTest extends SimpleTestBase {
String s = serialize(ps, in);
assertEquals("123", s);
int[] r = parse(ps, s, int[].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
in = new int[]{123,456};
s = serialize(ps, in);
assertEquals("123,456", s);
r = parse(ps, s, int[].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
}
@Test void f03b_tArray_3dIntArray() throws Exception {
@@ -609,14 +608,14 @@ public class OpenApiTest extends SimpleTestBase {
String s = serialize(ps, in);
assertEquals("123", s);
int[][][] r = parse(ps, s, int[][][].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
int[][][] in2 = {{{1,2},{3,4}},{{5,6},{7,8}}};
in = in2;
s = serialize(ps, in);
assertEquals("1\\\\\\,2\\,3\\\\\\,4,5\\\\\\,6\\,7\\\\\\,8", s);
r = parse(ps, s, int[][][].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
}
@@ -638,13 +637,13 @@ public class OpenApiTest extends SimpleTestBase {
String s = serialize(ps, in);
assertEquals("a", s);
F04 r = parse(ps, s, F04.class);
-
assertObject(in.toStringArray()).isSameJsonAs(r.toStringArray());
+ assertEquals(json(r.toStringArray()), json(in.toStringArray()));
in = new F04("a","b");
s = serialize(ps, in);
assertEquals("a,b", s);
r = parse(ps, s, F04.class);
-
assertObject(in.toStringArray()).isSameJsonAs(r.toStringArray());
+ assertEquals(json(r.toStringArray()), json(in.toStringArray()));
}
@Test void f05a_tArrayUon_IntArray() throws Exception {
@@ -653,13 +652,13 @@ public class OpenApiTest extends SimpleTestBase {
String s = serialize(ps, in);
assertEquals("@(123)", s);
int[] r = parse(ps, s, int[].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
in = new int[]{123,456};
s = serialize(ps, in);
assertEquals("@(123,456)", s);
r = parse(ps, s, int[].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
}
@Test void f05b_tArrayUon_3dIntArray() throws Exception {
@@ -668,14 +667,14 @@ public class OpenApiTest extends SimpleTestBase {
String s = serialize(ps, in);
assertEquals("@(@(@(123)))", s);
int[][][] r = parse(ps, s, int[][][].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
int[][][] in2 = {{{1,2},{3,4}},{{5,6},{7,8}}};
in = in2;
s = serialize(ps, in);
assertEquals("@(@(@(1,2),@(3,4)),@(@(5,6),@(7,8)))", s);
r = parse(ps, s, int[][][].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
}
@Test void f06a_tArrayPipes_IntArray() throws Exception {
@@ -684,13 +683,13 @@ public class OpenApiTest extends SimpleTestBase {
String s = serialize(ps, in);
assertEquals("123", s);
int[] r = parse(ps, s, int[].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
in = new int[]{123,456};
s = serialize(ps, in);
assertEquals("123|456", s);
r = parse(ps, s, int[].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
}
@Test void f06b_tArrayPipes_3dIntArray() throws Exception {
@@ -699,14 +698,14 @@ public class OpenApiTest extends SimpleTestBase {
String s = serialize(ps, in);
assertEquals("123", s);
int[][][] r = parse(ps, s, int[][][].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
int[][][] in2 = {{{1,2},{3,4}},{{5,6},{7,8}}};
in = in2;
s = serialize(ps, in);
assertEquals("1\\\\,2,3\\\\,4|5\\\\,6,7\\\\,8", s);
r = parse(ps, s, int[][][].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
}
@Test void f07a_tArraySsv_IntArray() throws Exception {
@@ -715,13 +714,13 @@ public class OpenApiTest extends SimpleTestBase {
String s = serialize(ps, in);
assertEquals("123", s);
int[] r = parse(ps, s, int[].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
in = new int[]{123,456};
s = serialize(ps, in);
assertEquals("123 456", s);
r = parse(ps, s, int[].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
}
@Test void f07b_tArraySsv_3dIntArray() throws Exception {
@@ -730,14 +729,14 @@ public class OpenApiTest extends SimpleTestBase {
String s = serialize(ps, in);
assertEquals("123", s);
int[][][] r = parse(ps, s, int[][][].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
int[][][] in2 = {{{1,2},{3,4}},{{5,6},{7,8}}};
in = in2;
s = serialize(ps, in);
assertEquals("1\\,2,3\\,4 5\\,6,7\\,8", s);
r = parse(ps, s, int[][][].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
}
@Test void f08a_tArrayTsv_IntArray() throws Exception {
@@ -746,13 +745,13 @@ public class OpenApiTest extends SimpleTestBase {
String s = serialize(ps, in);
assertEquals("123", s);
int[] r = parse(ps, s, int[].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
in = new int[]{123,456};
s = serialize(ps, in);
assertEquals("123\t456", s);
r = parse(ps, s, int[].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
}
@Test void f08b_tArrayTsv_3dIntArray() throws Exception {
@@ -761,14 +760,14 @@ public class OpenApiTest extends SimpleTestBase {
String s = serialize(ps, in);
assertEquals("123", s);
int[][][] r = parse(ps, s, int[][][].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
int[][][] in2 = {{{1,2},{3,4}},{{5,6},{7,8}}};
in = in2;
s = serialize(ps, in);
assertEquals("1\\,2,3\\,4\t5\\,6,7\\,8", s);
r = parse(ps, s, int[][][].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
}
@Test void f09a_tArrayCsv_IntArray() throws Exception {
@@ -777,13 +776,13 @@ public class OpenApiTest extends SimpleTestBase {
String s = serialize(ps, in);
assertEquals("123", s);
int[] r = parse(ps, s, int[].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
in = new int[]{123,456};
s = serialize(ps, in);
assertEquals("123,456", s);
r = parse(ps, s, int[].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
}
@Test void f09b_tArrayCsv_3dIntArray() throws Exception {
@@ -792,14 +791,14 @@ public class OpenApiTest extends SimpleTestBase {
String s = serialize(ps, in);
assertEquals("123", s);
int[][][] r = parse(ps, s, int[][][].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
int[][][] in2 = {{{1,2},{3,4}},{{5,6},{7,8}}};
in = in2;
s = serialize(ps, in);
assertEquals("1\\\\\\,2\\,3\\\\\\,4,5\\\\\\,6\\,7\\\\\\,8", s);
r = parse(ps, s, int[][][].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
}
@@ -813,7 +812,7 @@ public class OpenApiTest extends SimpleTestBase {
String s = serialize(ps, in);
assertEquals("1 2|3 4,5 6|7 8", s);
int[][][] r = parse(ps, s, int[][][].class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
}
//------------------------------------------------------------------------------------------------------------------
@@ -826,13 +825,13 @@ public class OpenApiTest extends SimpleTestBase {
String s = serialize(ps, in);
assertEquals("a=b", s);
JsonMap r = parse(ps, s, JsonMap.class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
in = JsonMap.of("a","b","c","d");
s = serialize(ps, in);
assertEquals("a=b,c=d", s);
r = parse(ps, s, JsonMap.class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
}
@Test void g01b_objectType_formatDefault_Map_3d() throws Exception {
@@ -846,13 +845,13 @@ public class OpenApiTest extends SimpleTestBase {
String s = serialize(ps, in);
assertEquals("a=b\\=c\\\\\\=d", s);
JsonMap r = parse(ps, s, JsonMap.class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
in =
JsonMap.of("a",JsonMap.of("b",JsonMap.of("c","d"),"e",JsonMap.of("f","g")));
s = serialize(ps, in);
assertEquals("a=b\\=c\\\\\\=d\\,e\\=f\\\\\\=g", s);
r = parse(ps, s, JsonMap.class);
- assertObject(in).isSameJsonAs(r);
+ assertEquals(json(r), json(in));
}
//---------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
index dd0e083dd..c2a79b724 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
@@ -322,7 +322,7 @@ class RestClient_Config_RestClient_Test extends
SimpleTestBase {
@Test void a08_marshaller() throws Exception {
RestClient rc =
MockRestClient.create(A.class).marshaller(Xml.DEFAULT).build();
ABean b =
rc.post("/echoBody",bean).run().cacheContent().assertContent("<object><f>1</f></object>").getContent().as(ABean.class);
- assertObject(b).isSameJsonAs(bean);
+ assertEquals(json(bean), json(b));
}
@Test void a09_marshalls() throws Exception {
@@ -333,27 +333,27 @@ class RestClient_Config_RestClient_Test extends
SimpleTestBase {
assertThrowsWithMessage(Exception.class, "Content-Type not
specified in response header. Cannot find appropriate parser.",
()->x.post("/echoBody",bean).contentType("text/json").run().getContent().as(ABean.class));
ABean b =
x.post("/echoBody",bean).accept("text/xml").contentType("text/xml").run().cacheContent().assertContent("<object><f>1</f></object>").getContent().as(ABean.class);
- assertObject(b).isSameJsonAs(bean);
+ assertEquals(json(bean), json(b));
b =
x.post("/echoBody",bean).mediaType("text/xml").run().cacheContent().assertContent("<object><f>1</f></object>").getContent().as(ABean.class);
- assertObject(b).isSameJsonAs(bean);
+ assertEquals(json(bean), json(b));
b =
x.post("/echoBody",bean).accept("text/json").contentType("text/json").run().cacheContent().assertContent("{\"f\":1}").getContent().as(ABean.class);
- assertObject(b).isSameJsonAs(bean);
+ assertEquals(json(bean), json(b));
b =
x.post("/echoBody",bean).mediaType("text/json").run().cacheContent().assertContent("{\"f\":1}").getContent().as(ABean.class);
- assertObject(b).isSameJsonAs(bean);
+ assertEquals(json(bean), json(b));
}
@Test void a10_serializer_parser() throws Exception {
RestClient x =
MockRestClient.create(A.class).serializer(XmlSerializer.class).parser(XmlParser.class).build();
ABean b =
x.post("/echoBody",bean).run().cacheContent().assertContent("<object><f>1</f></object>").getContent().as(ABean.class);
- assertObject(b).isSameJsonAs(bean);
+ assertEquals(json(bean), json(b));
x =
MockRestClient.create(A.class).serializer(XmlSerializer.DEFAULT).parser(XmlParser.DEFAULT).build();
b =
x.post("/echoBody",bean).run().cacheContent().assertContent("<object><f>1</f></object>").getContent().as(ABean.class);
- assertObject(b).isSameJsonAs(bean);
+ assertEquals(json(bean), json(b));
}
@Test void a11_serializers_parsers() throws Exception {
@@ -364,16 +364,16 @@ class RestClient_Config_RestClient_Test extends
SimpleTestBase {
assertThrowsWithMessage(Exception.class, "Content-Type not
specified in response header. Cannot find appropriate parser.",
()->x.post("/echoBody",bean).contentType("text/json").run().getContent().as(ABean.class));
ABean b =
x.post("/echoBody",bean).accept("text/xml").contentType("text/xml").run().cacheContent().assertContent("<object><f>1</f></object>").getContent().as(ABean.class);
- assertObject(b).isSameJsonAs(bean);
+ assertEquals(json(bean), json(b));
b =
x.post("/echoBody",bean).mediaType("text/xml").run().cacheContent().assertContent("<object><f>1</f></object>").getContent().as(ABean.class);
- assertObject(b).isSameJsonAs(bean);
+ assertEquals(json(bean), json(b));
b =
x.post("/echoBody",bean).accept("text/json").contentType("text/json").run().cacheContent().assertContent("{\"f\":1}").getContent().as(ABean.class);
- assertObject(b).isSameJsonAs(bean);
+ assertEquals(json(bean), json(b));
b =
x.post("/echoBody",bean).mediaType("text/json").run().cacheContent().assertContent("{\"f\":1}").getContent().as(ABean.class);
- assertObject(b).isSameJsonAs(bean);
+ assertEquals(json(bean), json(b));
final RestClient x2 =
MockRestClient.create(A.class).serializers(XmlSerializer.DEFAULT,JsonSerializer.DEFAULT).parsers(XmlParser.DEFAULT,JsonParser.DEFAULT).build();
@@ -382,16 +382,16 @@ class RestClient_Config_RestClient_Test extends
SimpleTestBase {
assertThrowsWithMessage(Exception.class, "Content-Type not
specified in response header. Cannot find appropriate parser.",
()->x2.post("/echoBody",bean).contentType("text/json").run().getContent().as(ABean.class));
b =
x2.post("/echoBody",bean).accept("text/xml").contentType("text/xml").run().cacheContent().assertContent("<object><f>1</f></object>").getContent().as(ABean.class);
- assertObject(b).isSameJsonAs(bean);
+ assertEquals(json(bean), json(b));
b =
x2.post("/echoBody",bean).mediaType("text/xml").run().cacheContent().assertContent("<object><f>1</f></object>").getContent().as(ABean.class);
- assertObject(b).isSameJsonAs(bean);
+ assertEquals(json(bean), json(b));
b =
x2.post("/echoBody",bean).accept("text/json").contentType("text/json").run().cacheContent().assertContent("{\"f\":1}").getContent().as(ABean.class);
- assertObject(b).isSameJsonAs(bean);
+ assertEquals(json(bean), json(b));
b =
x2.post("/echoBody",bean).mediaType("text/json").run().cacheContent().assertContent("{\"f\":1}").getContent().as(ABean.class);
- assertObject(b).isSameJsonAs(bean);
+ assertEquals(json(bean), json(b));
}
@Rest(partSerializer=A12a.class,partParser=A12b.class)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/uon/Common_UonTest.java
b/juneau-utest/src/test/java/org/apache/juneau/uon/Common_UonTest.java
index ba62fe9d9..316fe4589 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/uon/Common_UonTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/uon/Common_UonTest.java
@@ -39,13 +39,13 @@ class Common_UonTest extends SimpleTestBase {
String r = s.build().serialize(t1);
assertEquals("(s2=s2)", r);
t2 = p.parse(r, A.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.keepNullProperties();
r = s.build().serialize(t1);
assertEquals("(s1=null,s2=s2)", r);
t2 = pe.parse(r, A.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
}
public static class A {
@@ -69,7 +69,7 @@ class Common_UonTest extends SimpleTestBase {
r = s.build().serialize(t1);
assertEquals("(f1=(),f2=(f2a=null,f2b=(s2=s2)))", r);
t2 = pe.parse(r, B.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.trimEmptyMaps();
r = s.build().serialize(t1);
@@ -100,7 +100,7 @@ class Common_UonTest extends SimpleTestBase {
r = s.build().serialize(t1);
assertEquals("(f1=@(),f2=@(null,(s2=s2)))", r);
t2 = pe.parse(r, C.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.trimEmptyCollections();
r = s.build().serialize(t1);
@@ -131,7 +131,7 @@ class Common_UonTest extends SimpleTestBase {
r = s.build().serialize(t1);
assertEquals("(f1=@(),f2=@(null,(s2=s2)))", r);
t2 = pe.parse(r, D.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.trimEmptyCollections();
r = s.build().serialize(t1);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java
b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java
index d44fbc0b7..dfb2a5f12 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/Common_UrlEncodingTest.java
@@ -38,13 +38,13 @@ class Common_UrlEncodingTest extends SimpleTestBase {
String r = s.build().serialize(t1);
assertEquals("s2=s2", r);
t2 = p.parse(r, A.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.keepNullProperties();
r = s.build().serialize(t1);
assertEquals("s1=null&s2=s2", r);
t2 = p.parse(r, A.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
}
public static class A {
@@ -68,7 +68,7 @@ class Common_UrlEncodingTest extends SimpleTestBase {
r = s.build().serialize(t1);
assertEquals("f1=()&f2=(f2a=null,f2b=(s2=s2))", r);
t2 = p.parse(r, B.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.trimEmptyMaps();
r = s.build().serialize(t1);
@@ -99,7 +99,7 @@ class Common_UrlEncodingTest extends SimpleTestBase {
r = s.build().serialize(t1);
assertEquals("f1=@()&f2=@(null,(s2=s2))", r);
t2 = p.parse(r, C.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.trimEmptyCollections();
r = s.build().serialize(t1);
@@ -130,7 +130,7 @@ class Common_UrlEncodingTest extends SimpleTestBase {
r = s.build().serialize(t1);
assertEquals("f1=@()&f2=@(null,(s2=s2))", r);
t2 = p.parse(r, D.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.trimEmptyCollections();
r = s.build().serialize(t1);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/CommonTest.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/CommonTest.java
index 9c11b7636..2d6ea577c 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/CommonTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/CommonTest.java
@@ -40,13 +40,13 @@ class CommonTest extends SimpleTestBase {
String r = s.build().serialize(t1);
assertEquals("<object><s2>s2</s2></object>", r);
t2 = p.parse(r, A.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.keepNullProperties();
r = s.build().serialize(t1);
assertEquals("<object><s1 _type='null'/><s2>s2</s2></object>",
r);
t2 = p.parse(r, A.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
}
public static class A {
@@ -71,7 +71,7 @@ class CommonTest extends SimpleTestBase {
r = s.build().serialize(t1);
assertEquals("<object><f1/><f2><f2a
_type='null'/><f2b><s2>s2</s2></f2b></f2></object>", r);
t2 = p.parse(r, B.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.trimEmptyMaps();
r = s.build().serialize(t1);
@@ -103,7 +103,7 @@ class CommonTest extends SimpleTestBase {
r = s.build().serialize(t1);
assertEquals("<object><f1></f1><f2><null/><object><s2>s2</s2></object></f2></object>",
r);
t2 = p.parse(r, C.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.trimEmptyCollections();
r = s.build().serialize(t1);
@@ -135,7 +135,7 @@ class CommonTest extends SimpleTestBase {
r = s.build().serialize(t1);
assertEquals("<object><f1></f1><f2><null/><object><s2>s2</s2></object></f2></object>",
r);
t2 = p.parse(r, D.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
s.trimEmptyCollections();
r = s.build().serialize(t1);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
index 0a35a0959..2eed94399 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlCollapsedTest.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.xml;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.CollectionUtils.list;
import static org.apache.juneau.utest.utils.Utils2.*;
@@ -267,14 +266,14 @@ public class XmlCollapsedTest extends SimpleTestBase {
r = s.serialize(t1);
assertEquals("<object><xf1>x1</xf1><xf1>x2</xf1></object>", r);
t2 = p.parse(r, FA.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
validateXml(t1, s);
t1 = FB.newInstance();
r = s.serialize(t1);
assertEquals("<object><xf1>x1</xf1><xf1>x2</xf1></object>", r);
t2 = p.parse(r, FB.class);
- assertObject(t1).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t1));
validateXml(t1, s);
}
@@ -334,7 +333,7 @@ public class XmlCollapsedTest extends SimpleTestBase {
// Note that existing fields should be reused and appended to.
t2 = p.parse(xml, G.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
validateXml(t, s);
}
@@ -367,7 +366,7 @@ public class XmlCollapsedTest extends SimpleTestBase {
// Note that existing fields should be reused and appended to.
t2 = p.parse(xml, H.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
validateXml(t, s);
}
@@ -405,7 +404,7 @@ public class XmlCollapsedTest extends SimpleTestBase {
// Note that existing fields should be reused and appended to.
t2 = p.parse(xml, G.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
validateXml(t, s);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlContentTest.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlContentTest.java
index a9bc7562e..d30a8b554 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlContentTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlContentTest.java
@@ -12,16 +12,17 @@
//
***************************************************************************************************************************
package org.apache.juneau.xml;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.xml.annotation.XmlFormat.*;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.io.*;
+import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.xml.annotation.*;
import org.junit.jupiter.api.*;
-public class XmlContentTest {
+class XmlContentTest extends SimpleTestBase {
//-----------------------------------------------------------------------------------------------------------------
// Test beans with @Xml(format=CONTENT)
@@ -44,14 +45,14 @@ public class XmlContentTest {
r = sw.toString();
assertEquals("<A f1='f1' nil='true'></A>", r);
t2 = p.parse(r, A.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
sw = new StringWriter();
s2.serialize(t, sw);
r = sw.toString();
assertEquals("<A f1='f1' nil='true'></A>\n", r);
t2 = p.parse(r, A.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
//-------------------------------------------------------------------------------------------------------------
// Normal text
@@ -61,12 +62,12 @@ public class XmlContentTest {
r = s1.serialize(t);
assertEquals("<A f1='f1'>foobar</A>", r);
t2 = p.parse(r, A.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
r = s2.serialize(t);
assertEquals("<A f1='f1'>foobar</A>\n", r);
t2 = p.parse(r, A.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
//-------------------------------------------------------------------------------------------------------------
// Special characters
@@ -76,12 +77,12 @@ public class XmlContentTest {
r = s1.serialize(t);
assertEquals("<A
f1='f1'>~!@#$%^&*()_+`-={}|[]\\:\";'<>?,.

	_x0008_</A>",
r);
t2 = p.parse(r, A.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
r = s2.serialize(t);
assertEquals("<A
f1='f1'>~!@#$%^&*()_+`-={}|[]\\:\";'<>?,.

	_x0008_</A>\n",
r);
t2 = p.parse(r, A.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
//-------------------------------------------------------------------------------------------------------------
// Leading spaces
@@ -91,12 +92,12 @@ public class XmlContentTest {
r = s1.serialize(t);
assertEquals("<A f1='f1'>_x0020_ foobar</A>", r);
t2 = p.parse(r, A.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
r = s2.serialize(t);
assertEquals("<A f1='f1'>_x0020_ foobar</A>\n", r);
t2 = p.parse(r, A.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
//-------------------------------------------------------------------------------------------------------------
// Trailing spaces
@@ -106,12 +107,12 @@ public class XmlContentTest {
r = s1.serialize(t);
assertEquals("<A f1='f1'>foobar _x0020_</A>", r);
t2 = p.parse(r, A.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
r = s2.serialize(t);
assertEquals("<A f1='f1'>foobar _x0020_</A>\n", r);
t2 = p.parse(r, A.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
}
@Bean(typeName="A")
@@ -148,14 +149,14 @@ public class XmlContentTest {
r = sw.toString();
assertEquals("<A f1='f1' nil='true'></A>", r);
t2 = p.parse(r, B.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
sw = new StringWriter();
s2.serialize(t, sw);
r = sw.toString();
assertEquals("<A f1='f1' nil='true'></A>\n", r);
t2 = p.parse(r, B.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
//-------------------------------------------------------------------------------------------------------------
// Normal text
@@ -165,12 +166,12 @@ public class XmlContentTest {
r = s1.serialize(t);
assertEquals("<A f1='f1'>foobar</A>", r);
t2 = p.parse(r, B.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
r = s2.serialize(t);
assertEquals("<A f1='f1'>foobar</A>\n", r);
t2 = p.parse(r, B.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
//-------------------------------------------------------------------------------------------------------------
// Normal XML
@@ -180,12 +181,12 @@ public class XmlContentTest {
r = s1.serialize(t);
assertEquals("<A
f1='f1'><xxx>foobar<yyy>baz</yyy>foobar</xxx></A>", r);
t2 = p.parse(r, B.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
r = s2.serialize(t);
assertEquals("<A
f1='f1'><xxx>foobar<yyy>baz</yyy>foobar</xxx></A>\n",
r);
t2 = p.parse(r, B.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
//-------------------------------------------------------------------------------------------------------------
// Normal XML with leading and trailing space
@@ -195,12 +196,12 @@ public class XmlContentTest {
r = s1.serialize(t);
assertEquals("<A f1='f1'>_x0020_
<xxx>foobar<yyy>baz</yyy>foobar</xxx> _x0020_</A>", r);
t2 = p.parse(r, B.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
r = s2.serialize(t);
assertEquals("<A f1='f1'>_x0020_
<xxx>foobar<yyy>baz</yyy>foobar</xxx> _x0020_</A>\n",
r);
t2 = p.parse(r, B.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
//-------------------------------------------------------------------------------------------------------------
// XML with attributes
@@ -210,12 +211,12 @@ public class XmlContentTest {
r = s1.serialize(t);
assertEquals("<A f1='f1'><xxx
x=\"x\">foobar</xxx></A>", r);
t2 = p.parse(r, B.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
r = s2.serialize(t);
assertEquals("<A f1='f1'><xxx
x=\"x\">foobar</xxx></A>\n", r);
t2 = p.parse(r, B.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
//-------------------------------------------------------------------------------------------------------------
// XML with embedded entities
@@ -225,12 +226,12 @@ public class XmlContentTest {
r = s1.serialize(t);
assertEquals("<A f1='f1'><xxx
x=\"x\">foo&lt;&gt;bar</xxx></A>", r);
t2 = p.parse(r, B.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
r = s2.serialize(t);
assertEquals("<A f1='f1'><xxx
x=\"x\">foo&lt;&gt;bar</xxx></A>\n", r);
t2 = p.parse(r, B.class);
- assertObject(t).isSameJsonAs(t2);
+ assertEquals(json(t2), json(t));
}
@Bean(typeName="A")
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreCommentsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreCommentsTest.java
index 72fc00f7c..3393dc37f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreCommentsTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlIgnoreCommentsTest.java
@@ -12,7 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.xml;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.AssertionHelpers.*;
+import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
import java.text.*;
@@ -695,7 +696,7 @@ public class XmlIgnoreCommentsTest {
public void testNoComment() throws Exception {
try {
Object actual =
XmlParser.DEFAULT.parse(input.replace("|", ""), type);
- assertObject(expected).isSameJsonAs(actual);
+ assertEquals(json(actual), json(expected));
} catch (ComparisonFailure e) {
throw new ComparisonFailure(MessageFormat.format("Test
''{0}'' failed with comparison error", label), e.getExpected(), e.getActual());
} catch (Exception e) {
@@ -707,7 +708,7 @@ public class XmlIgnoreCommentsTest {
public void testNormalComment() throws Exception {
try {
Object actual =
XmlParser.DEFAULT.parse(input.replace("|", "<!--x-->"), type);
- assertObject(expected).isSameJsonAs(actual);
+ assertEquals(json(actual), json(expected));
} catch (ComparisonFailure e) {
throw new ComparisonFailure(MessageFormat.format("Test
''{0}'' failed with comparison error", label), e.getExpected(), e.getActual());
} catch (Exception e) {
@@ -720,7 +721,7 @@ public class XmlIgnoreCommentsTest {
try {
Object actual =
XmlParser.DEFAULT.parse(input.replace("|", " \n <!-- \n x \n --> \n "), type);
if (! skipWsTests)
- assertObject(expected).isSameJsonAs(actual);
+ assertEquals(json(actual), json(expected));
} catch (ComparisonFailure e) {
throw new ComparisonFailure(MessageFormat.format("Test
''{0}'' failed with comparison error", label), e.getExpected(), e.getActual());
} catch (Exception e) {
@@ -733,7 +734,7 @@ public class XmlIgnoreCommentsTest {
try {
Object actual =
XmlParser.DEFAULT.parse(input.replace("|", " \n <!-- \n x \n --> \n \n <!-- \n
x \n --> \n "), type);
if (! skipWsTests)
- assertObject(expected).isSameJsonAs(actual);
+ assertEquals(json(actual), json(expected));
} catch (ComparisonFailure e) {
throw new ComparisonFailure(MessageFormat.format("Test
''{0}'' failed with comparison error", label), e.getExpected(), e.getActual());
} catch (Exception e) {
