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 66289ff Tests.
66289ff is described below
commit 66289ff444f1a135dc00ddccca80300db51f4724
Author: JamesBognar <[email protected]>
AuthorDate: Thu Jun 25 15:03:28 2020 -0400
Tests.
---
.../test/java/org/apache/juneau/jena/RdfTest.java | 6 ++---
.../org/apache/juneau/testutils/TestUtils.java | 29 ----------------------
2 files changed, 3 insertions(+), 32 deletions(-)
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfTest.java
index 68415cf..2ce7b33 100755
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfTest.java
@@ -269,7 +269,7 @@ public class RdfTest {
assertXmlEquals(expected, rdfXml);
b2 = p.parse(rdfXml, B.class);
- assertEqualObjects(b, b2, true);
+ assertObject(b).jsonSameAsSorted(b2);
//-------------------------------------------------------------------------------------------------------------
// Default is Bag - Should only affect DEFAULT properties.
@@ -340,7 +340,7 @@ public class RdfTest {
assertXmlEquals(expected, rdfXml);
b2 = p.parse(rdfXml, B.class);
- assertEqualObjects(b, b2, true);
+ assertObject(b).jsonSameAsSorted(b2);
}
@Rdf(prefix="b", namespace="http://ns/";)
@@ -503,7 +503,7 @@ public class RdfTest {
assertXmlEquals(expected, rdfXml);
c2 = p.parse(rdfXml, C.class);
- assertEqualObjects(c, c2, true);
+ assertObject(c).jsonSameAsSorted(c2);
}
@Rdf(collectionFormat=RdfCollectionFormat.BAG)
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java
index 9f0c365..92947ce 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/testutils/TestUtils.java
@@ -35,21 +35,6 @@ import org.xml.sax.*;
@SuppressWarnings({})
public class TestUtils {
- private static JsonSerializer js = JsonSerializer.create()
- .ssq()
- .keepNullProperties()
- .addBeanTypes().addRootType()
- .build();
-
- private static JsonSerializer jsSorted = JsonSerializer.create()
- .ssq()
- .sortCollections()
- .sortMaps()
- .keepNullProperties()
- .addBeanTypes().addRootType()
- .build();
-
-
private static JsonSerializer js2 = JsonSerializer.create()
.ssq()
.addBeanTypes().addRootType()
@@ -64,20 +49,6 @@ public class TestUtils {
private static final BeanSession beanSession =
BeanContext.DEFAULT.createSession();
/**
- * Verifies that two objects are equivalent.
- * Does this by doing a string comparison after converting both to JSON.
- * @param sort If <jk>true</jk> sort maps and collections before
comparison.
- */
- public static final void assertEqualObjects(Object o1, Object o2,
boolean sort) throws SerializeException {
- JsonSerializer s = (sort ? jsSorted : js);
- String s1 = s.serialize(o1);
- String s2 = s.serialize(o2);
- if (s1.equals(s2))
- return;
- throw new ComparisonFailure(null, s1, s2);
- }
-
- /**
* Validates that the whitespace is correct in the specified XML.
*/
public static final void checkXmlWhitespace(String out) throws
SerializeException {
