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 5c89cf7cc Unit test modernization.
5c89cf7cc is described below
commit 5c89cf7cc7b20f8cc03a10d6ca3261c9ddbccd45
Author: James Bognar <[email protected]>
AuthorDate: Thu Aug 7 13:45:34 2025 -0400
Unit test modernization.
---
.../java/org/apache/juneau/AssertionHelpers.java | 7 +++++
.../java/org/apache/juneau/SimpleTestBase.java | 6 ++++
.../juneau/annotation/BeanAnnotation_Test.java | 5 ++--
.../annotation/BeanIgnoreAnnotation_Test.java | 11 ++++---
.../apache/juneau/annotation/BeanIgnore_Test.java | 1 -
.../juneau/annotation/BeancAnnotation_Test.java | 5 ++--
.../juneau/annotation/BeanpAnnotation_Test.java | 7 ++---
.../juneau/annotation/ExampleAnnotation_Test.java | 9 +++---
.../annotation/MarshalledAnnotation_Test.java | 5 ++--
.../annotation/NamePropertyAnnotation_Test.java | 7 ++---
.../annotation/ParentPropertyAnnotation_Test.java | 7 ++---
.../juneau/annotation/SwapAnnotation_Test.java | 9 +++---
.../juneau/annotation/UriAnnotation_Test.java | 9 +++---
.../juneau/csv/annotation/CsvAnnotation_Test.java | 9 +++---
.../apache/juneau/dto/swagger/Contact_Test.java | 1 -
.../dto/swagger/ExternalDocumentation_Test.java | 1 -
.../html/annotation/HtmlAnnotation_Test.java | 9 +++---
.../html/annotation/HtmlLinkAnnotation_Test.java | 5 ++--
.../http/annotation/AnnotationUtils_Test.java | 35 +++++++++++-----------
.../http/annotation/ContactAnnotation_Test.java | 1 -
.../http/annotation/ContentAnnotation_Test.java | 6 ++--
.../http/annotation/FormDataAnnotation_Test.java | 8 ++---
.../http/annotation/HeaderAnnotation_Test.java | 8 ++---
.../http/annotation/LicenseAnnotation_Test.java | 1 -
.../http/annotation/PathAnnotation_Test.java | 8 ++---
.../http/annotation/QueryAnnotation_Test.java | 8 ++---
.../http/annotation/RequestAnnotation_Test.java | 5 ++--
.../http/annotation/ResponseAnnotation_Test.java | 6 ++--
.../annotation/ResponseStatusAnnotation_Test.java | 7 ++---
.../juneau/http/annotation/TagAnnotation_Test.java | 1 -
.../json/annotation/JsonAnnotation_Test.java | 9 +++---
.../juneau/jsonschema/JsonSchemaGeneratorTest.java | 3 +-
.../annotation/ItemsAnnotation_Test.java | 1 -
.../annotation/SchemaAnnotation_Test.java | 9 +++---
.../annotation/SubItemsAnnotation_Test.java | 1 -
.../msgpack/annotation/MsgPackAnnotation_Test.java | 9 +++---
.../org/apache/juneau/mstat/ThrownStore_Test.java | 7 ++---
.../oapi/annotation/OpenApiAnnotation_Test.java | 9 +++---
.../juneau/objecttools/ObjectSearcher_Test.java | 2 --
.../annotation/PlainTextAnnotation_Test.java | 9 +++---
.../rest/annotation/OpSwaggerAnnotation_Test.java | 1 -
.../rest/annotation/RestAnnotation_Test.java | 5 ++--
.../rest/annotation/RestDeleteAnnotation_Test.java | 3 +-
.../annotation/RestDestroyAnnotation_Test.java | 3 +-
.../annotation/RestEndCallAnnotation_Test.java | 3 +-
.../rest/annotation/RestGetAnnotation_Test.java | 3 +-
.../rest/annotation/RestInitAnnotation_Test.java | 3 +-
.../rest/annotation/RestOpAnnotation_Test.java | 3 +-
.../rest/annotation/RestPostAnnotation_Test.java | 3 +-
.../annotation/RestPostCallAnnotation_Test.java | 3 +-
.../annotation/RestPostInitAnnotation_Test.java | 3 +-
.../annotation/RestPreCallAnnotation_Test.java | 3 +-
.../rest/annotation/RestPutAnnotation_Test.java | 3 +-
.../annotation/RestStartCallAnnotation_Test.java | 3 +-
.../rest/annotation/SwaggerAnnotation_Test.java | 1 -
.../soap/annotation/SoapXmlAnnotation_Test.java | 9 +++---
.../juneau/uon/annotation/UonAnnotation_Test.java | 9 +++---
.../annotation/UrlEncodingAnnotation_Test.java | 9 +++---
.../juneau/xml/annotation/XmlAnnotation_Test.java | 9 +++---
59 files changed, 153 insertions(+), 192 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/AssertionHelpers.java
b/juneau-utest/src/test/java/org/apache/juneau/AssertionHelpers.java
index ba1432a83..1ad70e091 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/AssertionHelpers.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/AssertionHelpers.java
@@ -55,6 +55,13 @@ public class AssertionHelpers {
assertEquals(json, Json5.DEFAULT.write(value));
}
+ /**
+ * Asserts the JSON5 representation of the specified object.
+ */
+ public static void assertJsonContains(Object value, String json) {
+ assertContains(json, Json5.DEFAULT.write(value));
+ }
+
/**
* Asserts the JSON5 representation of the specified object.
*/
diff --git a/juneau-utest/src/test/java/org/apache/juneau/SimpleTestBase.java
b/juneau-utest/src/test/java/org/apache/juneau/SimpleTestBase.java
index cee84cfe3..a794fa82d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/SimpleTestBase.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/SimpleTestBase.java
@@ -35,6 +35,12 @@ public abstract class SimpleTestBase {
AssertionHelpers.assertJson(value, json);
}
+ /**
+ * Asserts the JSON5 representation of the specified object.
+ */
+ public static void assertJsonContains(Object value, String json) {
+ AssertionHelpers.assertJsonContains(value, json);
+ }
/**
* Asserts the JSON5 representation of the specified object.
*/
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 c1fd4e61e..7e5a3df02 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.swap.*;
@@ -136,8 +135,8 @@ class BeanAnnotation_Test extends SimpleTestBase {
Bean c1 = BeanAnnotation.create(C1.class).on(C2.class).build();
Bean c2 = BeanAnnotation.create("a").on("b").build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
}
//------------------------------------------------------------------------------------------------------------------
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 b7660df62..4576d727b 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -88,11 +87,11 @@ class BeanIgnoreAnnotation_Test extends SimpleTestBase {
BeanIgnore c4 =
BeanIgnoreAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
BeanIgnore c5 =
BeanIgnoreAnnotation.create().on(C1.class.getConstructor()).on(C2.class.getConstructor()).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
-
assertObject(c5).asJson().isContains("on:['"+CNAME+"$C1()','"+CNAME+"$C2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c5,
"on:['"+CNAME+"$C1()','"+CNAME+"$C2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 8ff37fb7e..6833a7a4c 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import org.apache.juneau.*;
import org.apache.juneau.json.*;
import org.junit.jupiter.api.*;
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 e2adb1ada..73b93de36 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -74,8 +73,8 @@ class BeancAnnotation_Test extends SimpleTestBase {
Beanc c1 = BeancAnnotation.create("a").on("b").build();
Beanc c2 =
BeancAnnotation.create().on(C1.class.getConstructor()).on(C2.class.getConstructor()).build();
- assertObject(c1).asJson().isContains("on:['a','b']");
-
assertObject(c2).asJson().isContains("on:['"+CNAME+"$C1()','"+CNAME+"$C2()']");
+ assertJsonContains(c1, "on:['a','b']");
+ assertJsonContains(c2,
"on:['"+CNAME+"$C1()','"+CNAME+"$C2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 7e4766304..1acb17378 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -107,9 +106,9 @@ class BeanpAnnotation_Test extends SimpleTestBase {
Beanp c2 =
BeanpAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
Beanp c3 =
BeanpAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertObject(c1).asJson().isContains("on:['a','b']");
-
assertObject(c2).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['a','b']");
+ assertJsonContains(c2,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 91b48981f..ac67bd29c 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -87,10 +86,10 @@ class ExampleAnnotation_Test extends SimpleTestBase {
Example c3 =
ExampleAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
Example c4 =
ExampleAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 92d6dcdba..a7f2bdee4 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -88,8 +87,8 @@ class MarshalledAnnotation_Test extends SimpleTestBase {
Marshalled c1 =
MarshalledAnnotation.create(C1.class).on(C2.class).build();
Marshalled c2 =
MarshalledAnnotation.create("a").on("b").build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
}
//------------------------------------------------------------------------------------------------------------------
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 177ef2f16..ba81c80c5 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -78,9 +77,9 @@ class NamePropertyAnnotation_Test extends SimpleTestBase {
NameProperty c2 =
NamePropertyAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
NameProperty c3 =
NamePropertyAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertObject(c1).asJson().isContains("on:['a','b']");
-
assertObject(c2).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['a','b']");
+ assertJsonContains(c2,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 f99259e60..a9ed7ece9 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -78,9 +77,9 @@ class ParentPropertyAnnotation_Test extends SimpleTestBase {
ParentProperty c2 =
ParentPropertyAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
ParentProperty c3 =
ParentPropertyAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertObject(c1).asJson().isContains("on:['a','b']");
-
assertObject(c2).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['a','b']");
+ assertJsonContains(c2,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 7cfb4b346..0473f088e 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -95,10 +94,10 @@ class SwapAnnotation_Test extends SimpleTestBase {
Swap c3 =
SwapAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
Swap c4 =
SwapAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 4b7a8f731..2dc9ada31 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -80,10 +79,10 @@ class UriAnnotation_Test extends SimpleTestBase {
Uri c3 =
UriAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
Uri c4 =
UriAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 a554a99bc..7fbbf4dd3 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.csv.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -80,10 +79,10 @@ class CsvAnnotation_Test extends SimpleTestBase {
Csv c3 =
CsvAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
Csv c4 =
CsvAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 9fb1d6c3b..15ad3eb64 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.dto.swagger;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.jupiter.api.Assertions.*;
import java.net.*;
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 e79e80298..41b88e840 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.dto.swagger;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.jupiter.api.Assertions.*;
import java.net.*;
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 ce6bcc342..99a4be0d3 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.html.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.html.*;
@@ -101,10 +100,10 @@ class HtmlAnnotation_Test extends SimpleTestBase {
Html c3 =
HtmlAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
Html c4 =
HtmlAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 e0b33362d..b93b81af6 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.html.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -84,8 +83,8 @@ class HtmlLinkAnnotation_Test extends SimpleTestBase {
HtmlLink c1 =
HtmlLinkAnnotation.create(C1.class).on(C2.class).build();
HtmlLink c2 = HtmlLinkAnnotation.create("a").on("b").build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
index dd74ba924..89cfaf4ce 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
@@ -14,7 +14,6 @@ package org.apache.juneau.http.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import java.lang.annotation.*;
import java.lang.reflect.*;
@@ -55,7 +54,7 @@ class AnnotationUtils_Test extends SimpleTestBase {
}
@Test void a01_Body() {
-
assertObject(body().build().annotationType()).asJson().isContains("Content");
+ assertJsonContains(body().build().annotationType(), "Content");
assertTrue(ContentAnnotation.empty(A1.class.getAnnotation(Content.class)));
assertTrue(ContentAnnotation.empty(A2.class.getAnnotation(Content.class)));
@@ -66,7 +65,7 @@ class AnnotationUtils_Test extends SimpleTestBase {
@Test void a02_Contact() {
X1 x1 = A1.class.getAnnotation(X1.class);
-
assertObject(contact().build().annotationType()).asJson().isContains("Contact");
+ assertJsonContains(contact().build().annotationType(),
"Contact");
assertTrue(ContactAnnotation.empty(x1.contact()));
assertTrue(ContactAnnotation.empty(contact().build()));
@@ -81,7 +80,7 @@ class AnnotationUtils_Test extends SimpleTestBase {
Field f1 = A1.class.getField("f1");
Field f2 = A2.class.getField("f1");
-
assertObject(formData().build().annotationType()).asJson().isContains("FormData");
+ assertJsonContains(formData().build().annotationType(),
"FormData");
assertTrue(FormDataAnnotation.empty(f1.getAnnotation(FormData.class)));
assertTrue(FormDataAnnotation.empty(f2.getAnnotation(FormData.class)));
@@ -95,7 +94,7 @@ class AnnotationUtils_Test extends SimpleTestBase {
}
@Test void a04_HasFormData() {
-
assertObject(hasFormData().build().annotationType()).asJson().isContains("HasFormData");
+ assertJsonContains(hasFormData().build().annotationType(),
"HasFormData");
assertEquals("foo", hasFormData().name("foo").build().name());
assertEquals("foo", hasFormData().value("foo").build().value());
@@ -105,7 +104,7 @@ class AnnotationUtils_Test extends SimpleTestBase {
Field f1 = A1.class.getField("f1");
Field f2 = A2.class.getField("f1");
-
assertObject(query().build().annotationType()).asJson().isContains("Query");
+ assertJsonContains(query().build().annotationType(), "Query");
assertTrue(QueryAnnotation.empty(f1.getAnnotation(Query.class)));
assertTrue(QueryAnnotation.empty(f2.getAnnotation(Query.class)));
@@ -119,7 +118,7 @@ class AnnotationUtils_Test extends SimpleTestBase {
}
@Test void a06_HasQuery() {
-
assertObject(hasQuery().build().annotationType()).asJson().isContains("HasQuery");
+ assertJsonContains(hasQuery().build().annotationType(),
"HasQuery");
assertEquals("foo", hasQuery().name("foo").build().name());
assertEquals("foo", hasQuery().value("foo").build().value());
@@ -129,7 +128,7 @@ class AnnotationUtils_Test extends SimpleTestBase {
Field f1 = A1.class.getField("f1");
Field f2 = A2.class.getField("f1");
-
assertObject(header().build().annotationType()).asJson().isContains("Header");
+ assertJsonContains(header().build().annotationType(), "Header");
assertTrue(HeaderAnnotation.empty(f1.getAnnotation(Header.class)));
assertTrue(HeaderAnnotation.empty(f2.getAnnotation(Header.class)));
@@ -145,7 +144,7 @@ class AnnotationUtils_Test extends SimpleTestBase {
@Test void a08_License() {
X1 x = A1.class.getAnnotation(X1.class);
-
assertObject(license().build().annotationType()).asJson().isContains("License");
+ assertJsonContains(license().build().annotationType(),
"License");
assertTrue(LicenseAnnotation.empty(x.license()));
assertTrue(LicenseAnnotation.empty((License)null));
@@ -159,7 +158,7 @@ class AnnotationUtils_Test extends SimpleTestBase {
Field f1 = A1.class.getField("f1");
Field f2 = A2.class.getField("f1");
-
assertObject(path().build().annotationType()).asJson().isContains("Path");
+ assertJsonContains(path().build().annotationType(), "Path");
assertTrue(PathAnnotation.empty(f1.getAnnotation(Path.class)));
assertTrue(PathAnnotation.empty(f2.getAnnotation(Path.class)));
@@ -173,14 +172,14 @@ class AnnotationUtils_Test extends SimpleTestBase {
}
@Test void a10_Request() {
-
assertObject(request().build().annotationType()).asJson().isContains("Request");
+ assertJsonContains(request().build().annotationType(),
"Request");
assertString("org.apache.juneau.oapi.OpenApiParser",
request().parser(OpenApiParser.class).build().parser().getName());
assertString("org.apache.juneau.oapi.OpenApiSerializer",
request().serializer(OpenApiSerializer.class).build().serializer().getName());
}
@Test void a11_Response() {
-
assertObject(response().build().annotationType()).asJson().isContains("Response");
+ assertJsonContains(response().build().annotationType(),
"Response");
assertTrue(ResponseAnnotation.empty(A1.class.getAnnotation(Response.class)));
assertTrue(ResponseAnnotation.empty(A2.class.getAnnotation(Response.class)));
@@ -195,11 +194,11 @@ class AnnotationUtils_Test extends SimpleTestBase {
}
@Test void a14_ResponseStatus() {
-
assertObject(responseCode().build().annotationType()).asJson().isContains("StatusCode");
+ assertJsonContains(responseCode().build().annotationType(),
"StatusCode");
}
@Test void a15_Tag() {
-
assertObject(tag().build().annotationType()).asJson().isContains("Tag");
+ assertJsonContains(tag().build().annotationType(), "Tag");
assertArray(tag().description(a("foo")).build().description(),
"foo");
assertEquals("foo",
tag().externalDocs(externalDocs().url("foo").build()).build().externalDocs().url());
assertEquals("foo", tag().name("foo").build().name()); }
@@ -207,7 +206,7 @@ class AnnotationUtils_Test extends SimpleTestBase {
@Test void a16_ExternalDocs() {
X1 x = A1.class.getAnnotation(X1.class);
-
assertObject(externalDocs().build().annotationType()).asJson().isContains("ExternalDocs");
+ assertJsonContains(externalDocs().build().annotationType(),
"ExternalDocs");
assertTrue(ExternalDocsAnnotation.empty(x.externalDocs()));
assertTrue(ExternalDocsAnnotation.empty((ExternalDocs)null));
@@ -219,7 +218,7 @@ class AnnotationUtils_Test extends SimpleTestBase {
@Test void a17_Schema() {
X1 x = A1.class.getAnnotation(X1.class);
-
assertObject(schema().build().annotationType()).asJson().isContains("Schema");
+ assertJsonContains(schema().build().annotationType(), "Schema");
assertTrue(SchemaAnnotation.empty(x.schema()));
assertTrue(SchemaAnnotation.empty((Schema)null));
@@ -281,7 +280,7 @@ class AnnotationUtils_Test extends SimpleTestBase {
@Test void a18_SubItems() {
X1 x = A1.class.getAnnotation(X1.class);
-
assertObject(subItems().build().annotationType()).asJson().isContains("SubItems");
+ assertJsonContains(subItems().build().annotationType(),
"SubItems");
assertTrue(SubItemsAnnotation.empty(x.subItems()));
assertTrue(SubItemsAnnotation.empty((SubItems)null));
@@ -325,7 +324,7 @@ class AnnotationUtils_Test extends SimpleTestBase {
@Test void a19_Items() {
X1 x = A1.class.getAnnotation(X1.class);
-
assertObject(items().build().annotationType()).asJson().isContains("Items");
+ assertJsonContains(items().build().annotationType(), "Items");
assertTrue(ItemsAnnotation.empty(x.items()));
assertTrue(ItemsAnnotation.empty((Items)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 05469e89c..5d25136e6 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
@@ -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.*;
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 73519270f..16fc7907a 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
@@ -84,9 +84,9 @@ class ContentAnnotation_Test extends SimpleTestBase {
Content c2 = ContentAnnotation.create("a").on("b").build();
Content c4 =
ContentAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 bea3073b5..1d0262de1 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
@@ -101,10 +101,10 @@ class FormDataAnnotation_Test extends SimpleTestBase {
FormData c3 =
FormDataAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
FormData c4 =
FormDataAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 243faf21a..bbbf030ce 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
@@ -101,10 +101,10 @@ class HeaderAnnotation_Test extends SimpleTestBase {
Header c3 =
HeaderAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
Header c4 =
HeaderAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 f798f582f..dd173f571 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
@@ -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.*;
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 7221a87e2..5d41dfb1e 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
@@ -101,10 +101,10 @@ class PathAnnotation_Test extends SimpleTestBase {
Path c3 =
PathAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
Path c4 =
PathAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 d591694c9..2d420ba81 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
@@ -101,10 +101,10 @@ class QueryAnnotation_Test extends SimpleTestBase {
Query c3 =
QueryAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
Query c4 =
QueryAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 d89fc4654..62dc282ef 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
@@ -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.apache.juneau.oapi.*;
@@ -89,8 +88,8 @@ class RequestAnnotation_Test extends SimpleTestBase {
Request c1 =
RequestAnnotation.create(C1.class).on(C2.class).build();
Request c2 = RequestAnnotation.create("a").on("b").build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
}
//------------------------------------------------------------------------------------------------------------------
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 bc39dd438..2caf5747e 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
@@ -100,9 +100,9 @@ class ResponseAnnotation_Test extends SimpleTestBase {
Response c2 = ResponseAnnotation.create("a").on("b").build();
Response c4 =
ResponseAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 1269755bc..e955c5095 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
@@ -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.*;
@@ -86,9 +85,9 @@ class ResponseStatusAnnotation_Test extends SimpleTestBase {
StatusCode c2 =
StatusCodeAnnotation.create("a").on("b").build();
StatusCode c4 =
StatusCodeAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 3a184bca8..238b12374 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
@@ -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.apache.juneau.annotation.*;
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 daddd599e..0bbd53629 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.json.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -83,10 +82,10 @@ public class JsonAnnotation_Test extends SimpleTestBase {
Json c3 =
JsonAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
Json c4 =
JsonAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
index f912a0eb4..f0a8d5e15 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.jsonschema;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.jsonschema.TypeCategory.*;
import java.util.*;
@@ -1307,7 +1306,7 @@ public class JsonSchemaGeneratorTest extends
SimpleTestBase {
@Test void schemaOnClass_onConfig() throws Exception {
AnnotationWorkList al =
AnnotationWorkList.of(bConfig.getAnnotationList());
JsonSchemaGeneratorSession x =
JsonSchemaGenerator.create().apply(al).build().getSession();
- assertObject(x.getSchema(new
B())).asJson().isContains("'$ref':'ref'");
+ assertJsonContains(x.getSchema(new B()), "'$ref':'ref'");
}
}
\ No newline at end of file
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 11d90313e..cdd4b4520 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.jsonschema.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
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 62e151536..fea23c2f8 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.jsonschema.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
@@ -241,10 +240,10 @@ public class SchemaAnnotation_Test extends SimpleTestBase
{
Schema c3 =
SchemaAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
Schema c4 =
SchemaAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 c3ea2b055..9612b0d14 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.jsonschema.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
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 c0e935466..59c1cb64f 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.msgpack.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -82,10 +81,10 @@ public class MsgPackAnnotation_Test extends SimpleTestBase {
MsgPack c3 =
MsgPackAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
MsgPack c4 =
MsgPackAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
index c78365a31..5002efd09 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.mstat;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
@@ -278,7 +277,7 @@ class ThrownStore_Test extends SimpleTestBase {
assertNotEquals(0L, stats.getFirstOccurrence());
assertNotEquals(0L, stats.getLastOccurrence());
assertEquals("bar", stats.getFirstMessage());
-
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
+ assertJsonContains(stats.getStackTrace(), "org.apache.juneau");
assertContains("bar", stats);
stats = stats.clone();
@@ -287,7 +286,7 @@ class ThrownStore_Test extends SimpleTestBase {
assertNotEquals(0L, stats.getFirstOccurrence());
assertNotEquals(0L, stats.getLastOccurrence());
assertEquals("bar", stats.getFirstMessage());
-
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
+ assertJsonContains(stats.getStackTrace(), "org.apache.juneau");
assertContains("bar", stats);
stats = stats.getCausedBy().get();
@@ -296,7 +295,7 @@ class ThrownStore_Test extends SimpleTestBase {
assertNotEquals(0L, stats.getFirstOccurrence());
assertNotEquals(0L, stats.getLastOccurrence());
assertEquals("foo", stats.getFirstMessage());
-
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
+ assertJsonContains(stats.getStackTrace(), "org.apache.juneau");
assertContains("foo", stats);
}
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 c027c4cf5..e5153c8b1 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.oapi.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -80,10 +79,10 @@ public class OpenApiAnnotation_Test extends SimpleTestBase {
OpenApi c3 =
OpenApiAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
OpenApi c4 =
OpenApiAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 ca0d66bd7..d0a07706e 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,8 +14,6 @@ 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.*;
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 2d28ef2c5..257f807c8 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.plaintext.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -80,10 +79,10 @@ class PlainTextAnnotation_Test extends SimpleTestBase {
PlainText c3 =
PlainTextAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
PlainText c4 =
PlainTextAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 2608a1ccc..e59c67be1 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
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 5f2d5bc0f..70136977a 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.cp.*;
@@ -232,8 +231,8 @@ public class RestAnnotation_Test extends SimpleTestBase {
Rest c1 = RestAnnotation.create(C1.class).on(C2.class).build();
Rest c2 = RestAnnotation.create("a").on("b").build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
}
//------------------------------------------------------------------------------------------------------------------
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 c21658d9f..3dde2dd1c 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.encoders.*;
@@ -130,7 +129,7 @@ class RestDeleteAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
RestDelete c4 =
RestDeleteAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 b1155046f..b21b4add2 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -76,7 +75,7 @@ public class RestDestroyAnnotation_Test extends
SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
RestDestroy c4 =
RestDestroyAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 9da993c99..74bd159f3 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -76,7 +75,7 @@ public class RestEndCallAnnotation_Test extends
SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
RestEndCall c4 =
RestEndCallAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 a967f1d4b..3199be062 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.encoders.*;
@@ -141,7 +140,7 @@ public class RestGetAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
RestGet c4 =
RestGetAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 9a2089ef0..bd02f998c 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.*;
@@ -77,7 +76,7 @@ class RestInitAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
RestInit c4 =
RestInitAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 87291ec02..cc8f04245 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.encoders.*;
@@ -160,7 +159,7 @@ public class RestOpAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
RestOp c4 =
RestOpAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 ec08a0042..f23baed46 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.encoders.*;
@@ -157,7 +156,7 @@ public class RestPostAnnotation_Test extends SimpleTestBase
{
@Test void c01_otherMethods() throws Exception {
RestPost c4 =
RestPostAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 c6a7d9d31..218f45ea7 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -76,7 +75,7 @@ public class RestPostCallAnnotation_Test extends
SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
RestPostCall c4 =
RestPostCallAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 b86af93b0..d6cdb9d69 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -79,7 +78,7 @@ public class RestPostInitAnnotation_Test extends
SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
RestPostInit c4 =
RestPostInitAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 c7c93b433..4d9773be7 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -76,7 +75,7 @@ class RestPreCallAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
RestPreCall c4 =
RestPreCallAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 053d19543..33819579b 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.encoders.*;
@@ -157,7 +156,7 @@ class RestPutAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
RestPut c4 =
RestPutAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 c3fc7f7d4..f2590384a 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -76,7 +75,7 @@ public class RestStartCallAnnotation_Test extends
SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
RestStartCall c4 =
RestStartCallAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 902c48730..dca60e54d 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
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 e8aa001b2..19f169963 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.soap.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -80,10 +79,10 @@ public class SoapXmlAnnotation_Test extends SimpleTestBase {
SoapXml c3 =
SoapXmlAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
SoapXml c4 =
SoapXmlAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 822c7e973..7927c6557 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.uon.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -80,10 +79,10 @@ public class UonAnnotation_Test extends SimpleTestBase {
Uon c3 =
UonAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
Uon c4 =
UonAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 d5fe078ba..bf1969167 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.urlencoding.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -83,10 +82,10 @@ class UrlEncodingAnnotation_Test extends SimpleTestBase {
UrlEncoding c3 =
UrlEncodingAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
UrlEncoding c4 =
UrlEncodingAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
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 06d73559f..423c9a9a1 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.xml.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -92,10 +91,10 @@ class XmlAnnotation_Test extends SimpleTestBase {
Xml c3 =
XmlAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
Xml c4 =
XmlAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
-
assertObject(c1).asJson().isContains("on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertObject(c2).asJson().isContains("on:['a','b']");
-
assertObject(c3).asJson().isContains("on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
-
assertObject(c4).asJson().isContains("on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
+ assertJsonContains(c2, "on:['a','b']");
+ assertJsonContains(c3,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
+ assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
}
//------------------------------------------------------------------------------------------------------------------
