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 0466822a5 Unit test modernization.
0466822a5 is described below
commit 0466822a5edc992aff6ac85b4fd038d19cc10d95
Author: James Bognar <[email protected]>
AuthorDate: Thu Aug 7 13:47:35 2025 -0400
Unit test modernization.
---
.../java/org/apache/juneau/cp/BeanStore_Test.java | 110 ++++++++++-----------
.../apache/juneau/marshaller/Marshall_Test.java | 8 +-
.../juneau/rest/RestContext_Builder_Test.java | 7 +-
3 files changed, 62 insertions(+), 63 deletions(-)
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 f74f5144b..66cf24630 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
@@ -522,9 +522,9 @@ class BeanStore_Test extends SimpleTestBase {
assertNull(b.createMethodFinder(C.class).find(m).run());
}
}
- assertObject(b1c.createMethodFinder(C.class,
x).find("createA1").run()).isNotNull();
+ assertNotNull(b1c.createMethodFinder(C.class,
x).find("createA1").run());
assertNull(b1c.createMethodFinder(C.class,
C1.class).find("createA1").run());
-
assertObject(b2c.createMethodFinder(C.class).find("createA1").run()).isNotNull();
+
assertNotNull(b2c.createMethodFinder(C.class).find("createA1").run());
assertNull(b3c.createMethodFinder(C.class).find("createA1").run());
assertThrown(()->b1c.createMethodFinder(C.class,
x).find("createA7").run()).asMessage().isContains("foo");
assertNull(b1c.createMethodFinder(C.class,
C1.class).find("createA7").run());
@@ -561,9 +561,9 @@ class BeanStore_Test extends SimpleTestBase {
assertNull(b.createMethodFinder(C.class).find(m).run());
}
}
- assertObject(b1c.createMethodFinder(C.class,
x).find("createB1").run()).isNotNull();
- assertObject(b1c.createMethodFinder(C.class,
C2.class).find("createB1").run()).isNotNull();
-
assertObject(b2c.createMethodFinder(C.class).find("createB1").run()).isNotNull();
+ assertNotNull(b1c.createMethodFinder(C.class,
x).find("createB1").run());
+ assertNotNull(b1c.createMethodFinder(C.class,
C2.class).find("createB1").run());
+
assertNotNull(b2c.createMethodFinder(C.class).find("createB1").run());
assertNull(b3c.createMethodFinder(C.class).find("createB1").run());
assertThrown(()->b1c.createMethodFinder(C.class,
x).find("createB7").run()).asMessage().isContains("foo");
assertThrown(()->b1c.createMethodFinder(C.class,
C2.class).find("createB7").run()).asMessage().isContains("foo");
@@ -596,32 +596,32 @@ class BeanStore_Test extends SimpleTestBase {
assertNull(b.createMethodFinder(C.class,
x).find("createC3").run().a);
assertNull(b.createMethodFinder(C.class,
x).find("createC4").run());
assertNull(b.createMethodFinder(C.class,
x).find("createC5").run().a);
- assertObject(b.createMethodFinder(C.class,
x).find("createC6").run()).isNotNull();
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC6").run());
}
b1p.addBean(A1.class, new A1());
b2p.addBean(A1.class, new A1());
b3p.addBean(A1.class, new A1());
for (BeanStore b : array(b1c, b2c)) {
- assertObject(b.createMethodFinder(C.class,
x).find("createC1").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC2").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC3").run().a).isNotNull();
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC1").run());
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC2").run());
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC3").run().a);
assertNull(b.createMethodFinder(C.class,
x).find("createC4").run());
assertNull(b.createMethodFinder(C.class,
x).find("createC5").run().a);
- assertObject(b.createMethodFinder(C.class,
x).find("createC6").run()).isNotNull();
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC6").run());
assertNull(b.createMethodFinder(C.class,
C3.class).find("createC1").run());
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC2").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC3").run().a).isNotNull();
+ assertNotNull(b.createMethodFinder(C.class,
C3.class).find("createC2").run());
+ assertNotNull(b.createMethodFinder(C.class,
C3.class).find("createC3").run().a);
assertNull(b.createMethodFinder(C.class,
C3.class).find("createC4").run());
assertNull(b.createMethodFinder(C.class,
C3.class).find("createC5").run().a);
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC6").run()).isNotNull();
+ assertNotNull(b.createMethodFinder(C.class,
C3.class).find("createC6").run());
}
-
assertObject(b2c.createMethodFinder(C.class).find("createC1").run()).isNotNull();
-
assertObject(b2c.createMethodFinder(C.class).find("createC2").run()).isNotNull();
-
assertObject(b2c.createMethodFinder(C.class).find("createC3").run().a).isNotNull();
+
assertNotNull(b2c.createMethodFinder(C.class).find("createC1").run());
+
assertNotNull(b2c.createMethodFinder(C.class).find("createC2").run());
+
assertNotNull(b2c.createMethodFinder(C.class).find("createC3").run().a);
assertNull(b2c.createMethodFinder(C.class).find("createC4").run());
assertNull(b2c.createMethodFinder(C.class).find("createC5").run().a);
-
assertObject(b2c.createMethodFinder(C.class).find("createC6").run()).isNotNull();
+
assertNotNull(b2c.createMethodFinder(C.class).find("createC6").run());
for (String m :
array("createC1","createC2","createC3","createC4","createC5","createC6")) {
assertNull(b3c.createMethodFinder(C.class).find(m).run());
}
@@ -629,25 +629,25 @@ class BeanStore_Test extends SimpleTestBase {
b1p.clear().addSupplier(A1.class, A1::new);
b2p.clear().addSupplier(A1.class, A1::new);
for (BeanStore b : array(b1c, b2c)) {
- assertObject(b.createMethodFinder(C.class,
x).find("createC1").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC2").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC3").run().a).isNotNull();
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC1").run());
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC2").run());
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC3").run().a);
assertNull(b.createMethodFinder(C.class,
x).find("createC4").run());
assertNull(b.createMethodFinder(C.class,
x).find("createC5").run().a);
- assertObject(b.createMethodFinder(C.class,
x).find("createC6").run()).isNotNull();
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC6").run());
assertNull(b.createMethodFinder(C.class,
C3.class).find("createC1").run());
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC2").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC3").run().a).isNotNull();
+ assertNotNull(b.createMethodFinder(C.class,
C3.class).find("createC2").run());
+ assertNotNull(b.createMethodFinder(C.class,
C3.class).find("createC3").run().a);
assertNull(b.createMethodFinder(C.class,
C3.class).find("createC4").run());
assertNull(b.createMethodFinder(C.class,
C3.class).find("createC5").run().a);
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC6").run()).isNotNull();
+ assertNotNull(b.createMethodFinder(C.class,
C3.class).find("createC6").run());
}
-
assertObject(b2c.createMethodFinder(C.class).find("createC1").run()).isNotNull();
-
assertObject(b2c.createMethodFinder(C.class).find("createC2").run()).isNotNull();
+
assertNotNull(b2c.createMethodFinder(C.class).find("createC1").run());
+
assertNotNull(b2c.createMethodFinder(C.class).find("createC2").run());
assertType(A1.class,
b2c.createMethodFinder(C.class).find("createC3").run().a);
assertNull(b2c.createMethodFinder(C.class).find("createC4").run());
assertNull(b2c.createMethodFinder(C.class).find("createC5").run().a);
-
assertObject(b2c.createMethodFinder(C.class).find("createC6").run()).isNotNull();
+
assertNotNull(b2c.createMethodFinder(C.class).find("createC6").run());
for (String m :
array("createC1","createC2","createC3","createC4","createC5","createC6")) {
assertNull(b3c.createMethodFinder(C.class).find(m).run());
}
@@ -655,25 +655,25 @@ class BeanStore_Test extends SimpleTestBase {
b1p.clear().add(A1.class, null);
b2p.clear().add(A1.class, null);
for (BeanStore b : array(b1c, b2c)) {
- assertObject(b.createMethodFinder(C.class,
x).find("createC1").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC2").run()).isNotNull();
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC1").run());
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC2").run());
assertNull(b.createMethodFinder(C.class,
x).find("createC3").run().a);
assertNull(b.createMethodFinder(C.class,
x).find("createC4").run());
assertNull(b.createMethodFinder(C.class,
x).find("createC5").run().a);
- assertObject(b.createMethodFinder(C.class,
x).find("createC6").run()).isNotNull();
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC6").run());
assertNull(b.createMethodFinder(C.class,
C3.class).find("createC1").run());
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC2").run()).isNotNull();
+ assertNotNull(b.createMethodFinder(C.class,
C3.class).find("createC2").run());
assertNull(b.createMethodFinder(C.class,
C3.class).find("createC3").run().a);
assertNull(b.createMethodFinder(C.class,
C3.class).find("createC4").run());
assertNull(b.createMethodFinder(C.class,
C3.class).find("createC5").run().a);
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC6").run()).isNotNull();
+ assertNotNull(b.createMethodFinder(C.class,
C3.class).find("createC6").run());
}
-
assertObject(b2c.createMethodFinder(C.class).find("createC1").run()).isNotNull();
-
assertObject(b2c.createMethodFinder(C.class).find("createC2").run()).isNotNull();
+
assertNotNull(b2c.createMethodFinder(C.class).find("createC1").run());
+
assertNotNull(b2c.createMethodFinder(C.class).find("createC2").run());
assertNull(b2c.createMethodFinder(C.class).find("createC3").run().a);
assertNull(b2c.createMethodFinder(C.class).find("createC4").run());
assertNull(b2c.createMethodFinder(C.class).find("createC5").run().a);
-
assertObject(b2c.createMethodFinder(C.class).find("createC6").run()).isNotNull();
+
assertNotNull(b2c.createMethodFinder(C.class).find("createC6").run());
for (String m :
array("createC1","createC2","createC3","createC4","createC5","createC6")) {
assertNull(b3c.createMethodFinder(C.class).find(m).run());
}
@@ -681,25 +681,25 @@ class BeanStore_Test extends SimpleTestBase {
b1p.clear().addBean(A1.class, new A1()).add(A1.class, new A1(),
"Foo");
b2p.clear().addBean(A1.class, new A1()).add(A1.class, new A1(),
"Foo");
for (BeanStore b : array(b1c, b2c)) {
- assertObject(b.createMethodFinder(C.class,
x).find("createC1").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC2").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC3").run().a).isNotNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC4").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC5").run().a).isNotNull();
- assertObject(b.createMethodFinder(C.class,
x).find("createC6").run()).isNotNull();
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC1").run());
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC2").run());
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC3").run().a);
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC4").run());
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC5").run().a);
+ assertNotNull(b.createMethodFinder(C.class,
x).find("createC6").run());
assertNull(b.createMethodFinder(C.class,
C3.class).find("createC1").run());
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC2").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC3").run().a).isNotNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC4").run()).isNotNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC5").run().a).isNotNull();
- assertObject(b.createMethodFinder(C.class,
C3.class).find("createC6").run()).isNotNull();
+ assertNotNull(b.createMethodFinder(C.class,
C3.class).find("createC2").run());
+ assertNotNull(b.createMethodFinder(C.class,
C3.class).find("createC3").run().a);
+ assertNotNull(b.createMethodFinder(C.class,
C3.class).find("createC4").run());
+ assertNotNull(b.createMethodFinder(C.class,
C3.class).find("createC5").run().a);
+ assertNotNull(b.createMethodFinder(C.class,
C3.class).find("createC6").run());
}
-
assertObject(b2c.createMethodFinder(C.class).find("createC1").run()).isNotNull();
-
assertObject(b2c.createMethodFinder(C.class).find("createC2").run()).isNotNull();
-
assertObject(b2c.createMethodFinder(C.class).find("createC3").run().a).isNotNull();
-
assertObject(b2c.createMethodFinder(C.class).find("createC4").run()).isNotNull();
-
assertObject(b2c.createMethodFinder(C.class).find("createC5").run().a).isNotNull();
-
assertObject(b2c.createMethodFinder(C.class).find("createC6").run()).isNotNull();
+
assertNotNull(b2c.createMethodFinder(C.class).find("createC1").run());
+
assertNotNull(b2c.createMethodFinder(C.class).find("createC2").run());
+
assertNotNull(b2c.createMethodFinder(C.class).find("createC3").run().a);
+
assertNotNull(b2c.createMethodFinder(C.class).find("createC4").run());
+
assertNotNull(b2c.createMethodFinder(C.class).find("createC5").run().a);
+
assertNotNull(b2c.createMethodFinder(C.class).find("createC6").run());
for (String m :
array("createC1","createC2","createC3","createC4","createC5","createC6")) {
assertNull(b3c.createMethodFinder(C.class).find(m).run());
}
@@ -778,8 +778,8 @@ class BeanStore_Test extends SimpleTestBase {
@Test void d01_createBean_basic() {
BeanStore bs = BeanStore.create().outer(new
BeanStore_Test()).build();
- assertObject(bs.createBean(D1a.class).run()).isNotNull();
- assertObject(bs.createBean(D1b.class).run()).isNotNull();
+ assertNotNull(bs.createBean(D1a.class).run());
+ assertNotNull(bs.createBean(D1b.class).run());
assertNull(bs.createBean(null).run());
}
@@ -828,7 +828,7 @@ class BeanStore_Test extends SimpleTestBase {
BeanStore bs = BeanStore.INSTANCE;
assertObject(bs.createBean(D4a.class).run()).isNotAny(d4a1,
d4a2, d4a3, d4a4);
assertObject(bs.createBean(D4b.class).run()).isNotAny(d4b1,
d4b2);
- assertObject(bs.createBean(D4c.class).run()).isNotNull();
+ assertNotNull(bs.createBean(D4c.class).run());
}
public static class D5 {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/marshaller/Marshall_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Marshall_Test.java
index bd8f55708..9bac02c65 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/marshaller/Marshall_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/marshaller/Marshall_Test.java
@@ -12,16 +12,16 @@
//
***************************************************************************************************************************
package org.apache.juneau.marshaller;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
-public class Marshall_Test extends SimpleTestBase {
+class Marshall_Test extends SimpleTestBase {
@Test void basic() {
Marshaller m = Json5.DEFAULT;
- assertObject(m.getParser()).isNotNull();
- assertObject(m.getSerializer()).isNotNull();
+ assertNotNull(m.getParser());
+ assertNotNull(m.getSerializer());
}
}
\ No newline at end of file
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/RestContext_Builder_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/RestContext_Builder_Test.java
index a9c72a428..6af22f0f1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/RestContext_Builder_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/RestContext_Builder_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
@@ -58,7 +57,7 @@ public class RestContext_Builder_Test {
@Test
public void a02_createBeanStore_annotation() {
MockRestClient.buildLax(A2.class);
- assertObject(A2.beanStore.getBean(A.class)).isNotNull();
+ assertNotNull(A2.beanStore.getBean(A.class));
}
@Rest
@@ -73,7 +72,7 @@ public class RestContext_Builder_Test {
@Test
public void a03_createBeanStore_restBean1() {
MockRestClient.buildLax(A3.class);
- assertObject(A3.beanStore.getBean(A.class)).isNotNull();
+ assertNotNull(A3.beanStore.getBean(A.class));
}
@Rest
@@ -88,7 +87,7 @@ public class RestContext_Builder_Test {
@Test
public void a04_createBeanStore_restBean2() {
MockRestClient.buildLax(A4.class);
- assertObject(A4.beanStore.getBean(A.class)).isNotNull();
+ assertNotNull(A4.beanStore.getBean(A.class));
}
//-----------------------------------------------------------------------------------------------------------------
