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 58c603af5 Unit test modernization.
58c603af5 is described below
commit 58c603af556acd08609ab58750e83200d919ddc8
Author: James Bognar <[email protected]>
AuthorDate: Wed Aug 6 11:25:27 2025 -0400
Unit test modernization.
---
.../apache/juneau/assertions/Assertions_Test.java | 2 +-
.../juneau/assertions/LongAssertion_Test.java | 1 -
.../java/org/apache/juneau/config/ConfigTest.java | 8 +--
.../java/org/apache/juneau/cp/BeanStore_Test.java | 60 +++++++++++-----------
.../org/apache/juneau/http/BasicHeader_Test.java | 8 +--
.../apache/juneau/http/BasicHttpResource_Test.java | 8 +--
.../org/apache/juneau/http/EntityTag_Test.java | 24 ++++-----
.../org/apache/juneau/http/HttpMethod_Test.java | 27 +++++-----
.../org/apache/juneau/http/MediaType_Test.java | 6 +--
.../juneau/http/SerializedHttpEntity_Test.java | 4 +-
.../http/header/BasicBooleanHeader_Test.java | 1 -
.../juneau/http/header/BasicCsvHeader_Test.java | 25 +++++----
.../http/header/BasicEntityTagHeader_Test.java | 5 +-
.../http/header/BasicEntityTagsHeader_Test.java | 1 -
.../http/header/BasicIntegerHeader_Test.java | 1 -
.../juneau/http/header/BasicLongHeader_Test.java | 1 -
.../http/header/BasicMediaTypeHeader_Test.java | 14 ++---
.../juneau/http/header/BasicStringHeader_Test.java | 1 -
.../http/header/BasicStringRangesHeader_Test.java | 1 -
.../org/apache/juneau/http/header/ETag_Test.java | 7 +--
.../org/apache/juneau/http/part/PartList_Test.java | 18 +++----
.../httppart/OpenApiPartSerializer_Test.java | 1 -
.../apache/juneau/reflect/ExecutableInfoTest.java | 1 -
.../org/apache/juneau/reflect/FieldInfoTest.java | 1 -
.../client/RestClient_Config_RestClient_Test.java | 2 +-
.../rest/client/RestClient_Marshalls_Test.java | 1 -
.../juneau/rest/client/RestClient_Paths_Test.java | 3 +-
.../rest/client/RestClient_Response_Body_Test.java | 2 +-
.../org/apache/juneau/xml/InvalidXmlBeansTest.java | 1 -
.../test/java/org/apache/juneau/xml/XmlTest.java | 1 -
30 files changed, 112 insertions(+), 124 deletions(-)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
index 88814dd30..369d36a5e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/Assertions_Test.java
@@ -116,7 +116,7 @@ public class Assertions_Test {
@Test
public void a16_assertBoolean() {
- assertBoolean(true).isTrue();
+ assertTrue(true);
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
index 4af3261f7..b53f3a600 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/LongAssertion_Test.java
@@ -18,7 +18,6 @@ import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
import org.apache.juneau.*;
-import org.apache.juneau.httppart.*;
import org.apache.juneau.json.*;
import org.apache.juneau.serializer.*;
import org.junit.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
index 96168e979..221c0bb92 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
@@ -1027,14 +1027,14 @@ public class ConfigTest {
);
assertInteger(cf.get("key1").asInteger().get()).is(1);
- assertBoolean(cf.get("key2").asBoolean().get()).isTrue();
+ assertTrue(cf.get("key2").asBoolean().get());
assertInteger(cf.get("key3").as(int[].class).get()[2]).is(3);
assertInteger(cf.get("xkey3").as(int[].class).orElse(new
int[]{4,5,6})[2]).is(6);
assertInteger(cf.get("X/key3").as(int[].class).orElse(new
int[]{4,5,6})[2]).is(6);
assertEquals(url("http://foo").toString(),
cf.get("key4").as(URL.class).get().toString());
assertInteger(cf.get("section1/key1").asInteger().get()).is(2);
-
assertBoolean(cf.get("section1/key2").asBoolean().get()).isFalse();
+ assertFalse(cf.get("section1/key2").asBoolean().get());
assertInteger(cf.get("section1/key3").as(int[].class).get()[2]).is(6);
assertEquals(url("http://bar").toString(),
cf.get("section1/key4").as(URL.class).get().toString());
@@ -1055,12 +1055,12 @@ public class ConfigTest {
cf.commit();
assertInteger(cf.get("key1").asInteger().get()).is(1);
- assertBoolean(cf.get("key2").asBoolean().get()).isTrue();
+ assertTrue(cf.get("key2").asBoolean().get());
assertInteger(cf.get("key3").as(int[].class).get()[2]).is(3);
assertEquals(url("http://foo").toString(),
cf.get("key4").as(URL.class).get().toString());
assertInteger(cf.get("section1/key1").asInteger().get()).is(2);
-
assertBoolean(cf.get("section1/key2").asBoolean().get()).isFalse();
+ assertFalse(cf.get("section1/key2").asBoolean().get());
assertInteger(cf.get("section1/key3").as(int[].class).get()[2]).is(6);
assertEquals(url("http://bar").toString(),
cf.get("section1/key4").as(URL.class).get().toString());
}
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 59f4ef4d6..5f9d0aced 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
@@ -111,42 +111,42 @@ public class BeanStore_Test {
BeanStore b2c =
BeanStore.create().threadSafe().parent(b2p).build();
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
- assertBoolean(b.hasBean(A1.class)).isFalse();
+ assertFalse(b.hasBean(A1.class));
assertOptional(b.getBean(A1.class)).isNull();
}
b1p.addBean(A1.class, a1a);
b2p.addBean(A1.class, a1a);
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
- assertBoolean(b.hasBean(A1.class)).isTrue();
+ assertTrue(b.hasBean(A1.class));
assertOptional(b.getBean(A1.class)).is(a1a);
}
b1p.clear();
b2p.clear();
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
- assertBoolean(b.hasBean(A1.class)).isFalse();
+ assertFalse(b.hasBean(A1.class));
assertOptional(b.getBean(A1.class)).isNull();
}
b1p.addBean(A1.class, null);
b2p.addBean(A1.class, null);
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
- assertBoolean(b.hasBean(A1.class)).isTrue();
+ assertTrue(b.hasBean(A1.class));
assertOptional(b.getBean(A1.class)).isNull();
}
b1p.clear().addSupplier(A1.class, ()->a1a);
b2p.clear().addSupplier(A1.class, ()->a1a);
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
- assertBoolean(b.hasBean(A1.class)).isTrue();
+ assertTrue(b.hasBean(A1.class));
assertOptional(b.getBean(A1.class)).is(a1a);
}
b1p.add(A1.class, a1b);
b2p.add(A1.class, a1b);
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
- assertBoolean(b.hasBean(A1.class)).isTrue();
+ assertTrue(b.hasBean(A1.class));
assertOptional(b.getBean(A1.class)).is(a1b);
assertList(b.stream(A1.class).map(BeanStoreEntry::get)).isHas(a1b,a1a);
}
@@ -154,12 +154,12 @@ public class BeanStore_Test {
b1c.add(A2.class, a2a);
b2c.add(A2.class, a2a);
for (BeanStore b : array(b1p, b2p)) {
- assertBoolean(b.hasBean(A2.class)).isFalse();
+ assertFalse(b.hasBean(A2.class));
assertOptional(b.getBean(A2.class)).isNull();
assertList(b.stream(A2.class)).isEmpty();
}
for (BeanStore b : array(b1c, b2c)) {
- assertBoolean(b.hasBean(A2.class)).isTrue();
+ assertTrue(b.hasBean(A2.class));
assertOptional(b.getBean(A2.class)).is(a2a);
assertList(b.stream(A2.class).map(BeanStoreEntry::get)).isHas(a2a);
}
@@ -175,12 +175,12 @@ public class BeanStore_Test {
b2c.clear().addBean(A1.class, a1a);
for (BeanStore b : array(b1p, b2p)) {
- assertBoolean(b.hasBean(A1.class)).isFalse();
+ assertFalse(b.hasBean(A1.class));
assertOptional(b.getBean(A1.class)).isNull();
assertList(b.stream(A1.class)).isEmpty();
}
for (BeanStore b : array(b1c, b2c)) {
- assertBoolean(b.hasBean(A1.class)).isTrue();
+ assertTrue(b.hasBean(A1.class));
assertOptional(b.getBean(A1.class)).is(a1a);
assertList(b.stream(A1.class).map(BeanStoreEntry::get)).isHas(a1a);
}
@@ -188,7 +188,7 @@ public class BeanStore_Test {
b1c.removeBean(A1.class);
b2c.removeBean(A1.class);
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
- assertBoolean(b.hasBean(A1.class)).isFalse();
+ assertFalse(b.hasBean(A1.class));
assertOptional(b.getBean(A1.class)).isNull();
assertList(b.stream(A1.class)).isEmpty();
}
@@ -291,11 +291,11 @@ public class BeanStore_Test {
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
for (ExecutableInfo e : array(c1, m1, m3)) {
assertString(b.getMissingParams(e)).is(A1n);
- assertBoolean(b.hasAllParams(e)).isFalse();
+ assertFalse(b.hasAllParams(e));
}
for (ExecutableInfo e : array(c2, m2)) {
assertString(b.getMissingParams(e)).is(A1n+"@foo");
- assertBoolean(b.hasAllParams(e)).isFalse();
+ assertFalse(b.hasAllParams(e));
}
}
@@ -315,11 +315,11 @@ public class BeanStore_Test {
assertString(b.getMissingParams(m1)).isNull();
assertString(b.getMissingParams(m2)).is(A1n+"@foo");
assertString(b.getMissingParams(m3)).isNull();
- assertBoolean(b.hasAllParams(c1)).isTrue();
- assertBoolean(b.hasAllParams(c2)).isFalse();
- assertBoolean(b.hasAllParams(m1)).isTrue();
- assertBoolean(b.hasAllParams(m2)).isFalse();
- assertBoolean(b.hasAllParams(m3)).isTrue();
+ assertTrue(b.hasAllParams(c1));
+ assertFalse(b.hasAllParams(c2));
+ assertTrue(b.hasAllParams(m1));
+ assertFalse(b.hasAllParams(m2));
+ assertTrue(b.hasAllParams(m3));
assertArray(b.getParams(c1)).is(pA1a, pEmptyOptional,
pIsBeanStore);
assertArray(b.getParams(c2)).is(pNull, pEmptyOptional);
assertArray(b.getParams(m1)).is(pA1a, pEmptyOptional,
pIsBeanStore);
@@ -332,7 +332,7 @@ public class BeanStore_Test {
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
for (ExecutableInfo e : array(c1, c2, m1, m2, m3)) {
assertString(b.getMissingParams(e)).isNull();
- assertBoolean(b.hasAllParams(e)).isTrue();
+ assertTrue(b.hasAllParams(e));
}
assertArray(b.getParams(c1)).is(pA1a, pEmptyOptional,
pIsBeanStore);
assertArray(b.getParams(c2)).is(pA1a, pEmptyOptional);
@@ -346,7 +346,7 @@ public class BeanStore_Test {
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
for (ExecutableInfo e : array(c1, c2, m1, m2, m3)) {
assertString(b.getMissingParams(e)).isNull();
- assertBoolean(b.hasAllParams(e)).isTrue();
+ assertTrue(b.hasAllParams(e));
}
assertArray(b.getParams(c1)).is(pA1a, pEmptyOptional,
pIsBeanStore);
assertArray(b.getParams(c2)).is(pA1a, pEmptyOptional);
@@ -360,7 +360,7 @@ public class BeanStore_Test {
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
for (ExecutableInfo e : array(c1, c2, m1, m2, m3)) {
assertString(b.getMissingParams(e)).isNull();
- assertBoolean(b.hasAllParams(e)).isTrue();
+ assertTrue(b.hasAllParams(e));
}
assertArray(b.getParams(c1)).is(pA1a, pEmptyOptional,
pIsBeanStore);
assertArray(b.getParams(c2)).is(pA1a, pA2a);
@@ -374,7 +374,7 @@ public class BeanStore_Test {
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
for (ExecutableInfo e : array(c1, c2, m1, m2, m3)) {
assertString(b.getMissingParams(e)).isNull();
- assertBoolean(b.hasAllParams(e)).isTrue();
+ assertTrue(b.hasAllParams(e));
}
assertArray(b.getParams(c1)).is(pA1a, pA2a,
pIsBeanStore);
assertArray(b.getParams(c2)).is(pA1a, pA2a);
@@ -423,8 +423,8 @@ public class BeanStore_Test {
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
assertString(b.getMissingParams(c1)).is(A1n);
assertString(b.getMissingParams(c2)).is(A1n+"@foo");
- assertBoolean(b.hasAllParams(c1)).isFalse();
- assertBoolean(b.hasAllParams(c2)).isFalse();
+ assertFalse(b.hasAllParams(c1));
+ assertFalse(b.hasAllParams(c2));
}
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
@@ -437,8 +437,8 @@ public class BeanStore_Test {
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
assertString(b.getMissingParams(c1)).isNull();
assertString(b.getMissingParams(c2)).is(A1n+"@foo");
- assertBoolean(b.hasAllParams(c1)).isTrue();
- assertBoolean(b.hasAllParams(c2)).isFalse();
+ assertTrue(b.hasAllParams(c1));
+ assertFalse(b.hasAllParams(c2));
assertArray(b.getParams(c1)).is(pThis, pA1a,
pEmptyOptional, pIsBeanStore);
assertArray(b.getParams(c2)).is(pThis, pNull,
pEmptyOptional);
}
@@ -448,7 +448,7 @@ public class BeanStore_Test {
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
for (ExecutableInfo e : array(c1, c2)) {
assertString(b.getMissingParams(e)).isNull();
- assertBoolean(b.hasAllParams(e)).isTrue();
+ assertTrue(b.hasAllParams(e));
}
assertArray(b.getParams(c1)).is(pThis, pA1a,
pEmptyOptional, pIsBeanStore);
assertArray(b.getParams(c2)).is(pThis, pA1a,
pEmptyOptional);
@@ -459,7 +459,7 @@ public class BeanStore_Test {
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
for (ExecutableInfo e : array(c1, c2)) {
assertString(b.getMissingParams(e)).isNull();
- assertBoolean(b.hasAllParams(e)).isTrue();
+ assertTrue(b.hasAllParams(e));
}
assertArray(b.getParams(c1)).is(pThis, pA1a,
pEmptyOptional, pIsBeanStore);
assertArray(b.getParams(c2)).is(pThis, pA1a,
pEmptyOptional);
@@ -470,7 +470,7 @@ public class BeanStore_Test {
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
for (ExecutableInfo e : array(c1, c2)) {
assertString(b.getMissingParams(e)).isNull();
- assertBoolean(b.hasAllParams(e)).isTrue();
+ assertTrue(b.hasAllParams(e));
}
assertArray(b.getParams(c1)).is(pThis, pA1a,
pEmptyOptional, pIsBeanStore);
assertArray(b.getParams(c2)).is(pThis, pA1a, pA2a);
@@ -481,7 +481,7 @@ public class BeanStore_Test {
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
for (ExecutableInfo e : array(c1, c2)) {
assertString(b.getMissingParams(e)).isEmpty();
- assertBoolean(b.hasAllParams(e)).isTrue();
+ assertTrue(b.hasAllParams(e));
}
assertArray(b.getParams(c1)).is(pThis, pA1a, pA2a,
pIsBeanStore);
assertArray(b.getParams(c2)).is(pThis, pA1a, pA2a);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHeader_Test.java
index 878f19a07..4a1418284 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHeader_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHeader_Test.java
@@ -95,10 +95,10 @@ class BasicHeader_Test extends SimpleTestBase {
@Test void a09_equals() {
BasicHeader h1 = header("Foo","bar"), h2 = header("Foo","bar"),
h3 = header("Bar","bar"), h4 = header("Foo","baz");
assertInteger(h1.hashCode()).isExists();
- assertBoolean(h1.equals(h2)).isTrue();
- assertBoolean(h1.equals(h3)).isFalse();
- assertBoolean(h1.equals(h4)).isFalse();
- assertBoolean(h1.equals("foo")).isFalse();
+ assertTrue(h1.equals(h2));
+ assertFalse(h1.equals(h3));
+ assertFalse(h1.equals(h4));
+ assertFalse(h1.equals("foo"));
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
index 59b111dfd..8898b2b1f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/BasicHttpResource_Test.java
@@ -154,17 +154,17 @@ public class BasicHttpResource_Test {
@Test
public void a06_chunked() {
StringResource x1 = stringResource("foo").setChunked();
- assertBoolean(x1.isChunked()).isTrue();
+ assertTrue(x1.isChunked());
StringResource x2 = stringResource("foo");
- assertBoolean(x2.isChunked()).isFalse();
+ assertFalse(x2.isChunked());
}
@Test
public void a07_chunked_boolean() {
StringResource x1 = stringResource("foo").setChunked(true);
- assertBoolean(x1.isChunked()).isTrue();
+ assertTrue(x1.isChunked());
StringResource x2 = stringResource("foo").setChunked(false);
- assertBoolean(x2.isChunked()).isFalse();
+ assertFalse(x2.isChunked());
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/EntityTag_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/EntityTag_Test.java
index fca7388d2..2f900dc22 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/EntityTag_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/EntityTag_Test.java
@@ -34,38 +34,38 @@ public class EntityTag_Test {
EntityTag x1 = new EntityTag("\"foo\"");
assertString(x1).is("\"foo\"");
assertString(x1.getEntityValue()).is("foo");
- assertBoolean(x1.isWeak()).isFalse();
- assertBoolean(x1.isAny()).isFalse();
+ assertFalse(x1.isWeak());
+ assertFalse(x1.isAny());
EntityTag x2 = new EntityTag("W/\"foo\"");
assertString(x2).is("W/\"foo\"");
assertString(x2.getEntityValue()).is("foo");
- assertBoolean(x2.isWeak()).isTrue();
- assertBoolean(x2.isAny()).isFalse();
+ assertTrue(x2.isWeak());
+ assertFalse(x2.isAny());
EntityTag x3 = new EntityTag("*");
assertString(x3).is("*");
assertString(x3.getEntityValue()).is("*");
- assertBoolean(x3.isWeak()).isFalse();
- assertBoolean(x3.isAny()).isTrue();
+ assertFalse(x3.isWeak());
+ assertTrue(x3.isAny());
EntityTag x5 = new EntityTag("\"\"");
assertString(x5).is("\"\"");
assertString(x5.getEntityValue()).is("");
- assertBoolean(x5.isWeak()).isFalse();
- assertBoolean(x5.isAny()).isFalse();
+ assertFalse(x5.isWeak());
+ assertFalse(x5.isAny());
EntityTag x6 = EntityTag.of("\"foo\"");
assertString(x6).is("\"foo\"");
assertString(x6.getEntityValue()).is("foo");
- assertBoolean(x6.isWeak()).isFalse();
- assertBoolean(x6.isAny()).isFalse();
+ assertFalse(x6.isWeak());
+ assertFalse(x6.isAny());
EntityTag x7 = EntityTag.of((Supplier<?>)()->"\"foo\"");
assertString(x7).is("\"foo\"");
assertString(x7.getEntityValue()).is("foo");
- assertBoolean(x7.isWeak()).isFalse();
- assertBoolean(x7.isAny()).isFalse();
+ assertFalse(x7.isWeak());
+ assertFalse(x7.isAny());
assertObject(EntityTag.of(null)).isNull();
assertObject(EntityTag.of((Supplier<?>)()->null)).isNull();
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/HttpMethod_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/HttpMethod_Test.java
index 8fe24357c..fc0de5403 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/HttpMethod_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/HttpMethod_Test.java
@@ -12,8 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau.http;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpMethod.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -21,17 +22,17 @@ class HttpMethod_Test extends SimpleTestBase {
@Test
public void a01_hasContent() {
- assertBoolean(hasContent(OPTIONS)).isFalse();
- assertBoolean(hasContent(GET)).isFalse();
- assertBoolean(hasContent(HEAD)).isFalse();
- assertBoolean(hasContent(POST)).isTrue();
- assertBoolean(hasContent(PUT)).isTrue();
- assertBoolean(hasContent(DELETE)).isFalse();
- assertBoolean(hasContent(TRACE)).isFalse();
- assertBoolean(hasContent(CONNECT)).isFalse();
- assertBoolean(hasContent(PATCH)).isTrue();
- assertBoolean(hasContent(RRPC)).isTrue();
- assertBoolean(hasContent(OTHER)).isTrue();
- assertBoolean(hasContent(ANY)).isTrue();
+ assertFalse(hasContent(OPTIONS));
+ assertFalse(hasContent(GET));
+ assertFalse(hasContent(HEAD));
+ assertTrue(hasContent(POST));
+ assertTrue(hasContent(PUT));
+ assertFalse(hasContent(DELETE));
+ assertFalse(hasContent(TRACE));
+ assertFalse(hasContent(CONNECT));
+ assertTrue(hasContent(PATCH));
+ assertTrue(hasContent(RRPC));
+ assertTrue(hasContent(OTHER));
+ assertTrue(hasContent(ANY));
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/MediaType_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/MediaType_Test.java
index 2713adefa..feefe33ac 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/MediaType_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/MediaType_Test.java
@@ -59,9 +59,9 @@ public class MediaType_Test extends SimpleTestBase {
@Test void a04_equals() {
MediaType x1 = new MediaType("text/foo"), x2 = new
MediaType("text/foo"), x3 = new MediaType("text/bar");
- assertBoolean(x1.equals(x2)).isTrue();
- assertBoolean(x1.equals(x3)).isFalse();
- assertBoolean(x1.equals(null)).isFalse();
+ assertTrue(x1.equals(x2));
+ assertFalse(x1.equals(x3));
+ assertFalse(x1.equals(null));
}
@Test void a05_hashCode() {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
index ecb0b578c..973a56399 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
@@ -17,6 +17,8 @@ import static org.apache.juneau.http.HttpEntities.*;
import static org.apache.juneau.httppart.HttpPartSchema.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.utest.utils.Utils2.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.io.*;
import org.apache.juneau.*;
@@ -72,7 +74,7 @@ class SerializedHttpEntity_Test extends SimpleTestBase {
}
@Test void a06_isRepeatable() {
-
assertBoolean(serializedEntity(ABean.get(),null).isRepeatable()).isTrue();
+ assertTrue(serializedEntity(ABean.get(),null).isRepeatable());
}
@Test void a07_getContentLength() {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicBooleanHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicBooleanHeader_Test.java
index c942c022e..3228bf192 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicBooleanHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicBooleanHeader_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.utest.utils.Utils2.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicCsvHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicCsvHeader_Test.java
index 3aa3ef764..c493394eb 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicCsvHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicCsvHeader_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.utest.utils.Utils2.*;
import static org.junit.jupiter.api.Assertions.*;
@@ -69,20 +68,20 @@ class BasicCsvHeader_Test extends SimpleTestBase {
@Test void a02_contains() {
BasicCsvHeader x = new BasicCsvHeader("Foo",
(String)null,"bar","baz");
- assertBoolean(x.contains(null)).isTrue();
- assertBoolean(x.containsIgnoreCase(null)).isTrue();
- assertBoolean(x.contains("bar")).isTrue();
- assertBoolean(x.containsIgnoreCase("bar")).isTrue();
- assertBoolean(x.contains("qux")).isFalse();
- assertBoolean(x.containsIgnoreCase("qux")).isFalse();
- assertBoolean(x.contains("BAR")).isFalse();
- assertBoolean(x.containsIgnoreCase("BAR")).isTrue();
+ assertTrue(x.contains(null));
+ assertTrue(x.containsIgnoreCase(null));
+ assertTrue(x.contains("bar"));
+ assertTrue(x.containsIgnoreCase("bar"));
+ assertFalse(x.contains("qux"));
+ assertFalse(x.containsIgnoreCase("qux"));
+ assertFalse(x.contains("BAR"));
+ assertTrue(x.containsIgnoreCase("BAR"));
BasicCsvHeader x2 = csvHeader("Foo",()->null);
- assertBoolean(x2.contains((String)null)).isFalse();
- assertBoolean(x2.containsIgnoreCase(null)).isFalse();
- assertBoolean(x2.contains("bar")).isFalse();
- assertBoolean(x2.containsIgnoreCase("bar")).isFalse();
+ assertFalse(x2.contains((String)null));
+ assertFalse(x2.containsIgnoreCase(null));
+ assertFalse(x2.contains("bar"));
+ assertFalse(x2.containsIgnoreCase("bar"));
}
@Test void a03_assertList() {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicEntityTagHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicEntityTagHeader_Test.java
index 007f2886b..7bd3cd8b1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicEntityTagHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicEntityTagHeader_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.utest.utils.Utils2.*;
import static org.junit.jupiter.api.Assertions.*;
@@ -72,8 +71,8 @@ class BasicEntityTagHeader_Test extends SimpleTestBase {
EntityTag x = new
BasicEntityTagHeader("Foo","W/\"foo\"").asEntityTag().get();
assertString("W/\"foo\"", x);
assertString("foo", x.getEntityValue());
- assertBoolean(x.isWeak()).isTrue();
- assertBoolean(x.isAny()).isFalse();
+ assertTrue(x.isWeak());
+ assertFalse(x.isAny());
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicEntityTagsHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicEntityTagsHeader_Test.java
index 218129464..96e56ab8f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicEntityTagsHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicEntityTagsHeader_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.utest.utils.Utils2.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicIntegerHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicIntegerHeader_Test.java
index 8e9eae6d3..327407edc 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicIntegerHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicIntegerHeader_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.utest.utils.Utils2.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicLongHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicLongHeader_Test.java
index abc074104..60d6dacee 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicLongHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicLongHeader_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.utest.utils.Utils2.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaTypeHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaTypeHeader_Test.java
index e202ec0d8..fcefba131 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaTypeHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaTypeHeader_Test.java
@@ -78,10 +78,10 @@ class BasicMediaTypeHeader_Test extends SimpleTestBase {
}
@Test void a04_hasSubType() {
-
assertBoolean(contentType("text/foo+bar").hasSubType("bar")).isTrue();
-
assertBoolean(contentType("text/foo+bar").hasSubType("baz")).isFalse();
-
assertBoolean(contentType("text/foo+bar").hasSubType(null)).isFalse();
- assertBoolean(new
ContentType((String)null).hasSubType("bar")).isFalse();
+ assertTrue(contentType("text/foo+bar").hasSubType("bar"));
+ assertFalse(contentType("text/foo+bar").hasSubType("baz"));
+ assertFalse(contentType("text/foo+bar").hasSubType(null));
+ assertFalse(new ContentType((String)null).hasSubType("bar"));
}
@Test void a05_getSubTypes() {
@@ -90,9 +90,9 @@ class BasicMediaTypeHeader_Test extends SimpleTestBase {
}
@Test void a06_isMeta() {
-
assertBoolean(contentType("text/foo+bar").isMetaSubtype()).isFalse();
- assertBoolean(contentType("text/*").isMetaSubtype()).isTrue();
- assertBoolean(new
ContentType((String)null).isMetaSubtype()).isTrue();
+ assertFalse(contentType("text/foo+bar").isMetaSubtype());
+ assertTrue(contentType("text/*").isMetaSubtype());
+ assertTrue(new ContentType((String)null).isMetaSubtype());
}
@Test void a07_match() {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringHeader_Test.java
index 01a1e200e..4a8b389a7 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringHeader_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.utest.utils.Utils2.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringRangesHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringRangesHeader_Test.java
index 1c3cf10f4..051ce33b0 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringRangesHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicStringRangesHeader_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.utest.utils.Utils2.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/ETag_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/ETag_Test.java
index 44ab7a9f8..2de7c7905 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/ETag_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/ETag_Test.java
@@ -12,9 +12,10 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.utest.utils.Utils2.*;
+import static org.junit.jupiter.api.Assertions.*;
+
import java.io.*;
import java.util.function.*;
@@ -64,8 +65,8 @@ class ETag_Test extends SimpleTestBase {
EntityTag x = new ETag("W/\"foo\"").asEntityTag().get();
assertString(x).is("W/\"foo\"");
assertString(x.getEntityValue()).is("foo");
- assertBoolean(x.isWeak()).isTrue();
- assertBoolean(x.isAny()).isFalse();
+ assertTrue(x.isWeak());
+ assertFalse(x.isAny());
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/part/PartList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/part/PartList_Test.java
index babff253e..ceef5e424 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/part/PartList_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/part/PartList_Test.java
@@ -235,27 +235,27 @@ public class PartList_Test {
@Test
public void a11_contains() {
PartList x = PartList.of(FOO_1, FOO_2, X_x);
- assertBoolean(x.contains(null)).isFalse();
- assertBoolean(x.contains("Foo")).isTrue();
- assertBoolean(x.contains("FOO")).isFalse();
- assertBoolean(x.contains("Bar")).isFalse();
+ assertFalse(x.contains(null));
+ assertTrue(x.contains("Foo"));
+ assertFalse(x.contains("FOO"));
+ assertFalse(x.contains("Bar"));
}
@Test
public void a12_partIterator_all() {
PartList x = PartList.of();
- assertBoolean(x.partIterator().hasNext()).isFalse();
+ assertFalse(x.partIterator().hasNext());
x = PartList.of(FOO_1);
- assertBoolean(x.partIterator().hasNext()).isTrue();
+ assertTrue(x.partIterator().hasNext());
}
@Test
public void a13_partIterator_single() {
PartList x = PartList.of();
- assertBoolean(x.partIterator("Foo").hasNext()).isFalse();
+ assertFalse(x.partIterator("Foo").hasNext());
x = PartList.of(FOO_1);
- assertBoolean(x.partIterator("Foo").hasNext()).isTrue();
- assertBoolean(x.partIterator("FOO").hasNext()).isFalse();
+ assertTrue(x.partIterator("Foo").hasNext());
+ assertFalse(x.partIterator("FOO").hasNext());
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
index 7fe69fd72..945afe05f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
@@ -13,7 +13,6 @@
package org.apache.juneau.httppart;
import static java.lang.String.valueOf;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.httppart.HttpPartSchema.*;
import static org.apache.juneau.internal.CollectionUtils.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java
b/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java
index 03dbfc65d..db2c9715b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java
@@ -14,7 +14,6 @@ package org.apache.juneau.reflect;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.reflect.ReflectFlags.*;
import static org.apache.juneau.utest.utils.Utils2.*;
import static org.junit.Assert.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/reflect/FieldInfoTest.java
b/juneau-utest/src/test/java/org/apache/juneau/reflect/FieldInfoTest.java
index 8e7dbbcd6..9f30dfc5b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/FieldInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/FieldInfoTest.java
@@ -14,7 +14,6 @@ package org.apache.juneau.reflect;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.reflect.ReflectFlags.*;
import static org.apache.juneau.utest.utils.Utils2.*;
import static org.junit.Assert.*;
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 82c49ab9c..d221e3a46 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
@@ -41,7 +41,7 @@ import org.apache.juneau.utest.utils.*;
import org.apache.juneau.xml.*;
import org.junit.jupiter.api.*;
-public class RestClient_Config_RestClient_Test extends SimpleTestBase {
+class RestClient_Config_RestClient_Test extends SimpleTestBase {
public static class ABean {
public int f;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Marshalls_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Marshalls_Test.java
index 9b5910cd5..2cffb1771 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Marshalls_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Marshalls_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.client;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
index db402e48a..369e27a58 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Paths_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.client;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpParts.*;
import static org.apache.juneau.httppart.HttpPartSchema.*;
import static org.junit.jupiter.api.Assertions.*;
@@ -25,7 +24,7 @@ import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.junit.jupiter.api.*;
-public class RestClient_Paths_Test extends SimpleTestBase {
+class RestClient_Paths_Test extends SimpleTestBase {
@Rest
public static class A extends BasicRestObject {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
index 95ca639af..96adfa270 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
@@ -39,7 +39,7 @@ import org.apache.juneau.rest.servlet.*;
import org.apache.juneau.xml.*;
import org.junit.jupiter.api.*;
-public class RestClient_Response_Body_Test extends SimpleTestBase {
+class RestClient_Response_Body_Test extends SimpleTestBase {
public static class ABean {
public int f;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/xml/InvalidXmlBeansTest.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/InvalidXmlBeansTest.java
index 5dfdc6ae7..267931f19 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/InvalidXmlBeansTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/InvalidXmlBeansTest.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.xml;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
index 4179f3509..15f583b07 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlTest.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.xml;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.CollectionUtils.list;
import static org.apache.juneau.utest.utils.Utils2.*;