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 26c693144 Unit test modernization.
26c693144 is described below
commit 26c693144ab6284da97094a70150c672d670baec
Author: James Bognar <[email protected]>
AuthorDate: Thu Aug 7 16:56:40 2025 -0400
Unit test modernization.
---
.../test/java/org/apache/juneau/http/StringRange_Test.java | 1 -
.../apache/juneau/http/header/BasicDateHeader_Test.java | 1 -
.../juneau/http/header/BasicMediaRangesHeader_Test.java | 1 -
.../org/apache/juneau/http/header/RetryAfter_Test.java | 1 -
.../java/org/apache/juneau/http/part/PartList_Test.java | 14 +++++++-------
.../jsonschema/annotation/ExternalDocsAnnotation_Test.java | 1 -
.../test/java/org/apache/juneau/marshaller/Csv_Test.java | 1 -
.../java/org/apache/juneau/mstat/MethodExecStore_Test.java | 1 -
.../java/org/apache/juneau/utils/ReflectionMapTest.java | 1 -
9 files changed, 7 insertions(+), 15 deletions(-)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
index 7f376a99f..9d1b2c6cb 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/StringRange_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicDateHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicDateHeader_Test.java
index d4a5f09dc..126c6f59d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicDateHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicDateHeader_Test.java
@@ -14,7 +14,6 @@ package org.apache.juneau.http.header;
import static java.time.format.DateTimeFormatter.*;
import static java.time.temporal.ChronoUnit.*;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.utest.utils.Utils2.*;
import java.io.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaRangesHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaRangesHeader_Test.java
index b857128f2..9ebe23828 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaRangesHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/BasicMediaRangesHeader_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.utest.utils.Utils2.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/RetryAfter_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/RetryAfter_Test.java
index 6e7bef3b4..4e605359e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/RetryAfter_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/RetryAfter_Test.java
@@ -14,7 +14,6 @@ package org.apache.juneau.http.header;
import static java.time.format.DateTimeFormatter.*;
import static java.time.temporal.ChronoUnit.*;
-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/part/PartList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/part/PartList_Test.java
index de0ef37b7..9fead41b3 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
@@ -169,10 +169,10 @@ class PartList_Test extends SimpleTestBase {
@Test void a06_getCondensed() {
PartList x = PartList.of(FOO_1);
assertEmpty(x.get((String)null));
- assertOptional(x.get("Foo")).isString("Foo=1");
+ assertString("Foo=1", x.get("Foo"));
assertEmpty(x.get("Bar"));
x = PartList.of(FOO_1, FOO_2, FOO_3, X_x);
- assertOptional(x.get("Foo")).isString("Foo=1,2,3");
+ assertString("Foo=1,2,3", x.get("Foo"));
assertEmpty(x.get("Bar"));
}
@@ -186,12 +186,12 @@ class PartList_Test extends SimpleTestBase {
@Test void a07_getCondensed_asType() {
PartList x = PartList.of(FOO_1);
assertEmpty(x.get(null, APart.class));
- assertOptional(x.get("Foo", APart.class)).isString("a=1");
+ assertString("a=1", x.get("Foo", APart.class));
assertEmpty(x.get("Bar", APart.class));
x = PartList.of(FOO_1, FOO_2, FOO_3, X_x);
- assertOptional(x.get("Foo", APart.class)).isString("a=1,2,3");
+ assertString("a=1,2,3", x.get("Foo", APart.class));
assertEmpty(x.get("Bar", APart.class));
- assertOptional(x.get(Foo.class)).isString("Foo=1,2,3");
+ assertString("Foo=1,2,3", x.get(Foo.class));
final PartList x2 = x;
assertThrowsWithMessage(IllegalArgumentException.class, "Part
name could not be found on bean type 'java.lang.String'",
()->x2.get(String.class));
}
@@ -207,7 +207,7 @@ class PartList_Test extends SimpleTestBase {
@Test void a09_getFirst() {
PartList x = PartList.of(FOO_1, FOO_2, X_x);
assertEmpty(x.getFirst(null));
- assertOptional(x.getFirst("Foo")).isString("Foo=1");
+ assertString("Foo=1", x.getFirst("Foo"));
assertEmpty(x.getFirst("FOO"));
assertEmpty(x.getFirst("Bar"));
}
@@ -215,7 +215,7 @@ class PartList_Test extends SimpleTestBase {
@Test void a10_getLast() {
PartList x = PartList.of(FOO_1, FOO_2, X_x);
assertEmpty(x.getLast(null));
- assertOptional(x.getLast("Foo")).isString("Foo=2");
+ assertString("Foo=2", x.getLast("Foo"));
assertEmpty(x.getLast("FOO"));
assertEmpty(x.getLast("Bar"));
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation_Test.java
index 866677a55..f777333d9 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.jsonschema.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshaller/Csv_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Csv_Test.java
index c5fdb3d15..7cc55e965 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshaller/Csv_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Csv_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.marshaller;
-import static org.apache.juneau.assertions.Assertions.*;
import java.io.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
index 326e9428c..4af363971 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.mstat;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.jupiter.api.Assertions.*;
import java.lang.reflect.*;
import java.util.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/ReflectionMapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/ReflectionMapTest.java
index d02915286..ecf807278 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/utils/ReflectionMapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/utils/ReflectionMapTest.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.utils;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import java.lang.reflect.*;
