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 568a87330 Test modernization
568a87330 is described below
commit 568a873306dc031cac907a5fee9bc8024a65e086
Author: James Bognar <[email protected]>
AuthorDate: Wed Aug 27 13:26:49 2025 -0400
Test modernization
---
.../juneau/assertions/FluentObjectAssertion.java | 6 ++-
.../main/java/org/apache/juneau/config/Entry.java | 1 -
.../src/main/java/org/apache/juneau/ClassMeta.java | 10 ++++
.../java/org/apache/juneau/BeanConfig_Test.java | 15 +++---
.../test/java/org/apache/juneau/BeanMap_Test.java | 6 ++-
.../org/apache/juneau/ComboRoundTripTester.java | 4 ++
.../org/apache/juneau/ComboSerializeTester.java | 1 +
.../org/apache/juneau/DataConversion_Test.java | 2 +-
.../src/test/java/org/apache/juneau/TestUtils.java | 5 +-
.../java/org/apache/juneau/XmlValidatorParser.java | 5 +-
.../a/rttests/OptionalObjects_RoundTripTest.java | 9 ++--
.../java/org/apache/juneau/config/Config_Test.java | 4 ++
.../java/org/apache/juneau/cp/BeanStore_Test.java | 1 -
.../org/apache/juneau/html/BasicHtml_Test.java | 61 +++++++++-------------
.../apache/juneau/objecttools/ObjectRest_Test.java | 2 +-
.../client/RestClient_Config_RestClient_Test.java | 2 +-
.../client/RestClient_Response_Headers_Test.java | 1 +
.../apache/juneau/transform/AutoListSwapTest.java | 2 +-
.../apache/juneau/transform/AutoMapSwapTest.java | 2 +-
.../juneau/transform/AutoNumberSwapTest.java | 2 +-
.../juneau/transform/AutoObjectSwapTest.java | 2 +-
.../urlencoding/CommonParser_UrlEncodingTest.java | 1 +
.../juneau/utest/utils/FakeReaderParser.java | 4 +-
.../juneau/utest/utils/FakeStreamParser.java | 2 +-
.../juneau/utils/StringVarResolver_Test.java | 3 +-
25 files changed, 86 insertions(+), 67 deletions(-)
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
index 3cbef6a29..fe955b4b4 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
@@ -380,7 +380,8 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
* @return The fluent return object.
* @throws AssertionError If assertion failed.
*/
- public R isAny(T...values) throws AssertionError {
+ @SafeVarargs
+ public final R isAny(T...values) throws AssertionError {
for (var v : values)
if (equals(orElse(null), v))
return returns();
@@ -394,7 +395,8 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
* @return The fluent return object.
* @throws AssertionError If assertion failed.
*/
- public R isNotAny(T...values) throws AssertionError {
+ @SafeVarargs
+ public final R isNotAny(T...values) throws AssertionError {
for (var v : values)
if (equals(orElse(null), v))
throw error(MSG_unexpectedValueFound, v, value);
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
index 4997a85ea..498287b26 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
@@ -182,7 +182,6 @@ public class Entry {
return as(config.parser, type, args);
}
-
/**
* Same as {@link #as(Type, Type...)} but specifies the parser to use
to parse the entry.
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index b3f885a42..ce5529687 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -2193,6 +2193,16 @@ public final class ClassMeta<T> implements Type {
return t;
}
+ /**
+ * Cast this object to this type.
+ *
+ * @param o The object to cast.
+ * @return The cast object.
+ */
+ public T cast(Object o) {
+ return this.innerClass.cast(o);
+ }
+
@Override /* Object */
public int hashCode() {
return innerClass.hashCode();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanConfig_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/BeanConfig_Test.java
index ef80fd493..ef640bd81 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanConfig_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanConfig_Test.java
@@ -34,6 +34,7 @@ class BeanConfig_Test extends SimpleTestBase {
//====================================================================================================
// testBasic
//====================================================================================================
+ @SuppressWarnings("unchecked")
@Test void a01_basic() {
var bc = BeanContext.DEFAULT;
@@ -49,17 +50,17 @@ class BeanConfig_Test extends SimpleTestBase {
p2.setAddress(a);
// setup the reference results
- var m1 = new LinkedHashMap();
+ var m1 = new LinkedHashMap<String,Object>();
m1.put("name", p1.getName());
m1.put("age", Integer.valueOf(p1.getAge()));
- var m2 = new LinkedHashMap();
+ var m2 = new LinkedHashMap<String,Object>();
m2.put("street", a.getStreet());
m2.put("city", a.getCity());
m2.put("state", a.getState());
m2.put("zip", a.getZip());
- var m3 = new LinkedHashMap();
+ var m3 = new LinkedHashMap<String,Object>();
m3.put("name", p2.getName());
m3.put("age", Integer.valueOf(p2.getAge()));
m3.put("address", p2.getAddress());
@@ -79,7 +80,7 @@ class BeanConfig_Test extends SimpleTestBase {
assertEquals(bm1.size(), m2.size(), fs("Bean Adapter map's key
set has wrong size: {0} / {1} / {2}", a, bm1.size(), m2.size()));
var iter = bm1.keySet().iterator();
- var temp = new HashSet();
+ var temp = new HashSet<>();
var count = 0;
while (iter.hasNext()) {
temp.add(iter.next());
@@ -98,7 +99,7 @@ class BeanConfig_Test extends SimpleTestBase {
assertEquals(m3.entrySet(), es1, fs("Entry set reverse equality
failed: {0} / {1} / {2}", p2, es1, m3.entrySet()));
iter = es1.iterator();
- temp = new HashSet();
+ temp = new HashSet<>();
count = 0;
while (iter.hasNext()) {
temp.add(iter.next());
@@ -419,10 +420,10 @@ class BeanConfig_Test extends SimpleTestBase {
}
public static class AHandler implements InvocationHandler {
- private Map map;
+ private Map<String,Object> map;
public AHandler() {
- map = new HashMap();
+ map = new HashMap<>();
map.put("a", "");
map.put("b", Integer.valueOf(0));
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanMap_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/BeanMap_Test.java
index 457b0731e..0697f6dfb 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanMap_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMap_Test.java
@@ -464,7 +464,7 @@ class BeanMap_Test extends SimpleTestBase {
assertNotNull(t.b);
assertEquals("foo", t.b.s);
- var m2 = new TreeMap();
+ var m2 = new TreeMap<String,Object>();
m2.put("s", "bar");
m.put("b", m2);
assertNotNull(t.b);
@@ -515,7 +515,7 @@ class BeanMap_Test extends SimpleTestBase {
assertNotNull(t.b);
assertEquals("foo", t.b.s);
- var m2 = new TreeMap();
+ var m2 = new TreeMap<String,Object>();
m2.put("s", "bar");
m.put("b", m2);
assertNotNull(t.b);
@@ -865,6 +865,7 @@ class BeanMap_Test extends SimpleTestBase {
}
}
+ @SuppressWarnings("unchecked")
public static class M4<T extends Number> extends M1<T> {
public M4() {
this.x = (T)Integer.valueOf(3);
@@ -917,6 +918,7 @@ class BeanMap_Test extends SimpleTestBase {
}
}
+ @SuppressWarnings("unchecked")
public static class N4<T extends Number> extends N1<T> {
public N4() {
setX((T)Integer.valueOf(3));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/ComboRoundTripTester.java
b/juneau-utest/src/test/java/org/apache/juneau/ComboRoundTripTester.java
index 81821296a..d38cceeef 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/ComboRoundTripTester.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/ComboRoundTripTester.java
@@ -172,6 +172,7 @@ public class ComboRoundTripTester<T> {
parsers.put("msgPackT", create(b,
MsgPackParser.create().typePropertyName("t")));
}
+ @SuppressWarnings("unchecked")
private Serializer create(Builder<?> tb, Serializer.Builder sb) {
tb.serializerApply.accept(sb);
sb.swaps(tb.swaps);
@@ -184,6 +185,7 @@ public class ComboRoundTripTester<T> {
return sb.build();
}
+ @SuppressWarnings("unchecked")
private Parser create(Builder<?> tb, Parser.Builder pb) {
tb.parserApply.accept(pb);
pb.swaps(tb.swaps);
@@ -235,6 +237,7 @@ public class ComboRoundTripTester<T> {
}
}
+ @SuppressWarnings("unchecked")
public void testParse(String testName) throws Exception {
var s = serializers.get(testName);
var exp = expected.get(testName);
@@ -259,6 +262,7 @@ public class ComboRoundTripTester<T> {
}
}
+ @SuppressWarnings("unchecked")
public void testParseVerify(String testName) throws Exception {
var s = serializers.get(testName);
var p = parsers.get(testName);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/ComboSerializeTester.java
b/juneau-utest/src/test/java/org/apache/juneau/ComboSerializeTester.java
index 4ac05509c..164755844 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/ComboSerializeTester.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/ComboSerializeTester.java
@@ -131,6 +131,7 @@ public class ComboSerializeTester<T> {
serializers.put("msgPackT", create(b,
MsgPackSerializer.create().typePropertyName("t").addBeanTypes().addRootType()));
}
+ @SuppressWarnings("unchecked")
private Serializer create(Builder<?> tb, Serializer.Builder sb) {
tb.serializerApply.accept(sb);
sb.swaps(tb.swaps);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/DataConversion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/DataConversion_Test.java
index f38180420..d0f59768c 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/DataConversion_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/DataConversion_Test.java
@@ -66,7 +66,7 @@ class DataConversion_Test extends SimpleTestBase {
assertEquals("{foo:123}", m.getString("x"));
// *** Collection ***
- var s = new HashSet();
+ var s = new HashSet<Integer>();
s.add(123);
m.put("x", s);
assertEquals("[123]", m.getString("x"));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/TestUtils.java
b/juneau-utest/src/test/java/org/apache/juneau/TestUtils.java
index 1e8b1d4b3..365d5082c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/TestUtils.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/TestUtils.java
@@ -28,6 +28,7 @@ import org.apache.juneau.annotation.*;
import org.apache.juneau.bean.swagger.*;
import org.apache.juneau.common.internal.*;
import org.apache.juneau.common.utils.*;
+import org.apache.juneau.internal.*;
import org.apache.juneau.marshaller.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.mock.*;
@@ -36,7 +37,7 @@ import org.apache.juneau.xml.*;
import org.junit.jupiter.api.*;
import org.junit.jupiter.params.provider.*;
-public class TestUtils extends Utils {
+public class TestUtils extends Utils2 {
/**
* Asserts value when stringified matches the specified pattern.
@@ -134,6 +135,7 @@ public class TestUtils extends Utils {
/**
* Asserts the entries in an array matches the expected strings after
they've been made readable.
*/
+ @SuppressWarnings("unchecked")
public static void assertArray(Object array, Object...expected) {
if (expected.length == 1 && expected[0] instanceof String &&
s(expected[0]).contains(","))
expected = s(expected[0]).charAt(0) == '>' ? new
String[]{s(expected[0]).substring(1)} : splita(s(expected[0]));
@@ -157,6 +159,7 @@ public class TestUtils extends Utils {
/**
* Asserts the entries in a list matches the expected strings after
they've been made readable.
*/
+ @SuppressWarnings("unchecked")
public static void assertList(List<?> list, Object...expected) {
if (expected.length == 1 && expected[0] instanceof String &&
s(expected[0]).contains(","))
expected = s(expected[0]).charAt(0) == '>' ? new
String[]{s(expected[0]).substring(1)} : splita(s(expected[0]));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/XmlValidatorParser.java
b/juneau-utest/src/test/java/org/apache/juneau/XmlValidatorParser.java
index 2935c03df..990d90819 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/XmlValidatorParser.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/XmlValidatorParser.java
@@ -30,6 +30,7 @@ import org.apache.juneau.xml.*;
* <li class='note'>This class is thread safe and reusable.
* </ul>
*/
+@SuppressWarnings("unchecked")
public class XmlValidatorParser extends XmlParser {
//-----------------------------------------------------------------------------------------------------------------
@@ -50,7 +51,7 @@ public class XmlValidatorParser extends XmlParser {
@Override
protected <T> T doParse(ParserPipe
pipe, ClassMeta<T> type) throws IOException, ParseException,
ExecutableException {
try {
- return
(T)validate(pipe.getReader());
+ return
type.cast(validate(pipe.getReader()));
} catch (Exception e) {
throw new
ParseException(e);
}
@@ -83,4 +84,4 @@ public class XmlValidatorParser extends XmlParser {
parser.nextTag();
return parser;
}
-}
+}
\ No newline at end of file
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 caf4d0dbb..9cdc88b79 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
@@ -357,8 +357,8 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@MethodSource("testers")
void b07a_arrayOfOptionalIntegers(RoundTripTester t) throws Exception {
var x = new B07();
- x.f1 = new Optional[]{opt(123)};
- x.f2 = new List[]{alist(123)};
+ x.f1 = a(opt(123));
+ x.f2 = a(alist(123));
x = t.roundTrip(x);
assertEquals(123, x.f1[0].get().intValue());
}
@@ -367,17 +367,18 @@ class OptionalObjects_RoundTripTest extends
RoundTripTest_Base {
@MethodSource("testers")
void b07b_arrayOfOptionalIntegers_listWithEmpty(RoundTripTester t)
throws Exception {
var x = new B07();
- x.f1 = new Optional[]{empty()};
+ x.f1 = a(empty());
x = t.roundTrip(x);
assertEquals(1, x.f1.length);
assertFalse(x.f1[0].isPresent());
}
+ @SuppressWarnings("unchecked")
@ParameterizedTest
@MethodSource("testers")
void b07c_arrayOfOptionalIntegers_listWithNull(RoundTripTester t)
throws Exception {
var x = new B07();
- x.f1 = new Optional[]{null};
+ x.f1 = a(n(Optional.class));
x = t.roundTrip(x);
if (t.isValidationOnly())
return;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/Config_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/config/Config_Test.java
index fc7c353bd..32d02410d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/Config_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/Config_Test.java
@@ -423,6 +423,7 @@ class Config_Test extends SimpleTestBase {
//====================================================================================================
// public <T> T getObject(String key, Type type, Type...args)
throws ParseException
//====================================================================================================
+ @SuppressWarnings("unchecked")
@Test void getObject1() {
var c = init(
"a1={foo:123}",
@@ -463,6 +464,7 @@ class Config_Test extends SimpleTestBase {
//====================================================================================================
// public <T> T getObject(String key, Parser parser, Type type,
Type...args) throws ParseException
//====================================================================================================
+ @SuppressWarnings("unchecked")
@Test void getObject2() {
var c = init(
"a1=(foo=123)",
@@ -669,6 +671,7 @@ class Config_Test extends SimpleTestBase {
//====================================================================================================
// public <T> T getObjectWithDefault(String key, T def, Type type,
Type...args) throws ParseException
//====================================================================================================
+ @SuppressWarnings("unchecked")
@Test void getObjectWithDefault3() {
var c = init(
"a1={foo:123}",
@@ -714,6 +717,7 @@ class Config_Test extends SimpleTestBase {
//====================================================================================================
// public <T> T getObjectWithDefault(String key, Parser parser, T
def, Type type, Type...args) throws ParseException
//====================================================================================================
+ @SuppressWarnings("unchecked")
@Test void getObjectWithDefault4() {
var c = init(
"a1=(foo=123)",
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
index 7b42bd404..fd9aa991a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
@@ -15,7 +15,6 @@ package org.apache.juneau.cp;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
import static org.apache.juneau.TestUtils.*;
-import static org.apache.juneau.internal.Utils2.*;
import static org.junit.jupiter.api.Assertions.*;
import java.lang.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/html/BasicHtml_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/html/BasicHtml_Test.java
index 930bac473..dfa0e539c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/html/BasicHtml_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/html/BasicHtml_Test.java
@@ -16,7 +16,6 @@ import static org.apache.juneau.TestUtils.*;
import static org.apache.juneau.html.annotation.HtmlFormat.*;
import static org.junit.jupiter.api.Assertions.*;
-import java.lang.reflect.*;
import java.util.*;
import java.util.function.*;
import java.util.stream.*;
@@ -40,8 +39,6 @@ class BasicHtml_Test extends SimpleTestBase {
s3 =
HtmlSerializer.DEFAULT_SQ.copy().applyAnnotations(ANNOTATED_CLASSES).build();
private static final HtmlParser parser =
HtmlParser.DEFAULT.copy().applyAnnotations(ANNOTATED_CLASSES).build();
- private static final BeanSession BEANSESSION =
BeanContext.DEFAULT_SESSION;
-
private static Input[] INPUT = {
input(
"SimpleTypes-1",
@@ -54,7 +51,7 @@ class BasicHtml_Test extends SimpleTestBase {
),
input(
"SimpleTypes-2",
- boolean.class,
+ Boolean.class,
true,
"<boolean>true</boolean>",
"<boolean>true</boolean>",
@@ -63,7 +60,7 @@ class BasicHtml_Test extends SimpleTestBase {
),
input(
"SimpleTypes-3",
- int.class,
+ Integer.class,
123,
"<number>123</number>",
"<number>123</number>",
@@ -72,7 +69,7 @@ class BasicHtml_Test extends SimpleTestBase {
),
input(
"SimpleTypes-4",
- float.class,
+ Float.class,
1.23f,
"<number>1.23</number>",
"<number>1.23</number>",
@@ -140,7 +137,7 @@ class BasicHtml_Test extends SimpleTestBase {
"<ul><li><ul><li>foo</li></ul></li></ul>",
x -> assertType(String[][].class, x)
),
- new Input<Map<String,String>>(
+ input(
"MapWithStrings",
MapWithStrings.class,
new MapWithStrings().append("k1", "v1").append("k2",
null),
@@ -184,7 +181,7 @@ class BasicHtml_Test extends SimpleTestBase {
""".replaceAll("(?m)^\\s+|\\R", ""),
x -> assertType(String.class, x.get("k1"))
),
- new Input<Map<String,Number>>(
+ input(
"MapsWithNumbers",
MapWithNumbers.class,
new MapWithNumbers().append("k1", 123).append("k2",
1.23).append("k3", null),
@@ -240,9 +237,9 @@ class BasicHtml_Test extends SimpleTestBase {
""".replaceAll("(?m)^\\s+|\\R", ""),
x -> assertType(Number.class, x.get("k1"))
),
- new Input<Map<String,Object>>(
+ input(
"MapWithObjects",
- getType(Map.class,String.class,Object.class),
+ MapWithObjects.class,
new MapWithObjects().append("k1", "v1").append("k2",
123).append("k3", 1.23).append("k4", true).append("k5", null),
"""
<table>
@@ -320,16 +317,16 @@ class BasicHtml_Test extends SimpleTestBase {
""".replaceAll("(?m)^\\s+|\\R", ""),
x -> { assertType(String.class, x.get("k1"));
assertType(Integer.class, x.get("k2")); assertType(Float.class, x.get("k3"));
assertType(Boolean.class, x.get("k4")); }
),
- new Input<List<String>>(
+ input(
"ListWithStrings",
- getType(List.class,String.class),
+ ListWithStrings.class,
new ListWithStrings().append("foo").append(null),
"<ul><li>foo</li><li><null/></li></ul>",
"<ul>\n\t<li>foo</li>\n\t<li><null/></li>\n</ul>\n",
"<ul><li>foo</li><li><null/></li></ul>",
x -> assertType(String.class, x.get(0))
),
- new Input<List<Number>>(
+ input(
"ListWithNumbers",
ListWithNumbers.class,
new
ListWithNumbers().append(123).append(1.23).append(null),
@@ -338,9 +335,9 @@ class BasicHtml_Test extends SimpleTestBase {
"<ul><li>123</li><li>1.23</li><li><null/></li></ul>",
x -> { assertType(Integer.class, x.get(0));
assertType(Float.class, x.get(1)); }
),
- new Input<List<Object>>(
+ input(
"ListWithObjects",
- getType(List.class,Object.class),
+ ListWithObjects.class,
new
ListWithObjects().append("foo").append(123).append(1.23).append(true).append(null),
"<ul><li>foo</li><li><number>123</number></li><li><number>1.23</number></li><li><boolean>true</boolean></li><li><null/></li></ul>",
"<ul>\n\t<li>foo</li>\n\t<li><number>123</number></li>\n\t<li><number>1.23</number></li>\n\t<li><boolean>true</boolean></li>\n\t<li><null/></li>\n</ul>\n",
@@ -1237,7 +1234,7 @@ class BasicHtml_Test extends SimpleTestBase {
"<ul><li><a href='http://apache.org'>foo</a></li><li><a
href='http://apache.org'>foo</a></li></ul>",
x -> assertType(LinkBean.class, x[0])
),
- new Input<List<LinkBean>>(
+ input(
"ListWithLinkBeans",
ListWithLinkBeans.class,
new ListWithLinkBeans().append(new
LinkBean().init()).append(new LinkBean().init()),
@@ -1353,7 +1350,7 @@ class BasicHtml_Test extends SimpleTestBase {
"<ul><li><a href='http://apache.org'>foo</a></li><li><a
href='http://apache.org'>foo</a></li></ul>",
x -> assertType(LinkBeanC.class, x[0])
),
- new Input<List<LinkBeanC>>(
+ input(
"ListWithLinkBeansC",
ListWithLinkBeansC.class,
new ListWithLinkBeansC().append(new
LinkBeanC().init()).append(new LinkBeanC().init()),
@@ -2516,28 +2513,21 @@ class BasicHtml_Test extends SimpleTestBase {
return Stream.of(INPUT).map(x -> args(x));
}
- private static <T> Input<T> input(String label, Type type, T in, String
e1, String e2, String e3) {
+ private static <T> Input<T> input(String label, Class<T> type, T in,
String e1, String e2, String e3) {
return input(label, type, in, e1, e2, e3, null);
}
- private static <T> Input<T> input(String label, Type type, T in, String
e1, String e2, String e3, Consumer<T> verifier) {
+ private static <T> Input<T> input(String label, Class<T> type, T in,
String e1, String e2, String e3, Consumer<T> verifier) {
return new Input<>(label, type, in, e1, e2, e3, verifier);
}
- /**
- * Creates a ClassMeta for the given types.
- */
- private static final Type getType(Type type, Type...args) {
- return BEANSESSION.getClassMeta(type, args);
- }
-
public static class Input<T> {
private final String label, e1, e2, e3;
- private final Type type;
+ private final Class<T> type;
private final Object in;
private final Consumer<T> verifier;
- public Input(String label, Type type, T in, String e1, String
e2, String e3, Consumer<T> verifier) {
+ public Input(String label, Class<T> type, T in, String e1,
String e2, String e3, Consumer<T> verifier) {
this.label = label;
this.type = type;
this.in = in;
@@ -2567,7 +2557,7 @@ class BasicHtml_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("input")
- void a2_parseNormal(Input input) {
+ <T> void a2_parseNormal(Input<T> input) {
try {
var r = s1.serialize(input.in);
var o = parser.parse(r, input.type);
@@ -2582,11 +2572,11 @@ class BasicHtml_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("input")
- void a3_verifyNormal(Input input) {
+ <T> void a3_verifyNormal(Input<T> input) {
try {
var r = s1.serialize(input.in);
var o = parser.parse(r, input.type);
- input.verify(o);
+ input.verify(input.type.cast(o));
} catch (AssertionError e) {
throw e;
} catch (Throwable e) {
@@ -2609,7 +2599,7 @@ class BasicHtml_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("input")
- void b2_parseReadable(Input input) {
+ <T> void b2_parseReadable(Input<T> input) {
try {
var r = s2.serialize(input.in);
var o = parser.parse(r, input.type);
@@ -2624,7 +2614,7 @@ class BasicHtml_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("input")
- void b3_verifyReadable(Input input) {
+ <T> void b3_verifyReadable(Input<T> input) {
try {
var r = s2.serialize(input.in);
var o = parser.parse(r, input.type);
@@ -2651,7 +2641,7 @@ class BasicHtml_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("input")
- void c2_parseAbridged(Input input) {
+ <T> void c2_parseAbridged(Input<T> input) {
try {
var r = s3.serialize(input.in);
var o = parser.parse(r, input.type);
@@ -2666,7 +2656,7 @@ class BasicHtml_Test extends SimpleTestBase {
@ParameterizedTest
@MethodSource("input")
- void c3_verifyAbridged(Input input) {
+ void c3_verifyAbridged(Input<Object> input) {
try {
var r = s3.serialize(input.in);
var o = parser.parse(r, input.type);
@@ -3114,5 +3104,4 @@ class BasicHtml_Test extends SimpleTestBase {
return this;
}
}
-
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
index 057cb945f..b73b2d2ef 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
@@ -136,7 +136,7 @@ class ObjectRest_Test extends SimpleTestBase {
assertEquals(expectedValue, s);
// Try adding an address as a map (should be automatically
converted to an Address)
- var m = new HashMap();
+ var m = new HashMap<String,Object>();
m.put("street","street D");
m.put("city","city D");
m.put("state","state D");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
index c14dcc90b..ce8135322 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
@@ -358,7 +358,7 @@ class RestClient_Config_RestClient_Test extends
SimpleTestBase {
}
@Test void a11_serializers_parsers() throws Exception {
- var x =
MockRestClient.create(A.class).serializers(XmlSerializer.class,JsonSerializer.class).parsers(XmlParser.class,JsonParser.class).build();
+ var x =
MockRestClient.create(A.class).serializers(a(XmlSerializer.class,JsonSerializer.class)).parsers(a(XmlParser.class,JsonParser.class)).build();
assertThrowsWithMessage(RestCallException.class, "Content-Type
not specified on request. Cannot match correct serializer. Use
contentType(String) or mediaType(String) to specify transport language.",
()->x.post("/echoBody",bean).run());
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
index e15b86b47..309530254 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
@@ -96,6 +96,7 @@ class RestClient_Response_Headers_Test extends SimpleTestBase
{
assertEquals("baz", s);
}
+ @SuppressWarnings("unchecked")
@Test void a04_asType() throws Exception {
var i =
checkFooClient().build().get("/echo").header("Foo","123").run().getHeader("Foo").as(Integer.class).orElse(null);
assertEquals(123, i.intValue());
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transform/AutoListSwapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transform/AutoListSwapTest.java
index 9f87bb6ba..e3d658fc2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transform/AutoListSwapTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transform/AutoListSwapTest.java
@@ -26,7 +26,7 @@ import org.apache.juneau.serializer.*;
import org.apache.juneau.swap.*;
import org.junit.jupiter.api.*;
-@SuppressWarnings("rawtypes")
+@SuppressWarnings({"unchecked","rawtypes"})
class AutoListSwapTest extends SimpleTestBase {
private static final List<String> STRINGLIST = list("foo");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transform/AutoMapSwapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transform/AutoMapSwapTest.java
index 33c9de8f7..75a09ed09 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transform/AutoMapSwapTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transform/AutoMapSwapTest.java
@@ -26,7 +26,7 @@ import org.apache.juneau.serializer.*;
import org.apache.juneau.swap.*;
import org.junit.jupiter.api.*;
-@SuppressWarnings("rawtypes")
+@SuppressWarnings({"unchecked","rawtypes"})
class AutoMapSwapTest extends SimpleTestBase {
private static final Map<String,String> STRINGMAP = map("foo","bar");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transform/AutoNumberSwapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transform/AutoNumberSwapTest.java
index 2cb2571eb..02f29bfc6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transform/AutoNumberSwapTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transform/AutoNumberSwapTest.java
@@ -25,7 +25,7 @@ import org.apache.juneau.serializer.*;
import org.apache.juneau.swap.*;
import org.junit.jupiter.api.*;
-@SuppressWarnings("rawtypes")
+@SuppressWarnings({"unchecked","rawtypes"})
class AutoNumberSwapTest extends SimpleTestBase {
private static ObjectSwap find(Class<?> c) {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/transform/AutoObjectSwapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/transform/AutoObjectSwapTest.java
index a8c16be3f..72a3eb021 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/transform/AutoObjectSwapTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/transform/AutoObjectSwapTest.java
@@ -26,7 +26,7 @@ import org.apache.juneau.serializer.*;
import org.apache.juneau.swap.*;
import org.junit.jupiter.api.*;
-@SuppressWarnings("rawtypes")
+@SuppressWarnings({"unchecked","rawtypes"})
class AutoObjectSwapTest extends SimpleTestBase {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
index f320127a7..ed5fdfb99 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
@@ -149,6 +149,7 @@ class CommonParser_UrlEncodingTest extends SimpleTestBase {
}
}
+ @SuppressWarnings("unchecked")
@Test void a05_collections() throws Exception {
var s = UrlEncodingSerializer.DEFAULT;
var p2 = UrlEncodingParser.DEFAULT;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeReaderParser.java
b/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeReaderParser.java
index c23c08cfb..7d568ff39 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeReaderParser.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeReaderParser.java
@@ -80,7 +80,7 @@ public class FakeReaderParser extends ReaderParser implements
HttpPartParser {
@Override
public <T> T doParse(ParserSession session, ParserPipe pipe,
ClassMeta<T> type) throws IOException, ParseException, ExecutableException {
if (function != null)
- return (T)function.apply((ReaderParserSession)session,
pipe.asString(), type);
+ return
type.cast(function.apply((ReaderParserSession)session, pipe.asString(), type));
return null;
}
@@ -89,7 +89,7 @@ public class FakeReaderParser extends ReaderParser implements
HttpPartParser {
return new HttpPartParserSession() {
@Override
public <T> T parse(HttpPartType partType,
HttpPartSchema schema, String in, ClassMeta<T> toType) throws ParseException,
SchemaValidationException {
- return (T)partFunction.apply(partType, schema,
in, toType);
+ return toType.cast(partFunction.apply(partType,
schema, in, toType));
}
};
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeStreamParser.java
b/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeStreamParser.java
index dfb5a599a..7da467828 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeStreamParser.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeStreamParser.java
@@ -70,7 +70,7 @@ public class FakeStreamParser extends InputStreamParser {
@Override
public <T> T doParse(ParserSession session, ParserPipe pipe,
ClassMeta<T> type) throws IOException, ParseException, ExecutableException {
if (function != null)
- return
(T)function.apply((InputStreamParserSession)session,
IOUtils.readBytes(pipe.getInputStream()), type);
+ return
type.cast(function.apply((InputStreamParserSession)session,
IOUtils.readBytes(pipe.getInputStream()), type));
return null;
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolver_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolver_Test.java
index aa8d5418d..26dd69314 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolver_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolver_Test.java
@@ -13,6 +13,7 @@
package org.apache.juneau.utils;
import static org.junit.jupiter.api.Assertions.*;
+import static org.apache.juneau.TestUtils.*;
import org.apache.juneau.*;
import org.apache.juneau.common.internal.*;
@@ -198,7 +199,7 @@ class StringVarResolver_Test extends SimpleTestBase {
var vrb = VarResolver.create().defaultVars();
// Should reject names with characters outside A-Za-z
- for (Class<? extends Var> c : new Class[]{InvalidVar1.class,
InvalidVar2.class, InvalidVar3.class, InvalidVar4.class, InvalidVar5.class}) {
+ for (Class<? extends Var> c : a(InvalidVar1.class,
InvalidVar2.class, InvalidVar3.class, InvalidVar4.class, InvalidVar5.class)) {
assertThrows(Exception.class,
()->VarResolver.create().vars(c).build());
}
