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 9d0276168 Unit test modernization.
9d0276168 is described below
commit 9d0276168526fe8d83b222d9a1d744d6c3659c62
Author: James Bognar <james.bog...@salesforce.com>
AuthorDate: Thu Aug 7 13:41:33 2025 -0400
Unit test modernization.
---
.../test/java/org/apache/juneau/BeanMapTest.java | 7 ++-
.../apache/juneau/ReadWriteOnlyPropertiesTest.java | 53 ++++++++--------------
.../juneau/annotation/BeanAnnotation_Test.java | 10 ++--
.../annotation/BeanIgnoreAnnotation_Test.java | 10 ++--
.../apache/juneau/annotation/BeanIgnore_Test.java | 6 +--
.../juneau/annotation/BeancAnnotation_Test.java | 4 +-
.../juneau/annotation/BeanpAnnotation_Test.java | 4 +-
.../juneau/annotation/ExampleAnnotation_Test.java | 4 +-
.../annotation/MarshalledAnnotation_Test.java | 4 +-
.../annotation/NamePropertyAnnotation_Test.java | 4 +-
.../annotation/ParentPropertyAnnotation_Test.java | 4 +-
.../juneau/annotation/SwapAnnotation_Test.java | 4 +-
.../juneau/annotation/UriAnnotation_Test.java | 4 +-
.../java/org/apache/juneau/cp/BeanStore_Test.java | 12 ++---
.../juneau/csv/annotation/CsvAnnotation_Test.java | 4 +-
.../apache/juneau/dto/swagger/Contact_Test.java | 6 +--
.../dto/swagger/ExternalDocumentation_Test.java | 4 +-
.../org/apache/juneau/dto/swagger/Items_Test.java | 3 +-
.../apache/juneau/dto/swagger/SchemaInfo_Test.java | 5 +-
.../html/annotation/HtmlAnnotation_Test.java | 4 +-
.../html/annotation/HtmlLinkAnnotation_Test.java | 4 +-
.../org/apache/juneau/http/StringRange_Test.java | 4 +-
.../http/annotation/ContactAnnotation_Test.java | 4 +-
.../http/annotation/ContentAnnotation_Test.java | 4 +-
.../http/annotation/FormDataAnnotation_Test.java | 4 +-
.../annotation/HasFormDataAnnotation_Test.java | 3 +-
.../http/annotation/HasQueryAnnotation_Test.java | 3 +-
.../http/annotation/HeaderAnnotation_Test.java | 4 +-
.../http/annotation/LicenseAnnotation_Test.java | 4 +-
.../http/annotation/PathAnnotation_Test.java | 4 +-
.../http/annotation/QueryAnnotation_Test.java | 4 +-
.../http/annotation/RequestAnnotation_Test.java | 4 +-
.../http/annotation/ResponseAnnotation_Test.java | 4 +-
.../annotation/ResponseStatusAnnotation_Test.java | 4 +-
.../juneau/http/annotation/TagAnnotation_Test.java | 4 +-
.../apache/juneau/http/header/RetryAfter_Test.java | 4 +-
.../json/annotation/JsonAnnotation_Test.java | 4 +-
.../annotation/ExternalDocsAnnotation_Test.java | 4 +-
.../annotation/ItemsAnnotation_Test.java | 4 +-
.../annotation/SchemaAnnotation_Test.java | 4 +-
.../annotation/SubItemsAnnotation_Test.java | 4 +-
.../msgpack/annotation/MsgPackAnnotation_Test.java | 9 ++--
.../oapi/annotation/OpenApiAnnotation_Test.java | 4 +-
.../juneau/objecttools/ObjectPaginator_Test.java | 3 +-
.../juneau/objecttools/ObjectSearcher_Test.java | 40 ++++++++--------
.../annotation/PlainTextAnnotation_Test.java | 4 +-
.../rest/annotation/OpSwaggerAnnotation_Test.java | 4 +-
.../rest/annotation/RestAnnotation_Test.java | 4 +-
.../rest/annotation/RestDeleteAnnotation_Test.java | 4 +-
.../annotation/RestDestroyAnnotation_Test.java | 4 +-
.../annotation/RestEndCallAnnotation_Test.java | 4 +-
.../rest/annotation/RestGetAnnotation_Test.java | 4 +-
.../rest/annotation/RestInitAnnotation_Test.java | 4 +-
.../rest/annotation/RestOpAnnotation_Test.java | 4 +-
.../rest/annotation/RestPostAnnotation_Test.java | 4 +-
.../annotation/RestPostCallAnnotation_Test.java | 4 +-
.../annotation/RestPostInitAnnotation_Test.java | 4 +-
.../annotation/RestPreCallAnnotation_Test.java | 4 +-
.../rest/annotation/RestPutAnnotation_Test.java | 4 +-
.../annotation/RestStartCallAnnotation_Test.java | 4 +-
.../rest/annotation/SwaggerAnnotation_Test.java | 4 +-
.../soap/annotation/SoapXmlAnnotation_Test.java | 4 +-
.../juneau/uon/annotation/UonAnnotation_Test.java | 4 +-
.../juneau/urlencoding/UrlEncodingParserTest.java | 8 ++--
.../annotation/UrlEncodingAnnotation_Test.java | 4 +-
.../juneau/xml/annotation/XmlAnnotation_Test.java | 4 +-
66 files changed, 179 insertions(+), 203 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
index 8da3e5ad8..d482d69d4 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.junit.Assert.*;
import java.util.*;
@@ -1131,7 +1130,7 @@ class BeanMapTest extends SimpleTestBase {
m.put("f2", 2);
m.put("f3", 3);
- assertObject(m).asJsonSorted().is("{f1:1,f2:2,f3:0}");
+ assertJson(m, "{f1:1,f2:2,f3:0}");
}
public static class Q1 {}
@@ -1889,8 +1888,8 @@ class BeanMapTest extends SimpleTestBase {
// testBeanMethodOrder
//====================================================================================================
@Test void testBeanMethodOrder() {
- assertObject(new
W2()).asJsonSorted().is("{a1:'1',a2:'2',a3:'3',a4:'4'}");
- assertObject(new
W3()).asJsonSorted().is("{a3:'3',a4:'4',a5:'5',a6:'6'}");
+ assertJson(new W2(), "{a1:'1',a2:'2',a3:'3',a4:'4'}");
+ assertJson(new W3(), "{a3:'3',a4:'4',a5:'5',a6:'6'}");
}
public static class W {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/ReadWriteOnlyPropertiesTest.java
b/juneau-utest/src/test/java/org/apache/juneau/ReadWriteOnlyPropertiesTest.java
index c3a61cf85..3329ea49e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/ReadWriteOnlyPropertiesTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/ReadWriteOnlyPropertiesTest.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.junit.Assert.*;
import org.apache.juneau.annotation.*;
@@ -43,13 +42,11 @@ class ReadWriteOnlyPropertiesTest extends SimpleTestBase {
}
}
- @Test
- public void a01_beanpOnPrimitiveFields_serializer() {
+ @Test void a01_beanpOnPrimitiveFields_serializer() {
assertJson(A.create(), "{f1:1}");
}
- @Test
- public void a02_beanpOnPrimitiveFields_parser() {
+ @Test void a02_beanpOnPrimitiveFields_parser() {
A x = Json5.DEFAULT.read("{f1:1,f2:2}", A.class);
assertEquals(0, x.f1);
assertEquals(2, x.f2);
@@ -75,13 +72,11 @@ class ReadWriteOnlyPropertiesTest extends SimpleTestBase {
}
}
- @Test
- public void b01_beanAnnotation_serializer() {
+ @Test void b01_beanAnnotation_serializer() {
assertJson(B.create(), "{f1:1}");
}
- @Test
- public void b02_beanAnnotationParser() {
+ @Test void b02_beanAnnotationParser() {
Bc x =
JsonParser.DEFAULT.copy().applyAnnotations(BcConfig.class).build().parse("{f1:1,f2:2}",
Bc.class);
assertEquals(0, x.f1);
assertEquals(2, x.f2);
@@ -106,13 +101,11 @@ class ReadWriteOnlyPropertiesTest extends SimpleTestBase {
}
}
- @Test
- public void b01_beanAnnotation_serializer_usingConfig() {
+ @Test void b01_beanAnnotation_serializer_usingConfig() {
assertJson(B.create(), "{f1:1}");
}
- @Test
- public void b02_beanAnnotationParser_usingConfig() throws Exception {
+ @Test void b02_beanAnnotationParser_usingConfig() throws Exception {
B x = Json5.DEFAULT.read("{f1:1,f2:2}", B.class);
assertEquals(0, x.f1);
assertEquals(2, x.f2);
@@ -134,8 +127,7 @@ class ReadWriteOnlyPropertiesTest extends SimpleTestBase {
}
}
- @Test
- public void c01_beanContext_serializer() {
+ @Test void c01_beanContext_serializer() {
WriterSerializer sw;
sw = Json5Serializer.DEFAULT.copy()
@@ -169,8 +161,7 @@ class ReadWriteOnlyPropertiesTest extends SimpleTestBase {
assertEquals("{f1:1}", sw.toString(C.create()));
}
- @Test
- public void c02_beanAnnotationParser() throws Exception {
+ @Test void c02_beanAnnotationParser() throws Exception {
ReaderParser rp;
C x;
@@ -232,13 +223,11 @@ class ReadWriteOnlyPropertiesTest extends SimpleTestBase {
}
}
- @Test
- public void d01_beanAnnotation_bproAll_serializer() {
+ @Test void d01_beanAnnotation_bproAll_serializer() {
assertJson(D.create(), "{f1:1,f2:2}");
}
- @Test
- public void d02_beanAnnotation_bproAll_Parser() {
+ @Test void d02_beanAnnotation_bproAll_Parser() {
D x = Json5.DEFAULT.read("{f1:1,f2:2}", D.class);
assertEquals(0, x.f1);
assertEquals(0, x.f2);
@@ -259,13 +248,11 @@ class ReadWriteOnlyPropertiesTest extends SimpleTestBase {
}
}
- @Test
- public void d03_beanAnnotation_bproAll_serializer_usingConfig() {
-
assertObject(Dc.create()).asString(Json5Serializer.DEFAULT.copy().applyAnnotations(DcConfig.class).build()).is("{f1:1,f2:2}");
+ @Test void d03_beanAnnotation_bproAll_serializer_usingConfig() {
+ assertSerialized(Dc.create(),
Json5Serializer.DEFAULT.copy().applyAnnotations(DcConfig.class).build(),
"{f1:1,f2:2}");
}
- @Test
- public void d04_beanAnnotation_bproAll_Parser_usingConfig() throws
Exception {
+ @Test void d04_beanAnnotation_bproAll_Parser_usingConfig() throws
Exception {
Dc x =
JsonParser.DEFAULT.copy().applyAnnotations(DcConfig.class).build().parse("{f1:1,f2:2}",
Dc.class);
assertEquals(0, x.f1);
assertEquals(0, x.f2);
@@ -288,13 +275,11 @@ class ReadWriteOnlyPropertiesTest extends SimpleTestBase {
}
}
- @Test
- public void e01_beanAnnotation_bpwoAll_serializer() {
+ @Test void e01_beanAnnotation_bpwoAll_serializer() {
assertJson(E.create(), "{}");
}
- @Test
- public void e02_beanAnnotation_bpwoAll_Parser() throws Exception {
+ @Test void e02_beanAnnotation_bpwoAll_Parser() throws Exception {
E x = Json5.DEFAULT.read("{f1:1,f2:2}", E.class);
assertEquals(1, x.f1);
assertEquals(2, x.f2);
@@ -315,13 +300,11 @@ class ReadWriteOnlyPropertiesTest extends SimpleTestBase {
}
}
- @Test
- public void e03_beanAnnotation_bpwoAll_serializer_usingConfig() {
-
assertObject(E.create()).asString(Json5Serializer.DEFAULT.copy().applyAnnotations(EcConfig.class).build()).is("{}");
+ @Test void e03_beanAnnotation_bpwoAll_serializer_usingConfig() {
+ assertSerialized(E.create(),
Json5Serializer.DEFAULT.copy().applyAnnotations(EcConfig.class).build(), "{}");
}
- @Test
- public void e04_beanAnnotation_bpwoAll_Parser_usingConfig() throws
Exception {
+ @Test void e04_beanAnnotation_bpwoAll_Parser_usingConfig() throws
Exception {
Ec x =
JsonParser.DEFAULT.copy().applyAnnotations(EcConfig.class).build().parse("{f1:1,f2:2}",
Ec.class);
assertEquals(1, x.f1);
assertEquals(2, x.f2);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanAnnotation_Test.java
index 9b5c3fb99..c1fd4e61e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanAnnotation_Test.java
@@ -109,7 +109,7 @@ class BeanAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEquals(0, a1.hashCode());
assertNotEquals(-1, a1.hashCode());
assertEquals(a1.hashCode(), a2.hashCode());
@@ -199,10 +199,8 @@ class BeanAnnotation_Test extends SimpleTestBase {
Bean d2 = D2.class.getAnnotationsByType(Bean.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
- assertNotEquals(0, a1.hashCode());
- assertNotEquals(-1, a1.hashCode());
- assertEquals(d1.hashCode(), a1.hashCode());
- assertEquals(d2.hashCode(), a1.hashCode());
+ assertEqualsAll(a1, d1, d2);
+ assertNotEqualsAny(a1.hashCode(), 0, -1);
+ assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanIgnoreAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanIgnoreAnnotation_Test.java
index 7630cea0f..b7660df62 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanIgnoreAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanIgnoreAnnotation_Test.java
@@ -52,7 +52,7 @@ class BeanIgnoreAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEquals(0, a2.hashCode());
assertNotEquals(-1, a2.hashCode());
assertEquals(a1.hashCode(), a2.hashCode());
@@ -116,10 +116,8 @@ class BeanIgnoreAnnotation_Test extends SimpleTestBase {
BeanIgnore d2 = D2.class.getAnnotationsByType(BeanIgnore.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
- assertNotEquals(0, a1.hashCode());
- assertNotEquals(-1, a1.hashCode());
- assertEquals(d1.hashCode(), a1.hashCode());
- assertEquals(a1.hashCode(), d2.hashCode());
+ assertEqualsAll(a1, d1, d2);
+ assertNotEqualsAny(a1.hashCode(), 0, -1);
+ assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanIgnore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanIgnore_Test.java
index 38a10e305..8ff37fb7e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanIgnore_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanIgnore_Test.java
@@ -61,7 +61,7 @@ class BeanIgnore_Test extends SimpleTestBase {
}
@Test void testBeanIgnoreOnProperties_usingConfig() {
- assertObject(new
Ac()).asString(Json5Serializer.DEFAULT.copy().applyAnnotations(AcConfig.class).build()).is("{c:'c',a:'a'}");
+ assertSerialized(new Ac(),
Json5Serializer.DEFAULT.copy().applyAnnotations(AcConfig.class).build(),
"{c:'c',a:'a'}");
}
//------------------------------------------------------------------------------------------------------------------
@@ -113,6 +113,6 @@ class BeanIgnore_Test extends SimpleTestBase {
}
@Test void testBeanIgnoreOnBean_usingConfig() {
- assertObject(new
Bc()).asString(Json5Serializer.DEFAULT.copy().applyAnnotations(B1cConfig.class).build()).is("{f2:2,f3:'xxx',f4:'xxx'}");
+ assertSerialized(new Bc(),
Json5Serializer.DEFAULT.copy().applyAnnotations(B1cConfig.class).build(),
"{f2:2,f3:'xxx',f4:'xxx'}");
}
-}
\ No newline at end of file
+}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeancAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/annotation/BeancAnnotation_Test.java
index 5da489020..e2adb1ada 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeancAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/annotation/BeancAnnotation_Test.java
@@ -48,7 +48,7 @@ class BeancAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -99,7 +99,7 @@ class BeancAnnotation_Test extends SimpleTestBase {
Beanc d2 = D2.class.getAnnotationsByType(Beanc.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanpAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanpAnnotation_Test.java
index 6e1decd6b..7e4766304 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanpAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanpAnnotation_Test.java
@@ -74,7 +74,7 @@ class BeanpAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a2.hashCode(), 0, -1);
assertEquals(a2.hashCode(), a1.hashCode());
}
@@ -149,7 +149,7 @@ class BeanpAnnotation_Test extends SimpleTestBase {
Beanp d2 = D2.class.getAnnotationsByType(Beanp.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/annotation/ExampleAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/annotation/ExampleAnnotation_Test.java
index 46f4e81b9..91b48981f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/annotation/ExampleAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/annotation/ExampleAnnotation_Test.java
@@ -53,7 +53,7 @@ class ExampleAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -116,7 +116,7 @@ class ExampleAnnotation_Test extends SimpleTestBase {
Example d2 = D2.class.getAnnotationsByType(Example.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/annotation/MarshalledAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/annotation/MarshalledAnnotation_Test.java
index 3b73cf364..92d6dcdba 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/annotation/MarshalledAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/annotation/MarshalledAnnotation_Test.java
@@ -56,7 +56,7 @@ class MarshalledAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -117,7 +117,7 @@ class MarshalledAnnotation_Test extends SimpleTestBase {
Marshalled d2 = D2.class.getAnnotationsByType(Marshalled.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/annotation/NamePropertyAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/annotation/NamePropertyAnnotation_Test.java
index 391651fea..177ef2f16 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/annotation/NamePropertyAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/annotation/NamePropertyAnnotation_Test.java
@@ -45,7 +45,7 @@ class NamePropertyAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -102,7 +102,7 @@ class NamePropertyAnnotation_Test extends SimpleTestBase {
NameProperty d2 = D2.class.getAnnotationsByType(NameProperty.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/annotation/ParentPropertyAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/annotation/ParentPropertyAnnotation_Test.java
index 3d247313f..f99259e60 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/annotation/ParentPropertyAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/annotation/ParentPropertyAnnotation_Test.java
@@ -45,7 +45,7 @@ class ParentPropertyAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -102,7 +102,7 @@ class ParentPropertyAnnotation_Test extends SimpleTestBase {
ParentProperty d2 =
D2.class.getAnnotationsByType(ParentProperty.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/annotation/SwapAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/annotation/SwapAnnotation_Test.java
index b19945c1d..7cfb4b346 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/annotation/SwapAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/annotation/SwapAnnotation_Test.java
@@ -62,7 +62,7 @@ class SwapAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -130,7 +130,7 @@ class SwapAnnotation_Test extends SimpleTestBase {
Swap d2 = D2.class.getAnnotationsByType(Swap.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/annotation/UriAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/annotation/UriAnnotation_Test.java
index c11328c99..4b7a8f731 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/annotation/UriAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/annotation/UriAnnotation_Test.java
@@ -46,7 +46,7 @@ class UriAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -105,7 +105,7 @@ class UriAnnotation_Test extends SimpleTestBase {
Uri d2 = D2.class.getAnnotationsByType(Uri.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
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 c876a2645..f74f5144b 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
@@ -790,7 +790,7 @@ class BeanStore_Test extends SimpleTestBase {
@Test void d02_createBean_staticCreator_create() {
BeanStore bs = BeanStore.INSTANCE;
- assertObject(bs.createBean(D2.class).run()).is(d2);
+ assertEquals(d2, bs.createBean(D2.class).run());
}
public abstract static class D3 {
@@ -800,7 +800,7 @@ class BeanStore_Test extends SimpleTestBase {
@Test void d03_createBean_staticCreator_getInstance() {
BeanStore bs = BeanStore.INSTANCE;
- assertObject(bs.createBean(D3.class).run()).is(d3);
+ assertEquals(d3, bs.createBean(D3.class).run());
}
public static class D4a {
@@ -841,13 +841,13 @@ class BeanStore_Test extends SimpleTestBase {
@Test void d05_createBean_staticCreator_withBeans() {
BeanStore bs = BeanStore.create().build();
- assertObject(bs.createBean(D5.class).run()).is(d5a);
+ assertEquals(d5a, bs.createBean(D5.class).run());
bs.add(Integer.class, 1);
- assertObject(bs.createBean(D5.class).run()).is(d5c);
+ assertEquals(d5c, bs.createBean(D5.class).run());
bs.add(String.class, "x");
- assertObject(bs.createBean(D5.class).run()).is(d5b);
+ assertEquals(d5b, bs.createBean(D5.class).run());
bs.removeBean(Integer.class);
- assertObject(bs.createBean(D5.class).run()).is(d5a);
+ assertEquals(d5a, bs.createBean(D5.class).run());
}
public static class D6 {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/csv/annotation/CsvAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/csv/annotation/CsvAnnotation_Test.java
index ba5325fe3..a554a99bc 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/csv/annotation/CsvAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/csv/annotation/CsvAnnotation_Test.java
@@ -46,7 +46,7 @@ class CsvAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -105,7 +105,7 @@ class CsvAnnotation_Test extends SimpleTestBase {
Csv d2 = D2.class.getAnnotationsByType(Csv.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Contact_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Contact_Test.java
index 31d54d4c2..9fb1d6c3b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Contact_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Contact_Test.java
@@ -60,10 +60,10 @@ class Contact_Test extends SimpleTestBase {
assertJson(t,
"{name:'foo',url:'bar',email:'baz','$ref':'qux'}");
- assertObject(t.get("name",
String.class)).isType(String.class).is("foo");
+ assertEquals("foo", t.get("name", String.class));
assertString("bar", t.get("url", URI.class));
- assertObject(t.get("email",
String.class)).isType(String.class).is("baz");
- assertObject(t.get("$ref",
String.class)).isType(String.class).is("qux");
+ assertEquals("baz", t.get("email", String.class));
+ assertEquals("qux", t.get("$ref", String.class));
t.set("null", null).set(null, "null");
assertNull(t.get("null", Object.class));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ExternalDocumentation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ExternalDocumentation_Test.java
index 8aab070a3..e79e80298 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ExternalDocumentation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ExternalDocumentation_Test.java
@@ -56,9 +56,9 @@ class ExternalDocumentation_Test extends SimpleTestBase {
assertJson(t, "{description:'foo',url:'bar','$ref':'baz'}");
- assertObject(t.get("description",
String.class)).isType(String.class).is("foo");
+ assertEquals("foo", t.get("description", String.class));
assertString("bar", t.get("url", URI.class));
- assertObject(t.get("$ref",
String.class)).isType(String.class).is("baz");
+ assertEquals("baz", t.get("$ref", String.class));
t.set("null", null).set(null, "null");
assertNull(t.get("null", Object.class));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Items_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Items_Test.java
index 08676ca35..32cf58556 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Items_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Items_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.dto.swagger;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.bean.swagger.SwaggerBuilder.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.junit.jupiter.api.Assertions.*;
@@ -40,7 +39,7 @@ class Items_Test extends SimpleTestBase {
assertJson(t.setItems(items("foo")).getItems(), "{type:'foo'}");
assertEquals("foo",
t.setCollectionFormat("foo").getCollectionFormat());
assertString(t.setCollectionFormat(null).getCollectionFormat()).isNull();
- assertObject(t.setDefault("foo").getDefault()).is("foo");
+ assertEquals("foo", t.setDefault("foo").getDefault());
assertString("foo", t.setDefault(new
StringBuilder("foo")).getDefault());
assertNull(t.setDefault(null).getDefault());
assertEquals(123, t.setMaximum(123).getMaximum());
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/SchemaInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/SchemaInfo_Test.java
index a86c6be07..dad82aa4d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/SchemaInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/SchemaInfo_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.dto.swagger;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.bean.swagger.SwaggerBuilder.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.junit.jupiter.api.Assertions.*;
@@ -84,8 +83,8 @@ class SchemaInfo_Test extends SimpleTestBase {
assertTrue(t.setReadOnly(true).getReadOnly());
assertJson(t.setXml(xml().setName("foo")).getXml(),
"{name:'foo'}");
assertJson(t.setExternalDocs(externalDocumentation("foo")).getExternalDocs(),
"{url:'foo'}");
- assertObject(t.setExample("foo").getExample()).is("foo");
- assertObject(t.setExample(123).getExample()).is(123);
+ assertEquals("foo", t.setExample("foo").getExample());
+ assertEquals(123, t.setExample(123).getExample());
assertNull(t.setExample(null).getExample());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/html/annotation/HtmlAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/html/annotation/HtmlAnnotation_Test.java
index 1c051f36f..ce6bcc342 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/html/annotation/HtmlAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/html/annotation/HtmlAnnotation_Test.java
@@ -67,7 +67,7 @@ class HtmlAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -138,7 +138,7 @@ class HtmlAnnotation_Test extends SimpleTestBase {
Html d2 = D2.class.getAnnotationsByType(Html.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation_Test.java
index 9587eafe9..e0b33362d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation_Test.java
@@ -52,7 +52,7 @@ class HtmlLinkAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -111,7 +111,7 @@ class HtmlLinkAnnotation_Test extends SimpleTestBase {
HtmlLink d2 = D2.class.getAnnotationsByType(HtmlLink.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
index a33982591..1187a7a21 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
@@ -34,10 +34,10 @@ class StringRange_Test extends SimpleTestBase {
assertJson(x3.getExtensions(), "[{name:'a',value:'1'}]");
StringRange x4 = of("foo;a=1");
- assertObject(x3).is(x4);
+ assertEquals(x4, x3);
assertObject(x3).isNot(x2);
assertObject(x3).asString().isNot("foo");
- assertObject(x3.hashCode()).is(x4.hashCode());
+ assertEquals(x4.hashCode(), x3.hashCode());
assertString("*", of((String)null));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ContactAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ContactAnnotation_Test.java
index 4831e0f72..05469e89c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ContactAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ContactAnnotation_Test.java
@@ -49,7 +49,7 @@ class ContactAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a2.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -87,7 +87,7 @@ class ContactAnnotation_Test extends SimpleTestBase {
Contact d2 = D2.class.getAnnotationsByType(Contact.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ContentAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ContentAnnotation_Test.java
index ff56c590e..73519270f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ContentAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ContentAnnotation_Test.java
@@ -51,7 +51,7 @@ class ContentAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -110,7 +110,7 @@ class ContentAnnotation_Test extends SimpleTestBase {
Content d2 = D2.class.getAnnotationsByType(Content.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/FormDataAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/FormDataAnnotation_Test.java
index e1dbaee9d..bea3073b5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/FormDataAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/FormDataAnnotation_Test.java
@@ -67,7 +67,7 @@ class FormDataAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -138,7 +138,7 @@ class FormDataAnnotation_Test extends SimpleTestBase {
FormData d2 = D2.class.getAnnotationsByType(FormData.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HasFormDataAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HasFormDataAnnotation_Test.java
index 7d4f0cb81..5bfd7dab1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HasFormDataAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HasFormDataAnnotation_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -46,7 +45,7 @@ class HasFormDataAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HasQueryAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HasQueryAnnotation_Test.java
index 73dd413ac..ff2dfd79d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HasQueryAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HasQueryAnnotation_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -48,7 +47,7 @@ class HasQueryAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HeaderAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HeaderAnnotation_Test.java
index 98a634e76..243faf21a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HeaderAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HeaderAnnotation_Test.java
@@ -67,7 +67,7 @@ class HeaderAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -138,7 +138,7 @@ class HeaderAnnotation_Test extends SimpleTestBase {
Header d2 = D2.class.getAnnotationsByType(Header.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/LicenseAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/LicenseAnnotation_Test.java
index 6df9f35ec..f798f582f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/LicenseAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/LicenseAnnotation_Test.java
@@ -46,7 +46,7 @@ class LicenseAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -86,7 +86,7 @@ class LicenseAnnotation_Test extends SimpleTestBase {
License d2 = D2.class.getAnnotationsByType(License.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/PathAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/PathAnnotation_Test.java
index 9ec09106b..7221a87e2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/PathAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/PathAnnotation_Test.java
@@ -67,7 +67,7 @@ class PathAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -138,7 +138,7 @@ class PathAnnotation_Test extends SimpleTestBase {
Path d2 = D2.class.getAnnotationsByType(Path.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/QueryAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/QueryAnnotation_Test.java
index 7868e4ff7..d591694c9 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/QueryAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/QueryAnnotation_Test.java
@@ -67,7 +67,7 @@ class QueryAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -138,7 +138,7 @@ class QueryAnnotation_Test extends SimpleTestBase {
Query d2 = D2.class.getAnnotationsByType(Query.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/RequestAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/RequestAnnotation_Test.java
index 54c138790..d89fc4654 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/RequestAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/RequestAnnotation_Test.java
@@ -57,7 +57,7 @@ class RequestAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -118,7 +118,7 @@ class RequestAnnotation_Test extends SimpleTestBase {
Request d2 = D2.class.getAnnotationsByType(Request.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseAnnotation_Test.java
index 209530237..bc39dd438 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseAnnotation_Test.java
@@ -67,7 +67,7 @@ class ResponseAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -136,7 +136,7 @@ class ResponseAnnotation_Test extends SimpleTestBase {
Response d2 = D2.class.getAnnotationsByType(Response.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseStatusAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseStatusAnnotation_Test.java
index 9dacceddd..1269755bc 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseStatusAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseStatusAnnotation_Test.java
@@ -53,7 +53,7 @@ class ResponseStatusAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -114,7 +114,7 @@ class ResponseStatusAnnotation_Test extends SimpleTestBase {
StatusCode d2 = D2.class.getAnnotationsByType(StatusCode.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/TagAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/TagAnnotation_Test.java
index 14f485264..3a184bca8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/TagAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/TagAnnotation_Test.java
@@ -47,7 +47,7 @@ class TagAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -87,7 +87,7 @@ class TagAnnotation_Test extends SimpleTestBase {
Tag d2 = D2.class.getAnnotationsByType(Tag.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/RetryAfter_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/RetryAfter_Test.java
index e741ed9d7..bb595a595 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/RetryAfter_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/RetryAfter_Test.java
@@ -17,6 +17,8 @@ import static java.time.temporal.ChronoUnit.*;
import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.utest.utils.Utils2.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.io.*;
import java.time.*;
import java.util.function.*;
@@ -72,7 +74,7 @@ class RetryAfter_Test extends SimpleTestBase {
}
@Test void a02_asZonedDateTime() {
-
assertObject(retryAfter(PARSED2).asZonedDateTime().get().toString()).is("1994-10-29T19:43:31Z");
+ assertEquals("1994-10-29T19:43:31Z",
retryAfter(PARSED2).asZonedDateTime().get().toString());
}
@Test void a03_asInt() {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/json/annotation/JsonAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/json/annotation/JsonAnnotation_Test.java
index 6d0430a1e..daddd599e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/json/annotation/JsonAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/json/annotation/JsonAnnotation_Test.java
@@ -49,7 +49,7 @@ public class JsonAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -110,7 +110,7 @@ public class JsonAnnotation_Test extends SimpleTestBase {
Json d2 = D2.class.getAnnotationsByType(Json.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation_Test.java
index 39dfc07b5..c657267e3 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation_Test.java
@@ -44,7 +44,7 @@ class ExternalDocsAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -82,7 +82,7 @@ class ExternalDocsAnnotation_Test extends SimpleTestBase {
ExternalDocs d2 = D2.class.getAnnotationsByType(ExternalDocs.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ItemsAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ItemsAnnotation_Test.java
index 89a0f00ed..11d90313e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ItemsAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ItemsAnnotation_Test.java
@@ -141,7 +141,7 @@ class ItemsAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -243,7 +243,7 @@ class ItemsAnnotation_Test extends SimpleTestBase {
Items d2 = D2.class.getAnnotationsByType(Items.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java
index a7dfd4108..62e151536 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java
@@ -207,7 +207,7 @@ public class SchemaAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -370,7 +370,7 @@ public class SchemaAnnotation_Test extends SimpleTestBase {
Schema d2 = D2.class.getAnnotationsByType(Schema.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SubItemsAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SubItemsAnnotation_Test.java
index ebce1992f..c3ea2b055 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SubItemsAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SubItemsAnnotation_Test.java
@@ -141,7 +141,7 @@ public class SubItemsAnnotation_Test extends SimpleTestBase
{
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -243,7 +243,7 @@ public class SubItemsAnnotation_Test extends SimpleTestBase
{
SubItems d2 = D2.class.getAnnotationsByType(SubItems.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation_Test.java
index f01b01839..c0e935466 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation_Test.java
@@ -48,7 +48,7 @@ public class MsgPackAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -107,9 +107,8 @@ public class MsgPackAnnotation_Test extends SimpleTestBase {
MsgPack d2 = D2.class.getAnnotationsByType(MsgPack.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
- assertNotEquals(0, a1.hashCode());
- assertNotEquals(-1, a1.hashCode());
- assertEquals(d1.hashCode(), a1.hashCode());
+ assertEqualsAll(a1, d1, d2);
+ assertNotEqualsAny(a1.hashCode(), 0, -1);
+ assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation_Test.java
index aff09eadf..c027c4cf5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation_Test.java
@@ -46,7 +46,7 @@ public class OpenApiAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -105,7 +105,7 @@ public class OpenApiAnnotation_Test extends SimpleTestBase {
OpenApi d2 = D2.class.getAnnotationsByType(OpenApi.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectPaginator_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectPaginator_Test.java
index 79605132d..8702836a2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectPaginator_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectPaginator_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.objecttools;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import java.util.*;
@@ -36,7 +35,7 @@ class ObjectPaginator_Test extends SimpleTestBase {
}
@Test void a02_nonCollectionInput() {
- assertObject(op.run(bs, "foo", PageArgs.create(1,
3))).is("foo");
+ assertEquals("foo", op.run(bs, "foo", PageArgs.create(1, 3)));
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSearcher_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSearcher_Test.java
index 310734cee..ca0d66bd7 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSearcher_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectSearcher_Test.java
@@ -14,6 +14,8 @@ package org.apache.juneau.objecttools;
import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.internal.CollectionUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.util.*;
import org.apache.juneau.*;
@@ -398,7 +400,7 @@ public class ObjectSearcher_Test extends SimpleTestBase {
"f = '2011' ",
"f = \"2011\" "
))
- assertObject(run(in,
s)).asString(ws).is("[{f:'2011-01-01T00:00:00'},{f:'2011-01-31T00:00:00'}]");
+ assertSerialized(run(in, s), ws,
"[{f:'2011-01-01T00:00:00'},{f:'2011-01-31T00:00:00'}]");
}
@Test void c02_dateSearch_singleDate_ym() {
@@ -409,28 +411,28 @@ public class ObjectSearcher_Test extends SimpleTestBase {
"f='2011-01'",
"f=\"2011-01\""
))
- assertObject(run(in,
s)).asString(ws).is("[{f:'2011-01-01T00:00:00'},{f:'2011-01-31T00:00:00'}]");
+ assertSerialized(run(in, s), ws,
"[{f:'2011-01-01T00:00:00'},{f:'2011-01-31T00:00:00'}]");
}
@Test void c03_dateSearch_singleDate_ymd() {
B[] in = B.create("2010-01-01", "2011-01-01", "2011-01-31",
"2012-01-01");
- assertObject(run(in,
"f=2011-01-01")).asString(ws).is("[{f:'2011-01-01T00:00:00'}]");
+ assertSerialized(run(in, "f=2011-01-01"), ws,
"[{f:'2011-01-01T00:00:00'}]");
}
@Test void c04_dateSearch_singleDate_ymdh() {
B[] in = B.create("2011-01-01T11:15:59", "2011-01-01T12:00:00",
"2011-01-01T12:59:59", "2011-01-01T13:00:00");
- assertObject(run(in,
"f=2011-01-01T12")).asString(ws).is("[{f:'2011-01-01T12:00:00'},{f:'2011-01-01T12:59:59'}]");
+ assertSerialized(run(in, "f=2011-01-01T12"), ws,
"[{f:'2011-01-01T12:00:00'},{f:'2011-01-01T12:59:59'}]");
}
@Test void c05_dateSearch_singleDate_ymdhm() {
B[] in = B.create("2011-01-01T12:29:59", "2011-01-01T12:30:00",
"2011-01-01T12:30:59", "2011-01-01T12:31:00");
- assertObject(run(in,
"f=2011-01-01T12:30")).asString(ws).is("[{f:'2011-01-01T12:30:00'},{f:'2011-01-01T12:30:59'}]");
+ assertSerialized(run(in, "f=2011-01-01T12:30"), ws,
"[{f:'2011-01-01T12:30:00'},{f:'2011-01-01T12:30:59'}]");
}
@Test void c06_dateSearch_singleDate_ymdhms() {
B[] in = B.create("2011-01-01T12:30:29", "2011-01-01T12:30:30",
"2011-01-01T12:30:31");
- assertObject(run(in,
"f=2011-01-01T12:30:30")).asString(ws).is("[{f:'2011-01-01T12:30:30'}]");
+ assertSerialized(run(in, "f=2011-01-01T12:30:30"), ws,
"[{f:'2011-01-01T12:30:30'}]");
}
@Test void c07_dateSearch_openEndedRanges_y() {
@@ -449,7 +451,7 @@ public class ObjectSearcher_Test extends SimpleTestBase {
"f>=\"2001\"",
"f >= \"2001\" "
))
- assertObject(run(in,
s)).asString(ws).is("[{f:'2001-01-01T00:00:00'}]");
+ assertSerialized(run(in, s), ws,
"[{f:'2001-01-01T00:00:00'}]");
for (String s : a(
"f<2001",
"f < 2001 ",
@@ -464,19 +466,19 @@ public class ObjectSearcher_Test extends SimpleTestBase {
"f<=\"2000\"",
"f <= \"2000\" "
))
- assertObject(run(in,
s)).asString(ws).is("[{f:'2000-12-31T00:00:00'}]");
+ assertSerialized(run(in, s), ws,
"[{f:'2000-12-31T00:00:00'}]");
}
@Test void c08_dateSearch_openEndedRanges_toMinute() {
B[] in = B.create("2011-01-01T12:29:59", "2011-01-01T12:30:00");
- assertObject(run(in,
"f>=2011-01-01T12:30")).asString(ws).is("[{f:'2011-01-01T12:30:00'}]");
- assertObject(run(in,
"f<2011-01-01T12:30")).asString(ws).is("[{f:'2011-01-01T12:29:59'}]");
+ assertSerialized(run(in, "f>=2011-01-01T12:30"), ws,
"[{f:'2011-01-01T12:30:00'}]");
+ assertSerialized(run(in, "f<2011-01-01T12:30"), ws,
"[{f:'2011-01-01T12:29:59'}]");
}
@Test void c09_dateSearch_openEndedRanges_toSecond() {
B[] in = B.create("2011-01-01T12:30:59", "2011-01-01T12:31:00");
- assertObject(run(in,
"f>2011-01-01T12:30")).asString(ws).is("[{f:'2011-01-01T12:31:00'}]");
- assertObject(run(in,
"f<=2011-01-01T12:30")).asString(ws).is("[{f:'2011-01-01T12:30:59'}]");
+ assertSerialized(run(in, "f>2011-01-01T12:30"), ws,
"[{f:'2011-01-01T12:31:00'}]");
+ assertSerialized(run(in, "f<=2011-01-01T12:30"), ws,
"[{f:'2011-01-01T12:30:59'}]");
}
@Test void c10_dateSearch_closedRanges() {
@@ -494,7 +496,7 @@ public class ObjectSearcher_Test extends SimpleTestBase {
"f=2001 -\"2003-06-30\"",
"f= 2001 - \"2003-06-30\" "
))
- assertObject(run(in,
s)).asString(ws).is("[{f:'2001-01-01T00:00:00'},{f:'2003-06-30T23:59:59'}]");
+ assertSerialized(run(in, s), ws,
"[{f:'2001-01-01T00:00:00'},{f:'2003-06-30T23:59:59'}]");
for (String s : a(
"f= 2001 - 2003-06-30 2000",
@@ -519,7 +521,7 @@ public class ObjectSearcher_Test extends SimpleTestBase {
"f= 2001 - \"2003-06-30\" '2000'",
"f= 2001 - \"2003-06-30\" \"2000\""
))
- assertObject(run(in,
s)).asString(ws).is("[{f:'2000-12-31T23:59:59'},{f:'2001-01-01T00:00:00'},{f:'2003-06-30T23:59:59'}]");
+ assertSerialized(run(in, s), ws,
"[{f:'2000-12-31T23:59:59'},{f:'2001-01-01T00:00:00'},{f:'2003-06-30T23:59:59'}]");
}
@Test void c11_dateSearch_or1() {
@@ -532,7 +534,7 @@ public class ObjectSearcher_Test extends SimpleTestBase {
"f=\"2001\" \"2003\" \"2005\"",
"f= \"2001\" \"2003\" \"2005\" "
))
- assertObject(run(in,
s)).asString(ws).is("[{f:'2001-01-01T00:00:00'},{f:'2001-12-31T00:00:00'}]");
+ assertSerialized(run(in, s), ws,
"[{f:'2001-01-01T00:00:00'},{f:'2001-12-31T00:00:00'}]");
}
@Test void c12_dateSearch_or2() {
@@ -545,7 +547,7 @@ public class ObjectSearcher_Test extends SimpleTestBase {
"f=\"2001\" \"2003\" \"2005\"",
"f= \"2001\" \"2003\" \"2005\" "
))
- assertObject(run(in,
s)).asString(ws).is("[{f:'2003-01-01T00:00:00'},{f:'2003-12-31T00:00:00'}]");
+ assertSerialized(run(in, s), ws,
"[{f:'2003-01-01T00:00:00'},{f:'2003-12-31T00:00:00'}]");
}
@Test void c13_dateSearch_or3() {
@@ -558,7 +560,7 @@ public class ObjectSearcher_Test extends SimpleTestBase {
"f=\"2001\" \"2003\" \"2005\"",
"f= \"2001\" \"2003\" \"2005\" "
))
- assertObject(run(in,
s)).asString(ws).is("[{f:'2005-01-01T00:00:00'},{f:'2005-12-31T00:00:00'}]");
+ assertSerialized(run(in, s), ws,
"[{f:'2005-01-01T00:00:00'},{f:'2005-12-31T00:00:00'}]");
}
@Test void c14_dateSearch_or_singleAndRange() {
@@ -589,7 +591,7 @@ public class ObjectSearcher_Test extends SimpleTestBase {
"f=>=\"2003\" \"2001\"",
"f= >=\"2003\" \"2001\" "
))
- assertObject(run(in,
s)).asString(ws).is("[{f:'2001-01-01T00:00:00'},{f:'2003-01-01T00:00:00'}]");
+ assertSerialized(run(in, s), ws,
"[{f:'2001-01-01T00:00:00'},{f:'2003-01-01T00:00:00'}]");
for (String s : a(
"f=<2001 2003",
"f= <2001 2003 ",
@@ -616,7 +618,7 @@ public class ObjectSearcher_Test extends SimpleTestBase {
"f=\"2003\" <=\"2000\"",
"f= \"2003\" <=\"2000\" "
))
- assertObject(run(in,
s)).asString(ws).is("[{f:'2000-12-31T00:00:00'},{f:'2003-01-01T00:00:00'}]");
+ assertSerialized(run(in, s), ws,
"[{f:'2000-12-31T00:00:00'},{f:'2003-01-01T00:00:00'}]");
}
// @Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation_Test.java
index bca3575ed..2d28ef2c5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation_Test.java
@@ -46,7 +46,7 @@ class PlainTextAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -105,7 +105,7 @@ class PlainTextAnnotation_Test extends SimpleTestBase {
PlainText d2 = D2.class.getAnnotationsByType(PlainText.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation_Test.java
index 65e2c11f4..2608a1ccc 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/OpSwaggerAnnotation_Test.java
@@ -74,7 +74,7 @@ class OpSwaggerAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -132,7 +132,7 @@ class OpSwaggerAnnotation_Test extends SimpleTestBase {
OpSwagger d2 = D2.class.getAnnotationsByType(OpSwagger.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
index b10620473..5f2d5bc0f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
@@ -200,7 +200,7 @@ public class RestAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -349,7 +349,7 @@ public class RestAnnotation_Test extends SimpleTestBase {
Rest d2 = D2.class.getAnnotationsByType(Rest.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation_Test.java
index f37ab1c9e..c21658d9f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation_Test.java
@@ -99,7 +99,7 @@ class RestDeleteAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -198,7 +198,7 @@ class RestDeleteAnnotation_Test extends SimpleTestBase {
}
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestDestroyAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestDestroyAnnotation_Test.java
index 6d536c4f3..b1155046f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestDestroyAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestDestroyAnnotation_Test.java
@@ -45,7 +45,7 @@ public class RestDestroyAnnotation_Test extends
SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -98,7 +98,7 @@ public class RestDestroyAnnotation_Test extends
SimpleTestBase {
RestDestroy d2 = D2.class.getAnnotationsByType(RestDestroy.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestEndCallAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestEndCallAnnotation_Test.java
index e4422345b..9da993c99 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestEndCallAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestEndCallAnnotation_Test.java
@@ -45,7 +45,7 @@ public class RestEndCallAnnotation_Test extends
SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -98,7 +98,7 @@ public class RestEndCallAnnotation_Test extends
SimpleTestBase {
RestEndCall d2 = D2.class.getAnnotationsByType(RestEndCall.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestGetAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestGetAnnotation_Test.java
index fc5ca2393..a967f1d4b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestGetAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestGetAnnotation_Test.java
@@ -110,7 +110,7 @@ public class RestGetAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -215,7 +215,7 @@ public class RestGetAnnotation_Test extends SimpleTestBase {
}
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestInitAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestInitAnnotation_Test.java
index 5063b04e4..9a2089ef0 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestInitAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestInitAnnotation_Test.java
@@ -46,7 +46,7 @@ class RestInitAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -99,7 +99,7 @@ class RestInitAnnotation_Test extends SimpleTestBase {
RestInit d2 = D2.class.getAnnotationsByType(RestInit.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOpAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOpAnnotation_Test.java
index 5b4dec87f..87291ec02 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOpAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOpAnnotation_Test.java
@@ -129,7 +129,7 @@ public class RestOpAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -246,7 +246,7 @@ public class RestOpAnnotation_Test extends SimpleTestBase {
}
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostAnnotation_Test.java
index 86e09e04f..ec08a0042 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostAnnotation_Test.java
@@ -126,7 +126,7 @@ public class RestPostAnnotation_Test extends SimpleTestBase
{
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -241,7 +241,7 @@ public class RestPostAnnotation_Test extends SimpleTestBase
{
}
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostCallAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostCallAnnotation_Test.java
index 04aa912c5..c6a7d9d31 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostCallAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostCallAnnotation_Test.java
@@ -45,7 +45,7 @@ public class RestPostCallAnnotation_Test extends
SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -98,7 +98,7 @@ public class RestPostCallAnnotation_Test extends
SimpleTestBase {
RestPostCall d2 = D2.class.getAnnotationsByType(RestPostCall.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostInitAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostInitAnnotation_Test.java
index 153cab167..b86af93b0 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostInitAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostInitAnnotation_Test.java
@@ -48,7 +48,7 @@ public class RestPostInitAnnotation_Test extends
SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -103,7 +103,7 @@ public class RestPostInitAnnotation_Test extends
SimpleTestBase {
RestPostInit d2 = D2.class.getAnnotationsByType(RestPostInit.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPreCallAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPreCallAnnotation_Test.java
index 28fa63665..c7c93b433 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPreCallAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPreCallAnnotation_Test.java
@@ -45,7 +45,7 @@ class RestPreCallAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -98,7 +98,7 @@ class RestPreCallAnnotation_Test extends SimpleTestBase {
RestPreCall d2 = D2.class.getAnnotationsByType(RestPreCall.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPutAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPutAnnotation_Test.java
index 9746206e8..053d19543 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPutAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPutAnnotation_Test.java
@@ -126,7 +126,7 @@ class RestPutAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -241,7 +241,7 @@ class RestPutAnnotation_Test extends SimpleTestBase {
}
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestStartCallAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestStartCallAnnotation_Test.java
index 42d0a6fe9..c3fc7f7d4 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestStartCallAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestStartCallAnnotation_Test.java
@@ -45,7 +45,7 @@ public class RestStartCallAnnotation_Test extends
SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -98,7 +98,7 @@ public class RestStartCallAnnotation_Test extends
SimpleTestBase {
RestStartCall d2 =
D2.class.getAnnotationsByType(RestStartCall.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/SwaggerAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/SwaggerAnnotation_Test.java
index e27473e5e..902c48730 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/SwaggerAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/SwaggerAnnotation_Test.java
@@ -67,7 +67,7 @@ class SwaggerAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -119,7 +119,7 @@ class SwaggerAnnotation_Test extends SimpleTestBase {
Swagger d2 = D2.class.getAnnotationsByType(Swagger.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation_Test.java
index 8257d2923..e8aa001b2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation_Test.java
@@ -46,7 +46,7 @@ public class SoapXmlAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -105,7 +105,7 @@ public class SoapXmlAnnotation_Test extends SimpleTestBase {
SoapXml d2 = D2.class.getAnnotationsByType(SoapXml.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/uon/annotation/UonAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/uon/annotation/UonAnnotation_Test.java
index 7b22a3faf..822c7e973 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/uon/annotation/UonAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/uon/annotation/UonAnnotation_Test.java
@@ -46,7 +46,7 @@ public class UonAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -105,7 +105,7 @@ public class UonAnnotation_Test extends SimpleTestBase {
Uon d2 = D2.class.getAnnotationsByType(Uon.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java
b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java
index 562e3fea3..7f9e8305b 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingParserTest.java
@@ -669,7 +669,7 @@ public class UrlEncodingParserTest extends SimpleTestBase {
+ "f19:[[{a:'a',b:1,c:true}],[{a:'b',b:2,c:false}]],"
+ "f20:[[{a:'a',b:1,c:true}],[{a:'b',b:2,c:false}]]"
+"}";
- assertObject(t).asJsonSorted().is(e);
+ assertJson(t, e);
}
@Test void testMultiPartParametersOnBeansViaProperty_usingConfig()
throws Exception {
@@ -722,7 +722,7 @@ public class UrlEncodingParserTest extends SimpleTestBase {
+ "f19:[[{a:'a',b:1,c:true}],[{a:'b',b:2,c:false}]],"
+ "f20:[[{a:'a',b:1,c:true}],[{a:'b',b:2,c:false}]]"
+"}";
- assertObject(t).asJsonSorted().is(e);
+ assertJson(t, e);
}
//====================================================================================================
@@ -777,7 +777,7 @@ public class UrlEncodingParserTest extends SimpleTestBase {
+ "f19:[[{a:'a',b:1,c:true}],[{a:'b',b:2,c:false}]],"
+ "f20:[[{a:'a',b:1,c:true}],[{a:'b',b:2,c:false}]]"
+"}";
- assertObject(t).asJsonSorted().is(e);
+ assertJson(t, e);
}
@Test void
testMultiPartParametersOnBeansViaAnnotationOnClass_usingConfig() throws
Exception {
@@ -829,6 +829,6 @@ public class UrlEncodingParserTest extends SimpleTestBase {
+ "f19:[[{a:'a',b:1,c:true}],[{a:'b',b:2,c:false}]],"
+ "f20:[[{a:'a',b:1,c:true}],[{a:'b',b:2,c:false}]]"
+"}";
- assertObject(t).asJsonSorted().is(e);
+ assertJson(t, e);
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation_Test.java
index f35bd06db..d5fe078ba 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation_Test.java
@@ -49,7 +49,7 @@ class UrlEncodingAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -110,7 +110,7 @@ class UrlEncodingAnnotation_Test extends SimpleTestBase {
UrlEncoding d2 = D2.class.getAnnotationsByType(UrlEncoding.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/xml/annotation/XmlAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/annotation/XmlAnnotation_Test.java
index ef0ae5c97..06d73559f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/xml/annotation/XmlAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/xml/annotation/XmlAnnotation_Test.java
@@ -58,7 +58,7 @@ class XmlAnnotation_Test extends SimpleTestBase {
}
@Test void a02_testEquivalency() {
- assertObject(a1).is(a2);
+ assertEquals(a2, a1);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEquals(a1.hashCode(), a2.hashCode());
}
@@ -125,7 +125,7 @@ class XmlAnnotation_Test extends SimpleTestBase {
Xml d2 = D2.class.getAnnotationsByType(Xml.class)[0];
@Test void d01_comparisonWithDeclarativeAnnotations() {
- assertObject(d1).is(d2).is(a1);
+ assertEqualsAll(a1, d1, d2);
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
