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 8f4f9c338 Test modernization
8f4f9c338 is described below
commit 8f4f9c338f9c2c87b3bda686704741941ee6b6a5
Author: James Bognar <[email protected]>
AuthorDate: Thu Sep 4 12:56:36 2025 -0400
Test modernization
---
.../a/rttests/RoundTripAddClassAttrs_Test.java | 22 ++++++-------
.../juneau/a/rttests/RoundTripBeanMaps_Test.java | 36 ++++++++++----------
.../a/rttests/RoundTripBeansWithBuilders_Test.java | 38 +++++++++++-----------
.../a/rttests/RoundTripLargeObjects_Test.java | 24 +++++++-------
.../juneau/a/rttests/RoundTripMaps_Test.java | 36 ++++++++++----------
.../juneau/a/rttests/RoundTripTest_Base.java | 36 ++++++++++----------
.../a/rttests/RoundTripTransformBeans_Test.java | 36 ++++++++++----------
.../apache/juneau/a/rttests/RoundTrip_Tester.java | 9 +++--
8 files changed, 120 insertions(+), 117 deletions(-)
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 2ed978dd6..458a288f4 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
@@ -36,42 +36,42 @@ import org.junit.jupiter.params.provider.*;
class RoundTripAddClassAttrs_Test extends SimpleTestBase {
private static RoundTrip_Tester[] TESTERS = {
- tester("JsonSerializer.DEFAULT/JsonParser.DEFAULT")
+ tester(1, "JsonSerializer.DEFAULT/JsonParser.DEFAULT")
.serializer(JsonSerializer.create().addBeanTypes().addRootType())
.parser(JsonParser.create().disableInterfaceProxies())
.build(),
- tester("JsonSerializer.DEFAULT_SIMPLE/JsonParser.DEFAULT")
+ tester(2, "JsonSerializer.DEFAULT_SIMPLE/JsonParser.DEFAULT")
.serializer(JsonSerializer.create().json5().addBeanTypes().addRootType())
.parser(JsonParser.create().disableInterfaceProxies())
.build(),
- tester("JsonSerializer.DEFAULT_SQ/JsonParser.DEFAULT")
+ tester(3, "JsonSerializer.DEFAULT_SQ/JsonParser.DEFAULT")
.serializer(JsonSerializer.create().json5().addBeanTypes().addRootType())
.parser(JsonParser.create().disableInterfaceProxies())
.build(),
- tester("XmlSerializer.DEFAULT/XmlParser.DEFAULT")
+ tester(4, "XmlSerializer.DEFAULT/XmlParser.DEFAULT")
.serializer(XmlSerializer.create().addBeanTypes().addRootType())
.parser(XmlParser.create().disableInterfaceProxies())
.validateXmlWhitespace()
.validateXml()
.build(),
- tester("HtmlSerializer.DEFAULT/HtmlParser.DEFAULT")
+ tester(5, "HtmlSerializer.DEFAULT/HtmlParser.DEFAULT")
.serializer(HtmlSerializer.create().addBeanTypes().addRootType())
.parser(HtmlParser.create().disableInterfaceProxies())
.validateXmlWhitespace()
.build(),
-
tester("UonSerializer.DEFAULT_ENCODING/UonParser.DEFAULT_DECODING")
+ tester(6,
"UonSerializer.DEFAULT_ENCODING/UonParser.DEFAULT_DECODING")
.serializer(UonSerializer.create().encoding().addBeanTypes().addRootType())
.parser(UonParser.create().decoding().disableInterfaceProxies())
.build(),
- tester("UonSerializer.DEFAULT/UonParser.DEFAULT")
+ tester(7, "UonSerializer.DEFAULT/UonParser.DEFAULT")
.serializer(UonSerializer.create().addBeanTypes().addRootType())
.parser(UonParser.create().disableInterfaceProxies())
.build(),
-
tester("UrlEncodingSerializer.DEFAULT/UrlEncodingParser.DEFAULT")
+ tester(8,
"UrlEncodingSerializer.DEFAULT/UrlEncodingParser.DEFAULT")
.serializer(UrlEncodingSerializer.create().addBeanTypes().addRootType())
.parser(UrlEncodingParser.create().disableInterfaceProxies())
.build(),
- tester("MsgPackSerializer.DEFAULT/MsgPackParser.DEFAULT")
+ tester(9, "MsgPackSerializer.DEFAULT/MsgPackParser.DEFAULT")
.serializer(MsgPackSerializer.create().addBeanTypes().addRootType())
.parser(MsgPackParser.create().disableInterfaceProxies())
.build()
@@ -81,8 +81,8 @@ class RoundTripAddClassAttrs_Test extends SimpleTestBase {
return TESTERS;
}
- 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);
+ protected static RoundTrip_Tester.Builder tester(int index, String
label) {
+ return RoundTrip_Tester.create(index,
label).dictionary(A.class, B.class, C.class, D.class, E.class, F.class);
}
//====================================================================================================
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 22e74ca5b..30b69d136 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
@@ -42,73 +42,73 @@ import org.junit.jupiter.params.provider.*;
class RoundTripBeanMaps_Test extends SimpleTestBase {
private static RoundTrip_Tester[] TESTERS = {
- tester("Json - default")
+ tester(1, "Json - default")
.serializer(JsonSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
.build(),
- tester("Json - lax")
+ tester(2, "Json - lax")
.serializer(JsonSerializer.create().json5().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
.build(),
- tester("Json - lax, readable")
+ tester(3, "Json - lax, readable")
.serializer(JsonSerializer.create().json5().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
.build(),
- tester("Xml - namespaces, validation, readable")
+ tester(4, "Xml - namespaces, validation, readable")
.serializer(XmlSerializer.create().ns().sq().keepNullProperties().addNamespaceUrisToRoot().useWhitespace().addBeanTypes().addRootType())
.parser(XmlParser.create())
.validateXmlWhitespace()
.validateXml()
.build(),
- tester("Xml - no namespaces, validation")
+ tester(5, "Xml - no namespaces, validation")
.serializer(XmlSerializer.create().sq().keepNullProperties().addBeanTypes().addRootType())
.parser(XmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Html - default")
+ tester(6, "Html - default")
.serializer(HtmlSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(HtmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Html - readable")
+ tester(7, "Html - readable")
.serializer(HtmlSerializer.create().sq().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(HtmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Html - with key/value headers")
+ tester(8, "Html - with key/value headers")
.serializer(HtmlSerializer.create().addKeyValueTableHeaders().addBeanTypes().addRootType())
.parser(HtmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Uon - default")
+ tester(9, "Uon - default")
.serializer(UonSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(UonParser.create())
.build(),
- tester("Uon - readable")
+ tester(10, "Uon - readable")
.serializer(UonSerializer.create().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(UonParser.create())
.build(),
- tester("Uon - encoded")
+ tester(11, "Uon - encoded")
.serializer(UonSerializer.create().encoding().keepNullProperties().addBeanTypes().addRootType())
.parser(UonParser.create().decoding())
.build(),
- tester("UrlEncoding - default")
+ tester(12, "UrlEncoding - default")
.serializer(UrlEncodingSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(UrlEncodingParser.create())
.build(),
- tester("UrlEncoding - readable")
+ tester(13, "UrlEncoding - readable")
.serializer(UrlEncodingSerializer.create().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(UrlEncodingParser.create())
.build(),
- tester("UrlEncoding - expanded params")
+ tester(14, "UrlEncoding - expanded params")
.serializer(UrlEncodingSerializer.create().expandedParams().addBeanTypes().addRootType())
.parser(UrlEncodingParser.create().expandedParams())
.build(),
- tester("MsgPack")
+ tester(15, "MsgPack")
.serializer(MsgPackSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(MsgPackParser.create())
.build(),
- tester("Json schema")
+ tester(16, "Json schema")
.serializer(JsonSchemaSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.returnOriginalObject()
.build(),
@@ -118,8 +118,8 @@ class RoundTripBeanMaps_Test extends SimpleTestBase {
return TESTERS;
}
- 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));
+ protected static RoundTrip_Tester.Builder tester(int index, String
label) {
+ return RoundTrip_Tester.create(index,
label).annotatedClasses(L2Config.class,
M2Config.class).implClasses(Map.of(IBean.class, CBean.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 1c2abd149..12cc981bc 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
@@ -35,73 +35,73 @@ import org.junit.jupiter.params.provider.*;
class RoundTripBeansWithBuilders_Test extends SimpleTestBase {
private static RoundTrip_Tester[] TESTERS = {
- tester("Json - default")
+ tester(1, "Json - default")
.serializer(JsonSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
.build(),
- tester("Json - lax")
+ tester(2, "Json - lax")
.serializer(JsonSerializer.create().json5().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
.build(),
- tester("Json - lax, readable")
+ tester(3, "Json - lax, readable")
.serializer(JsonSerializer.create().json5().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
.build(),
- tester("Xml - namespaces, validation, readable")
+ tester(4, "Xml - namespaces, validation, readable")
.serializer(XmlSerializer.create().ns().sq().keepNullProperties().addNamespaceUrisToRoot().useWhitespace().addBeanTypes().addRootType())
.parser(XmlParser.create())
.validateXmlWhitespace()
.validateXml()
.build(),
- tester("Xml - no namespaces, validation")
+ tester(5, "Xml - no namespaces, validation")
.serializer(XmlSerializer.create().sq().keepNullProperties().addBeanTypes().addRootType())
.parser(XmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Html - default")
+ tester(6, "Html - default")
.serializer(HtmlSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(HtmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Html - readable")
+ tester(7, "Html - readable")
.serializer(HtmlSerializer.create().sq().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(HtmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Html - with key/value headers")
+ tester(8, "Html - with key/value headers")
.serializer(HtmlSerializer.create().addKeyValueTableHeaders().addBeanTypes().addRootType())
.parser(HtmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Uon - default")
+ tester(9, "Uon - default")
.serializer(UonSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(UonParser.create())
.build(),
- tester("Uon - readable")
+ tester(10, "Uon - readable")
.serializer(UonSerializer.create().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(UonParser.create())
.build(),
- tester("Uon - encoded")
+ tester(11, "Uon - encoded")
.serializer(UonSerializer.create().encoding().keepNullProperties().addBeanTypes().addRootType())
.parser(UonParser.create().decoding())
.build(),
- tester("UrlEncoding - default")
+ tester(12, "UrlEncoding - default")
.serializer(UrlEncodingSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(UrlEncodingParser.create())
.build(),
- tester("UrlEncoding - readable")
+ tester(13, "UrlEncoding - readable")
.serializer(UrlEncodingSerializer.create().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(UrlEncodingParser.create())
.build(),
- tester("UrlEncoding - expanded params")
+ tester(14, "UrlEncoding - expanded params")
.serializer(UrlEncodingSerializer.create().expandedParams().addBeanTypes().addRootType())
.parser(UrlEncodingParser.create().expandedParams())
.build(),
- tester("MsgPack")
+ tester(15, "MsgPack")
.serializer(MsgPackSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(MsgPackParser.create())
.build(),
- tester("Json schema")
+ tester(16, "Json schema")
.serializer(JsonSchemaSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.returnOriginalObject()
.build(),
@@ -111,8 +111,8 @@ class RoundTripBeansWithBuilders_Test extends
SimpleTestBase {
return TESTERS;
}
- protected static RoundTrip_Tester.Builder tester(String label) {
- return
RoundTrip_Tester.create(label).annotatedClasses(AcConfig.class);
+ protected static RoundTrip_Tester.Builder tester(int index, String
label) {
+ return RoundTrip_Tester.create(index,
label).annotatedClasses(AcConfig.class);
}
//====================================================================================================
@@ -235,7 +235,7 @@ class RoundTripBeansWithBuilders_Test extends
SimpleTestBase {
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"))
+ if (t.label.contains("UrlEncoding - expanded params"))
return;
var x = A3.create()
.f1(new A[]{A.create().f1(1).build()})
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 f4cbfe0da..798bede0e 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
@@ -39,43 +39,43 @@ class RoundTripLargeObjects_Test extends SimpleTestBase {
private static final int SIZE_PARAM = 20000;
private static RoundTrip_Tester[] TESTERS = {
- tester("Json DEFAULT")
+ tester(1, "Json DEFAULT")
.serializer(JsonSerializer.create().keepNullProperties())
.parser(JsonParser.create())
.build(),
- tester("Json5 DEFAULT")
+ tester(2, "Json5 DEFAULT")
.serializer(Json5Serializer.create().keepNullProperties())
.parser(Json5Parser.create())
.build(),
- tester("Json DEFAULT_SQ")
+ tester(3, "Json DEFAULT_SQ")
.serializer(JsonSerializer.create().json5().keepNullProperties())
.parser(JsonParser.create())
.build(),
- tester("Xml DEFAULT w/namespaces,validation")
+ tester(4, "Xml DEFAULT w/namespaces,validation")
.serializer(XmlSerializer.create().sq().ns().keepNullProperties().addNamespaceUrisToRoot().useWhitespace())
.parser(XmlParser.create())
.validateXml()
.validateXmlWhitespace()
.build(),
- tester("Xml DEFAULT wo/namespaces,validation")
+ tester(5, "Xml DEFAULT wo/namespaces,validation")
.serializer(XmlSerializer.create().sq().keepNullProperties())
.parser(XmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Html")
+ tester(6, "Html")
.serializer(HtmlSerializer.create().keepNullProperties())
.parser(HtmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("UrlEncoding")
+ tester(7, "UrlEncoding")
.serializer(UrlEncodingSerializer.create().keepNullProperties())
.parser(UrlEncodingParser.create())
.build(),
- tester("Uon")
+ tester(8, "Uon")
.serializer(UonSerializer.create().keepNullProperties())
.parser(UonParser.create())
.build(),
- tester("MsgPack")
+ tester(9, "MsgPack")
.serializer(MsgPackSerializer.create().keepNullProperties())
.parser(MsgPackParser.create())
.build()
@@ -85,8 +85,8 @@ class RoundTripLargeObjects_Test extends SimpleTestBase {
return TESTERS;
}
- protected static RoundTrip_Tester.Builder tester(String label) {
- return RoundTrip_Tester.create(label);
+ protected static RoundTrip_Tester.Builder tester(int index, String
label) {
+ return RoundTrip_Tester.create(index, label);
}
//====================================================================================================
@@ -103,7 +103,7 @@ class RoundTripLargeObjects_Test extends SimpleTestBase {
var s = t.getSerializer();
var p = t.getParser();
System.err.println("\n---Speed test on " + t.label + "---"); //
NOT DEBUG
- var r = (Object)"";
+ var r = (Object)"";
// Initialization run.
r = s.serialize(a);
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 3935882d2..cf7677ed7 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
@@ -37,73 +37,73 @@ import org.junit.jupiter.params.provider.*;
class RoundTripMaps_Test extends SimpleTestBase {
private static RoundTrip_Tester[] TESTERS = {
- tester("Json - default")
+ tester(1, "Json - default")
.serializer(JsonSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
.build(),
- tester("Json - lax")
+ tester(2, "Json - lax")
.serializer(JsonSerializer.create().json5().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
.build(),
- tester("Json - lax, readable")
+ tester(3, "Json - lax, readable")
.serializer(JsonSerializer.create().json5().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
.build(),
- tester("Xml - namespaces, validation, readable")
+ tester(4, "Xml - namespaces, validation, readable")
.serializer(XmlSerializer.create().ns().sq().keepNullProperties().addNamespaceUrisToRoot().useWhitespace().addBeanTypes().addRootType())
.parser(XmlParser.create())
.validateXmlWhitespace()
.validateXml()
.build(),
- tester("Xml - no namespaces, validation")
+ tester(5, "Xml - no namespaces, validation")
.serializer(XmlSerializer.create().sq().keepNullProperties().addBeanTypes().addRootType())
.parser(XmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Html - default")
+ tester(6, "Html - default")
.serializer(HtmlSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(HtmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Html - readable")
+ tester(7, "Html - readable")
.serializer(HtmlSerializer.create().sq().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(HtmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Html - with key/value headers")
+ tester(8, "Html - with key/value headers")
.serializer(HtmlSerializer.create().addKeyValueTableHeaders().addBeanTypes().addRootType())
.parser(HtmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Uon - default")
+ tester(9, "Uon - default")
.serializer(UonSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(UonParser.create())
.build(),
- tester("Uon - readable")
+ tester(10, "Uon - readable")
.serializer(UonSerializer.create().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(UonParser.create())
.build(),
- tester("Uon - encoded")
+ tester(11, "Uon - encoded")
.serializer(UonSerializer.create().encoding().keepNullProperties().addBeanTypes().addRootType())
.parser(UonParser.create().decoding())
.build(),
- tester("UrlEncoding - default")
+ tester(12, "UrlEncoding - default")
.serializer(UrlEncodingSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(UrlEncodingParser.create())
.build(),
- tester("UrlEncoding - readable")
+ tester(13, "UrlEncoding - readable")
.serializer(UrlEncodingSerializer.create().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(UrlEncodingParser.create())
.build(),
- tester("UrlEncoding - expanded params")
+ tester(14, "UrlEncoding - expanded params")
.serializer(UrlEncodingSerializer.create().expandedParams().addBeanTypes().addRootType())
.parser(UrlEncodingParser.create().expandedParams())
.build(),
- tester("MsgPack")
+ tester(15, "MsgPack")
.serializer(MsgPackSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(MsgPackParser.create())
.build(),
- tester("Json schema")
+ tester(16, "Json schema")
.serializer(JsonSchemaSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.returnOriginalObject()
.build(),
@@ -113,8 +113,8 @@ class RoundTripMaps_Test extends SimpleTestBase {
return TESTERS;
}
- protected static RoundTrip_Tester.Builder tester(String label) {
- return
RoundTrip_Tester.create(label).pojoSwaps(ByteArraySwap.Base64.class);
+ protected static RoundTrip_Tester.Builder tester(int index, String
label) {
+ return RoundTrip_Tester.create(index,
label).pojoSwaps(ByteArraySwap.Base64.class);
}
//====================================================================================================
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 a90890a63..6ac96ca0b 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
@@ -27,73 +27,73 @@ import org.apache.juneau.xml.*;
public abstract class RoundTripTest_Base extends SimpleTestBase {
private static RoundTrip_Tester[] TESTERS = {
- tester("Json - default")
+ tester(1, "Json - default")
.serializer(JsonSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
.build(),
- tester("Json - lax")
+ tester(2, "Json - lax")
.serializer(JsonSerializer.create().json5().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
.build(),
- tester("Json - lax, readable")
+ tester(3, "Json - lax, readable")
.serializer(JsonSerializer.create().json5().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
.build(),
- tester("Xml - namespaces, validation, readable")
+ tester(4, "Xml - namespaces, validation, readable")
.serializer(XmlSerializer.create().ns().sq().keepNullProperties().addNamespaceUrisToRoot().useWhitespace().addBeanTypes().addRootType())
.parser(XmlParser.create())
.validateXmlWhitespace()
.validateXml()
.build(),
- tester("Xml - no namespaces, validation")
+ tester(5, "Xml - no namespaces, validation")
.serializer(XmlSerializer.create().sq().keepNullProperties().addBeanTypes().addRootType())
.parser(XmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Html - default")
+ tester(6, "Html - default")
.serializer(HtmlSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(HtmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Html - readable")
+ tester(7, "Html - readable")
.serializer(HtmlSerializer.create().sq().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(HtmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Html - with key/value headers")
+ tester(8, "Html - with key/value headers")
.serializer(HtmlSerializer.create().addKeyValueTableHeaders().addBeanTypes().addRootType())
.parser(HtmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Uon - default")
+ tester(9, "Uon - default")
.serializer(UonSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(UonParser.create())
.build(),
- tester("Uon - readable")
+ tester(10, "Uon - readable")
.serializer(UonSerializer.create().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(UonParser.create())
.build(),
- tester("Uon - encoded")
+ tester(11, "Uon - encoded")
.serializer(UonSerializer.create().encoding().keepNullProperties().addBeanTypes().addRootType())
.parser(UonParser.create().decoding())
.build(),
- tester("UrlEncoding - default")
+ tester(12, "UrlEncoding - default")
.serializer(UrlEncodingSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(UrlEncodingParser.create())
.build(),
- tester("UrlEncoding - readable")
+ tester(13, "UrlEncoding - readable")
.serializer(UrlEncodingSerializer.create().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(UrlEncodingParser.create())
.build(),
- tester("UrlEncoding - expanded params")
+ tester(14, "UrlEncoding - expanded params")
.serializer(UrlEncodingSerializer.create().expandedParams().addBeanTypes().addRootType())
.parser(UrlEncodingParser.create().expandedParams())
.build(),
- tester("MsgPack")
+ tester(15, "MsgPack")
.serializer(MsgPackSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(MsgPackParser.create())
.build(),
- tester("Json schema")
+ tester(16, "Json schema")
.serializer(JsonSchemaSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.returnOriginalObject()
.build(),
@@ -103,7 +103,7 @@ public abstract class RoundTripTest_Base extends
SimpleTestBase {
return TESTERS;
}
- protected static RoundTrip_Tester.Builder tester(String label) {
- return RoundTrip_Tester.create(label);
+ protected static RoundTrip_Tester.Builder tester(int index, String
label) {
+ return RoundTrip_Tester.create(index, 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 4286d23a3..6e99d1185 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
@@ -45,73 +45,73 @@ import org.junit.jupiter.params.provider.*;
class RoundTripTransformBeans_Test extends SimpleTestBase {
private static RoundTrip_Tester[] TESTERS = {
- tester("Json - default")
+ tester(1, "Json - default")
.serializer(JsonSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
.build(),
- tester("Json - lax")
+ tester(2, "Json - lax")
.serializer(JsonSerializer.create().json5().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
.build(),
- tester("Json - lax, readable")
+ tester(3, "Json - lax, readable")
.serializer(JsonSerializer.create().json5().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(JsonParser.create())
.build(),
- tester("Xml - namespaces, validation, readable")
+ tester(4, "Xml - namespaces, validation, readable")
.serializer(XmlSerializer.create().ns().sq().keepNullProperties().addNamespaceUrisToRoot().useWhitespace().addBeanTypes().addRootType())
.parser(XmlParser.create())
.validateXmlWhitespace()
.validateXml()
.build(),
- tester("Xml - no namespaces, validation")
+ tester(5, "Xml - no namespaces, validation")
.serializer(XmlSerializer.create().sq().keepNullProperties().addBeanTypes().addRootType())
.parser(XmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Html - default")
+ tester(6, "Html - default")
.serializer(HtmlSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(HtmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Html - readable")
+ tester(7, "Html - readable")
.serializer(HtmlSerializer.create().sq().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(HtmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Html - with key/value headers")
+ tester(8, "Html - with key/value headers")
.serializer(HtmlSerializer.create().addKeyValueTableHeaders().addBeanTypes().addRootType())
.parser(HtmlParser.create())
.validateXmlWhitespace()
.build(),
- tester("Uon - default")
+ tester(9, "Uon - default")
.serializer(UonSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(UonParser.create())
.build(),
- tester("Uon - readable")
+ tester(10, "Uon - readable")
.serializer(UonSerializer.create().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(UonParser.create())
.build(),
- tester("Uon - encoded")
+ tester(11, "Uon - encoded")
.serializer(UonSerializer.create().encoding().keepNullProperties().addBeanTypes().addRootType())
.parser(UonParser.create().decoding())
.build(),
- tester("UrlEncoding - default")
+ tester(12, "UrlEncoding - default")
.serializer(UrlEncodingSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(UrlEncodingParser.create())
.build(),
- tester("UrlEncoding - readable")
+ tester(13, "UrlEncoding - readable")
.serializer(UrlEncodingSerializer.create().ws().keepNullProperties().addBeanTypes().addRootType())
.parser(UrlEncodingParser.create())
.build(),
- tester("UrlEncoding - expanded params")
+ tester(14, "UrlEncoding - expanded params")
.serializer(UrlEncodingSerializer.create().expandedParams().addBeanTypes().addRootType())
.parser(UrlEncodingParser.create().expandedParams())
.build(),
- tester("MsgPack")
+ tester(15, "MsgPack")
.serializer(MsgPackSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.parser(MsgPackParser.create())
.build(),
- tester("Json schema")
+ tester(16, "Json schema")
.serializer(JsonSchemaSerializer.create().keepNullProperties().addBeanTypes().addRootType())
.returnOriginalObject()
.build(),
@@ -121,8 +121,8 @@ class RoundTripTransformBeans_Test extends SimpleTestBase {
return TESTERS;
}
- 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);
+ protected static RoundTrip_Tester.Builder tester(int index, String
label) {
+ return RoundTrip_Tester.create(index,
label).annotatedClasses(BcConfig.class, E1cConfig.class, F1cConfig.class,
F2acConfig.class).pojoSwaps(D2.class, ByteArraySwap.Base64.class);
}
//====================================================================================================
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTrip_Tester.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTrip_Tester.java
index ecc00c835..729af8085 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTrip_Tester.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTrip_Tester.java
@@ -26,12 +26,15 @@ import org.apache.juneau.xml.*;
@SuppressWarnings("unchecked")
public class RoundTrip_Tester {
- public static Builder create(String label) {
- return new Builder().label(label);
+ public static Builder create(int index, String label) {
+ return new Builder().index(index).label(label);
}
static class Builder {
+ private int index;
+ public Builder index(int value) { index = value; return this; }
+
private String label;
public Builder label(String value) { label = value; return
this; }
@@ -79,7 +82,7 @@ public class RoundTrip_Tester {
public boolean debug;
private RoundTrip_Tester(Builder b) {
- label = b.label;
+ label = "[" + b.index + "] " + b.label;
var bs = b.s;
var bp = ofNullable(b.p);
