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 a0c29ac24 Test modernization
a0c29ac24 is described below
commit a0c29ac2466aee22415f036c918fac38a46d7b53
Author: James Bognar <[email protected]>
AuthorDate: Sat Aug 30 13:00:00 2025 -0400
Test modernization
---
.../org/apache/juneau/CloseableStringReader.java | 6 +++---
.../juneau/annotation/BeanAnnotation_Test.java | 15 +++++++-------
.../annotation/BeanIgnoreAnnotation_Test.java | 23 +++++++++++-----------
.../juneau/annotation/BeancAnnotation_Test.java | 14 ++++++-------
.../juneau/annotation/BeanpAnnotation_Test.java | 16 +++++++--------
.../juneau/annotation/ExampleAnnotation_Test.java | 21 ++++++++++----------
.../annotation/MarshalledAnnotation_Test.java | 14 ++++++-------
.../annotation/NamePropertyAnnotation_Test.java | 16 +++++++--------
.../annotation/ParentPropertyAnnotation_Test.java | 16 +++++++--------
.../juneau/annotation/SwapAnnotation_Test.java | 18 ++++++++---------
.../juneau/annotation/UriAnnotation_Test.java | 18 ++++++++---------
.../apache/juneau/common/internal/IOUtilsTest.java | 10 +++++-----
.../juneau/csv/annotation/CsvAnnotation_Test.java | 18 ++++++++---------
.../html/annotation/HtmlAnnotation_Test.java | 18 ++++++++---------
.../html/annotation/HtmlLinkAnnotation_Test.java | 14 ++++++-------
.../http/annotation/ContactAnnotation_Test.java | 10 +++++-----
.../http/annotation/ContentAnnotation_Test.java | 6 +++---
.../http/annotation/FormDataAnnotation_Test.java | 8 ++++----
.../annotation/HasFormDataAnnotation_Test.java | 6 +++---
.../http/annotation/HasQueryAnnotation_Test.java | 6 +++---
.../http/annotation/HeaderAnnotation_Test.java | 8 ++++----
.../http/annotation/LicenseAnnotation_Test.java | 8 ++++----
.../http/annotation/PathAnnotation_Test.java | 8 ++++----
.../http/annotation/QueryAnnotation_Test.java | 8 ++++----
.../http/annotation/RequestAnnotation_Test.java | 14 ++++++-------
.../http/annotation/ResponseAnnotation_Test.java | 6 +++---
.../annotation/ResponseStatusAnnotation_Test.java | 16 +++++++--------
.../json/annotation/JsonAnnotation_Test.java | 8 ++++----
.../jsonschema/JsonSchemaConfigAnnotationTest.java | 18 ++++++++---------
.../annotation/ItemsAnnotation_Test.java | 10 +++++-----
.../annotation/SchemaAnnotation_Test.java | 8 ++++----
.../msgpack/annotation/MsgPackAnnotation_Test.java | 12 +++++------
.../oapi/annotation/OpenApiAnnotation_Test.java | 8 ++++----
.../juneau/parser/ParserConfigAnnotationTest.java | 12 +++++------
.../annotation/PlainTextAnnotation_Test.java | 18 ++++++++---------
.../rest/annotation/RestAnnotation_Test.java | 4 ++--
.../rest/annotation/RestDeleteAnnotation_Test.java | 2 +-
.../annotation/RestDestroyAnnotation_Test.java | 2 +-
.../annotation/RestEndCallAnnotation_Test.java | 2 +-
.../rest/annotation/RestGetAnnotation_Test.java | 2 +-
.../rest/annotation/RestInitAnnotation_Test.java | 2 +-
.../rest/annotation/RestOpAnnotation_Test.java | 2 +-
.../rest/annotation/RestPostAnnotation_Test.java | 2 +-
.../annotation/RestPostCallAnnotation_Test.java | 2 +-
.../annotation/RestPostInitAnnotation_Test.java | 2 +-
.../annotation/RestPreCallAnnotation_Test.java | 12 +++++------
.../rest/annotation/RestPutAnnotation_Test.java | 2 +-
.../annotation/RestStartCallAnnotation_Test.java | 2 +-
.../soap/annotation/SoapXmlAnnotation_Test.java | 8 ++++----
.../juneau/uon/annotation/UonAnnotation_Test.java | 8 ++++----
.../annotation/UrlEncodingAnnotation_Test.java | 18 ++++++++---------
.../juneau/xml/annotation/XmlAnnotation_Test.java | 18 ++++++++---------
52 files changed, 261 insertions(+), 264 deletions(-)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/CloseableStringReader.java
b/juneau-utest/src/test/java/org/apache/juneau/CloseableStringReader.java
index 67d536413..4b6830459 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/CloseableStringReader.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/CloseableStringReader.java
@@ -25,11 +25,11 @@ public class CloseableStringReader extends StringReader {
}
private void checkOpen() {
- if (isClosed)
+ if (isClosed)
throw new IllegalStateException("Reader is closed");
- }
+ }
- @Override
+ @Override
public void close() {
isClosed = true;
}
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 d81dc3473..92fdd92cb 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
@@ -56,7 +56,7 @@ class BeanAnnotation_Test extends SimpleTestBase {
.build();
Bean a2 = BeanAnnotation.create()
- .description("description")
+ .description("description")
.dictionary(X1.class)
.example("example")
.excludeProperties("excludeProperties")
@@ -83,7 +83,7 @@ class BeanAnnotation_Test extends SimpleTestBase {
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "dictionary:['"+CNAME+"$X1'],"
+ "example:'example',"
+ "excludeProperties:'excludeProperties',"
@@ -137,8 +137,8 @@ class BeanAnnotation_Test extends SimpleTestBase {
var c1 = BeanAnnotation.create(C1.class).on(C2.class).build();
var c2 = BeanAnnotation.create("a").on("b").build();
- assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertJsonContains(c2, "on:['a','b']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -146,7 +146,7 @@ class BeanAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@Bean(
- description={ "description" },
+ description={ "description" },
dictionary=X1.class,
example="example",
excludeProperties="excludeProperties",
@@ -173,7 +173,7 @@ class BeanAnnotation_Test extends SimpleTestBase {
Bean d1 = D1.class.getAnnotationsByType(Bean.class)[0];
@Bean(
- description={ "description" },
+ description={ "description" },
dictionary=X1.class,
example="example",
excludeProperties="excludeProperties",
@@ -204,5 +204,4 @@ class BeanAnnotation_Test extends SimpleTestBase {
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
-}
-
+}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanIgnoreAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanIgnoreAnnotation_Test.java
index af04e7da3..7223c5b07 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
@@ -29,13 +29,13 @@ class BeanIgnoreAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
BeanIgnore a1 = BeanIgnoreAnnotation.create()
- .description("description")
+ .description("description")
.on("a")
.onClass(X1.class)
.build();
BeanIgnore a2 = BeanIgnoreAnnotation.create()
- .description("description")
+ .description("description")
.on("a")
.onClass(X1.class)
.build();
@@ -43,7 +43,7 @@ class BeanIgnoreAnnotation_Test extends SimpleTestBase {
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "on:['a'],"
+ "onClass:['"+CNAME+"$X1']"
+ "}"
@@ -87,11 +87,11 @@ class BeanIgnoreAnnotation_Test extends SimpleTestBase {
var c4 =
BeanIgnoreAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
var c5 =
BeanIgnoreAnnotation.create().on(C1.class.getConstructor()).on(C2.class.getConstructor()).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
+ assertBean(c5, "on", "["+CNAME+"$C1(),"+CNAME+"$C2()]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -99,7 +99,7 @@ class BeanIgnoreAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@BeanIgnore(
- description={ "description" },
+ description={ "description" },
on="a",
onClass=X1.class
)
@@ -107,7 +107,7 @@ class BeanIgnoreAnnotation_Test extends SimpleTestBase {
BeanIgnore d1 = D1.class.getAnnotationsByType(BeanIgnore.class)[0];
@BeanIgnore(
- description={ "description" },
+ description={ "description" },
on="a",
onClass=X1.class
)
@@ -119,5 +119,4 @@ class BeanIgnoreAnnotation_Test extends SimpleTestBase {
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
-}
-
+}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeancAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/annotation/BeancAnnotation_Test.java
index 22052d169..50ed03f39 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
@@ -27,13 +27,13 @@ class BeancAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
Beanc a1 = BeancAnnotation.create()
- .description("description")
+ .description("description")
.on("on")
.properties("properties")
.build();
Beanc a2 = BeancAnnotation.create()
- .description("description")
+ .description("description")
.on("on")
.properties("properties")
.build();
@@ -41,7 +41,7 @@ class BeancAnnotation_Test extends SimpleTestBase {
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "on:['on'],"
+ "properties:'properties'"
+ "}"
@@ -75,8 +75,8 @@ class BeancAnnotation_Test extends SimpleTestBase {
var c1 = BeancAnnotation.create("a").on("b").build();
var c2 =
BeancAnnotation.create().on(C1.class.getConstructor()).on(C2.class.getConstructor()).build();
- assertJsonContains(c1, "on:['a','b']");
- assertJsonContains(c2,
"on:['"+CNAME+"$C1()','"+CNAME+"$C2()']");
+ assertBean(c1, "on", "[a,b]");
+ assertBean(c2, "on", "["+CNAME+"$C1(),"+CNAME+"$C2()]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -84,7 +84,7 @@ class BeancAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@Beanc(
- description={ "description" },
+ description={ "description" },
on="on",
properties="properties"
)
@@ -92,7 +92,7 @@ class BeancAnnotation_Test extends SimpleTestBase {
Beanc d1 = D1.class.getAnnotationsByType(Beanc.class)[0];
@Beanc(
- description={ "description" },
+ description={ "description" },
on="on",
properties="properties"
)
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 b2ed87507..f1a88524b 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
@@ -29,7 +29,7 @@ class BeanpAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
Beanp a1 = BeanpAnnotation.create()
- .description("description")
+ .description("description")
.dictionary(X1.class)
.format("format")
.name("name")
@@ -43,7 +43,7 @@ class BeanpAnnotation_Test extends SimpleTestBase {
.build();
Beanp a2 = BeanpAnnotation.create()
- .description("description")
+ .description("description")
.dictionary(X1.class)
.format("format")
.name("name")
@@ -59,7 +59,7 @@ class BeanpAnnotation_Test extends SimpleTestBase {
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "dictionary:['"+CNAME+"$X1'],"
+ "format:'format',"
+ "name:'name',"
@@ -108,9 +108,9 @@ class BeanpAnnotation_Test extends SimpleTestBase {
var c2 =
BeanpAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c3 =
BeanpAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c1, "on:['a','b']");
- assertJsonContains(c2,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
- assertJsonContains(c3,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(c1, "on", "[a,b]");
+ assertBean(c2, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c3, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -118,7 +118,7 @@ class BeanpAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@Beanp(
- description={ "description" },
+ description={ "description" },
dictionary=X1.class,
format="format",
name="name",
@@ -134,7 +134,7 @@ class BeanpAnnotation_Test extends SimpleTestBase {
Beanp d1 = D1.class.getAnnotationsByType(Beanp.class)[0];
@Beanp(
- description={ "description" },
+ description={ "description" },
dictionary=X1.class,
format="format",
name="name",
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 8c7e6f889..8fdd2ac1b 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
@@ -29,14 +29,14 @@ class ExampleAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
Example a1 = ExampleAnnotation.create()
- .description("description")
+ .description("description")
.on("on")
.onClass(X1.class)
.value("value")
.build();
Example a2 = ExampleAnnotation.create()
- .description("description")
+ .description("description")
.on("on")
.onClass(X1.class)
.value("value")
@@ -45,7 +45,7 @@ class ExampleAnnotation_Test extends SimpleTestBase {
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "on:['on'],"
+ "onClass:['"+CNAME+"$X1'],"
+ "value:'value'"
@@ -88,10 +88,10 @@ class ExampleAnnotation_Test extends SimpleTestBase {
var c3 =
ExampleAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
ExampleAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -99,7 +99,7 @@ class ExampleAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@Example(
- description={ "description" },
+ description={ "description" },
on="on",
onClass=X1.class,
value="value"
@@ -108,7 +108,7 @@ class ExampleAnnotation_Test extends SimpleTestBase {
Example d1 = D1.class.getAnnotationsByType(Example.class)[0];
@Example(
- description={ "description" },
+ description={ "description" },
on="on",
onClass=X1.class,
value="value"
@@ -121,5 +121,4 @@ class ExampleAnnotation_Test extends SimpleTestBase {
assertNotEqualsAny(a1.hashCode(), 0, -1);
assertEqualsAll(a1.hashCode(), d1.hashCode(), d2.hashCode());
}
-}
-
+}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/annotation/MarshalledAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/annotation/MarshalledAnnotation_Test.java
index d9d1f430b..ef6f00c5b 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
@@ -29,7 +29,7 @@ class MarshalledAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
Marshalled a1 = MarshalledAnnotation.create()
- .description("description")
+ .description("description")
.example("example")
.implClass(X1.class)
.on("on")
@@ -37,7 +37,7 @@ class MarshalledAnnotation_Test extends SimpleTestBase {
.build();
Marshalled a2 = MarshalledAnnotation.create()
- .description("description")
+ .description("description")
.example("example")
.implClass(X1.class)
.on("on")
@@ -47,7 +47,7 @@ class MarshalledAnnotation_Test extends SimpleTestBase {
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "example:'example',"
+ "implClass:'"+CNAME+"$X1',"
+ "on:['on'],"
@@ -89,8 +89,8 @@ class MarshalledAnnotation_Test extends SimpleTestBase {
var c1 =
MarshalledAnnotation.create(C1.class).on(C2.class).build();
var c2 = MarshalledAnnotation.create("a").on("b").build();
- assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertJsonContains(c2, "on:['a','b']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -98,7 +98,7 @@ class MarshalledAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@Marshalled(
- description={ "description" },
+ description={ "description" },
example="example",
implClass=X1.class,
on="on",
@@ -108,7 +108,7 @@ class MarshalledAnnotation_Test extends SimpleTestBase {
Marshalled d1 = D1.class.getAnnotationsByType(Marshalled.class)[0];
@Marshalled(
- description={ "description" },
+ description={ "description" },
example="example",
implClass=X1.class,
on="on",
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 9c5db6a26..7a015808b 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
@@ -27,19 +27,19 @@ class NamePropertyAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
NameProperty a1 = NamePropertyAnnotation.create()
- .description("description")
+ .description("description")
.on("on")
.build();
NameProperty a2 = NamePropertyAnnotation.create()
- .description("description")
+ .description("description")
.on("on")
.build();
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "on:['on']"
+ "}"
);
@@ -79,9 +79,9 @@ class NamePropertyAnnotation_Test extends SimpleTestBase {
var c2 =
NamePropertyAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c3 =
NamePropertyAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c1, "on:['a','b']");
- assertJsonContains(c2,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
- assertJsonContains(c3,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(c1, "on", "[a,b]");
+ assertBean(c2, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c3, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -89,14 +89,14 @@ class NamePropertyAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@NameProperty(
- description={ "description" },
+ description={ "description" },
on="on"
)
public static class D1 {}
NameProperty d1 = D1.class.getAnnotationsByType(NameProperty.class)[0];
@NameProperty(
- description={ "description" },
+ description={ "description" },
on="on"
)
public static class D2 {}
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 c0cc55b52..b5abdc424 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
@@ -27,19 +27,19 @@ class ParentPropertyAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
ParentProperty a1 = ParentPropertyAnnotation.create()
- .description("description")
+ .description("description")
.on("on")
.build();
ParentProperty a2 = ParentPropertyAnnotation.create()
- .description("description")
+ .description("description")
.on("on")
.build();
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "on:['on']"
+ "}"
);
@@ -79,9 +79,9 @@ class ParentPropertyAnnotation_Test extends SimpleTestBase {
var c2 =
ParentPropertyAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c3 =
ParentPropertyAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c1, "on:['a','b']");
- assertJsonContains(c2,
"on:['"+CNAME+"$C1.f1','"+CNAME+"$C2.f2']");
- assertJsonContains(c3,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(c1, "on", "[a,b]");
+ assertBean(c2, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c3, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -89,14 +89,14 @@ class ParentPropertyAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@ParentProperty(
- description={ "description" },
+ description={ "description" },
on="on"
)
public static class D1 {}
ParentProperty d1 =
D1.class.getAnnotationsByType(ParentProperty.class)[0];
@ParentProperty(
- description={ "description" },
+ description={ "description" },
on="on"
)
public static class D2 {}
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 3b6ab6ca3..5a6ab813b 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
@@ -29,7 +29,7 @@ class SwapAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
Swap a1 = SwapAnnotation.create()
- .description("description")
+ .description("description")
.impl(X1.class)
.mediaTypes("mediaTypes")
.on("on")
@@ -39,7 +39,7 @@ class SwapAnnotation_Test extends SimpleTestBase {
.build();
Swap a2 = SwapAnnotation.create()
- .description("description")
+ .description("description")
.impl(X1.class)
.mediaTypes("mediaTypes")
.on("on")
@@ -51,7 +51,7 @@ class SwapAnnotation_Test extends SimpleTestBase {
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "impl:'"+CNAME+"$X1',"
+ "mediaTypes:['mediaTypes'],"
+ "on:['on'],"
@@ -96,10 +96,10 @@ class SwapAnnotation_Test extends SimpleTestBase {
var c3 =
SwapAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
SwapAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -107,7 +107,7 @@ class SwapAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@Swap(
- description={ "description" },
+ description={ "description" },
impl=X1.class,
mediaTypes="mediaTypes",
on="on",
@@ -119,7 +119,7 @@ class SwapAnnotation_Test extends SimpleTestBase {
Swap d1 = D1.class.getAnnotationsByType(Swap.class)[0];
@Swap(
- description={ "description" },
+ description={ "description" },
impl=X1.class,
mediaTypes="mediaTypes",
on="on",
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 f23a6fb6f..d97579c3a 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
@@ -27,19 +27,19 @@ class UriAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
Uri a1 = UriAnnotation.create()
- .description("description")
+ .description("description")
.on("a")
.build();
Uri a2 = UriAnnotation.create()
- .description("description")
+ .description("description")
.on("a")
.build();
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "on:['a'],"
+ "onClass:[]"
+ "}"
@@ -81,10 +81,10 @@ class UriAnnotation_Test extends SimpleTestBase {
var c3 =
UriAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
UriAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -92,14 +92,14 @@ class UriAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@Uri(
- description={ "description" },
+ description={ "description" },
on="a"
)
public static class D1 {}
Uri d1 = D1.class.getAnnotationsByType(Uri.class)[0];
@Uri(
- description={ "description" },
+ description={ "description" },
on="a"
)
public static class D2 {}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/common/internal/IOUtilsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/common/internal/IOUtilsTest.java
index 0e1882418..89489e003 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/common/internal/IOUtilsTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/common/internal/IOUtilsTest.java
@@ -27,9 +27,9 @@ import org.junit.jupiter.api.*;
*/
class IOUtilsTest extends SimpleTestBase {
- @Test void a01_readPath() throws IOException {
- var p = new Properties();
- p.load(new
StringReader(IOUtils.read(Paths.get("src/test/resources/files/Test3.properties"))));
- assertEquals("files/Test3.properties", p.get("file"));
- }
+ @Test void a01_readPath() throws IOException {
+ var p = new Properties();
+ p.load(new
StringReader(IOUtils.read(Paths.get("src/test/resources/files/Test3.properties"))));
+ assertEquals("files/Test3.properties", p.get("file"));
+ }
}
\ No newline at end of file
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 2331e306e..84b1f354c 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
@@ -27,19 +27,19 @@ class CsvAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
Csv a1 = CsvAnnotation.create()
- .description("description")
+ .description("description")
.on("a")
.build();
Csv a2 = CsvAnnotation.create()
- .description("description")
+ .description("description")
.on("a")
.build();
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "on:['a'],"
+ "onClass:[]"
+ "}"
@@ -81,10 +81,10 @@ class CsvAnnotation_Test extends SimpleTestBase {
var c3 =
CsvAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
CsvAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -92,14 +92,14 @@ class CsvAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@Csv(
- description={ "description" },
+ description={ "description" },
on="a"
)
public static class D1 {}
Csv d1 = D1.class.getAnnotationsByType(Csv.class)[0];
@Csv(
- description={ "description" },
+ description={ "description" },
on="a"
)
public static class D2 {}
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 45a962e30..56ade4af6 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
@@ -31,7 +31,7 @@ class HtmlAnnotation_Test extends SimpleTestBase {
Html a1 = HtmlAnnotation.create()
.anchorText("a")
- .description("description")
+ .description("description")
.format(HtmlFormat.XML)
.link("c")
.noTableHeaders(true)
@@ -42,7 +42,7 @@ class HtmlAnnotation_Test extends SimpleTestBase {
Html a2 = HtmlAnnotation.create()
.anchorText("a")
- .description("description")
+ .description("description")
.format(HtmlFormat.XML)
.link("c")
.noTableHeaders(true)
@@ -55,7 +55,7 @@ class HtmlAnnotation_Test extends SimpleTestBase {
assertJson(a1, ""
+ "{"
+ "anchorText:'a',"
- + "description:['description'],"
+ + "description:['description'],"
+ "format:'XML',"
+ "link:'c',"
+ "noTableHeaders:true,"
@@ -102,10 +102,10 @@ class HtmlAnnotation_Test extends SimpleTestBase {
var c3 =
HtmlAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
HtmlAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -114,7 +114,7 @@ class HtmlAnnotation_Test extends SimpleTestBase {
@Html(
anchorText="a",
- description={ "description" },
+ description={ "description" },
format=HtmlFormat.XML,
link="c",
noTableHeaders=true,
@@ -127,7 +127,7 @@ class HtmlAnnotation_Test extends SimpleTestBase {
@Html(
anchorText="a",
- description={ "description" },
+ description={ "description" },
format=HtmlFormat.XML,
link="c",
noTableHeaders=true,
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 1bc38d299..4930f4905 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
@@ -27,14 +27,14 @@ class HtmlLinkAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
HtmlLink a1 = HtmlLinkAnnotation.create()
- .description("description")
+ .description("description")
.nameProperty("a")
.on("b")
.uriProperty("c")
.build();
HtmlLink a2 = HtmlLinkAnnotation.create()
- .description("description")
+ .description("description")
.nameProperty("a")
.on("b")
.uriProperty("c")
@@ -43,7 +43,7 @@ class HtmlLinkAnnotation_Test extends SimpleTestBase {
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "nameProperty:'a',"
+ "on:['b'],"
+ "onClass:[],"
@@ -85,8 +85,8 @@ class HtmlLinkAnnotation_Test extends SimpleTestBase {
var c1 =
HtmlLinkAnnotation.create(C1.class).on(C2.class).build();
var c2 = HtmlLinkAnnotation.create("a").on("b").build();
- assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertJsonContains(c2, "on:['a','b']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -94,7 +94,7 @@ class HtmlLinkAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@HtmlLink(
- description={ "description" },
+ description={ "description" },
nameProperty="a",
on="b",
uriProperty="c"
@@ -103,7 +103,7 @@ class HtmlLinkAnnotation_Test extends SimpleTestBase {
HtmlLink d1 = D1.class.getAnnotationsByType(HtmlLink.class)[0];
@HtmlLink(
- description={ "description" },
+ description={ "description" },
nameProperty="a",
on="b",
uriProperty="c"
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 0d9351677..e4e1744c7 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
@@ -25,14 +25,14 @@ class ContactAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
Contact a1 = ContactAnnotation.create()
- .description("description")
+ .description("description")
.email("email")
.name("name")
.url("url")
.build();
Contact a2 = ContactAnnotation.create()
- .description("description")
+ .description("description")
.email("email")
.name("name")
.url("url")
@@ -41,7 +41,7 @@ class ContactAnnotation_Test extends SimpleTestBase {
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "email:'email',"
+ "name:'name',"
+ "url:'url'"
@@ -70,7 +70,7 @@ class ContactAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@Contact(
- description={ "description" },
+ description={ "description" },
email="email",
name="name",
url="url"
@@ -79,7 +79,7 @@ class ContactAnnotation_Test extends SimpleTestBase {
Contact d1 = D1.class.getAnnotationsByType(Contact.class)[0];
@Contact(
- description={ "description" },
+ description={ "description" },
email="email",
name="name",
url="url"
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 d3d6bc5de..68e3b5dfd 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
@@ -78,9 +78,9 @@ class ContentAnnotation_Test extends SimpleTestBase {
var c2 = ContentAnnotation.create("a").on("b").build();
var c4 =
ContentAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertJsonContains(c2, "on:['a','b']");
- assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(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 c5845cf71..00d63612b 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
@@ -102,10 +102,10 @@ class FormDataAnnotation_Test extends SimpleTestBase {
var c3 =
FormDataAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
FormDataAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
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 326beeb23..077d91084 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
@@ -25,13 +25,13 @@ class HasFormDataAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
HasFormData a1 = HasFormDataAnnotation.create()
- .description("description")
+ .description("description")
.name("name")
.value("value")
.build();
HasFormData a2 = HasFormDataAnnotation.create()
- .description("description")
+ .description("description")
.name("name")
.value("value")
.build();
@@ -39,7 +39,7 @@ class HasFormDataAnnotation_Test extends SimpleTestBase {
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "name:'name',"
+ "value:'value'"
+ "}"
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 f5890182f..3f5bb71c0 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
@@ -27,13 +27,13 @@ class HasQueryAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
HasQuery a1 = HasQueryAnnotation.create()
- .description("description")
+ .description("description")
.name("name")
.value("value")
.build();
HasQuery a2 = HasQueryAnnotation.create()
- .description("description")
+ .description("description")
.name("name")
.value("value")
.build();
@@ -41,7 +41,7 @@ class HasQueryAnnotation_Test extends SimpleTestBase {
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "name:'name',"
+ "value:'value'"
+ "}"
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 885ba6270..752a251ca 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
@@ -102,10 +102,10 @@ class HeaderAnnotation_Test extends SimpleTestBase {
var c3 =
HeaderAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
HeaderAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(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 4bb4f1fe5..5dc0ccf9d 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
@@ -25,13 +25,13 @@ class LicenseAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
License a1 = LicenseAnnotation.create()
- .description("description")
+ .description("description")
.name("name")
.url("url")
.build();
License a2 = LicenseAnnotation.create()
- .description("description")
+ .description("description")
.name("name")
.url("url")
.build();
@@ -39,7 +39,7 @@ class LicenseAnnotation_Test extends SimpleTestBase {
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "name:'name',"
+ "url:'url'"
+ "}"
@@ -79,7 +79,7 @@ class LicenseAnnotation_Test extends SimpleTestBase {
License d1 = D1.class.getAnnotationsByType(License.class)[0];
@License(
- description={ "description" },
+ description={ "description" },
name="name",
url="url"
)
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 7864a3d35..43315bbf2 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
@@ -102,10 +102,10 @@ class PathAnnotation_Test extends SimpleTestBase {
var c3 =
PathAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
PathAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(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 4187540e6..454e7e941 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
@@ -102,10 +102,10 @@ class QueryAnnotation_Test extends SimpleTestBase {
var c3 =
QueryAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
QueryAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(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 67d62d16a..112e26ed8 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
@@ -30,7 +30,7 @@ class RequestAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
Request a1 = RequestAnnotation.create()
- .description("description")
+ .description("description")
.on("on")
.onClass(X1.class)
.parser(OpenApiParser.class)
@@ -38,7 +38,7 @@ class RequestAnnotation_Test extends SimpleTestBase {
.build();
Request a2 = RequestAnnotation.create()
- .description("description")
+ .description("description")
.on("on")
.onClass(X1.class)
.parser(OpenApiParser.class)
@@ -48,7 +48,7 @@ class RequestAnnotation_Test extends SimpleTestBase {
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "on:['on'],"
+ "onClass:['"+CNAME+"$X1'],"
+
"parser:'org.apache.juneau.oapi.OpenApiParser',"
@@ -90,8 +90,8 @@ class RequestAnnotation_Test extends SimpleTestBase {
var c1 =
RequestAnnotation.create(C1.class).on(C2.class).build();
var c2 = RequestAnnotation.create("a").on("b").build();
- assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertJsonContains(c2, "on:['a','b']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -99,7 +99,7 @@ class RequestAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@Request(
- description={ "description" },
+ description={ "description" },
on="on",
onClass=X1.class,
parser=OpenApiParser.class,
@@ -109,7 +109,7 @@ class RequestAnnotation_Test extends SimpleTestBase {
Request d1 = D1.class.getAnnotationsByType(Request.class)[0];
@Request(
- description={ "description" },
+ description={ "description" },
on="on",
onClass=X1.class,
parser=OpenApiParser.class,
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 728eed459..28d48e092 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
@@ -101,9 +101,9 @@ class ResponseAnnotation_Test extends SimpleTestBase {
var c2 = ResponseAnnotation.create("a").on("b").build();
var c4 =
ResponseAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertJsonContains(c2, "on:['a','b']");
- assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(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 d389bb0ec..ce5b38c34 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
@@ -29,14 +29,14 @@ class ResponseStatusAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
StatusCode a1 = StatusCodeAnnotation.create()
- .description("description")
+ .description("description")
.on("on")
.onClass(X1.class)
.value(1)
.build();
StatusCode a2 = StatusCodeAnnotation.create()
- .description("description")
+ .description("description")
.on("on")
.onClass(X1.class)
.value(1)
@@ -45,7 +45,7 @@ class ResponseStatusAnnotation_Test extends SimpleTestBase {
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "on:['on'],"
+ "onClass:['"+CNAME+"$X1'],"
+ "value:[1]"
@@ -87,9 +87,9 @@ class ResponseStatusAnnotation_Test extends SimpleTestBase {
var c2 = StatusCodeAnnotation.create("a").on("b").build();
var c4 =
StatusCodeAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertJsonContains(c2, "on:['a','b']");
- assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -97,7 +97,7 @@ class ResponseStatusAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@StatusCode(
- description={ "description" },
+ description={ "description" },
on="on",
onClass=X1.class,
value=1
@@ -106,7 +106,7 @@ class ResponseStatusAnnotation_Test extends SimpleTestBase {
StatusCode d1 = D1.class.getAnnotationsByType(StatusCode.class)[0];
@StatusCode(
- description={ "description" },
+ description={ "description" },
on="on",
onClass=X1.class,
value=1
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 964ca5555..90c0a77a4 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
@@ -84,10 +84,10 @@ class JsonAnnotation_Test extends SimpleTestBase {
var c3 =
JsonAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
JsonAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java
index 8a9799ec2..f08c03dc6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java
@@ -34,15 +34,15 @@ class JsonSchemaConfigAnnotationTest extends SimpleTestBase
{
}
private static final Function<Object,String> TO_STRING = t -> {
- if (t instanceof Collection)
- return ((Collection<?>)t)
- .stream()
- .map(JsonSchemaConfigAnnotationTest.TO_STRING)
- .collect(Collectors.joining(","));
- if (t instanceof BeanDefMapper)
- return t.getClass().getSimpleName();
- return t.toString();
- };
+ if (t instanceof Collection)
+ return ((Collection<?>)t)
+ .stream()
+ .map(JsonSchemaConfigAnnotationTest.TO_STRING)
+ .collect(Collectors.joining(","));
+ if (t instanceof BeanDefMapper)
+ return t.getClass().getSimpleName();
+ return t.toString();
+ };
static VarResolverSession sr =
VarResolver.create().vars(XVar.class).build().createSession();
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 9a837e014..59d6c2916 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
@@ -31,7 +31,7 @@ class ItemsAnnotation_Test extends SimpleTestBase {
._enum("enum")
.cf("cf")
.collectionFormat("collectionFormat")
- .description("description")
+ .description("description")
.df("df")
.e("e")
.emax(true)
@@ -68,7 +68,7 @@ class ItemsAnnotation_Test extends SimpleTestBase {
._enum("enum")
.cf("cf")
.collectionFormat("collectionFormat")
- .description("description")
+ .description("description")
.df("df")
.e("e")
.emax(true)
@@ -107,7 +107,7 @@ class ItemsAnnotation_Test extends SimpleTestBase {
+ "_enum:['enum'],"
+ "cf:'cf',"
+ "collectionFormat:'collectionFormat',"
- + "description:['description'],"
+ + "description:['description'],"
+ "df:['df'],"
+ "e:['e'],"
+ "emax:true,"
@@ -171,7 +171,7 @@ class ItemsAnnotation_Test extends SimpleTestBase {
_enum="enum",
cf="cf",
collectionFormat="collectionFormat",
- description={ "description" },
+ description={ "description" },
df="df",
e="e",
emax=true,
@@ -210,7 +210,7 @@ class ItemsAnnotation_Test extends SimpleTestBase {
_enum="enum",
cf="cf",
collectionFormat="collectionFormat",
- description={ "description" },
+ description={ "description" },
df="df",
e="e",
emax=true,
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 c6012b771..8dc7ef87b 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
@@ -242,10 +242,10 @@ class SchemaAnnotation_Test extends SimpleTestBase {
var c3 =
SchemaAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
SchemaAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
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 8ef94789b..00069861a 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
@@ -81,10 +81,10 @@ class MsgPackAnnotation_Test extends SimpleTestBase {
var c3 =
MsgPackAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
MsgPackAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -92,14 +92,14 @@ class MsgPackAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@MsgPack(
- description="description",
+ description="description",
on="a"
)
public static class D1 {}
MsgPack d1 = D1.class.getAnnotationsByType(MsgPack.class)[0];
@MsgPack(
- description="description",
+ description="description",
on="a"
)
public static class D2 {}
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 a7ed874c8..7e73c954f 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
@@ -81,10 +81,10 @@ class OpenApiAnnotation_Test extends SimpleTestBase {
var c3 =
OpenApiAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
OpenApiAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java
b/juneau-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java
index d969f86f8..5ce550c9b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java
@@ -35,12 +35,12 @@ class ParserConfigAnnotationTest extends SimpleTestBase {
}
private static final Function<Object,String> TO_STRING = t -> {
- if (t == null)
- return null;
- if (t instanceof AA)
- return "AA";
- return t.toString();
- };
+ if (t == null)
+ return null;
+ if (t instanceof AA)
+ return "AA";
+ return t.toString();
+ };
static VarResolverSession sr =
VarResolver.create().vars(XVar.class).build().createSession();
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 0a8de5f57..53fb4f0bc 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
@@ -27,19 +27,19 @@ class PlainTextAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
PlainText a1 = PlainTextAnnotation.create()
- .description("description")
+ .description("description")
.on("a")
.build();
PlainText a2 = PlainTextAnnotation.create()
- .description("description")
+ .description("description")
.on("a")
.build();
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "on:['a'],"
+ "onClass:[]"
+ "}"
@@ -81,10 +81,10 @@ class PlainTextAnnotation_Test extends SimpleTestBase {
var c3 =
PlainTextAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
PlainTextAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -92,14 +92,14 @@ class PlainTextAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@PlainText(
- description={ "description" },
+ description={ "description" },
on="a"
)
public static class D1 {}
PlainText d1 = D1.class.getAnnotationsByType(PlainText.class)[0];
@PlainText(
- description={ "description" },
+ description={ "description" },
on="a"
)
public static class D2 {}
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 71d02fda7..6a77750da 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
@@ -233,8 +233,8 @@ class RestAnnotation_Test extends SimpleTestBase {
var c1 = RestAnnotation.create(C1.class).on(C2.class).build();
var c2 = RestAnnotation.create("a").on("b").build();
- assertJsonContains(c1, "on:['"+CNAME+"$C1','"+CNAME+"$C2']");
- assertJsonContains(c2, "on:['a','b']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(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 a2c303e5f..8e05ce0ce 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
@@ -131,7 +131,7 @@ class RestDeleteAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
var c4 =
RestDeleteAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(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 87219aab9..0c7eb0548 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
@@ -77,7 +77,7 @@ class RestDestroyAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
var c4 =
RestDestroyAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(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 7774e4339..68abf9144 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
@@ -77,7 +77,7 @@ class RestEndCallAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
var c4 =
RestEndCallAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(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 9d418499b..5a7ad6090 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
@@ -142,7 +142,7 @@ class RestGetAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
var c4 =
RestGetAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(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 75d426761..cae8555e4 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
@@ -80,7 +80,7 @@ class RestInitAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
var c4 =
RestInitAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(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 e155df332..87e3fa163 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
@@ -161,7 +161,7 @@ class RestOpAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
var c4 =
RestOpAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(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 89a8e481c..cca232f29 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
@@ -158,7 +158,7 @@ class RestPostAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
var c4 =
RestPostAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(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 26cb474bc..5ce969579 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
@@ -77,7 +77,7 @@ class RestPostCallAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
var c4 =
RestPostCallAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(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 153c29a85..b93e80c3a 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
@@ -80,7 +80,7 @@ class RestPostInitAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
var c4 =
RestPostInitAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(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 18470d073..e4e2a36d9 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
@@ -27,19 +27,19 @@ class RestPreCallAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
RestPreCall a1 = RestPreCallAnnotation.create()
- .description("description")
+ .description("description")
.on("a")
.build();
RestPreCall a2 = RestPreCallAnnotation.create()
- .description("description")
+ .description("description")
.on("a")
.build();
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "on:['a']"
+ "}"
);
@@ -77,7 +77,7 @@ class RestPreCallAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
var c4 =
RestPreCallAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -85,14 +85,14 @@ class RestPreCallAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@RestPreCall(
- description={ "description" },
+ description={ "description" },
on="a"
)
public static class D1 {}
RestPreCall d1 = D1.class.getAnnotationsByType(RestPreCall.class)[0];
@RestPreCall(
- description={ "description" },
+ description={ "description" },
on="a"
)
public static class D2 {}
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 9f75dab87..f5f84b29c 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
@@ -158,7 +158,7 @@ class RestPutAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
var c4 =
RestPutAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(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 f6b6eae48..af3c1c404 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
@@ -77,7 +77,7 @@ class RestStartCallAnnotation_Test extends SimpleTestBase {
@Test void c01_otherMethods() throws Exception {
var c4 =
RestStartCallAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- assertJsonContains(c4,
"on:['"+CNAME+"$C1.m1()','"+CNAME+"$C2.m2()']");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
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 8eb815975..ce1d02b49 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
@@ -81,10 +81,10 @@ class SoapXmlAnnotation_Test extends SimpleTestBase {
var c3 =
SoapXmlAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
SoapXmlAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(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 deb389068..2f27abfca 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
@@ -81,10 +81,10 @@ class UonAnnotation_Test extends SimpleTestBase {
var c3 =
UonAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
UonAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(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 f05485cb0..0536ce44b 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
@@ -27,13 +27,13 @@ class UrlEncodingAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
UrlEncoding a1 = UrlEncodingAnnotation.create()
- .description("description")
+ .description("description")
.expandedParams(true)
.on("a")
.build();
UrlEncoding a2 = UrlEncodingAnnotation.create()
- .description("description")
+ .description("description")
.expandedParams(true)
.on("a")
.build();
@@ -41,7 +41,7 @@ class UrlEncodingAnnotation_Test extends SimpleTestBase {
@Test void a01_basic() {
assertJson(a1, ""
+ "{"
- + "description:['description'],"
+ + "description:['description'],"
+ "expandedParams:true,"
+ "on:['a'],"
+ "onClass:[]"
@@ -84,10 +84,10 @@ class UrlEncodingAnnotation_Test extends SimpleTestBase {
var c3 =
UrlEncodingAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
UrlEncodingAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -95,7 +95,7 @@ class UrlEncodingAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
@UrlEncoding(
- description="description",
+ description="description",
expandedParams=true,
on="a"
)
@@ -103,7 +103,7 @@ class UrlEncodingAnnotation_Test extends SimpleTestBase {
UrlEncoding d1 = D1.class.getAnnotationsByType(UrlEncoding.class)[0];
@UrlEncoding(
- description="description",
+ description="description",
expandedParams=true,
on="a"
)
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 1da1b0686..b618498c5 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
@@ -27,7 +27,7 @@ class XmlAnnotation_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
Xml a1 = XmlAnnotation.create()
- .description("description")
+ .description("description")
.childName("a")
.format(XmlFormat.ATTR)
.namespace("c")
@@ -36,7 +36,7 @@ class XmlAnnotation_Test extends SimpleTestBase {
.build();
Xml a2 = XmlAnnotation.create()
- .description("description")
+ .description("description")
.childName("a")
.format(XmlFormat.ATTR)
.namespace("c")
@@ -48,7 +48,7 @@ class XmlAnnotation_Test extends SimpleTestBase {
assertJson(a1, ""
+ "{"
+ "childName:'a',"
- + "description:['description'],"
+ + "description:['description'],"
+ "format:'ATTR',"
+ "namespace:'c',"
+ "on:['d'],"
@@ -93,10 +93,10 @@ class XmlAnnotation_Test extends SimpleTestBase {
var c3 =
XmlAnnotation.create().on(C1.class.getField("f1")).on(C2.class.getField("f2")).build();
var c4 =
XmlAnnotation.create().on(C1.class.getMethod("m1")).on(C2.class.getMethod("m2")).build();
- 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()']");
+ assertBean(c1, "on", "["+CNAME+"$C1,"+CNAME+"$C2]");
+ assertBean(c2, "on", "[a,b]");
+ assertBean(c3, "on", "["+CNAME+"$C1.f1,"+CNAME+"$C2.f2]");
+ assertBean(c4, "on", "["+CNAME+"$C1.m1(),"+CNAME+"$C2.m2()]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -105,7 +105,7 @@ class XmlAnnotation_Test extends SimpleTestBase {
@Xml(
childName="a",
- description={ "description" },
+ description={ "description" },
format=XmlFormat.ATTR,
namespace="c",
on="d",
@@ -116,7 +116,7 @@ class XmlAnnotation_Test extends SimpleTestBase {
@Xml(
childName="a",
- description={ "description" },
+ description={ "description" },
format=XmlFormat.ATTR,
namespace="c",
on="d",
