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 fa017dede Unit test modernization.
fa017dede is described below
commit fa017dedefd44902ce2f984b5327ca8a8ff4c7f0
Author: James Bognar <[email protected]>
AuthorDate: Wed Aug 6 11:54:25 2025 -0400
Unit test modernization.
---
.../apache/juneau/assertions/Assertions_Test.java | 1 -
.../java/org/apache/juneau/cp/BeanStore_Test.java | 14 +++---
.../apache/juneau/cp/DefaultClassList_Test.java | 4 +-
.../apache/juneau/http/BasicHttpResource_Test.java | 40 +++++++----------
.../apache/juneau/http/header/IfRange_Test.java | 5 +--
.../apache/juneau/http/header/RetryAfter_Test.java | 4 +-
.../org/apache/juneau/http/part/PartList_Test.java | 26 +++++------
.../org/apache/juneau/mstat/ThrownStore_Test.java | 51 ++++++++--------------
8 files changed, 58 insertions(+), 87 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 369d36a5e..450b25b90 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
@@ -181,7 +181,6 @@ public class Assertions_Test {
@Test
public void a24_assertOptional() {
- assertOptional(empty()).isNull();
assertOptional(optional(1)).isNotNull();
}
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 dc39f4cf3..57e7a90ee 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
@@ -106,7 +106,7 @@ class BeanStore_Test extends SimpleTestBase {
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
assertFalse(b.hasBean(A1.class));
- assertOptional(b.getBean(A1.class)).isNull();
+ assertEmpty(b.getBean(A1.class));
}
b1p.addBean(A1.class, a1a);
@@ -120,14 +120,14 @@ class BeanStore_Test extends SimpleTestBase {
b2p.clear();
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
assertFalse(b.hasBean(A1.class));
- assertOptional(b.getBean(A1.class)).isNull();
+ assertEmpty(b.getBean(A1.class));
}
b1p.addBean(A1.class, null);
b2p.addBean(A1.class, null);
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
assertTrue(b.hasBean(A1.class));
- assertOptional(b.getBean(A1.class)).isNull();
+ assertEmpty(b.getBean(A1.class));
}
b1p.clear().addSupplier(A1.class, ()->a1a);
@@ -149,7 +149,7 @@ class BeanStore_Test extends SimpleTestBase {
b2c.add(A2.class, a2a);
for (BeanStore b : array(b1p, b2p)) {
assertFalse(b.hasBean(A2.class));
- assertOptional(b.getBean(A2.class)).isNull();
+ assertEmpty(b.getBean(A2.class));
assertStream(b.stream(A2.class));
}
for (BeanStore b : array(b1c, b2c)) {
@@ -170,7 +170,7 @@ class BeanStore_Test extends SimpleTestBase {
for (BeanStore b : array(b1p, b2p)) {
assertFalse(b.hasBean(A1.class));
- assertOptional(b.getBean(A1.class)).isNull();
+ assertEmpty(b.getBean(A1.class));
assertStream(b.stream(A1.class));
}
for (BeanStore b : array(b1c, b2c)) {
@@ -183,7 +183,7 @@ class BeanStore_Test extends SimpleTestBase {
b2c.removeBean(A1.class);
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
assertFalse(b.hasBean(A1.class));
- assertOptional(b.getBean(A1.class)).isNull();
+ assertEmpty(b.getBean(A1.class));
assertStream(b.stream(A1.class));
}
}
@@ -211,7 +211,7 @@ class BeanStore_Test extends SimpleTestBase {
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
assertOptional(b.getBean(A1.class, "foo")).is(a1b);
assertOptional(b.getBean(A1.class, "bar")).is(a1d);
- assertOptional(b.getBean(A1.class, "baz")).isNull();
+ assertEmpty(b.getBean(A1.class, "baz"));
}
for (BeanStore b : array(b1p, b2p)) {
assertOptional(b.getBean(A1.class, null)).is(a1a);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/cp/DefaultClassList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/cp/DefaultClassList_Test.java
index cceee2eab..0e0382d1a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/DefaultClassList_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/DefaultClassList_Test.java
@@ -27,10 +27,10 @@ class DefaultClassList_Test extends SimpleTestBase {
@Test void a01_basic() {
DefaultClassList x = create();
- assertOptional(x.get(String.class)).isNull();
+ assertEmpty(x.get(String.class));
x = of(Long.class,null);
- assertOptional(x.get(String.class)).isNull();
+ assertEmpty(x.get(String.class));
assertOptional(x.get(Long.class)).isNotNull();
assertOptional(x.get(Number.class)).isNotNull();
assertOptional(x.get(Object.class)).isNotNull();
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 8898b2b1f..27cee4001 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
@@ -17,19 +17,17 @@ import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.http.HttpResources.*;
import static org.apache.juneau.utest.utils.Utils2.*;
import static org.junit.Assert.*;
-import static org.junit.runners.MethodSorters.*;
-
import java.io.*;
import java.nio.file.*;
+import org.apache.juneau.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.resource.*;
-import org.junit.*;
+import org.junit.jupiter.api.*;
+
+class BasicHttpResource_Test extends SimpleTestBase {
-@FixMethodOrder(NAME_ASCENDING)
-public class BasicHttpResource_Test {
- @Test
- public void a01_basic() throws Exception {
+ @Test void a01_basic() throws Exception {
File f = Files.createTempFile("test","txt").toFile();
HttpResource x = stringResource((String)null);
@@ -110,18 +108,16 @@ public class BasicHttpResource_Test {
assertObject(x.getContentEncoding()).isNull();
}
- @Test
- public void a02_header_String_Object() {
+ @Test void a02_header_String_Object() {
HeaderList x =
stringResource("foo").addHeader("Foo","bar").addHeader("Foo","baz").addHeader(null,"bar").addHeader("foo",null).getHeaders();
assertString(x.getFirst("Foo").get().toString()).is("Foo: bar");
assertString(x.getLast("Foo").get().toString()).is("Foo: baz");
- assertOptional(x.getFirst("Bar")).isNull();
- assertOptional(x.getLast("Bar")).isNull();
+ assertEmpty(x.getFirst("Bar"));
+ assertEmpty(x.getLast("Bar"));
assertObject(x.getAll()).asJson().is("['Foo: bar','Foo: baz']");
}
- @Test
- public void a03_header_Header() {
+ @Test void a03_header_Header() {
HeaderList x =
stringResource("foo").addHeaders(header("Foo","bar")).addHeaders(header("Foo","baz")).addHeaders(header("Bar",null)).getHeaders();
assertString(x.getFirst("Foo").get().toString()).is("Foo: bar");
assertString(x.getLast("Foo").get().toString()).is("Foo: baz");
@@ -130,8 +126,7 @@ public class BasicHttpResource_Test {
assertObject(x.getAll()).asJson().is("['Foo: bar','Foo:
baz','Bar: null']");
}
- @Test
- public void a04_headers_List() {
+ @Test void a04_headers_List() {
HeaderList x =
stringResource("foo").addHeaders(header("Foo","bar"),header("Foo","baz"),header("Bar",null),null).getHeaders();
assertString(x.getFirst("Foo").get().toString()).is("Foo: bar");
assertString(x.getLast("Foo").get().toString()).is("Foo: baz");
@@ -140,8 +135,7 @@ public class BasicHttpResource_Test {
assertObject(x.getAll()).asJson().is("['Foo: bar','Foo:
baz','Bar: null']");
}
- @Test
- public void a05_headers_array() {
+ @Test void a05_headers_array() {
HeaderList x =
stringResource("foo").addHeaders(header("Foo","bar"),header("Foo","baz"),header("Bar",null),null).getHeaders();
assertString(x.getFirst("Foo").get().toString()).is("Foo: bar");
assertString(x.getLast("Foo").get().toString()).is("Foo: baz");
@@ -151,32 +145,28 @@ public class BasicHttpResource_Test {
}
- @Test
- public void a06_chunked() {
+ @Test void a06_chunked() {
StringResource x1 = stringResource("foo").setChunked();
assertTrue(x1.isChunked());
StringResource x2 = stringResource("foo");
assertFalse(x2.isChunked());
}
- @Test
- public void a07_chunked_boolean() {
+ @Test void a07_chunked_boolean() {
StringResource x1 = stringResource("foo").setChunked(true);
assertTrue(x1.isChunked());
StringResource x2 = stringResource("foo").setChunked(false);
assertFalse(x2.isChunked());
}
- @Test
- public void a08_contentType_String() {
+ @Test void a08_contentType_String() {
StringResource x1 =
stringResource("foo").setContentType("text/plain");
assertString(x1.getContentType().getValue()).is("text/plain");
StringResource x2 =
stringResource("foo").setContentType((String)null);
assertObject(x2.getContentType()).isNull();
}
- @Test
- public void a09_contentEncoding_String() {
+ @Test void a09_contentEncoding_String() {
StringResource x1 =
stringResource("foo").setContentEncoding("identity");
assertString(x1.getContentEncoding().getValue()).is("identity");
StringResource x2 =
stringResource("foo").setContentEncoding((String)null);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/IfRange_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/IfRange_Test.java
index 7e3fa0f6f..259972934 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/IfRange_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/IfRange_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.*;
@@ -80,8 +79,8 @@ class IfRange_Test extends SimpleTestBase {
@Test void a02_asEntityTag() {
EntityTag x = ifRange(VALUE1).asEntityTag().get();
assertString(x).is("\"foo\"");
- assertOptional(ifRange(()->null).asEntityTag()).isNull();
- assertOptional(ifRange(()->PARSED3).asEntityTag()).isNull();
+ assertEmpty(ifRange(()->null).asEntityTag());
+ assertEmpty(ifRange(()->PARSED3).asEntityTag());
}
//------------------------------------------------------------------------------------------------------------------
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 a3823d009..e741ed9d7 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
@@ -77,8 +77,8 @@ class RetryAfter_Test extends SimpleTestBase {
@Test void a03_asInt() {
assertOptional(retryAfter(123).asInteger()).is(123);
- assertOptional(new
RetryAfter((String)null).asInteger()).isNull();
- assertOptional(retryAfter(()->null).asInteger()).isNull();
+ assertEmpty(new RetryAfter((String)null).asInteger());
+ assertEmpty(retryAfter(()->null).asInteger());
}
//------------------------------------------------------------------------------------------------------------------
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 49aebe482..f03de1d15 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
@@ -17,8 +17,6 @@ import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.http.HttpParts.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.runners.MethodSorters.*;
-
import java.util.*;
import java.util.concurrent.atomic.*;
@@ -170,12 +168,12 @@ class PartList_Test extends SimpleTestBase {
@Test void a06_getCondensed() {
PartList x = PartList.of(FOO_1);
- assertOptional(x.get((String)null)).isNull();
+ assertEmpty(x.get((String)null));
assertOptional(x.get("Foo")).isString("Foo=1");
- assertOptional(x.get("Bar")).isNull();
+ assertEmpty(x.get("Bar"));
x = PartList.of(FOO_1, FOO_2, FOO_3, X_x);
assertOptional(x.get("Foo")).isString("Foo=1,2,3");
- assertOptional(x.get("Bar")).isNull();
+ assertEmpty(x.get("Bar"));
}
@Query("Foo")
@@ -187,12 +185,12 @@ class PartList_Test extends SimpleTestBase {
@Test void a07_getCondensed_asType() {
PartList x = PartList.of(FOO_1);
- assertOptional(x.get(null, APart.class)).isNull();
+ assertEmpty(x.get(null, APart.class));
assertOptional(x.get("Foo", APart.class)).isString("a=1");
- assertOptional(x.get("Bar", APart.class)).isNull();
+ 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");
- assertOptional(x.get("Bar", APart.class)).isNull();
+ assertEmpty(x.get("Bar", APart.class));
assertOptional(x.get(Foo.class)).isString("Foo=1,2,3");
final PartList x2 = x;
assertThrows(IllegalArgumentException.class,
()->x2.get(String.class), "Part name could not be found on bean type
'java.lang.String'");
@@ -208,18 +206,18 @@ class PartList_Test extends SimpleTestBase {
@Test void a09_getFirst() {
PartList x = PartList.of(FOO_1, FOO_2, X_x);
- assertOptional(x.getFirst(null)).isNull();
+ assertEmpty(x.getFirst(null));
assertOptional(x.getFirst("Foo")).isString("Foo=1");
- assertOptional(x.getFirst("FOO")).isNull();
- assertOptional(x.getFirst("Bar")).isNull();
+ assertEmpty(x.getFirst("FOO"));
+ assertEmpty(x.getFirst("Bar"));
}
@Test void a10_getLast() {
PartList x = PartList.of(FOO_1, FOO_2, X_x);
- assertOptional(x.getLast(null)).isNull();
+ assertEmpty(x.getLast(null));
assertOptional(x.getLast("Foo")).isString("Foo=2");
- assertOptional(x.getLast("FOO")).isNull();
- assertOptional(x.getLast("Bar")).isNull();
+ assertEmpty(x.getLast("FOO"));
+ assertEmpty(x.getLast("Bar"));
}
@Test void a11_contains() {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
index 2301678e2..055bb024c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/mstat/ThrownStore_Test.java
@@ -14,24 +14,21 @@ package org.apache.juneau.mstat;
import static org.apache.juneau.assertions.AssertionPredicates.*;
import static org.apache.juneau.assertions.Assertions.*;
-import static org.junit.runners.MethodSorters.*;
-
import java.util.*;
+import org.apache.juneau.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.rest.stats.*;
-import org.junit.*;
+import org.junit.jupiter.api.*;
@SuppressWarnings("serial")
-@FixMethodOrder(NAME_ASCENDING)
-public class ThrownStore_Test {
+class ThrownStore_Test extends SimpleTestBase {
//------------------------------------------------------------------------------------------------------------------
// Basic tests
//------------------------------------------------------------------------------------------------------------------
- @Test
- public void a01_testBasic() {
+ @Test void a01_testBasic() {
Throwable t1 = new Throwable();
t1.fillInStackTrace();
@@ -48,8 +45,7 @@ public class ThrownStore_Test {
assertLong(db.getStats(t1).get().getHash()).isNot(db.getStats(t2).get().getHash());
}
- @Test
- public void a02_getStats() {
+ @Test void a02_getStats() {
Throwable t1 = new Throwable();
t1.fillInStackTrace();
@@ -65,13 +61,12 @@ public class ThrownStore_Test {
List<ThrownStats> l = db.getStats(); // Should be a snapshot.
db.add(t1);
- assertList(l).isSize(2);
+ assertSize(2, l);
assertInteger(l.get(0).getCount()).is(2);
assertInteger(l.get(1).getCount()).is(1);
}
- @Test
- public void a03_reset() {
+ @Test void a03_reset() {
Throwable t1 = new Throwable();
t1.fillInStackTrace();
@@ -79,11 +74,10 @@ public class ThrownStore_Test {
db.add(t1);
db.reset();
- assertOptional(db.getStats(t1)).isNull();
+ assertEmpty(db.getStats(t1));
}
- @Test
- public void a04_sameStackTraces() {
+ @Test void a04_sameStackTraces() {
ThrownStore db = new ThrownStore();
Throwable t1 = new Throwable() {
@@ -116,8 +110,7 @@ public class ThrownStore_Test {
assertInteger(db.getStats(t2).get().getCount()).is(2);
}
- @Test
- public void a05_slightlyDifferentStackTraces() {
+ @Test void a05_slightlyDifferentStackTraces() {
ThrownStore db = new ThrownStore();
Throwable t1 = new Throwable() {
@@ -150,8 +143,7 @@ public class ThrownStore_Test {
assertInteger(db.getStats(t2).get().getCount()).is(1);
}
- @Test
- public void a06_proxyElements() {
+ @Test void a06_proxyElements() {
ThrownStore db = new ThrownStore();
Throwable t1 = new Throwable() {
@@ -188,15 +180,13 @@ public class ThrownStore_Test {
// Builder tests.
//------------------------------------------------------------------------------------------------------------------
- @Test
- public void b01_builder_default() {
+ @Test void b01_builder_default() {
assertObject(ThrownStore.create().build()).isType(ThrownStore.class);
}
public static class B1 extends ThrownStore{}
- @Test
- public void b02_builder_implClass() {
+ @Test void b02_builder_implClass() {
assertObject(ThrownStore.create().type(B1.class).build()).isType(B1.class);
}
@@ -206,8 +196,7 @@ public class ThrownStore_Test {
}
}
- @Test
- public void b04_builder_implClass_bad() {
+ @Test void b04_builder_implClass_bad() {
assertThrown(()->ThrownStore.create().type(B4.class).build()).asMessages().isContains("foobar");
}
@@ -227,8 +216,7 @@ public class ThrownStore_Test {
}
}
- @Test
- public void b05_builder_beanFactory() {
+ @Test void b05_builder_beanFactory() {
BeanStore bs = BeanStore.create().build();
assertThrown(()->ThrownStore.create(bs).type(B5b.class).build()).asMessages().isAny(contains("Public
constructor found but could not find prerequisites: B5a"));
@@ -257,8 +245,7 @@ public class ThrownStore_Test {
}
}
- @Test
- public void b06_statsImplClass() {
+ @Test void b06_statsImplClass() {
BeanStore bs = BeanStore.create().build();
Throwable t1 = new Throwable();
@@ -276,8 +263,7 @@ public class ThrownStore_Test {
// ThrownStats tests.
//------------------------------------------------------------------------------------------------------------------
- @Test
- public void c01_thrownStats_basic() {
+ @Test void c01_thrownStats_basic() {
Throwable t1 = new Throwable("foo");
t1.fillInStackTrace();
Throwable t2 = new Throwable("bar", t1);
@@ -321,8 +307,7 @@ public class ThrownStore_Test {
public static class D2 {}
- @Test
- public void d01_ignoreClasses() {
+ @Test void d01_ignoreClasses() {
ThrownStore db =
ThrownStore.create().ignoreClasses(D1.class,D2.class,ThrownStore_Test.class).build();
Throwable t1 = new Throwable() {
