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 4fc6cc2b1 Test modernization
4fc6cc2b1 is described below
commit 4fc6cc2b18e915315867020e042a3782e591a1cb
Author: James Bognar <[email protected]>
AuthorDate: Thu Sep 4 10:54:20 2025 -0400
Test modernization
---
.../BeanTraverseProperties_ComboRoundTripTest.java | 8 +-
.../org/apache/juneau/ComboRoundTripTest_Base.java | 112 ++++++++++-----------
...dTripTester.java => ComboRoundTrip_Tester.java} | 19 ++--
.../org/apache/juneau/ComboSerializeTest_Base.java | 36 +++----
...alizeTester.java => ComboSerialize_Tester.java} | 8 +-
.../apache/juneau/DynaBean_ComboRoundTripTest.java | 8 +-
.../SerializerProperties_ComboRoundTripTest.java | 8 +-
.../a/rttests/BeanInheritance_RoundTripTest.java | 4 +-
.../a/rttests/BeanProperties_RoundTripTest.java | 8 +-
.../juneau/a/rttests/Classes_RoundTripTest.java | 2 +-
.../juneau/a/rttests/DTOs_RoundTripTest.java | 4 +-
.../juneau/a/rttests/Enum_RoundTripTest.java | 16 +--
.../juneau/a/rttests/Generics_RoundTripTest.java | 2 +-
.../juneau/a/rttests/JsonMaps_RoundTripTest.java | 2 +-
.../a/rttests/ObjectsAsStrings_RoundTripTest.java | 6 +-
.../ObjectsWithSpecialMethods_RoundTripTest.java | 4 +-
.../a/rttests/OptionalObjects_RoundTripTest.java | 58 +++++------
.../PrimitiveObjectBeans_RoundTripTest.java | 4 +-
.../a/rttests/PrimitivesBeans_RoundTripTest.java | 4 +-
.../a/rttests/ReadOnlyBeans_RoundTripTest.java | 2 +-
.../a/rttests/RoundTripAddClassAttrs_Test.java | 22 ++--
.../juneau/a/rttests/RoundTripBeanMaps_Test.java | 58 +++++------
.../a/rttests/RoundTripBeansWithBuilders_Test.java | 16 +--
.../a/rttests/RoundTripLargeObjects_Test.java | 10 +-
.../juneau/a/rttests/RoundTripMaps_Test.java | 20 ++--
.../juneau/a/rttests/RoundTripTest_Base.java | 8 +-
.../a/rttests/RoundTripTransformBeans_Test.java | 36 +++----
...{RoundTripTester.java => RoundTrip_Tester.java} | 8 +-
.../a/rttests/SimpleObjects_RoundTripTest.java | 112 ++++++++++-----------
.../a/rttests/TrimStrings_RoundTripTest.java | 2 +-
.../html5/Html5Template_ComboRoundTripTest.java | 8 +-
.../juneau/dto/html5/Html5_ComboRoundTripTest.java | 8 +-
.../ReaderObject_ComboSerializeTest.java | 8 +-
.../BeanDictionary_ComboRoundTripTest.java | 8 +-
.../transforms/Builder_ComboRoundTripTest.java | 8 +-
.../ByteArrayBase64Swap_ComboRoundTripTest.java | 8 +-
.../ReaderObjectSwap_ComboSerializeTest.java | 8 +-
.../SwapsAnnotation_ComboSerializeTest.java | 8 +-
38 files changed, 337 insertions(+), 334 deletions(-)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/BeanTraverseProperties_ComboRoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/BeanTraverseProperties_ComboRoundTripTest.java
index 7142bd4a3..b448e96ce 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/BeanTraverseProperties_ComboRoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/BeanTraverseProperties_ComboRoundTripTest.java
@@ -21,11 +21,11 @@ import org.apache.juneau.BeanTraverseContext.*;
*/
class BeanTraverseProperties_ComboRoundTripTest extends
ComboRoundTripTest_Base {
- private static <T> ComboRoundTripTester.Builder<T> tester(int index,
String label, Type type, T bean) {
- return ComboRoundTripTester.create(index, label, type,
()->bean);
+ private static <T> ComboRoundTrip_Tester.Builder<T> tester(int index,
String label, Type type, T bean) {
+ return ComboRoundTrip_Tester.create(index, label, type,
()->bean);
}
- private static ComboRoundTripTester<?>[] TESTERS = {
+ private static ComboRoundTrip_Tester<?>[] TESTERS = {
tester(1, "BEANTRAVERSE_initialDepth", A.class, new A().init())
.json("{f:1}")
.jsonT("{f:1}")
@@ -125,7 +125,7 @@ class BeanTraverseProperties_ComboRoundTripTest extends
ComboRoundTripTest_Base
.build()
};
- static ComboRoundTripTester<?>[] testers() {
+ static ComboRoundTrip_Tester<?>[] testers() {
return TESTERS;
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/ComboRoundTripTest_Base.java
b/juneau-utest/src/test/java/org/apache/juneau/ComboRoundTripTest_Base.java
index b045c54c2..ca476ae8c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/ComboRoundTripTest_Base.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/ComboRoundTripTest_Base.java
@@ -35,19 +35,19 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void a11_serializeJson(ComboRoundTripTester<?> t) throws
Exception {
+ public void a11_serializeJson(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testSerialize("json");
}
@ParameterizedTest
@MethodSource("testers")
- public void a12_parseJson(ComboRoundTripTester<?> t) throws Exception {
+ public void a12_parseJson(ComboRoundTrip_Tester<?> t) throws Exception {
t.testParse("json");
}
@ParameterizedTest
@MethodSource("testers")
- public void a13_verifyJson(ComboRoundTripTester<?> t) throws Exception {
+ public void a13_verifyJson(ComboRoundTrip_Tester<?> t) throws Exception
{
t.testParseVerify("json");
}
@@ -57,19 +57,19 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void a21_serializeJsonT(ComboRoundTripTester<?> t) throws
Exception {
+ public void a21_serializeJsonT(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testSerialize("jsonT");
}
@ParameterizedTest
@MethodSource("testers")
- public void a22_parseJsonT(ComboRoundTripTester<?> t) throws Exception {
+ public void a22_parseJsonT(ComboRoundTrip_Tester<?> t) throws Exception
{
t.testParse("jsonT");
}
@ParameterizedTest
@MethodSource("testers")
- public void a23_verifyJsonT(ComboRoundTripTester<?> t) throws Exception
{
+ public void a23_verifyJsonT(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testParseVerify("jsonT");
}
@@ -79,19 +79,19 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void a31_serializeJsonR(ComboRoundTripTester<?> t) throws
Exception {
+ public void a31_serializeJsonR(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testSerialize("jsonR");
}
@ParameterizedTest
@MethodSource("testers")
- public void a32_parseJsonR(ComboRoundTripTester<?> t) throws Exception {
+ public void a32_parseJsonR(ComboRoundTrip_Tester<?> t) throws Exception
{
t.testParse("jsonR");
}
@ParameterizedTest
@MethodSource("testers")
- public void a33_verifyJsonR(ComboRoundTripTester<?> t) throws Exception
{
+ public void a33_verifyJsonR(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testParseVerify("jsonR");
}
@@ -101,19 +101,19 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void b11_serializeXml(ComboRoundTripTester<?> t) throws
Exception {
+ public void b11_serializeXml(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testSerialize("xml");
}
@ParameterizedTest
@MethodSource("testers")
- public void b12_parseXml(ComboRoundTripTester<?> t) throws Exception {
+ public void b12_parseXml(ComboRoundTrip_Tester<?> t) throws Exception {
t.testParse("xml");
}
@ParameterizedTest
@MethodSource("testers")
- public void b13_verifyXml(ComboRoundTripTester<?> t) throws Exception {
+ public void b13_verifyXml(ComboRoundTrip_Tester<?> t) throws Exception {
t.testParseVerify("xml");
}
@@ -123,19 +123,19 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void b21_serializeXmlT(ComboRoundTripTester<?> t) throws
Exception {
+ public void b21_serializeXmlT(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testSerialize("xmlT");
}
@ParameterizedTest
@MethodSource("testers")
- public void b22_parseXmlT(ComboRoundTripTester<?> t) throws Exception {
+ public void b22_parseXmlT(ComboRoundTrip_Tester<?> t) throws Exception {
t.testParse("xmlT");
}
@ParameterizedTest
@MethodSource("testers")
- public void b23_verifyXmlT(ComboRoundTripTester<?> t) throws Exception {
+ public void b23_verifyXmlT(ComboRoundTrip_Tester<?> t) throws Exception
{
t.testParseVerify("xmlT");
}
@@ -145,19 +145,19 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void b31_serializeXmlR(ComboRoundTripTester<?> t) throws
Exception {
+ public void b31_serializeXmlR(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testSerialize("xmlR");
}
@ParameterizedTest
@MethodSource("testers")
- public void b32_parseXmlR(ComboRoundTripTester<?> t) throws Exception {
+ public void b32_parseXmlR(ComboRoundTrip_Tester<?> t) throws Exception {
t.testParse("xmlR");
}
@ParameterizedTest
@MethodSource("testers")
- public void b33_verifyXmlR(ComboRoundTripTester<?> t) throws Exception {
+ public void b33_verifyXmlR(ComboRoundTrip_Tester<?> t) throws Exception
{
t.testParseVerify("xmlR");
}
@@ -167,19 +167,19 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void b41_serializeXmlNs(ComboRoundTripTester<?> t) throws
Exception {
+ public void b41_serializeXmlNs(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testSerialize("xmlNs");
}
@ParameterizedTest
@MethodSource("testers")
- public void b42_parseXmlNs(ComboRoundTripTester<?> t) throws Exception {
+ public void b42_parseXmlNs(ComboRoundTrip_Tester<?> t) throws Exception
{
t.testParse("xmlNs");
}
@ParameterizedTest
@MethodSource("testers")
- public void b43_verifyXmlNs(ComboRoundTripTester<?> t) throws Exception
{
+ public void b43_verifyXmlNs(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testParseVerify("xmlNs");
}
@@ -189,19 +189,19 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void c11_serializeHtml(ComboRoundTripTester<?> t) throws
Exception {
+ public void c11_serializeHtml(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testSerialize("html");
}
@ParameterizedTest
@MethodSource("testers")
- public void c12_parseHtml(ComboRoundTripTester<?> t) throws Exception {
+ public void c12_parseHtml(ComboRoundTrip_Tester<?> t) throws Exception {
t.testParse("html");
}
@ParameterizedTest
@MethodSource("testers")
- public void c13_verifyHtml(ComboRoundTripTester<?> t) throws Exception {
+ public void c13_verifyHtml(ComboRoundTrip_Tester<?> t) throws Exception
{
t.testParseVerify("html");
}
@@ -211,19 +211,19 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void c21_serializeHtmlT(ComboRoundTripTester<?> t) throws
Exception {
+ public void c21_serializeHtmlT(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testSerialize("htmlT");
}
@ParameterizedTest
@MethodSource("testers")
- public void c22_parseHtmlT(ComboRoundTripTester<?> t) throws Exception {
+ public void c22_parseHtmlT(ComboRoundTrip_Tester<?> t) throws Exception
{
t.testParse("htmlT");
}
@ParameterizedTest
@MethodSource("testers")
- public void c23_verifyHtmlT(ComboRoundTripTester<?> t) throws Exception
{
+ public void c23_verifyHtmlT(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testParseVerify("htmlT");
}
@@ -233,19 +233,19 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void c31_serializeHtmlR(ComboRoundTripTester<?> t) throws
Exception {
+ public void c31_serializeHtmlR(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testSerialize("htmlR");
}
@ParameterizedTest
@MethodSource("testers")
- public void c32_parseHtmlR(ComboRoundTripTester<?> t) throws Exception {
+ public void c32_parseHtmlR(ComboRoundTrip_Tester<?> t) throws Exception
{
t.testParse("htmlR");
}
@ParameterizedTest
@MethodSource("testers")
- public void c33_verifyHtmlR(ComboRoundTripTester<?> t) throws Exception
{
+ public void c33_verifyHtmlR(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testParseVerify("htmlR");
}
@@ -255,19 +255,19 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void d11_serializeUon(ComboRoundTripTester<?> t) throws
Exception {
+ public void d11_serializeUon(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testSerialize("uon");
}
@ParameterizedTest
@MethodSource("testers")
- public void d12_parseUon(ComboRoundTripTester<?> t) throws Exception {
+ public void d12_parseUon(ComboRoundTrip_Tester<?> t) throws Exception {
t.testParse("uon");
}
@ParameterizedTest
@MethodSource("testers")
- public void d13_verifyUon(ComboRoundTripTester<?> t) throws Exception {
+ public void d13_verifyUon(ComboRoundTrip_Tester<?> t) throws Exception {
t.testParseVerify("uon");
}
@@ -277,19 +277,19 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void d21_serializeUonT(ComboRoundTripTester<?> t) throws
Exception {
+ public void d21_serializeUonT(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testSerialize("uonT");
}
@ParameterizedTest
@MethodSource("testers")
- public void d22_parseUonT(ComboRoundTripTester<?> t) throws Exception {
+ public void d22_parseUonT(ComboRoundTrip_Tester<?> t) throws Exception {
t.testParse("uonT");
}
@ParameterizedTest
@MethodSource("testers")
- public void d23_verifyUonT(ComboRoundTripTester<?> t) throws Exception {
+ public void d23_verifyUonT(ComboRoundTrip_Tester<?> t) throws Exception
{
t.testParseVerify("uonT");
}
@@ -299,19 +299,19 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void d31_serializeUonR(ComboRoundTripTester<?> t) throws
Exception {
+ public void d31_serializeUonR(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testSerialize("uonR");
}
@ParameterizedTest
@MethodSource("testers")
- public void d32_parseUonR(ComboRoundTripTester<?> t) throws Exception {
+ public void d32_parseUonR(ComboRoundTrip_Tester<?> t) throws Exception {
t.testParse("uonR");
}
@ParameterizedTest
@MethodSource("testers")
- public void d33_verifyUonR(ComboRoundTripTester<?> t) throws Exception {
+ public void d33_verifyUonR(ComboRoundTrip_Tester<?> t) throws Exception
{
t.testParseVerify("uonR");
}
@@ -321,19 +321,19 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void e11_serializeUrlEncoding(ComboRoundTripTester<?> t) throws
Exception {
+ public void e11_serializeUrlEncoding(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testSerialize("urlEnc");
}
@ParameterizedTest
@MethodSource("testers")
- public void e12_parseUrlEncoding(ComboRoundTripTester<?> t) throws
Exception {
+ public void e12_parseUrlEncoding(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testParse("urlEnc");
}
@ParameterizedTest
@MethodSource("testers")
- public void e13_verifyUrlEncoding(ComboRoundTripTester<?> t) throws
Exception {
+ public void e13_verifyUrlEncoding(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testParseVerify("urlEnc");
}
@@ -343,19 +343,19 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void e21_serializeUrlEncodingT(ComboRoundTripTester<?> t) throws
Exception {
+ public void e21_serializeUrlEncodingT(ComboRoundTrip_Tester<?> t)
throws Exception {
t.testSerialize("urlEncT");
}
@ParameterizedTest
@MethodSource("testers")
- public void e22_parseUrlEncodingT(ComboRoundTripTester<?> t) throws
Exception {
+ public void e22_parseUrlEncodingT(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testParse("urlEncT");
}
@ParameterizedTest
@MethodSource("testers")
- public void e23_verifyUrlEncodingT(ComboRoundTripTester<?> t) throws
Exception {
+ public void e23_verifyUrlEncodingT(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testParseVerify("urlEncT");
}
@@ -365,19 +365,19 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void e31_serializeUrlEncodingR(ComboRoundTripTester<?> t) throws
Exception {
+ public void e31_serializeUrlEncodingR(ComboRoundTrip_Tester<?> t)
throws Exception {
t.testSerialize("urlEncR");
}
@ParameterizedTest
@MethodSource("testers")
- public void e32_parseUrlEncodingR(ComboRoundTripTester<?> t) throws
Exception {
+ public void e32_parseUrlEncodingR(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testParse("urlEncR");
}
@ParameterizedTest
@MethodSource("testers")
- public void e33_verifyUrlEncodingR(ComboRoundTripTester<?> t) throws
Exception {
+ public void e33_verifyUrlEncodingR(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testParseVerify("urlEncR");
}
@@ -387,25 +387,25 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void f11_serializeMsgPack(ComboRoundTripTester<?> t) throws
Exception {
+ public void f11_serializeMsgPack(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testSerialize("msgPack");
}
@ParameterizedTest
@MethodSource("testers")
- public void f12_parseMsgPack(ComboRoundTripTester<?> t) throws
Exception {
+ public void f12_parseMsgPack(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testParse("msgPack");
}
@ParameterizedTest
@MethodSource("testers")
- public void f13_parseMsgPackJsonEquivalency(ComboRoundTripTester<?> t)
throws Exception {
+ public void f13_parseMsgPackJsonEquivalency(ComboRoundTrip_Tester<?> t)
throws Exception {
t.testParseJsonEquivalency("msgPack");
}
@ParameterizedTest
@MethodSource("testers")
- public void f14_verifyMsgPack(ComboRoundTripTester<?> t) throws
Exception {
+ public void f14_verifyMsgPack(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testParseVerify("msgPack");
}
@@ -415,25 +415,25 @@ public abstract class ComboRoundTripTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void f21_serializeMsgPackT(ComboRoundTripTester<?> t) throws
Exception {
+ public void f21_serializeMsgPackT(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testSerialize("msgPackT");
}
@ParameterizedTest
@MethodSource("testers")
- public void f22_parseMsgPackT(ComboRoundTripTester<?> t) throws
Exception {
+ public void f22_parseMsgPackT(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testParse("msgPackT");
}
@ParameterizedTest
@MethodSource("testers")
- public void f23_parseMsgPackTJsonEquivalency(ComboRoundTripTester<?> t)
throws Exception {
+ public void f23_parseMsgPackTJsonEquivalency(ComboRoundTrip_Tester<?>
t) throws Exception {
t.testParseJsonEquivalency("msgPackT");
}
@ParameterizedTest
@MethodSource("testers")
- public void f24_verifyMsgPackT(ComboRoundTripTester<?> t) throws
Exception {
+ public void f24_verifyMsgPackT(ComboRoundTrip_Tester<?> t) throws
Exception {
t.testParseVerify("msgPackT");
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/ComboRoundTripTester.java
b/juneau-utest/src/test/java/org/apache/juneau/ComboRoundTrip_Tester.java
similarity index 96%
rename from
juneau-utest/src/test/java/org/apache/juneau/ComboRoundTripTester.java
rename to
juneau-utest/src/test/java/org/apache/juneau/ComboRoundTrip_Tester.java
index d38cceeef..225c278a5 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/ComboRoundTripTester.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/ComboRoundTrip_Tester.java
@@ -33,13 +33,14 @@ import org.apache.juneau.xml.*;
* Represents the input to a ComboTest.
* @param <T>
*/
-public class ComboRoundTripTester<T> {
+public class ComboRoundTrip_Tester<T> {
public static <T> Builder<T> create(int index, String label, Type type,
Supplier<T> in) {
- return new Builder<>("["+index+"] " + label, type, in);
+ return new Builder<>(index, label, type, in);
}
public static class Builder<T> {
+ private int index;
private String label;
private Supplier<T> in;
private String exceptionMsg;
@@ -53,13 +54,15 @@ public class ComboRoundTripTester<T> {
private Consumer<Serializer.Builder> serializerApply = x -> {};
private Consumer<Parser.Builder> parserApply = x -> {};
- public Builder(String label, Type type, T in) {
+ public Builder(int index, String label, Type type, T in) {
+ this.index = index;
this.label = label;
this.type = type;
this.in = () -> in;
}
- public Builder(String label, Type type, Supplier<T> in) {
+ public Builder(int index, String label, Type type, Supplier<T>
in) {
+ this.index = index;
this.label = label;
this.type = type;
this.in = in;
@@ -107,8 +110,8 @@ public class ComboRoundTripTester<T> {
public Builder<T> rdfXmlT(String value) {
expected.put("rdfXmlT", value); return this; }
public Builder<T> rdfXmlR(String value) {
expected.put("rdfXmlR", value); return this; }
- public ComboRoundTripTester<T> build() {
- return new ComboRoundTripTester<>(this);
+ public ComboRoundTrip_Tester<T> build() {
+ return new ComboRoundTrip_Tester<>(this);
}
}
@@ -123,8 +126,8 @@ public class ComboRoundTripTester<T> {
private final Map<String,Parser> parsers = map();
private final Function<T,T> postConvert;
- private ComboRoundTripTester(Builder<T> b) {
- label = b.label;
+ private ComboRoundTrip_Tester(Builder<T> b) {
+ label = "[" + b.index + "] " + b.label;
type = b.type;
in = b.in;
expected = b.expected;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/ComboSerializeTest_Base.java
b/juneau-utest/src/test/java/org/apache/juneau/ComboSerializeTest_Base.java
index 798d0af6a..0052e0e8f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/ComboSerializeTest_Base.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/ComboSerializeTest_Base.java
@@ -26,7 +26,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void a11_serializeJson(ComboSerializeTester<?> t) throws
Exception {
+ public void a11_serializeJson(ComboSerialize_Tester<?> t) throws
Exception {
t.testSerialize("json");
}
@@ -36,7 +36,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void a21_serializeJsonT(ComboSerializeTester<?> t) throws
Exception {
+ public void a21_serializeJsonT(ComboSerialize_Tester<?> t) throws
Exception {
t.testSerialize("jsonT");
}
@@ -46,7 +46,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void a31_serializeJsonR(ComboSerializeTester<?> t) throws
Exception {
+ public void a31_serializeJsonR(ComboSerialize_Tester<?> t) throws
Exception {
t.testSerialize("jsonR");
}
@@ -56,7 +56,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void b11_serializeXml(ComboSerializeTester<?> t) throws
Exception {
+ public void b11_serializeXml(ComboSerialize_Tester<?> t) throws
Exception {
t.testSerialize("xml");
}
@@ -66,7 +66,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void b21_serializeXmlT(ComboSerializeTester<?> t) throws
Exception {
+ public void b21_serializeXmlT(ComboSerialize_Tester<?> t) throws
Exception {
t.testSerialize("xmlT");
}
@@ -76,7 +76,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void b31_serializeXmlR(ComboSerializeTester<?> t) throws
Exception {
+ public void b31_serializeXmlR(ComboSerialize_Tester<?> t) throws
Exception {
t.testSerialize("xmlR");
}
@@ -86,7 +86,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void b41_serializeXmlNs(ComboSerializeTester<?> t) throws
Exception {
+ public void b41_serializeXmlNs(ComboSerialize_Tester<?> t) throws
Exception {
t.testSerialize("xmlNs");
}
@@ -96,7 +96,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void c11_serializeHtml(ComboSerializeTester<?> t) throws
Exception {
+ public void c11_serializeHtml(ComboSerialize_Tester<?> t) throws
Exception {
t.testSerialize("html");
}
@@ -106,7 +106,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void c21_serializeHtmlT(ComboSerializeTester<?> t) throws
Exception {
+ public void c21_serializeHtmlT(ComboSerialize_Tester<?> t) throws
Exception {
t.testSerialize("htmlT");
}
@@ -116,7 +116,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void c31_serializeHtmlR(ComboSerializeTester<?> t) throws
Exception {
+ public void c31_serializeHtmlR(ComboSerialize_Tester<?> t) throws
Exception {
t.testSerialize("htmlR");
}
@@ -126,7 +126,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void d11_serializeUon(ComboSerializeTester<?> t) throws
Exception {
+ public void d11_serializeUon(ComboSerialize_Tester<?> t) throws
Exception {
t.testSerialize("uon");
}
@@ -136,7 +136,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void d21_serializeUonT(ComboSerializeTester<?> t) throws
Exception {
+ public void d21_serializeUonT(ComboSerialize_Tester<?> t) throws
Exception {
t.testSerialize("uonT");
}
@@ -146,7 +146,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void d31_serializeUonR(ComboSerializeTester<?> t) throws
Exception {
+ public void d31_serializeUonR(ComboSerialize_Tester<?> t) throws
Exception {
t.testSerialize("uonR");
}
@@ -156,7 +156,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void e11_serializeUrlEncoding(ComboSerializeTester<?> t) throws
Exception {
+ public void e11_serializeUrlEncoding(ComboSerialize_Tester<?> t) throws
Exception {
t.testSerialize("urlEnc");
}
@@ -166,7 +166,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void e21_serializeUrlEncodingT(ComboSerializeTester<?> t) throws
Exception {
+ public void e21_serializeUrlEncodingT(ComboSerialize_Tester<?> t)
throws Exception {
t.testSerialize("urlEncT");
}
@@ -176,7 +176,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void e31_serializeUrlEncodingR(ComboSerializeTester<?> t) throws
Exception {
+ public void e31_serializeUrlEncodingR(ComboSerialize_Tester<?> t)
throws Exception {
t.testSerialize("urlEncR");
}
@@ -186,7 +186,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void f11_serializeMsgPack(ComboSerializeTester<?> t) throws
Exception {
+ public void f11_serializeMsgPack(ComboSerialize_Tester<?> t) throws
Exception {
t.testSerialize("msgPack");
}
@@ -196,7 +196,7 @@ public abstract class ComboSerializeTest_Base extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- public void f21_serializeMsgPackT(ComboSerializeTester<?> t) throws
Exception {
+ public void f21_serializeMsgPackT(ComboSerialize_Tester<?> t) throws
Exception {
t.testSerialize("msgPackT");
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/ComboSerializeTester.java
b/juneau-utest/src/test/java/org/apache/juneau/ComboSerialize_Tester.java
similarity index 98%
rename from
juneau-utest/src/test/java/org/apache/juneau/ComboSerializeTester.java
rename to
juneau-utest/src/test/java/org/apache/juneau/ComboSerialize_Tester.java
index 26ca3d37e..d6665480b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/ComboSerializeTester.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/ComboSerialize_Tester.java
@@ -32,7 +32,7 @@ import org.apache.juneau.xml.*;
* Represents the input to a ComboTest.
* @param <T>
*/
-public class ComboSerializeTester<T> {
+public class ComboSerialize_Tester<T> {
public static <T> Builder<T> create(int index, String label,
Supplier<T> in) {
return new Builder<>(index, label, in);
@@ -95,8 +95,8 @@ public class ComboSerializeTester<T> {
public Builder<T> rdfXmlT(String value) {
expected.put("rdfXmlT", value); return this; }
public Builder<T> rdfXmlR(String value) {
expected.put("rdfXmlR", value); return this; }
- public ComboSerializeTester<T> build() {
- return new ComboSerializeTester<>(this);
+ public ComboSerialize_Tester<T> build() {
+ return new ComboSerialize_Tester<>(this);
}
}
@@ -107,7 +107,7 @@ public class ComboSerializeTester<T> {
private final Map<String,String> expected;
private final Map<String,Serializer> serializers = map();
- private ComboSerializeTester(Builder<T> b) {
+ private ComboSerialize_Tester(Builder<T> b) {
label = "[" + b.index + "] " + b.label;
in = b.in;
expected = b.expected;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/DynaBean_ComboRoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/DynaBean_ComboRoundTripTest.java
index 6b7336459..7f42102d1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/DynaBean_ComboRoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/DynaBean_ComboRoundTripTest.java
@@ -32,11 +32,11 @@ class DynaBean_ComboRoundTripTest extends
ComboRoundTripTest_Base {
SINGLE_DATE.set(1901, 2, 3, 10, 11, 12);
}
- private static <T> ComboRoundTripTester.Builder<T> tester(int index,
String label, Class<T> type, T bean) {
- return ComboRoundTripTester.create(index, label, type,
()->bean).serializerApply(Serializer.Builder::keepNullProperties);
+ private static <T> ComboRoundTrip_Tester.Builder<T> tester(int index,
String label, Class<T> type, T bean) {
+ return ComboRoundTrip_Tester.create(index, label, type,
()->bean).serializerApply(Serializer.Builder::keepNullProperties);
}
- private static ComboRoundTripTester<?>[] TESTERS = {
+ private static ComboRoundTrip_Tester<?>[] TESTERS = {
tester(1, "BeanWithDynaField", BeanWithDynaField.class, new
BeanWithDynaField().init())
.json("{f1:1,f2a:'a',f2b:'b',f3:3}")
.jsonT("{f1:1,f2a:'a',f2b:'b',f3:3}")
@@ -186,7 +186,7 @@ class DynaBean_ComboRoundTripTest extends
ComboRoundTripTest_Base {
.build()
};
- static ComboRoundTripTester<?>[] testers() {
+ static ComboRoundTrip_Tester<?>[] testers() {
return TESTERS;
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/SerializerProperties_ComboRoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/SerializerProperties_ComboRoundTripTest.java
index 07c698ac3..25145c99e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/SerializerProperties_ComboRoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/SerializerProperties_ComboRoundTripTest.java
@@ -29,11 +29,11 @@ import org.apache.juneau.xml.*;
@SuppressWarnings({})
class SerializerProperties_ComboRoundTripTest extends ComboRoundTripTest_Base {
- private static <T> ComboRoundTripTester.Builder<T> tester(int index,
String label, Type type, T bean) {
- return ComboRoundTripTester.create(index, label, type,
()->bean);
+ private static <T> ComboRoundTrip_Tester.Builder<T> tester(int index,
String label, Type type, T bean) {
+ return ComboRoundTrip_Tester.create(index, label, type,
()->bean);
}
- private static ComboRoundTripTester<?>[] TESTERS = {
+ private static ComboRoundTrip_Tester<?>[] TESTERS = {
tester(1, "SERIALIZER_addBeanTypes", JsonMap.class,
JsonMap.of("a", T0.create()))
.json("{a:{_type:'BwT',f:1}}")
.jsonT("{a:{t:'BwT',f:1}}")
@@ -331,7 +331,7 @@ class SerializerProperties_ComboRoundTripTest extends
ComboRoundTripTest_Base {
.build(),
};
- static ComboRoundTripTester<?>[] testers() {
+ static ComboRoundTrip_Tester<?>[] testers() {
return TESTERS;
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/BeanInheritance_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/BeanInheritance_RoundTripTest.java
index 889ab340a..ec24b3ea7 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/BeanInheritance_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/BeanInheritance_RoundTripTest.java
@@ -30,7 +30,7 @@ class BeanInheritance_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a01_beanInheritance(RoundTripTester t) throws Exception {
+ void a01_beanInheritance(RoundTrip_Tester t) throws Exception {
// Skip tests that just return the same object.
if (t.returnOriginalObject)
@@ -123,7 +123,7 @@ class BeanInheritance_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a02_beanInheritance(RoundTripTester t) throws Exception {
+ void a02_beanInheritance(RoundTrip_Tester t) throws Exception {
var t1 = new B1().init();
var t2 = t. roundTrip(t1, B1.class);
assertEquals(json(t2), json(t1));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/BeanProperties_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/BeanProperties_RoundTripTest.java
index 5cef4aa94..de7f11551 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/BeanProperties_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/BeanProperties_RoundTripTest.java
@@ -38,7 +38,7 @@ class BeanProperties_RoundTripTest extends RoundTripTest_Base
{
@SuppressWarnings("unchecked")
@ParameterizedTest
@MethodSource("testers")
- void a01_arrayOfListOfLongs(RoundTripTester t) throws Exception {
+ void a01_arrayOfListOfLongs(RoundTrip_Tester t) throws Exception {
var o = new A01();
o.f1 = new List[1];
o.f1[0] = alist(123L);
@@ -52,7 +52,7 @@ class BeanProperties_RoundTripTest extends RoundTripTest_Base
{
@ParameterizedTest
@MethodSource("testers")
- void a02_listOfArrayOfLongs(RoundTripTester t) throws Exception {
+ void a02_listOfArrayOfLongs(RoundTrip_Tester t) throws Exception {
var o = new A02();
o.f1 = Utils.<Long[]>alist(new Long[]{123L});
o = t.roundTrip(o);
@@ -66,7 +66,7 @@ class BeanProperties_RoundTripTest extends RoundTripTest_Base
{
@SuppressWarnings("unchecked")
@ParameterizedTest
@MethodSource("testers")
- void a03_2dArrayOfListOfLongs(RoundTripTester t) throws Exception {
+ void a03_2dArrayOfListOfLongs(RoundTrip_Tester t) throws Exception {
var o = new A03();
o.f1 = new List[1][1];
o.f1[0] = new List[]{alist(123L)};
@@ -80,7 +80,7 @@ class BeanProperties_RoundTripTest extends RoundTripTest_Base
{
@ParameterizedTest
@MethodSource("testers")
- void a04_listOf2dArrayOfLongs(RoundTripTester t) throws Exception {
+ void a04_listOf2dArrayOfLongs(RoundTrip_Tester t) throws Exception {
var o = new A04();
o.f1 = Utils.<Long[][]>alist(new Long[][]{new Long[]{123L}});
o = t.roundTrip(o);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/Classes_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/Classes_RoundTripTest.java
index 5dd444d77..847ea5b2f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/Classes_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/Classes_RoundTripTest.java
@@ -26,7 +26,7 @@ class Classes_RoundTripTest extends RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a01_classObjects(RoundTripTester t) throws Exception {
+ void a01_classObjects(RoundTrip_Tester t) throws Exception {
var o = String.class;
o = t.roundTrip(o);
assertSame(o, String.class);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/DTOs_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/DTOs_RoundTripTest.java
index 83e85eaa3..416628883 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/DTOs_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/DTOs_RoundTripTest.java
@@ -28,7 +28,7 @@ class DTOs_RoundTripTest extends RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a01_jsonSchema1(RoundTripTester t) throws Exception {
+ void a01_jsonSchema1(RoundTrip_Tester t) throws Exception {
var x1 = JsonSchema_Test.getTest1();
var x2 = t.roundTrip(x1, JsonSchema.class);
assertEquals(json(x2), json(x1));
@@ -36,7 +36,7 @@ class DTOs_RoundTripTest extends RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a02_jsonSchema2(RoundTripTester t) throws Exception {
+ void a02_jsonSchema2(RoundTrip_Tester t) throws Exception {
var x1 = JsonSchema_Test.getTest2();
var x2 = t.roundTrip(x1, JsonSchema.class);
assertEquals(json(x2), json(x1));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/Enum_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/Enum_RoundTripTest.java
index 5238177c6..2a83f22a8 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/Enum_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/Enum_RoundTripTest.java
@@ -34,7 +34,7 @@ class Enum_RoundTripTest extends RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a01_enumA(RoundTripTester t) throws Exception {
+ void a01_enumA(RoundTrip_Tester t) throws Exception {
var x = AEnum.FOO;
assertJson("'FOO'", x);
x = t.roundTrip(x, AEnum.class);
@@ -43,7 +43,7 @@ class Enum_RoundTripTest extends RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a02_enumB(RoundTripTester t) throws Exception {
+ void a02_enumB(RoundTrip_Tester t) throws Exception {
var s = JsonSerializer.create().json5().build();
var x = BEnum.FOO;
assertEquals("'xfoo'", s.serialize(x));
@@ -57,7 +57,7 @@ class Enum_RoundTripTest extends RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a03_enumArrayA(RoundTripTester t) throws Exception {
+ void a03_enumArrayA(RoundTrip_Tester t) throws Exception {
var x = new AEnum[]{AEnum.FOO,AEnum.BAR,null};
assertJson("['FOO','BAR',null]", x);
x = t.roundTrip(x, AEnum[].class);
@@ -68,7 +68,7 @@ class Enum_RoundTripTest extends RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a04_enumArrayB(RoundTripTester t) throws Exception {
+ void a04_enumArrayB(RoundTrip_Tester t) throws Exception {
var x = new BEnum[]{BEnum.FOO,BEnum.BAR,null};
assertJson("['xfoo','xbar',null]", x);
x = t.roundTrip(x, BEnum[].class);
@@ -83,7 +83,7 @@ class Enum_RoundTripTest extends RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a05_enum2dArrayA(RoundTripTester t) throws Exception {
+ void a05_enum2dArrayA(RoundTrip_Tester t) throws Exception {
var x = new AEnum[][]{{AEnum.FOO,AEnum.BAR,null},null};
assertJson("[['FOO','BAR',null],null]", x);
x = t.roundTrip(x, AEnum[][].class);
@@ -95,7 +95,7 @@ class Enum_RoundTripTest extends RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a06_enum2dArrayB(RoundTripTester t) throws Exception {
+ void a06_enum2dArrayB(RoundTrip_Tester t) throws Exception {
var x = new BEnum[][]{{BEnum.FOO,BEnum.BAR,null},null};
assertJson("[['xfoo','xbar',null],null]", x);
x = t.roundTrip(x, BEnum[][].class);
@@ -111,7 +111,7 @@ class Enum_RoundTripTest extends RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a07_beansWithEnumA(RoundTripTester t) throws Exception {
+ void a07_beansWithEnumA(RoundTrip_Tester t) throws Exception {
var x1 = new A().init();
var x2 = t.roundTrip(x1, A.class);
assertEquals(json(x1), json(x2));
@@ -120,7 +120,7 @@ class Enum_RoundTripTest extends RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a08_beansWithEnumB(RoundTripTester t) throws Exception {
+ void a08_beansWithEnumB(RoundTrip_Tester t) throws Exception {
var x1 = new B().init();
var x2 = t.roundTrip(x1, B.class);
assertEquals(json(x1), json(x2));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/Generics_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/Generics_RoundTripTest.java
index 4f498c026..424ea821b 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/Generics_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/Generics_RoundTripTest.java
@@ -31,7 +31,7 @@ class Generics_RoundTripTest extends RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a01_beansWithUnboundTypeVars(RoundTripTester t) throws Exception {
+ void a01_beansWithUnboundTypeVars(RoundTrip_Tester t) throws Exception {
if (t.returnOriginalObject)
return;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/JsonMaps_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/JsonMaps_RoundTripTest.java
index b19a29e6a..86516f113 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/JsonMaps_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/JsonMaps_RoundTripTest.java
@@ -35,7 +35,7 @@ class JsonMaps_RoundTripTest extends RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a01_basic(RoundTripTester t) throws Exception {
+ void a01_basic(RoundTrip_Tester t) throws Exception {
var x1 = new A(JsonMap.ofJson("{f1:'a',f2:2}"));
x1 = t.roundTrip(x1, A.class);
assertBean(x1, "f1,f2", "a,2");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/ObjectsAsStrings_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/ObjectsAsStrings_RoundTripTest.java
index 32f611c63..0a690a5d9 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/ObjectsAsStrings_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/ObjectsAsStrings_RoundTripTest.java
@@ -31,7 +31,7 @@ class ObjectsAsStrings_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a01_basic(RoundTripTester t) throws Exception {
+ void a01_basic(RoundTrip_Tester t) throws Exception {
var x = new A().init();
x = t.roundTrip(x);
assertBean(x, "a1{f},a2{f},a3{f},a4{f}", "{1},{2},{3},{4}");
@@ -115,7 +115,7 @@ class ObjectsAsStrings_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a02_enumWithOverriddenStringValue(RoundTripTester t) throws
Exception {
+ void a02_enumWithOverriddenStringValue(RoundTrip_Tester t) throws
Exception {
var x = new B().init();
if (! t.returnOriginalObject) {
var r = t.getSerializer().serialize(x);
@@ -175,7 +175,7 @@ class ObjectsAsStrings_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a03_ordering(RoundTripTester t) throws Exception {
+ void a03_ordering(RoundTrip_Tester t) throws Exception {
var x = new C().init();
x = t.roundTrip(x);
assertJson("{c1:{f:'1'},c2:{f:'2'},c3:{f:'3'},c4:{f:'4'}}", x);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/ObjectsWithSpecialMethods_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/ObjectsWithSpecialMethods_RoundTripTest.java
index 1966e821a..a74995503 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/ObjectsWithSpecialMethods_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/ObjectsWithSpecialMethods_RoundTripTest.java
@@ -33,7 +33,7 @@ class ObjectsWithSpecialMethods_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a01_nameProperty(RoundTripTester t) throws Exception {
+ void a01_nameProperty(RoundTrip_Tester t) throws Exception {
var x = new A().init();
x = t.roundTrip(x);
assertJson("{a2:{f2:2},m:{k1:{f2:2}}}", x);
@@ -76,7 +76,7 @@ class ObjectsWithSpecialMethods_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a02_parentProperty(RoundTripTester t) throws Exception {
+ void a02_parentProperty(RoundTrip_Tester t) throws Exception {
var x = new B().init();
x = t.roundTrip(x);
if (t.isValidationOnly())
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/OptionalObjects_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/OptionalObjects_RoundTripTest.java
index ab7e7387e..93c97154a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/OptionalObjects_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/OptionalObjects_RoundTripTest.java
@@ -33,7 +33,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a01_emptyOptional(RoundTripTester t) throws Exception {
+ void a01_emptyOptional(RoundTrip_Tester t) throws Exception {
var x = empty();
x = t.roundTrip(x);
assertFalse(x.isPresent());
@@ -41,7 +41,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a02_optionalContainingString(RoundTripTester t) throws Exception {
+ void a02_optionalContainingString(RoundTrip_Tester t) throws Exception {
var x = opt("foobar");
x = t.roundTrip(x);
assertEquals("foobar", x.get());
@@ -64,7 +64,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b01a_stringField(RoundTripTester t) throws Exception {
+ void b01a_stringField(RoundTrip_Tester t) throws Exception {
var x = new B01();
x.f1 = opt("foo");
x = t.roundTrip(x);
@@ -73,7 +73,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b01b_stringField_emptyValue(RoundTripTester t) throws Exception {
+ void b01b_stringField_emptyValue(RoundTrip_Tester t) throws Exception {
var x = new B01();
x.f1 = empty();
x = t.roundTrip(x);
@@ -82,7 +82,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b01c_stringField_nullField(RoundTripTester t) throws Exception {
+ void b01c_stringField_nullField(RoundTrip_Tester t) throws Exception {
var x = new B01();
x.f1 = null;
x = t.roundTrip(x);
@@ -101,7 +101,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b02a_integerField(RoundTripTester t) throws Exception {
+ void b02a_integerField(RoundTrip_Tester t) throws Exception {
var x = new B02();
x.f1 = opt(123);
x = t.roundTrip(x);
@@ -110,7 +110,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b02b_integerField_emptyValue(RoundTripTester t) throws Exception {
+ void b02b_integerField_emptyValue(RoundTrip_Tester t) throws Exception {
var x = new B02();
x.f1 = empty();
x = t.roundTrip(x);
@@ -119,7 +119,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b02c_integerField_nullField(RoundTripTester t) throws Exception {
+ void b02c_integerField_nullField(RoundTrip_Tester t) throws Exception {
var x = new B02();
x.f1 = null;
x = t.roundTrip(x);
@@ -138,7 +138,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b03a_integerListField(RoundTripTester t) throws Exception {
+ void b03a_integerListField(RoundTrip_Tester t) throws Exception {
var x = new B03();
x.f1 = opt(alist(123));
x = t.roundTrip(x);
@@ -147,7 +147,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b03b_integerListField_listWithNull(RoundTripTester t) throws
Exception {
+ void b03b_integerListField_listWithNull(RoundTrip_Tester t) throws
Exception {
var x = new B03();
x.f1 = opt(alist((Integer)null));
x = t.roundTrip(x);
@@ -158,7 +158,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b03c_integerListField_emptyList(RoundTripTester t) throws
Exception {
+ void b03c_integerListField_emptyList(RoundTrip_Tester t) throws
Exception {
var x = new B03();
x.f1 = opt(alist());
x = t.roundTrip(x);
@@ -168,7 +168,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b03d_integerListField_emptyValue(RoundTripTester t) throws
Exception {
+ void b03d_integerListField_emptyValue(RoundTrip_Tester t) throws
Exception {
var x = new B03();
x.f1 = empty();
x = t.roundTrip(x);
@@ -177,7 +177,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b03e_integerListField_nullField(RoundTripTester t) throws
Exception {
+ void b03e_integerListField_nullField(RoundTrip_Tester t) throws
Exception {
var x = new B03();
x.f1 = null;
x = t.roundTrip(x);
@@ -196,7 +196,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b04a_optionalOptionalInteger(RoundTripTester t) throws Exception {
+ void b04a_optionalOptionalInteger(RoundTrip_Tester t) throws Exception {
var x = new B04();
x.f1 = opt(opt(123));
x = t.roundTrip(x);
@@ -205,7 +205,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b04b_optionalOptionalInteger_emptyInnerValue(RoundTripTester t)
throws Exception {
+ void b04b_optionalOptionalInteger_emptyInnerValue(RoundTrip_Tester t)
throws Exception {
var x = new B04();
x.f1 = opt(empty());
x = t.roundTrip(x);
@@ -215,7 +215,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b04c_optionalOptionalInteger_emptyOuterValue(RoundTripTester t)
throws Exception {
+ void b04c_optionalOptionalInteger_emptyOuterValue(RoundTrip_Tester t)
throws Exception {
var x = new B04();
x.f1 = empty();
x = t.roundTrip(x);
@@ -227,7 +227,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b04d_optionalOptionalInteger_nullField(RoundTripTester t) throws
Exception {
+ void b04d_optionalOptionalInteger_nullField(RoundTrip_Tester t) throws
Exception {
var x = new B04();
x.f1 = null;
x = t.roundTrip(x);
@@ -256,7 +256,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b05a_optionalOptionalBean(RoundTripTester t) throws Exception {
+ void b05a_optionalOptionalBean(RoundTrip_Tester t) throws Exception {
var x = new B05();
x.f1 = opt(opt(B05B.create()));
x = t.roundTrip(x);
@@ -265,7 +265,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b05b_optionalOptionalBean_emptyInnerValue(RoundTripTester t)
throws Exception {
+ void b05b_optionalOptionalBean_emptyInnerValue(RoundTrip_Tester t)
throws Exception {
var x = new B05();
x.f1 = opt(empty());
x = t.roundTrip(x);
@@ -275,7 +275,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b05c_optionalOptionalBean_emptyOuterValue(RoundTripTester t)
throws Exception {
+ void b05c_optionalOptionalBean_emptyOuterValue(RoundTrip_Tester t)
throws Exception {
var x = new B05();
x.f1 = empty();
x = t.roundTrip(x);
@@ -287,7 +287,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b05d_optionalOptionalBean_nullField(RoundTripTester t) throws
Exception {
+ void b05d_optionalOptionalBean_nullField(RoundTrip_Tester t) throws
Exception {
var x = new B05();
x.f1 = null;
x = t.roundTrip(x);
@@ -307,7 +307,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b06a_listOfOptionalIntegers(RoundTripTester t) throws Exception {
+ void b06a_listOfOptionalIntegers(RoundTrip_Tester t) throws Exception {
var x = new B06();
x.f1 = alist(opt(123));
x = t.roundTrip(x);
@@ -316,7 +316,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b06b_listOfOptionalIntegers_listWithEmpty(RoundTripTester t)
throws Exception {
+ void b06b_listOfOptionalIntegers_listWithEmpty(RoundTrip_Tester t)
throws Exception {
var x = new B06();
x.f1 = alist(empty());
x = t.roundTrip(x);
@@ -326,7 +326,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b06c_listOfOptionalIntegers_listWithNull(RoundTripTester t) throws
Exception {
+ void b06c_listOfOptionalIntegers_listWithNull(RoundTrip_Tester t)
throws Exception {
var x = new B06();
x.f1 = alist((Optional<Integer>)null);
x = t.roundTrip(x);
@@ -338,7 +338,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b06d_listOfOptionalIntegers_nullField(RoundTripTester t) throws
Exception {
+ void b06d_listOfOptionalIntegers_nullField(RoundTrip_Tester t) throws
Exception {
var x = new B06();
x.f1 = null;
x = t.roundTrip(x);
@@ -356,7 +356,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b07a_arrayOfOptionalIntegers(RoundTripTester t) throws Exception {
+ void b07a_arrayOfOptionalIntegers(RoundTrip_Tester t) throws Exception {
var x = new B07();
x.f1 = a(opt(123));
x.f2 = a(alist(123));
@@ -366,7 +366,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b07b_arrayOfOptionalIntegers_listWithEmpty(RoundTripTester t)
throws Exception {
+ void b07b_arrayOfOptionalIntegers_listWithEmpty(RoundTrip_Tester t)
throws Exception {
var x = new B07();
x.f1 = a(empty());
x = t.roundTrip(x);
@@ -377,7 +377,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@SuppressWarnings("unchecked")
@ParameterizedTest
@MethodSource("testers")
- void b07c_arrayOfOptionalIntegers_listWithNull(RoundTripTester t)
throws Exception {
+ void b07c_arrayOfOptionalIntegers_listWithNull(RoundTrip_Tester t)
throws Exception {
var x = new B07();
x.f1 = a(n(Optional.class));
x = t.roundTrip(x);
@@ -389,7 +389,7 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void b07d_arrayOfOptionalIntegers_nullField(RoundTripTester t) throws
Exception {
+ void b07d_arrayOfOptionalIntegers_nullField(RoundTrip_Tester t) throws
Exception {
var x = new B07();
x.f1 = null;
x = t.roundTrip(x);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/PrimitiveObjectBeans_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/PrimitiveObjectBeans_RoundTripTest.java
index 4a16598a1..337e50f4e 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/PrimitiveObjectBeans_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/PrimitiveObjectBeans_RoundTripTest.java
@@ -30,7 +30,7 @@ class PrimitiveObjectBeans_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a01_primitiveObjectsBean(RoundTripTester t) throws Exception {
+ void a01_primitiveObjectsBean(RoundTrip_Tester t) throws Exception {
var x = PrimitiveObjectsBean.get();
x = t.roundTrip(x, PrimitiveObjectsBean.class);
x = t.roundTrip(x, PrimitiveObjectsBean.class);
@@ -151,7 +151,7 @@ class PrimitiveObjectBeans_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a02_primitiveAtomicObjectsBean(RoundTripTester t) throws Exception
{
+ void a02_primitiveAtomicObjectsBean(RoundTrip_Tester t) throws
Exception {
var x = PrimitiveAtomicObjectsBean.get();
x = t.roundTrip(x, PrimitiveAtomicObjectsBean.class);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/PrimitivesBeans_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/PrimitivesBeans_RoundTripTest.java
index 1f6ba0d03..e02bec7c9 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/PrimitivesBeans_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/PrimitivesBeans_RoundTripTest.java
@@ -32,7 +32,7 @@ class PrimitivesBeans_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a01_primitivesBean(RoundTripTester t) throws Exception {
+ void a01_primitivesBean(RoundTrip_Tester t) throws Exception {
var x = new PrimitivesBean().init();
x = t.roundTrip(x, PrimitivesBean.class);
@@ -249,7 +249,7 @@ class PrimitivesBeans_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a02_primitivesBeanList(RoundTripTester t) throws Exception {
+ void a02_primitivesBeanList(RoundTrip_Tester t) throws Exception {
var x = alist(new PrimitivesBean().init(), null, new
PrimitivesBean().init());
if (t.getParser() == null)
return;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/ReadOnlyBeans_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/ReadOnlyBeans_RoundTripTest.java
index 50bbccad0..34fff6a67 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/ReadOnlyBeans_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/ReadOnlyBeans_RoundTripTest.java
@@ -30,7 +30,7 @@ class ReadOnlyBeans_RoundTripTest extends RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a01_basic(RoundTripTester t) throws Exception {
+ void a01_basic(RoundTrip_Tester t) throws Exception {
var x1 = new B(1, "a");
var x2 = new B(2, "b");
var x3 = new A(x1, x2);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrs_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrs_Test.java
index d549dca03..2ed978dd6 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrs_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripAddClassAttrs_Test.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.params.provider.*;
*/
class RoundTripAddClassAttrs_Test extends SimpleTestBase {
- private static RoundTripTester[] TESTERS = {
+ private static RoundTrip_Tester[] TESTERS = {
tester("JsonSerializer.DEFAULT/JsonParser.DEFAULT")
.serializer(JsonSerializer.create().addBeanTypes().addRootType())
.parser(JsonParser.create().disableInterfaceProxies())
@@ -77,12 +77,12 @@ class RoundTripAddClassAttrs_Test extends SimpleTestBase {
.build()
};
- static RoundTripTester[] testers() {
+ static RoundTrip_Tester[] testers() {
return TESTERS;
}
- protected static RoundTripTester.Builder tester(String label) {
- return RoundTripTester.create(label).dictionary(A.class,
B.class, C.class, D.class, E.class, F.class);
+ protected static RoundTrip_Tester.Builder tester(String label) {
+ return RoundTrip_Tester.create(label).dictionary(A.class,
B.class, C.class, D.class, E.class, F.class);
}
//====================================================================================================
@@ -91,7 +91,7 @@ class RoundTripAddClassAttrs_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a01_bean(RoundTripTester t) throws Exception {
+ void a01_bean(RoundTrip_Tester t) throws Exception {
var x = new A("foo");
x = t.roundTrip(x, A.class);
@@ -133,7 +133,7 @@ class RoundTripAddClassAttrs_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a02_beanArray(RoundTripTester t) throws Exception {
+ void a02_beanArray(RoundTrip_Tester t) throws Exception {
var x = a(new A("foo"));
x = t.roundTrip(x, A[].class);
@@ -152,7 +152,7 @@ class RoundTripAddClassAttrs_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a03_beanWithBeanProps(RoundTripTester t) throws Exception {
+ void a03_beanWithBeanProps(RoundTrip_Tester t) throws Exception {
var x = new B("foo");
x = t.roundTrip(x, B.class);
assertBean(x, "f2a{f1},f2b{f1},f2c{f1},f2d{f1}",
"{foo},{foo},{foo},{foo}");
@@ -179,7 +179,7 @@ class RoundTripAddClassAttrs_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a04_mapsWithTypeParams(RoundTripTester t) throws Exception {
+ void a04_mapsWithTypeParams(RoundTrip_Tester t) throws Exception {
var x = new C("foo");
x = t.roundTrip(x, C.class);
assertBean(x,
"f3a{foo{f1}},f3b{foo{f1}},f3c{foo{f1}},f3d{foo{f1}}",
"{{foo}},{{foo}},{{foo}},{{foo}}");
@@ -211,7 +211,7 @@ class RoundTripAddClassAttrs_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a05_mapsWithoutTypeParams(RoundTripTester t) throws Exception {
+ void a05_mapsWithoutTypeParams(RoundTrip_Tester t) throws Exception {
var x = new D("foo");
x = t.roundTrip(x, D.class);
assertBean(x, "f4a{0{f1}},f4b{0{f1}},f4c{0{f1}},f4d{0{f1}}",
"{{foo}},{{foo}},{{foo}},{{foo}}");
@@ -243,7 +243,7 @@ class RoundTripAddClassAttrs_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a06_beanWithListProps(RoundTripTester t) throws Exception {
+ void a06_beanWithListProps(RoundTrip_Tester t) throws Exception {
var x = new E("foo");
x = t.roundTrip(x, E.class);
assertBean(x, "f5a{0{f1}},f5b{0{f1}},f5c{0{f1}},f5d{0{f1}}",
"{{foo}},{{foo}},{{foo}},{{foo}}");
@@ -275,7 +275,7 @@ class RoundTripAddClassAttrs_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a07_beanWithListOfArraysProps(RoundTripTester t) throws Exception {
+ void a07_beanWithListOfArraysProps(RoundTrip_Tester t) throws Exception
{
var x = new F("foo");
x = t.roundTrip(x, F.class);
assertBean(x,
"f6a{0{0{f1}}},f6b{0{0{f1}}},f6c{0{0{f1}}},f6d{0{0{f1}}}",
"{{{foo}}},{{{foo}}},{{{foo}}},{{{foo}}}");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMaps_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMaps_Test.java
index bfba45910..22e74ca5b 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMaps_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeanMaps_Test.java
@@ -41,7 +41,7 @@ import org.junit.jupiter.params.provider.*;
@SuppressWarnings({"serial"})
class RoundTripBeanMaps_Test extends SimpleTestBase {
- private static RoundTripTester[] TESTERS = {
+ private static RoundTrip_Tester[] TESTERS = {
tester("Json - default")
.serializer(JsonSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
@@ -114,12 +114,12 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
.build(),
};
- static RoundTripTester[] testers() {
+ static RoundTrip_Tester[] testers() {
return TESTERS;
}
- protected static RoundTripTester.Builder tester(String label) {
- return
RoundTripTester.create(label).annotatedClasses(L2Config.class,
M2Config.class).implClasses(Map.of(IBean.class, CBean.class));
+ protected static RoundTrip_Tester.Builder tester(String label) {
+ return
RoundTrip_Tester.create(label).annotatedClasses(L2Config.class,
M2Config.class).implClasses(Map.of(IBean.class, CBean.class));
}
//====================================================================================================
@@ -128,7 +128,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a01_implClasses(RoundTripTester t) throws Exception {
+ void a01_implClasses(RoundTrip_Tester t) throws Exception {
var bean = new CBean();
bean.setF1("bar");
@@ -146,7 +146,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a02_implArrayClasses(RoundTripTester t) throws Exception {
+ void a02_implArrayClasses(RoundTrip_Tester t) throws Exception {
var bean = (IBean[])new CBean[]{new CBean()};
bean[0].setF1("bar");
@@ -164,7 +164,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a03_implListClasses(RoundTripTester t) throws Exception {
+ void a03_implListClasses(RoundTrip_Tester t) throws Exception {
var l = alist(new CBean());
l.get(0).setF1("bar");
@@ -186,7 +186,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a04_implMap(RoundTripTester t) throws Exception {
+ void a04_implMap(RoundTrip_Tester t) throws Exception {
var l = CollectionUtils.map("foo",new CBean());
l.get("foo").setF1("bar");
@@ -208,7 +208,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a05_implMap2(RoundTripTester t) throws Exception {
+ void a05_implMap2(RoundTrip_Tester t) throws Exception {
var b = new A(1);
b = t.roundTrip(b);
if (t.returnOriginalObject || t.getParser() == null)
@@ -264,7 +264,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a06_subTypesUsingAnnotation(RoundTripTester t) throws Exception {
+ void a06_subTypesUsingAnnotation(RoundTrip_Tester t) throws Exception {
var js =
JsonSerializer.create().json5().addBeanTypes().addRootType().build();
// Skip validation-only tests
@@ -339,7 +339,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a07_subTypesUsingBeanFilter(RoundTripTester t) throws Exception {
+ void a07_subTypesUsingBeanFilter(RoundTrip_Tester t) throws Exception {
var js = JsonSerializer.create().json5().build();
// Skip validation-only tests
@@ -416,7 +416,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a08_subTypePropertyWithRealPropertyUsingAnnotation(RoundTripTester
t) throws Exception {
+ void
a08_subTypePropertyWithRealPropertyUsingAnnotation(RoundTrip_Tester t) throws
Exception {
// Skip validation-only tests
if (t.isValidationOnly())
return;
@@ -458,7 +458,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a09_subTypePropertyWithRealPropertyUsingBeanFilter(RoundTripTester
t) throws Exception {
+ void
a09_subTypePropertyWithRealPropertyUsingBeanFilter(RoundTrip_Tester t) throws
Exception {
// Skip validation-only tests
if (t.isValidationOnly())
return;
@@ -504,7 +504,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a10_propertiesUsingAnnotation(RoundTripTester t) throws Exception {
+ void a10_propertiesUsingAnnotation(RoundTrip_Tester t) throws Exception
{
// Skip validation-only tests
if (t.isValidationOnly())
return;
@@ -536,7 +536,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a11_propertiesUsingBeanFilter(RoundTripTester t) throws Exception {
+ void a11_propertiesUsingBeanFilter(RoundTrip_Tester t) throws Exception
{
var js =
JsonSerializer.create().json5().beanProperties(D2.class, "f3,f2").build();
// Skip validation-only tests
@@ -569,7 +569,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a12_excludePropertiesUsingAnnotation(RoundTripTester t) throws
Exception {
+ void a12_excludePropertiesUsingAnnotation(RoundTrip_Tester t) throws
Exception {
// Skip validation-only tests
if (t.isValidationOnly())
return;
@@ -600,7 +600,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a13_excludePropertiesUsingBeanFilter(RoundTripTester t) throws
Exception {
+ void a13_excludePropertiesUsingBeanFilter(RoundTrip_Tester t) throws
Exception {
// Skip validation-only tests
if (t.isValidationOnly())
return;
@@ -630,7 +630,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a14_interfaceClassUsingAnnotation(RoundTripTester t) throws
Exception {
+ void a14_interfaceClassUsingAnnotation(RoundTrip_Tester t) throws
Exception {
// Skip validation-only tests
if (t.isValidationOnly())
return;
@@ -664,7 +664,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a15_interfaceClassUsingBeanFilter(RoundTripTester t) throws
Exception {
+ void a15_interfaceClassUsingBeanFilter(RoundTrip_Tester t) throws
Exception {
var s = t.getSerializer().copy();
var p = t.getParser() == null ? null : t.getParser().copy();
FB2 x;
@@ -721,7 +721,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a16_memberClass(RoundTripTester t) {
+ void a16_memberClass(RoundTrip_Tester t) {
var x = G.create();
assertDoesNotThrow(()->t.roundTrip(x, G.class));
}
@@ -762,7 +762,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a17_memberClassWithMapClass(RoundTripTester t) {
+ void a17_memberClassWithMapClass(RoundTrip_Tester t) {
var x = H.create();
assertDoesNotThrow(()->t.roundTrip(x, H.class));
}
@@ -803,7 +803,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a18_memberClassWithListClass(RoundTripTester t) {
+ void a18_memberClassWithListClass(RoundTrip_Tester t) {
var x = I.create();
assertDoesNotThrow(()->t.roundTrip(x, I.class));
}
@@ -844,7 +844,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a19_memberClassWithStringConstructor(RoundTripTester t) {
+ void a19_memberClassWithStringConstructor(RoundTrip_Tester t) {
var x = J.create();
assertDoesNotThrow(()->t.roundTrip(x, J.class));
}
@@ -882,7 +882,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a20_beanPropertyPrecedence(RoundTripTester t) {
+ void a20_beanPropertyPrecedence(RoundTrip_Tester t) {
var x = K.create();
assertDoesNotThrow(()->t.roundTrip(x, K.class));
}
@@ -925,7 +925,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a21_wrapperAttrAnnotationOnBean(RoundTripTester t) {
+ void a21_wrapperAttrAnnotationOnBean(RoundTrip_Tester t) {
var x = L.create();
assertDoesNotThrow(()->t.roundTrip(x, L.class));
@@ -947,7 +947,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a22_wrapperAttrAnnotationOnBean_usingConfig(RoundTripTester t) {
+ void a22_wrapperAttrAnnotationOnBean_usingConfig(RoundTrip_Tester t) {
var x = L2.create();
assertDoesNotThrow(()->t.roundTrip(x, L2.class));
@@ -975,7 +975,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a23_wrapperAttrAnnotationOnNonBean(RoundTripTester t) {
+ void a23_wrapperAttrAnnotationOnNonBean(RoundTrip_Tester t) {
var x = M.create();
assertDoesNotThrow(()->t.roundTrip(x, M.class));
@@ -1008,7 +1008,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a24_WrapperAttrAnnotationOnNonBean_usingConfig(RoundTripTester t) {
+ void a24_WrapperAttrAnnotationOnNonBean_usingConfig(RoundTrip_Tester t)
{
var x = M2.create();
assertDoesNotThrow(()->t.roundTrip(x, M2.class));
@@ -1047,7 +1047,7 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a25_BeanPropertyWithBeanWithAttrsField(RoundTripTester t) throws
Exception {
+ void a25_BeanPropertyWithBeanWithAttrsField(RoundTrip_Tester t) throws
Exception {
var x = N.create();
x = t.roundTrip(x, N.class);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeansWithBuilders_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeansWithBuilders_Test.java
index 470488fac..1c2abd149 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeansWithBuilders_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripBeansWithBuilders_Test.java
@@ -34,7 +34,7 @@ import org.junit.jupiter.params.provider.*;
*/
class RoundTripBeansWithBuilders_Test extends SimpleTestBase {
- private static RoundTripTester[] TESTERS = {
+ private static RoundTrip_Tester[] TESTERS = {
tester("Json - default")
.serializer(JsonSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
@@ -107,12 +107,12 @@ class RoundTripBeansWithBuilders_Test extends
SimpleTestBase {
.build(),
};
- static RoundTripTester[] testers() {
+ static RoundTrip_Tester[] testers() {
return TESTERS;
}
- protected static RoundTripTester.Builder tester(String label) {
- return
RoundTripTester.create(label).annotatedClasses(AcConfig.class);
+ protected static RoundTrip_Tester.Builder tester(String label) {
+ return
RoundTrip_Tester.create(label).annotatedClasses(AcConfig.class);
}
//====================================================================================================
@@ -121,7 +121,7 @@ class RoundTripBeansWithBuilders_Test extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a01_simple(RoundTripTester t) throws Exception {
+ void a01_simple(RoundTrip_Tester t) throws Exception {
var x = A.create().f1(1).build();
x = t.roundTrip(x, A.class);
assertBean(x, "f1", "1");
@@ -154,7 +154,7 @@ class RoundTripBeansWithBuilders_Test extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a02_simple_usingConfig(RoundTripTester t) throws Exception {
+ void a02_simple_usingConfig(RoundTrip_Tester t) throws Exception {
var x = Ac.create().f1(1).build();
x = t.roundTrip(x, Ac.class);
assertBean(x, "f1", "1");
@@ -195,7 +195,7 @@ class RoundTripBeansWithBuilders_Test extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a03_beanPropertyBuilder_simple(RoundTripTester t) throws Exception
{
+ void a03_beanPropertyBuilder_simple(RoundTrip_Tester t) throws
Exception {
var x = A2.create().f1(A.create().f1(1).build()).build();
x = t.roundTrip(x, A2.class);
assertBean(x, "f1{f1}", "{1}");
@@ -232,7 +232,7 @@ class RoundTripBeansWithBuilders_Test extends
SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a04_beanPropertyBuilder_collections(RoundTripTester t) throws
Exception {
+ void a04_beanPropertyBuilder_collections(RoundTrip_Tester t) throws
Exception {
// It's simply not possible to allow for expanded parameters
with a builder-based approach
// since the value on the builder can only be set once.
if (t.label.equals("UrlEncoding - expanded params"))
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.java
index 23526c899..f4cbfe0da 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripLargeObjects_Test.java
@@ -38,7 +38,7 @@ class RoundTripLargeObjects_Test extends SimpleTestBase {
private static final int NUM_RUNS = 10;
private static final int SIZE_PARAM = 20000;
- private static RoundTripTester[] TESTERS = {
+ private static RoundTrip_Tester[] TESTERS = {
tester("Json DEFAULT")
.serializer(JsonSerializer.create().keepNullProperties())
.parser(JsonParser.create())
@@ -81,12 +81,12 @@ class RoundTripLargeObjects_Test extends SimpleTestBase {
.build()
};
- static RoundTripTester[] testers() {
+ static RoundTrip_Tester[] testers() {
return TESTERS;
}
- protected static RoundTripTester.Builder tester(String label) {
- return RoundTripTester.create(label);
+ protected static RoundTrip_Tester.Builder tester(String label) {
+ return RoundTrip_Tester.create(label);
}
//====================================================================================================
@@ -95,7 +95,7 @@ class RoundTripLargeObjects_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a01_largeMap(RoundTripTester t) throws Exception {
+ void a01_largeMap(RoundTrip_Tester t) throws Exception {
long startTime;
var numRuns = NUM_RUNS;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripMaps_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripMaps_Test.java
index db48b5976..3935882d2 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripMaps_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripMaps_Test.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.params.provider.*;
@SuppressWarnings({"deprecation"})
class RoundTripMaps_Test extends SimpleTestBase {
- private static RoundTripTester[] TESTERS = {
+ private static RoundTrip_Tester[] TESTERS = {
tester("Json - default")
.serializer(JsonSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
@@ -109,12 +109,12 @@ class RoundTripMaps_Test extends SimpleTestBase {
.build(),
};
- static RoundTripTester[] testers() {
+ static RoundTrip_Tester[] testers() {
return TESTERS;
}
- protected static RoundTripTester.Builder tester(String label) {
- return
RoundTripTester.create(label).pojoSwaps(ByteArraySwap.Base64.class);
+ protected static RoundTrip_Tester.Builder tester(String label) {
+ return
RoundTrip_Tester.create(label).pojoSwaps(ByteArraySwap.Base64.class);
}
//====================================================================================================
@@ -123,7 +123,7 @@ class RoundTripMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a01_mapIntegerString(RoundTripTester t) throws Exception {
+ void a01_mapIntegerString(RoundTrip_Tester t) throws Exception {
var x = new TreeMap<Integer,String>();
x.put(1, "a");
x.put(2, null);
@@ -147,7 +147,7 @@ class RoundTripMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a02_mapBooleanString(RoundTripTester t) throws Exception {
+ void a02_mapBooleanString(RoundTrip_Tester t) throws Exception {
var x = new TreeMap<Boolean,String>();
x.put(true, "a");
x.put(false, null);
@@ -171,7 +171,7 @@ class RoundTripMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a03_mapByteArrayString(RoundTripTester t) throws Exception {
+ void a03_mapByteArrayString(RoundTrip_Tester t) throws Exception {
// Note, you cannot really test maps with byte[] keys since
byte[] does not test for equality.
// So just test serialization.
@@ -215,7 +215,7 @@ class RoundTripMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a04_mapDateString(RoundTripTester t) throws Exception {
+ void a04_mapDateString(RoundTrip_Tester t) throws Exception {
var xd1 = new Date(1,2,3,4,5,6);
var xd2 = new Date(2,3,4,5,6,7);
@@ -242,7 +242,7 @@ class RoundTripMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a05_mapCalendarString(RoundTripTester t) throws Exception {
+ void a05_mapCalendarString(RoundTrip_Tester t) throws Exception {
var xc1 =
GregorianCalendar.from(ZonedDateTime.parse("2012-12-21T12:34:56Z"));
var xc2 =
GregorianCalendar.from(ZonedDateTime.parse("2012-12-21T12:34:57Z"));
@@ -270,7 +270,7 @@ class RoundTripMaps_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a06_mapEnumString(RoundTripTester t) throws Exception {
+ void a06_mapEnumString(RoundTrip_Tester t) throws Exception {
var x = new TreeMap<TestEnum,String>();
x.put(TestEnum.FOO, "a");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest_Base.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest_Base.java
index a43a62c68..a90890a63 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest_Base.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTest_Base.java
@@ -26,7 +26,7 @@ import org.apache.juneau.xml.*;
*/
public abstract class RoundTripTest_Base extends SimpleTestBase {
- private static RoundTripTester[] TESTERS = {
+ private static RoundTrip_Tester[] TESTERS = {
tester("Json - default")
.serializer(JsonSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
@@ -99,11 +99,11 @@ public abstract class RoundTripTest_Base extends
SimpleTestBase {
.build(),
};
- static RoundTripTester[] testers() {
+ static RoundTrip_Tester[] testers() {
return TESTERS;
}
- protected static RoundTripTester.Builder tester(String label) {
- return RoundTripTester.create(label);
+ protected static RoundTrip_Tester.Builder tester(String label) {
+ return RoundTrip_Tester.create(label);
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeans_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeans_Test.java
index 7f4c180e1..4286d23a3 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeans_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeans_Test.java
@@ -44,7 +44,7 @@ import org.junit.jupiter.params.provider.*;
@SuppressWarnings({"rawtypes","serial"})
class RoundTripTransformBeans_Test extends SimpleTestBase {
- private static RoundTripTester[] TESTERS = {
+ private static RoundTrip_Tester[] TESTERS = {
tester("Json - default")
.serializer(JsonSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
@@ -117,12 +117,12 @@ class RoundTripTransformBeans_Test extends SimpleTestBase
{
.build(),
};
- static RoundTripTester[] testers() {
+ static RoundTrip_Tester[] testers() {
return TESTERS;
}
- protected static RoundTripTester.Builder tester(String label) {
- return
RoundTripTester.create(label).annotatedClasses(BcConfig.class, E1cConfig.class,
F1cConfig.class, F2acConfig.class).pojoSwaps(D2.class,
ByteArraySwap.Base64.class);
+ protected static RoundTrip_Tester.Builder tester(String label) {
+ return
RoundTrip_Tester.create(label).annotatedClasses(BcConfig.class,
E1cConfig.class, F1cConfig.class, F2acConfig.class).pojoSwaps(D2.class,
ByteArraySwap.Base64.class);
}
//====================================================================================================
@@ -131,7 +131,7 @@ class RoundTripTransformBeans_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a01_swapBeans1(RoundTripTester t) throws Exception {
+ void a01_swapBeans1(RoundTrip_Tester t) throws Exception {
var x = new A().init();
x = t.roundTrip(x, A.class);
@@ -231,7 +231,7 @@ class RoundTripTransformBeans_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a02_swapBeans2(RoundTripTester t) throws Exception {
+ void a02_swapBeans2(RoundTrip_Tester t) throws Exception {
var x = new A().init();
x = t.roundTrip(x, A.class);
@@ -271,7 +271,7 @@ class RoundTripTransformBeans_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a03_swaps(RoundTripTester t) throws Exception {
+ void a03_swaps(RoundTrip_Tester t) throws Exception {
var x = new B();
x.f1 = "bar";
x = t.roundTrip(x, B.class);
@@ -299,7 +299,7 @@ class RoundTripTransformBeans_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a04_Swaps_usingConfig(RoundTripTester t) throws Exception {
+ void a04_Swaps_usingConfig(RoundTrip_Tester t) throws Exception {
var x = new Bc();
x.f1 = "bar";
x = t.roundTrip(x, Bc.class);
@@ -335,7 +335,7 @@ class RoundTripTransformBeans_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a05_xmlGregorianCalendar(RoundTripTester t) throws Exception {
+ void a05_xmlGregorianCalendar(RoundTrip_Tester t) throws Exception {
if (t.isValidationOnly())
return;
@@ -357,7 +357,7 @@ class RoundTripTransformBeans_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a06_subTypeWithGenerics(RoundTripTester t) throws Exception {
+ void a06_subTypeWithGenerics(RoundTrip_Tester t) throws Exception {
var s =
JsonSerializer.DEFAULT.copy().addBeanTypes().addRootType().build();
var x = C3.create();
@@ -405,7 +405,7 @@ class RoundTripTransformBeans_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a07_surrogates(RoundTripTester t) throws Exception {
+ void a07_surrogates(RoundTrip_Tester t) throws Exception {
var s = JsonSerializer.create().json5().swaps(D2.class).build();
var p = JsonParser.create().swaps(D2.class).build();
var x = D1.create();
@@ -447,7 +447,7 @@ class RoundTripTransformBeans_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a08_surrogatesThroughAnnotation(RoundTripTester t) throws
Exception {
+ void a08_surrogatesThroughAnnotation(RoundTrip_Tester t) throws
Exception {
var s = Json5Serializer.DEFAULT;
var p = JsonParser.DEFAULT;
var x = E1.create();
@@ -490,7 +490,7 @@ class RoundTripTransformBeans_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a09_surrogatesThroughAnnotation_usingConfig(RoundTripTester t)
throws Exception {
+ void a09_surrogatesThroughAnnotation_usingConfig(RoundTrip_Tester t)
throws Exception {
var s =
Json5Serializer.DEFAULT.copy().applyAnnotations(E1cConfig.class).build();
var p =
JsonParser.DEFAULT.copy().applyAnnotations(E1cConfig.class).build();
var x = E1c.create();
@@ -555,7 +555,7 @@ class RoundTripTransformBeans_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a10_swapOnPrivateField(RoundTripTester t) throws Exception {
+ void a10_swapOnPrivateField(RoundTrip_Tester t) throws Exception {
var s = Json5Serializer.DEFAULT;
var p = JsonParser.DEFAULT;
@@ -590,7 +590,7 @@ class RoundTripTransformBeans_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a11_swapOnPrivateField_usingConfig(RoundTripTester t) throws
Exception {
+ void a11_swapOnPrivateField_usingConfig(RoundTrip_Tester t) throws
Exception {
var s =
Json5Serializer.DEFAULT.copy().applyAnnotations(F1cConfig.class).build();
var p =
JsonParser.DEFAULT.copy().applyAnnotations(F1cConfig.class).build();
@@ -624,7 +624,7 @@ class RoundTripTransformBeans_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a12_swapOnPrivateField_Inherited(RoundTripTester t) throws
Exception {
+ void a12_swapOnPrivateField_Inherited(RoundTrip_Tester t) throws
Exception {
var s = Json5Serializer.DEFAULT;
var p = JsonParser.DEFAULT;
@@ -662,7 +662,7 @@ class RoundTripTransformBeans_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a13_swapOnPrivateField_Inherited_usingConfig(RoundTripTester t)
throws Exception {
+ void a13_swapOnPrivateField_Inherited_usingConfig(RoundTrip_Tester t)
throws Exception {
var s =
Json5Serializer.DEFAULT.copy().applyAnnotations(F2ac.class).build();
var p =
JsonParser.DEFAULT.copy().applyAnnotations(F2ac.class).build();
@@ -704,7 +704,7 @@ class RoundTripTransformBeans_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("testers")
- void a14_beanWithIncompleteCopyConstructor(RoundTripTester t) throws
Exception {
+ void a14_beanWithIncompleteCopyConstructor(RoundTrip_Tester t) throws
Exception {
var x = F.create();
x = t.roundTrip(x);
assertJson("{f1:1,f2:2}", x);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTester.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTrip_Tester.java
similarity index 97%
rename from
juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTester.java
rename to
juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTrip_Tester.java
index fb13692f1..ecc00c835 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripTester.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTrip_Tester.java
@@ -24,7 +24,7 @@ import org.apache.juneau.serializer.*;
import org.apache.juneau.xml.*;
@SuppressWarnings("unchecked")
-public class RoundTripTester {
+public class RoundTrip_Tester {
public static Builder create(String label) {
return new Builder().label(label);
@@ -65,8 +65,8 @@ public class RoundTripTester {
private Class<?>[] annotatedClasses = a();
public Builder annotatedClasses(Class<?>...value) {
annotatedClasses = value; return this; }
- public RoundTripTester build() {
- return new RoundTripTester(this);
+ public RoundTrip_Tester build() {
+ return new RoundTrip_Tester(this);
}
}
@@ -78,7 +78,7 @@ public class RoundTripTester {
private boolean validateXml;
public boolean debug;
- private RoundTripTester(Builder b) {
+ private RoundTrip_Tester(Builder b) {
label = b.label;
var bs = b.s;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/SimpleObjects_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/SimpleObjects_RoundTripTest.java
index 6d6908ec1..28758d0c3 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/SimpleObjects_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/SimpleObjects_RoundTripTest.java
@@ -30,39 +30,39 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a01_null(RoundTripTester t) throws Exception {
+ void a01_null(RoundTrip_Tester t) throws Exception {
assertNull(t.roundTrip((String)null));
}
@ParameterizedTest
@MethodSource("testers")
- void a02_optional(RoundTripTester t) throws Exception {
+ void a02_optional(RoundTrip_Tester t) throws Exception {
assertFalse(t.roundTrip(empty()).isPresent());
}
@ParameterizedTest
@MethodSource("testers")
- void a03_string(RoundTripTester t) throws Exception {
+ void a03_string(RoundTrip_Tester t) throws Exception {
assertEquals("foobar", t.roundTrip("foobar"));
assertEquals("", t.roundTrip(""));
}
@ParameterizedTest
@MethodSource("testers")
- void a04_optionalContainingString(RoundTripTester t) throws Exception {
+ void a04_optionalContainingString(RoundTrip_Tester t) throws Exception {
assertEquals("foobar", t.roundTrip(opt("foobar")).get());
assertEquals("", t.roundTrip(opt("")).get());
}
@ParameterizedTest
@MethodSource("testers")
- void a05_stringArray(RoundTripTester t) throws Exception {
+ void a05_stringArray(RoundTrip_Tester t) throws Exception {
assertArrayEquals(new String[]{"foo", null, "null", ""},
t.roundTrip(new String[]{"foo", null, "null", ""}, String[].class));
}
@ParameterizedTest
@MethodSource("testers")
- void a06_string2dArray(RoundTripTester t) throws Exception {
+ void a06_string2dArray(RoundTrip_Tester t) throws Exception {
var x = a(a("foo", null, "null", ""),null);
x = t.roundTrip(x, String[][].class);
assertEquals("foo", x[0][0]);
@@ -74,19 +74,19 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a07_int(RoundTripTester t) throws Exception {
+ void a07_int(RoundTrip_Tester t) throws Exception {
assertEquals(123, t.roundTrip(123).intValue());
}
@ParameterizedTest
@MethodSource("testers")
- void a08_intArray(RoundTripTester t) throws Exception {
+ void a08_intArray(RoundTrip_Tester t) throws Exception {
assertArrayEquals(new int[]{1,2,3}, t.roundTrip(new
int[]{1,2,3}, int[].class));
}
@ParameterizedTest
@MethodSource("testers")
- void a09_int2dArray(RoundTripTester t) throws Exception {
+ void a09_int2dArray(RoundTrip_Tester t) throws Exception {
var x = new int[][]{{1,2,3},null};
x = t.roundTrip(x, int[][].class);
assertEquals(1, x[0][0]);
@@ -97,7 +97,7 @@ class SimpleObjects_RoundTripTest extends RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a10_int3dArray(RoundTripTester t) throws Exception {
+ void a10_int3dArray(RoundTrip_Tester t) throws Exception {
var x = new int[][][]{{{1,2,3},{4,5,6},null},null};
x = t.roundTrip(x, int[][][].class);
assertEquals(1, x[0][0][0]);
@@ -112,20 +112,20 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a11_boolean(RoundTripTester t) throws Exception {
+ void a11_boolean(RoundTrip_Tester t) throws Exception {
assertTrue(t.roundTrip(true));
assertFalse(t.roundTrip(false));
}
@ParameterizedTest
@MethodSource("testers")
- void a12_booleanArray(RoundTripTester t) throws Exception {
+ void a12_booleanArray(RoundTrip_Tester t) throws Exception {
assertArrayEquals(new boolean[]{true,false}, t.roundTrip(new
boolean[]{true,false}, boolean[].class));
}
@ParameterizedTest
@MethodSource("testers")
- void a13_boolean2dArray(RoundTripTester t) throws Exception {
+ void a13_boolean2dArray(RoundTrip_Tester t) throws Exception {
var x = new boolean[][]{{true,false},null};
x = t.roundTrip(x, boolean[][].class);
assertTrue(x[0][0]);
@@ -135,19 +135,19 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a14_char(RoundTripTester t) throws Exception {
+ void a14_char(RoundTrip_Tester t) throws Exception {
assertEquals('a', t.roundTrip('a', char.class).charValue());
}
@ParameterizedTest
@MethodSource("testers")
- void a15_charArray(RoundTripTester t) throws Exception {
+ void a15_charArray(RoundTrip_Tester t) throws Exception {
assertArrayEquals(new char[]{'a',0}, t.roundTrip(new
char[]{'a',0}, char[].class));
}
@ParameterizedTest
@MethodSource("testers")
- void a16_char2dArray(RoundTripTester t) throws Exception {
+ void a16_char2dArray(RoundTrip_Tester t) throws Exception {
var x = new char[][]{{'a',0},null};
x = t.roundTrip(x, char[][].class);
assertEquals('a', x[0][0]);
@@ -157,19 +157,19 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a17_float(RoundTripTester t) throws Exception {
+ void a17_float(RoundTrip_Tester t) throws Exception {
assertEquals(1f, t.roundTrip(1f, float.class), 0.1f);
}
@ParameterizedTest
@MethodSource("testers")
- void a18_floatArray(RoundTripTester t) throws Exception {
+ void a18_floatArray(RoundTrip_Tester t) throws Exception {
assertArrayEquals(new float[]{1f}, t.roundTrip(new float[]{1f},
float[].class), 0.1f);
}
@ParameterizedTest
@MethodSource("testers")
- void a19_float2dArray(RoundTripTester t) throws Exception {
+ void a19_float2dArray(RoundTrip_Tester t) throws Exception {
var x = new float[][]{{1f},null};
x = t.roundTrip(x, float[][].class);
assertEquals(1f, x[0][0], 0.1f);
@@ -178,19 +178,19 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a20_double(RoundTripTester t) throws Exception {
+ void a20_double(RoundTrip_Tester t) throws Exception {
assertEquals(1d, t.roundTrip(1d, double.class), 0.1f);
}
@ParameterizedTest
@MethodSource("testers")
- void a21_doubleArray(RoundTripTester t) throws Exception {
+ void a21_doubleArray(RoundTrip_Tester t) throws Exception {
assertArrayEquals(new double[]{1d}, t.roundTrip(new
double[]{1d}, double[].class), 0.1);
}
@ParameterizedTest
@MethodSource("testers")
- void a22_double2dArray(RoundTripTester t) throws Exception {
+ void a22_double2dArray(RoundTrip_Tester t) throws Exception {
var x = new double[][]{{1d},null};
x = t.roundTrip(x, double[][].class);
assertEquals(1d, x[0][0], 0.1f);
@@ -199,19 +199,19 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a23_long(RoundTripTester t) throws Exception {
+ void a23_long(RoundTrip_Tester t) throws Exception {
assertEquals(1L, t.roundTrip(1L, long.class).longValue());
}
@ParameterizedTest
@MethodSource("testers")
- void a24_longArray(RoundTripTester t) throws Exception {
+ void a24_longArray(RoundTrip_Tester t) throws Exception {
assertArrayEquals(new long[]{1L}, t.roundTrip(new long[]{1L},
long[].class));
}
@ParameterizedTest
@MethodSource("testers")
- void a25_long2dArray(RoundTripTester t) throws Exception {
+ void a25_long2dArray(RoundTrip_Tester t) throws Exception {
var x = new long[][]{{1L},null};
x = t.roundTrip(x, long[][].class);
assertEquals(1L, x[0][0]);
@@ -220,19 +220,19 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a26_short(RoundTripTester t) throws Exception {
+ void a26_short(RoundTrip_Tester t) throws Exception {
assertEquals((short)1, t.roundTrip((short)1,
short.class).shortValue());
}
@ParameterizedTest
@MethodSource("testers")
- void a27_shortArray(RoundTripTester t) throws Exception {
+ void a27_shortArray(RoundTrip_Tester t) throws Exception {
assertArrayEquals(new short[]{(short)1}, t.roundTrip(new
short[]{(short)1}, short[].class));
}
@ParameterizedTest
@MethodSource("testers")
- void a28_short2dArray(RoundTripTester t) throws Exception {
+ void a28_short2dArray(RoundTrip_Tester t) throws Exception {
var x = new short[][]{{(short)1},null};
x = t.roundTrip(x, short[][].class);
assertEquals((short)1, x[0][0]);
@@ -241,13 +241,13 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a29_integer(RoundTripTester t) throws Exception {
+ void a29_integer(RoundTrip_Tester t) throws Exception {
assertEquals(Integer.valueOf(123), t.roundTrip((Integer)123,
Integer.class));
}
@ParameterizedTest
@MethodSource("testers")
- void a30_integerArray(RoundTripTester t) throws Exception {
+ void a30_integerArray(RoundTrip_Tester t) throws Exception {
var x = new Integer[]{123, null};
x = t.roundTrip(x, Integer[].class);
assertEquals(Integer.valueOf(123), x[0]);
@@ -256,7 +256,7 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a31_integer2dArray(RoundTripTester t) throws Exception {
+ void a31_integer2dArray(RoundTrip_Tester t) throws Exception {
var x = new Integer[][]{{123,null},null};
x = t.roundTrip(x, Integer[][].class);
assertEquals(Integer.valueOf(123), x[0][0]);
@@ -266,7 +266,7 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a32_integer3dArray(RoundTripTester t) throws Exception {
+ void a32_integer3dArray(RoundTrip_Tester t) throws Exception {
var x = new Integer[][][]{{{123,null},null},null};
x = t.roundTrip(x, Integer[][][].class);
assertEquals(Integer.valueOf(123), x[0][0][0]);
@@ -277,14 +277,14 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a33_booleanObject(RoundTripTester t) throws Exception {
+ void a33_booleanObject(RoundTrip_Tester t) throws Exception {
assertTrue(t.roundTrip(Boolean.TRUE, Boolean.class));
assertFalse(t.roundTrip(Boolean.FALSE, Boolean.class));
}
@ParameterizedTest
@MethodSource("testers")
- void a34_booleanObjectArray(RoundTripTester t) throws Exception {
+ void a34_booleanObjectArray(RoundTrip_Tester t) throws Exception {
var x = new Boolean[]{true,false,null};
x = t.roundTrip(x, Boolean[].class);
assertTrue(x[0]);
@@ -294,7 +294,7 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a35_booleanObject2dArray(RoundTripTester t) throws Exception {
+ void a35_booleanObject2dArray(RoundTrip_Tester t) throws Exception {
var x = new Boolean[][]{{true,false,null},null};
x = t.roundTrip(x, Boolean[][].class);
assertTrue(x[0][0]);
@@ -305,13 +305,13 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a36_character(RoundTripTester t) throws Exception {
+ void a36_character(RoundTrip_Tester t) throws Exception {
assertEquals(Character.valueOf('a'),
t.roundTrip((Character)'a', Character.class));
}
@ParameterizedTest
@MethodSource("testers")
- void a37_characterArray(RoundTripTester t) throws Exception {
+ void a37_characterArray(RoundTrip_Tester t) throws Exception {
var x = new Character[]{'a',null};
x = t.roundTrip(x, Character[].class);
assertEquals(Character.valueOf('a'), x[0]);
@@ -320,7 +320,7 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a38_character2dArray(RoundTripTester t) throws Exception {
+ void a38_character2dArray(RoundTrip_Tester t) throws Exception {
var x = new Character[][]{{'a',null},null};
x = t.roundTrip(x, Character[][].class);
assertEquals(Character.valueOf('a'), x[0][0]);
@@ -330,13 +330,13 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a39_floatObject(RoundTripTester t) throws Exception {
+ void a39_floatObject(RoundTrip_Tester t) throws Exception {
assertEquals(Float.valueOf(1f), t.roundTrip((Float)1f,
Float.class));
}
@ParameterizedTest
@MethodSource("testers")
- void a40_floatObjectArray(RoundTripTester t) throws Exception {
+ void a40_floatObjectArray(RoundTrip_Tester t) throws Exception {
var x = new Float[]{1f, null};
x = t.roundTrip(x, Float[].class);
assertEquals(Float.valueOf(1f), x[0]);
@@ -345,7 +345,7 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a41_floatObject2dArray(RoundTripTester t) throws Exception {
+ void a41_floatObject2dArray(RoundTrip_Tester t) throws Exception {
var x = new Float[][]{{1f,null},null};
x = t.roundTrip(x, Float[][].class);
assertEquals(Float.valueOf(1f), x[0][0]);
@@ -355,13 +355,13 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a42_doubleObject(RoundTripTester t) throws Exception {
+ void a42_doubleObject(RoundTrip_Tester t) throws Exception {
assertEquals(Double.valueOf(1d), t.roundTrip((Double)1d,
Double.class));
}
@ParameterizedTest
@MethodSource("testers")
- void a43_doubleObjectArray(RoundTripTester t) throws Exception {
+ void a43_doubleObjectArray(RoundTrip_Tester t) throws Exception {
var x = new Double[]{1d,null};
x = t.roundTrip(x, Double[].class);
assertEquals(Double.valueOf(1d), x[0]);
@@ -370,7 +370,7 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a44_doubleObject2dArray(RoundTripTester t) throws Exception {
+ void a44_doubleObject2dArray(RoundTrip_Tester t) throws Exception {
var x = new Double[][]{{1d,null},null};
x = t.roundTrip(x, Double[][].class);
assertEquals(Double.valueOf(1d), x[0][0]);
@@ -380,13 +380,13 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a45_longObject(RoundTripTester t) throws Exception {
+ void a45_longObject(RoundTrip_Tester t) throws Exception {
assertEquals(Long.valueOf(1L), t.roundTrip((Long)1L,
Long.class));
}
@ParameterizedTest
@MethodSource("testers")
- void a46_longObjectArray(RoundTripTester t) throws Exception {
+ void a46_longObjectArray(RoundTrip_Tester t) throws Exception {
var x = new Long[]{1L, null};
x = t.roundTrip(x, Long[].class);
assertEquals(Long.valueOf(1L), x[0]);
@@ -395,7 +395,7 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a47_longObject2dArray(RoundTripTester t) throws Exception {
+ void a47_longObject2dArray(RoundTrip_Tester t) throws Exception {
var x = new Long[][]{{1L,null},null};
x = t.roundTrip(x, Long[][].class);
assertEquals(Long.valueOf(1L), x[0][0]);
@@ -405,13 +405,13 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a48_shortObject(RoundTripTester t) throws Exception {
+ void a48_shortObject(RoundTrip_Tester t) throws Exception {
assertEquals(Short.valueOf((short)1),
t.roundTrip((Short)(short)1, Short.class));
}
@ParameterizedTest
@MethodSource("testers")
- void a49_shortObjectArray(RoundTripTester t) throws Exception {
+ void a49_shortObjectArray(RoundTrip_Tester t) throws Exception {
var x = new Short[]{(short)1,null};
x = t.roundTrip(x, Short[].class);
assertEquals(Short.valueOf((short)1), x[0]);
@@ -420,7 +420,7 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a50_shortObject2dArray(RoundTripTester t) throws Exception {
+ void a50_shortObject2dArray(RoundTrip_Tester t) throws Exception {
var x = new Short[][]{{(short)1,null},null};
x = t.roundTrip(x, Short[][].class);
assertEquals(Short.valueOf((short)1), x[0][0]);
@@ -430,7 +430,7 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a51_jsonMap(RoundTripTester t) throws Exception {
+ void a51_jsonMap(RoundTrip_Tester t) throws Exception {
var x =
JsonMap.ofJson("{a:'b',c:123,d:false,e:null,f:[123,'abc',true,false,null]}");
x = t.roundTrip(x);
assertEquals("b", x.get("a"));
@@ -447,7 +447,7 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a52_jsonList(RoundTripTester t) throws Exception {
+ void a52_jsonList(RoundTrip_Tester t) throws Exception {
var x = new JsonList("['abc',123,true,false,null,{a:'b'}]");
x = t.roundTrip(x);
assertEquals("abc", x.get(0));
@@ -461,7 +461,7 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a53_treeMap(RoundTripTester t) throws Exception {
+ void a53_treeMap(RoundTrip_Tester t) throws Exception {
var x = new TreeMap<String,Object>();
x.put("a", 1);
x.put("b", 2);
@@ -495,7 +495,7 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a54_linkedHashMap(RoundTripTester t) throws Exception {
+ void a54_linkedHashMap(RoundTrip_Tester t) throws Exception {
var x = new LinkedHashMap<String,Object>();
x.put("a", true);
x.put("b", false);
@@ -572,7 +572,7 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a55_vector(RoundTripTester t) {
+ void a55_vector(RoundTrip_Tester t) {
var x = new Vector<Integer>();
x.add(1);
x.add(2);
@@ -582,7 +582,7 @@ class SimpleObjects_RoundTripTest extends
RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a56_extendedUnicode(RoundTripTester t) throws Exception {
+ void a56_extendedUnicode(RoundTrip_Tester t) throws Exception {
// Test 4-byte UTF-8 character
assertEquals("𤭢𤭢", t.roundTrip("𤭢𤭢"));
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/TrimStrings_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/TrimStrings_RoundTripTest.java
index d93a8d228..7a926d889 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/TrimStrings_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/TrimStrings_RoundTripTest.java
@@ -32,7 +32,7 @@ class TrimStrings_RoundTripTest extends RoundTripTest_Base {
@ParameterizedTest
@MethodSource("testers")
- void a01_basic(RoundTripTester t) throws Exception {
+ void a01_basic(RoundTrip_Tester t) throws Exception {
if (t.isValidationOnly())
return;
var s = t.getSerializer();
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/html5/Html5Template_ComboRoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/html5/Html5Template_ComboRoundTripTest.java
index 098aee0d9..eb25df6f6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/dto/html5/Html5Template_ComboRoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/dto/html5/Html5Template_ComboRoundTripTest.java
@@ -27,11 +27,11 @@ import org.apache.juneau.bean.html5.*;
@SuppressWarnings({})
class Html5Template_ComboRoundTripTest extends ComboRoundTripTest_Base {
- private static <T> ComboRoundTripTester.Builder<T> tester(int index,
String label, Type type, T bean) {
- return ComboRoundTripTester.create(index, label, type,
()->bean);
+ private static <T> ComboRoundTrip_Tester.Builder<T> tester(int index,
String label, Type type, T bean) {
+ return ComboRoundTrip_Tester.create(index, label, type,
()->bean);
}
- private static ComboRoundTripTester<?>[] TESTERS = {
+ private static ComboRoundTrip_Tester<?>[] TESTERS = {
tester(1, "FormTemplate-1", FormTemplate.class, new
FormTemplate("http://myaction";, 123, true))
.json("{a:{action:'http://myaction'},c:[{_type:'input',a:{type:'text',name:'v1',value:123}},{_type:'input',a:{type:'text',name:'v2',value:true}}]}")
.jsonT("{a:{action:'http://myaction'},c:[{t:'input',a:{type:'text',name:'v1',value:123}},{t:'input',a:{type:'text',name:'v2',value:true}}]}")
@@ -86,7 +86,7 @@ class Html5Template_ComboRoundTripTest extends
ComboRoundTripTest_Base {
}
}
- static ComboRoundTripTester<?>[] testers() {
+ static ComboRoundTrip_Tester<?>[] testers() {
return TESTERS;
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/html5/Html5_ComboRoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/html5/Html5_ComboRoundTripTest.java
index 863c91277..e6e6dabc3 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/dto/html5/Html5_ComboRoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/dto/html5/Html5_ComboRoundTripTest.java
@@ -39,11 +39,11 @@ class Html5_ComboRoundTripTest extends
ComboRoundTripTest_Base {
return HtmlBuilder.a(ref, children);
}
- private static <T> ComboRoundTripTester.Builder<T> tester(int index,
String label, Type type, T bean) {
- return ComboRoundTripTester.create(index, label, type,
()->bean);
+ private static <T> ComboRoundTrip_Tester.Builder<T> tester(int index,
String label, Type type, T bean) {
+ return ComboRoundTrip_Tester.create(index, label, type,
()->bean);
}
- private static ComboRoundTripTester<?>[] TESTERS = {
+ private static ComboRoundTrip_Tester<?>[] TESTERS = {
tester(1, "A", A.class, a2("http://foo";, "bar"))
.json("{_type:'a',a:{href:'http://foo'},c:['bar']}")
.jsonT("{t:'a',a:{href:'http://foo'},c:['bar']}")
@@ -2226,7 +2226,7 @@ class Html5_ComboRoundTripTest extends
ComboRoundTripTest_Base {
.build(),
};
- static ComboRoundTripTester<?>[] testers() {
+ static ComboRoundTrip_Tester<?>[] testers() {
return TESTERS;
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/serializer/ReaderObject_ComboSerializeTest.java
b/juneau-utest/src/test/java/org/apache/juneau/serializer/ReaderObject_ComboSerializeTest.java
index c63b23158..5fb7e4fd9 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/serializer/ReaderObject_ComboSerializeTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/serializer/ReaderObject_ComboSerializeTest.java
@@ -25,11 +25,11 @@ import org.apache.juneau.*;
*/
public class ReaderObject_ComboSerializeTest extends ComboSerializeTest_Base {
- private static <T> ComboSerializeTester.Builder<T> tester(int index,
String label, Supplier<T> bean) {
- return ComboSerializeTester.create(index, label,
bean).serializerApply(Serializer.Builder::keepNullProperties);
+ private static <T> ComboSerialize_Tester.Builder<T> tester(int index,
String label, Supplier<T> bean) {
+ return ComboSerialize_Tester.create(index, label,
bean).serializerApply(Serializer.Builder::keepNullProperties);
}
- private static ComboSerializeTester<?>[] TESTERS = {
+ private static ComboSerialize_Tester<?>[] TESTERS = {
tester(1, "SimpleReader", ()->reader("foobar"))
.json("foobar")
.jsonT("foobar")
@@ -220,7 +220,7 @@ public class ReaderObject_ComboSerializeTest extends
ComboSerializeTest_Base {
.build()
};
- static ComboSerializeTester<?>[] testers() {
+ static ComboSerialize_Tester<?>[] testers() {
return TESTERS;
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanDictionary_ComboRoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanDictionary_ComboRoundTripTest.java
index 6ff550fec..b3b83e6c2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanDictionary_ComboRoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/BeanDictionary_ComboRoundTripTest.java
@@ -28,11 +28,11 @@ import org.apache.juneau.serializer.*;
*/
class BeanDictionary_ComboRoundTripTest extends ComboRoundTripTest_Base {
- private static <T> ComboRoundTripTester.Builder<T> tester(int index,
String label, Type type, T bean) {
- return ComboRoundTripTester.create(index, label, type,
()->bean).serializerApply(Serializer.Builder::keepNullProperties);
+ private static <T> ComboRoundTrip_Tester.Builder<T> tester(int index,
String label, Type type, T bean) {
+ return ComboRoundTrip_Tester.create(index, label, type,
()->bean).serializerApply(Serializer.Builder::keepNullProperties);
}
- private static ComboRoundTripTester<?>[] TESTERS = {
+ private static ComboRoundTrip_Tester<?>[] TESTERS = {
tester(1, "A", A.class, new A().init())
.json("{_type:'A',a:1}")
.jsonT("{t:'A',a:1}")
@@ -611,7 +611,7 @@ class BeanDictionary_ComboRoundTripTest extends
ComboRoundTripTest_Base {
.build()
};
- static ComboRoundTripTester<?>[] testers() {
+ static ComboRoundTrip_Tester<?>[] testers() {
return TESTERS;
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/Builder_ComboRoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/Builder_ComboRoundTripTest.java
index ee9b5f62a..f9eab4a2a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/Builder_ComboRoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/Builder_ComboRoundTripTest.java
@@ -21,11 +21,11 @@ import org.apache.juneau.annotation.*;
class Builder_ComboRoundTripTest extends ComboRoundTripTest_Base {
- private static <T> ComboRoundTripTester.Builder<T> tester(int index,
String label, Type type, T bean) {
- return ComboRoundTripTester.create(index, label, type,
()->bean);
+ private static <T> ComboRoundTrip_Tester.Builder<T> tester(int index,
String label, Type type, T bean) {
+ return ComboRoundTrip_Tester.create(index, label, type,
()->bean);
}
- private static ComboRoundTripTester<?>[] TESTERS = {
+ private static ComboRoundTrip_Tester<?>[] TESTERS = {
tester(1, "A", A.class, new A(null).init())
.json("{a:1}")
.jsonT("{a:1}")
@@ -178,7 +178,7 @@ class Builder_ComboRoundTripTest extends
ComboRoundTripTest_Base {
.build()
};
- static ComboRoundTripTester<?>[] testers() {
+ static ComboRoundTrip_Tester<?>[] testers() {
return TESTERS;
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/ByteArrayBase64Swap_ComboRoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/ByteArrayBase64Swap_ComboRoundTripTest.java
index 6bdd54225..9f54b14b1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/ByteArrayBase64Swap_ComboRoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/ByteArrayBase64Swap_ComboRoundTripTest.java
@@ -24,13 +24,13 @@ import org.apache.juneau.swaps.*;
class ByteArrayBase64Swap_ComboRoundTripTest extends ComboRoundTripTest_Base {
- private static <T> ComboRoundTripTester.Builder<T> tester(int index,
String label, Type type, T bean) {
- return ComboRoundTripTester.create(index, label, type, ()->bean)
+ private static <T> ComboRoundTrip_Tester.Builder<T> tester(int index,
String label, Type type, T bean) {
+ return ComboRoundTrip_Tester.create(index, label, type,
()->bean)
.serializerApply(s ->
s.swaps(ByteArraySwap.Base64.class).keepNullProperties())
.parserApply(p -> p.swaps(ByteArraySwap.Base64.class));
}
- private static ComboRoundTripTester<?>[] TESTERS = {
+ private static ComboRoundTrip_Tester<?>[] TESTERS = {
tester(1, "ByteArray1d", byte[].class, new byte[] {1,2,3})
.json("'AQID'")
.jsonT("'AQID'")
@@ -300,7 +300,7 @@ class ByteArrayBase64Swap_ComboRoundTripTest extends
ComboRoundTripTest_Base {
.build()
};
- static ComboRoundTripTester<?>[] testers() {
+ static ComboRoundTrip_Tester<?>[] testers() {
return TESTERS;
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/ReaderObjectSwap_ComboSerializeTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/ReaderObjectSwap_ComboSerializeTest.java
index fbe5d6f07..dc3ac949a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/ReaderObjectSwap_ComboSerializeTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/ReaderObjectSwap_ComboSerializeTest.java
@@ -28,11 +28,11 @@ import org.apache.juneau.swap.*;
@SuppressWarnings({})
public class ReaderObjectSwap_ComboSerializeTest extends
ComboSerializeTest_Base {
- private static <T> ComboSerializeTester.Builder<T> tester(int index,
String label, Supplier<T> bean) {
- return ComboSerializeTester.create(index, label, bean);
+ private static <T> ComboSerialize_Tester.Builder<T> tester(int index,
String label, Supplier<T> bean) {
+ return ComboSerialize_Tester.create(index, label, bean);
}
- private static ComboSerializeTester<?>[] TESTERS = {
+ private static ComboSerialize_Tester<?>[] TESTERS = {
tester(1, "PojoToSimpleReader", PojoToSimpleReader::new)
.json("foo")
.jsonT("foo")
@@ -265,7 +265,7 @@ public class ReaderObjectSwap_ComboSerializeTest extends
ComboSerializeTest_Base
.build()
};
- static ComboSerializeTester<?>[] testers() {
+ static ComboSerialize_Tester<?>[] testers() {
return TESTERS;
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transforms/SwapsAnnotation_ComboSerializeTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transforms/SwapsAnnotation_ComboSerializeTest.java
index 3f9bbad3a..fa4b95e6a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transforms/SwapsAnnotation_ComboSerializeTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transforms/SwapsAnnotation_ComboSerializeTest.java
@@ -25,8 +25,8 @@ import org.apache.juneau.swap.*;
*/
class SwapsAnnotation_ComboSerializeTest extends ComboSerializeTest_Base {
- private static <T> ComboSerializeTester.Builder<T> tester(int index,
String label, Supplier<T> bean) {
- return ComboSerializeTester.create(index, label,
bean).serializerApply(s -> s.swaps(
+ private static <T> ComboSerialize_Tester.Builder<T> tester(int index,
String label, Supplier<T> bean) {
+ return ComboSerialize_Tester.create(index, label,
bean).serializerApply(s -> s.swaps(
ContextSwap.class,
ContextSwapJson.class,
ContextSwapXml.class,
@@ -38,7 +38,7 @@ class SwapsAnnotation_ComboSerializeTest extends
ComboSerializeTest_Base {
));
}
- private static ComboSerializeTester<?>[] TESTERS = {
+ private static ComboSerialize_Tester<?>[] TESTERS = {
tester(1, "TestMediaTypeLiterals", TestMediaTypeLiterals::new)
.json("'JSON'")
.jsonT("'JSON'")
@@ -366,7 +366,7 @@ class SwapsAnnotation_ComboSerializeTest extends
ComboSerializeTest_Base {
.build()
};
- static ComboSerializeTester<?>[] testers() {
+ static ComboSerialize_Tester<?>[] testers() {
return TESTERS;
}
