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 6f323b1cd Unit test modernization.
6f323b1cd is described below
commit 6f323b1cd8dd71a26921ccf617b804ff1cd74f63
Author: James Bognar <[email protected]>
AuthorDate: Thu Aug 7 12:59:33 2025 -0400
Unit test modernization.
---
.../test/java/org/apache/juneau/annotation/BeanAnnotation_Test.java | 2 +-
.../java/org/apache/juneau/annotation/BeanIgnoreAnnotation_Test.java | 2 +-
.../test/java/org/apache/juneau/annotation/BeancAnnotation_Test.java | 2 +-
.../test/java/org/apache/juneau/annotation/BeanpAnnotation_Test.java | 2 +-
.../test/java/org/apache/juneau/annotation/ExampleAnnotation_Test.java | 2 +-
.../java/org/apache/juneau/annotation/MarshalledAnnotation_Test.java | 2 +-
.../java/org/apache/juneau/annotation/NamePropertyAnnotation_Test.java | 2 +-
.../org/apache/juneau/annotation/ParentPropertyAnnotation_Test.java | 2 +-
.../test/java/org/apache/juneau/annotation/SwapAnnotation_Test.java | 2 +-
.../src/test/java/org/apache/juneau/annotation/UriAnnotation_Test.java | 2 +-
.../test/java/org/apache/juneau/csv/annotation/CsvAnnotation_Test.java | 2 +-
.../src/test/java/org/apache/juneau/dto/swagger/Items_Test.java | 2 +-
.../src/test/java/org/apache/juneau/dto/swagger/Operation_Test.java | 3 +--
.../test/java/org/apache/juneau/dto/swagger/ParameterInfo_Test.java | 3 +--
.../src/test/java/org/apache/juneau/dto/swagger/SchemaInfo_Test.java | 2 +-
.../src/test/java/org/apache/juneau/dto/swagger/Swagger_Test.java | 3 +--
.../java/org/apache/juneau/html/annotation/HtmlAnnotation_Test.java | 2 +-
.../org/apache/juneau/html/annotation/HtmlLinkAnnotation_Test.java | 2 +-
.../java/org/apache/juneau/http/annotation/ContactAnnotation_Test.java | 2 +-
.../org/apache/juneau/http/annotation/HasFormDataAnnotation_Test.java | 2 +-
.../org/apache/juneau/http/annotation/HasQueryAnnotation_Test.java | 2 +-
.../java/org/apache/juneau/http/annotation/LicenseAnnotation_Test.java | 2 +-
.../java/org/apache/juneau/http/annotation/RequestAnnotation_Test.java | 2 +-
.../apache/juneau/http/annotation/ResponseStatusAnnotation_Test.java | 2 +-
.../java/org/apache/juneau/http/annotation/TagAnnotation_Test.java | 2 +-
.../org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java | 1 -
.../java/org/apache/juneau/json/annotation/JsonAnnotation_Test.java | 2 +-
.../org/apache/juneau/jsonschema/annotation/ItemsAnnotation_Test.java | 2 +-
.../org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java | 2 +-
.../apache/juneau/jsonschema/annotation/SubItemsAnnotation_Test.java | 2 +-
.../org/apache/juneau/msgpack/annotation/MsgPackAnnotation_Test.java | 2 +-
.../java/org/apache/juneau/oapi/annotation/OpenApiAnnotation_Test.java | 2 +-
.../apache/juneau/plaintext/annotation/PlainTextAnnotation_Test.java | 2 +-
.../org/apache/juneau/rest/annotation/OpSwaggerAnnotation_Test.java | 2 +-
.../java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java | 2 +-
.../org/apache/juneau/rest/annotation/RestDeleteAnnotation_Test.java | 2 +-
.../org/apache/juneau/rest/annotation/RestDestroyAnnotation_Test.java | 2 +-
.../org/apache/juneau/rest/annotation/RestEndCallAnnotation_Test.java | 2 +-
.../java/org/apache/juneau/rest/annotation/RestGetAnnotation_Test.java | 2 +-
.../org/apache/juneau/rest/annotation/RestInitAnnotation_Test.java | 2 +-
.../java/org/apache/juneau/rest/annotation/RestOpAnnotation_Test.java | 2 +-
.../org/apache/juneau/rest/annotation/RestPostAnnotation_Test.java | 2 +-
.../org/apache/juneau/rest/annotation/RestPostCallAnnotation_Test.java | 2 +-
.../org/apache/juneau/rest/annotation/RestPostInitAnnotation_Test.java | 2 +-
.../org/apache/juneau/rest/annotation/RestPreCallAnnotation_Test.java | 2 +-
.../java/org/apache/juneau/rest/annotation/RestPutAnnotation_Test.java | 2 +-
.../apache/juneau/rest/annotation/RestStartCallAnnotation_Test.java | 2 +-
.../java/org/apache/juneau/rest/annotation/SwaggerAnnotation_Test.java | 2 +-
.../java/org/apache/juneau/soap/annotation/SoapXmlAnnotation_Test.java | 2 +-
.../test/java/org/apache/juneau/uon/annotation/UonAnnotation_Test.java | 2 +-
.../juneau/urlencoding/annotation/UrlEncodingAnnotation_Test.java | 2 +-
.../test/java/org/apache/juneau/xml/annotation/XmlAnnotation_Test.java | 2 +-
52 files changed, 51 insertions(+), 55 deletions(-)
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 d387a2772..9b5c3fb99 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
@@ -80,7 +80,7 @@ class BeanAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "dictionary:['"+CNAME+"$X1'],"
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 ed559b609..7630cea0f 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
@@ -42,7 +42,7 @@ class BeanIgnoreAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['a'],"
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 700d6e5ae..5da489020 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
@@ -38,7 +38,7 @@ class BeancAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['on'],"
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 56ff81a63..6e1decd6b 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
@@ -56,7 +56,7 @@ class BeanpAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "dictionary:['"+CNAME+"$X1'],"
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 7c977e374..46f4e81b9 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
@@ -42,7 +42,7 @@ class ExampleAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['on'],"
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 08a3e09e5..3b73cf364 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
@@ -44,7 +44,7 @@ class MarshalledAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "example:'example',"
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 187e8cbad..391651fea 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
@@ -36,7 +36,7 @@ class NamePropertyAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['on']"
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 5df1130f7..3d247313f 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
@@ -36,7 +36,7 @@ class ParentPropertyAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['on']"
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 8892403ae..b19945c1d 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
@@ -48,7 +48,7 @@ class SwapAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "impl:'"+CNAME+"$X1',"
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 e644a4cf8..c11328c99 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
@@ -36,7 +36,7 @@ class UriAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['a'],"
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 9931a9dbf..ba5325fe3 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
@@ -36,7 +36,7 @@ class CsvAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['a'],"
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 144f9036f..08676ca35 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
@@ -241,7 +241,7 @@ class Items_Test extends SimpleTestBase {
.set("type", "j")
.set("uniqueItems", true);
- assertObject(t.keySet()).asJson().is(
+ assertJson(t.keySet(),
"['collectionFormat','default','enum','exclusiveMaximum','exclusiveMinimum','format','items','maximum','maxItems',"
+
"'maxLength','minimum','minItems','minLength','multipleOf','pattern','$ref','type','uniqueItems']"
);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Operation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Operation_Test.java
index 142c59556..68d99186c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Operation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Operation_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.Assert.*;
@@ -207,7 +206,7 @@ class Operation_Test extends SimpleTestBase {
.set("tags", set("k"))
.set("$ref", "ref");
- assertObject(t.keySet()).asJson().is(
+ assertJson(t.keySet(),
"['consumes','deprecated','description','externalDocs','operationId','parameters','produces','responses','schemes','security','summary','tags','$ref']"
);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ParameterInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ParameterInfo_Test.java
index 8518a0e79..d339761aa 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ParameterInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ParameterInfo_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.*;
@@ -291,7 +290,7 @@ class ParameterInfo_Test extends SimpleTestBase {
.set("uniqueItems", true)
.set("$ref", "ref");
- assertObject(t.keySet()).asJson().is(
+ assertJson(t.keySet(),
"['allowEmptyValue','collectionFormat','default','description','enum','exclusiveMaximum','exclusiveMinimum',"
+
"'format','in','items','maximum','maxItems','maxLength','minimum','minItems','minLength','multipleOf','name',"
+
"'pattern','required','schema','type','uniqueItems','$ref']"
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 d4d66e2e8..a86c6be07 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
@@ -348,7 +348,7 @@ class SchemaInfo_Test extends SimpleTestBase {
.set("uniqueItems", true)
.set("xml", xml().setName("o"));
- assertObject(t.keySet()).asJson().is(
+ assertJson(t.keySet(),
"['additionalProperties','allOf','default','description','discriminator','enum','example','exclusiveMaximum','exclusiveMinimum',"
+
"'externalDocs','format','items','maximum','maxItems','maxLength','maxProperties','minimum','minItems','minLength','minProperties',"
+
"'multipleOf','pattern','properties','readOnly','$ref','requiredProperties','title','type','uniqueItems','xml']"
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Swagger_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Swagger_Test.java
index 78b0a83b8..ae321a42a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Swagger_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Swagger_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.*;
@@ -249,7 +248,7 @@ class Swagger_Test extends SimpleTestBase {
.set("tags", set(tag("o")))
.set("$ref", "ref");
- assertObject(t.keySet()).asJson().is(
+ assertJson(t.keySet(),
"['basePath','consumes','definitions','externalDocs','host','info','parameters','paths','produces','responses',"
+
"'schemes','security','securityDefinitions','swagger','tags','$ref']"
);
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 69da952b5..1c051f36f 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
@@ -51,7 +51,7 @@ class HtmlAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "anchorText:'a',"
+ "description:['description'],"
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 45a2630ff..9587eafe9 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
@@ -40,7 +40,7 @@ class HtmlLinkAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "nameProperty:'a',"
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 ce1519785..4831e0f72 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
@@ -38,7 +38,7 @@ class ContactAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "email:'email',"
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 b2d248308..7d4f0cb81 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
@@ -36,7 +36,7 @@ class HasFormDataAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "name:'name',"
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 7f36a9956..73dd413ac 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
@@ -38,7 +38,7 @@ class HasQueryAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "name:'name',"
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 99e78a79b..6df9f35ec 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
@@ -36,7 +36,7 @@ class LicenseAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "name:'name',"
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 9f0cab892..54c138790 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
@@ -45,7 +45,7 @@ class RequestAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['on'],"
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 d53cc5514..9dacceddd 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
@@ -42,7 +42,7 @@ class ResponseStatusAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['on'],"
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 ef1ea0bf3..14f485264 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
@@ -37,7 +37,7 @@ class TagAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "externalDocs:{description:[],url:''},"
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
index 6d69ddcaa..0c23df499 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.remote;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.common.internal.IOUtils.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.http.HttpResources.*;
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 a274cfd36..6d0430a1e 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
@@ -38,7 +38,7 @@ public class JsonAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['a'],"
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 f4298b822..89a0f00ed 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
@@ -99,7 +99,7 @@ class ItemsAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "'$ref':'$ref',"
+ "_default:['default'],"
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 b195f868c..a7dfd4108 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
@@ -143,7 +143,7 @@ public class SchemaAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "'$ref':'$ref',"
+ "_default:['default'],"
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 1d9f21a1b..ebce1992f 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
@@ -99,7 +99,7 @@ public class SubItemsAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "'$ref':'$ref',"
+ "_default:['default'],"
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 fb27c7429..f01b01839 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
@@ -38,7 +38,7 @@ public class MsgPackAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['a'],"
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 abf797885..aff09eadf 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
@@ -36,7 +36,7 @@ public class OpenApiAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['a'],"
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 b1d3a23a1..bca3575ed 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
@@ -36,7 +36,7 @@ class PlainTextAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['a'],"
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 4c75e1446..65e2c11f4 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
@@ -55,7 +55,7 @@ class OpSwaggerAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "consumes:['consumes'],"
+ "deprecated:'deprecated',"
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 c8b47d38d..b10620473 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
@@ -144,7 +144,7 @@ public class RestAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "allowedHeaderParams:'allowedHeaderParams',"
+ "allowedMethodHeaders:'allowedMethodHeaders',"
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 aa9069b0b..f37ab1c9e 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
@@ -73,7 +73,7 @@ class RestDeleteAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "clientVersion:'clientVersion',"
+ "debug:'debug',"
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 e90b6a760..6d536c4f3 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
@@ -36,7 +36,7 @@ public class RestDestroyAnnotation_Test extends
SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['a']"
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 2881ad7a3..e4422345b 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
@@ -36,7 +36,7 @@ public class RestEndCallAnnotation_Test extends
SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['a']"
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 fbf638724..fc5ca2393 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
@@ -81,7 +81,7 @@ public class RestGetAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "clientVersion:'clientVersion',"
+
"converters:['org.apache.juneau.rest.converter.RestConverter'],"
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 27c1335c3..5063b04e4 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
@@ -37,7 +37,7 @@ class RestInitAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['a']"
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 71af99c43..5b4dec87f 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
@@ -94,7 +94,7 @@ public class RestOpAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "clientVersion:'clientVersion',"
+ "consumes:['consumes'],"
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 3bfb8fc5d..86e09e04f 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
@@ -92,7 +92,7 @@ public class RestPostAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "clientVersion:'clientVersion',"
+ "consumes:['consumes'],"
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 e3b98bc62..04aa912c5 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
@@ -36,7 +36,7 @@ public class RestPostCallAnnotation_Test extends
SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['a']"
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 5f77c3579..153cab167 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
@@ -38,7 +38,7 @@ public class RestPostInitAnnotation_Test extends
SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "childFirst:true,"
+ "description:['description'],"
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 3fd31bc83..28fa63665 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
@@ -36,7 +36,7 @@ class RestPreCallAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['a']"
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 06e1d25aa..9746206e8 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
@@ -92,7 +92,7 @@ class RestPutAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "clientVersion:'clientVersion',"
+ "consumes:['consumes'],"
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 03d14160b..42d0a6fe9 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
@@ -36,7 +36,7 @@ public class RestStartCallAnnotation_Test extends
SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['a']"
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 34ab04bcb..e27473e5e 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
@@ -51,7 +51,7 @@ class SwaggerAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+
"contact:{description:[],email:'',name:'',url:''},"
+ "description:['description'],"
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 f0674eb23..8257d2923 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
@@ -36,7 +36,7 @@ public class SoapXmlAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['a'],"
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 bd74baca4..7b22a3faf 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
@@ -36,7 +36,7 @@ public class UonAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['a'],"
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 4d12be054..f35bd06db 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
@@ -38,7 +38,7 @@ class UrlEncodingAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "description:['description'],"
+ "expandedParams:true,"
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 f9e267ef4..ef0ae5c97 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
@@ -44,7 +44,7 @@ class XmlAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().is(""
+ assertJson(a1, ""
+ "{"
+ "childName:'a',"
+ "description:['description'],"
