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 65482bbd7 Unit test modernization.
65482bbd7 is described below
commit 65482bbd7135718e2da0380a5c3123013681ea79
Author: James Bognar <[email protected]>
AuthorDate: Thu Aug 7 16:54:41 2025 -0400
Unit test modernization.
---
.../apache/juneau/a/rttests/RoundTripGenericsTest.java | 6 +++---
.../test/java/org/apache/juneau/cp/BeanStore_Test.java | 18 +++++++++---------
.../org/apache/juneau/cp/DefaultClassList_Test.java | 7 +++----
.../java/org/apache/juneau/http/StringRange_Test.java | 4 ++--
.../juneau/http/header/BasicDateHeader_Test.java | 2 +-
.../org/apache/juneau/http/header/RetryAfter_Test.java | 2 +-
.../java/org/apache/juneau/marshaller/Csv_Test.java | 8 ++++----
.../org/apache/juneau/utils/ReflectionMapTest.java | 2 +-
8 files changed, 24 insertions(+), 25 deletions(-)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripGenericsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripGenericsTest.java
index caf31bcf7..24fa71936 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripGenericsTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/RoundTripGenericsTest.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.a.rttests;
-import static org.apache.juneau.assertions.Assertions.*;
+import static org.apache.juneau.AssertionHelpers.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
@@ -46,14 +46,14 @@ public class RoundTripGenericsTest extends RoundTripTest {
// During parsing, these become JsonMaps.
Pair pair = new Pair<>(new Source().init(), new
Target().init());
pair = roundTrip(pair);
-
assertObject(pair).asJsonSorted().is("{s:{s1:'a1'},t:{t1:'b1'}}");
+ assertJson(pair, "{s:{s1:'a1'},t:{t1:'b1'}}");
assertEquals("JsonMap", pair.getS().getClass().getSimpleName());
assertEquals("JsonMap", pair.getT().getClass().getSimpleName());
// If you specify a concrete class, the type variables become
bound and
// the property types correctly resolve.
pair = roundTrip(pair, RealPair.class);
-
assertObject(pair).asJsonSorted().is("{s:{s1:'a1'},t:{t1:'b1'}}");
+ assertJson(pair, "{s:{s1:'a1'},t:{t1:'b1'}}");
assertEquals("Source", pair.getS().getClass().getSimpleName());
assertEquals("Target", pair.getT().getClass().getSimpleName());
}
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 9b0a64947..38ba3f8ef 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,7 +111,7 @@ class BeanStore_Test extends SimpleTestBase {
b2p.addBean(A1.class, a1a);
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
assertTrue(b.hasBean(A1.class));
- assertOptional(b.getBean(A1.class)).is(a1a);
+ assertEquals(a1a, b.getBean(A1.class).get());
}
b1p.clear();
@@ -132,14 +132,14 @@ class BeanStore_Test extends SimpleTestBase {
b2p.clear().addSupplier(A1.class, ()->a1a);
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
assertTrue(b.hasBean(A1.class));
- assertOptional(b.getBean(A1.class)).is(a1a);
+ assertEquals(a1a, b.getBean(A1.class).get());
}
b1p.add(A1.class, a1b);
b2p.add(A1.class, a1b);
for (BeanStore b : array(b1p, b1c, b2p, b2c)) {
assertTrue(b.hasBean(A1.class));
- assertOptional(b.getBean(A1.class)).is(a1b);
+ assertEquals(a1b, b.getBean(A1.class).get());
assertStream(b.stream(A1.class).map(BeanStoreEntry::get), a1b, a1a);
}
@@ -152,7 +152,7 @@ class BeanStore_Test extends SimpleTestBase {
}
for (BeanStore b : array(b1c, b2c)) {
assertTrue(b.hasBean(A2.class));
- assertOptional(b.getBean(A2.class)).is(a2a);
+ assertEquals(a2a, b.getBean(A2.class).get());
assertStream(b.stream(A2.class).map(BeanStoreEntry::get), a2a);
}
@@ -173,7 +173,7 @@ class BeanStore_Test extends SimpleTestBase {
}
for (BeanStore b : array(b1c, b2c)) {
assertTrue(b.hasBean(A1.class));
- assertOptional(b.getBean(A1.class)).is(a1a);
+ assertEquals(a1a, b.getBean(A1.class).get());
assertStream(b.stream(A1.class).map(BeanStoreEntry::get), a1a);
}
@@ -207,15 +207,15 @@ 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);
+ assertEquals(a1b, b.getBean(A1.class, "foo").get());
+ assertEquals(a1d, b.getBean(A1.class, "bar").get());
assertEmpty(b.getBean(A1.class, "baz"));
}
for (BeanStore b : array(b1p, b2p)) {
- assertOptional(b.getBean(A1.class, null)).is(a1a);
+ assertEquals(a1a, b.getBean(A1.class, null).get());
}
for (BeanStore b : array(b1c, b2c)) {
- assertOptional(b.getBean(A1.class, null)).is(a1e);
+ assertEquals(a1e, b.getBean(A1.class, null).get());
}
}
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 389251354..3c366d6cc 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.cp;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.cp.DefaultClassList.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
@@ -29,9 +28,9 @@ class DefaultClassList_Test extends SimpleTestBase {
x = of(Long.class,null);
assertEmpty(x.get(String.class));
- assertOptional(x.get(Long.class)).isNotNull();
- assertOptional(x.get(Number.class)).isNotNull();
- assertOptional(x.get(Object.class)).isNotNull();
+ assertPresent(x.get(Long.class));
+ assertPresent(x.get(Number.class));
+ assertPresent(x.get(Object.class));
assertThrowsWithMessage(IllegalArgumentException.class,
"Argument 'type' cannot be null.", ()->create().get(null));
}
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 1187a7a21..7f376a99f 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
@@ -35,8 +35,8 @@ class StringRange_Test extends SimpleTestBase {
StringRange x4 = of("foo;a=1");
assertEquals(x4, x3);
- assertObject(x3).isNot(x2);
- assertObject(x3).asString().isNot("foo");
+ assertNotEquals(x3, x2);
+ assertNotEquals("foo", s(x3));
assertEquals(x4.hashCode(), x3.hashCode());
assertString("*", of((String)null));
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 e40bf8c12..d4a5f09dc 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
@@ -69,7 +69,7 @@ class BasicDateHeader_Test extends SimpleTestBase {
}
@Test void a02_asZonedDateTime() {
-
assertOptional(dateHeader(HEADER,VALUE).asZonedDateTime()).asString().is("1994-10-29T19:43:31Z");
+ assertString("1994-10-29T19:43:31Z",
dateHeader(HEADER,VALUE).asZonedDateTime());
}
@Test void a04_assertZonedDateTime() {
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 bb595a595..6e7bef3b4 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
@@ -78,7 +78,7 @@ class RetryAfter_Test extends SimpleTestBase {
}
@Test void a03_asInt() {
- assertOptional(retryAfter(123).asInteger()).is(123);
+ assertEquals(123, retryAfter(123).asInteger().get());
assertEmpty(new RetryAfter((String)null).asInteger());
assertEmpty(retryAfter(()->null).asInteger());
}
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 aff9b60cd..c5fdb3d15 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
@@ -21,7 +21,7 @@ import org.apache.juneau.collections.*;
import org.apache.juneau.parser.*;
import org.junit.jupiter.api.*;
-class Csv_Test extends SimpleTestBase{
+class Csv_Test extends SimpleTestBase{
@Test void a01_to() throws Exception {
Object in1 = "foo", in2 = new
Object[]{JsonMap.of("a","foo","b","bar")};
@@ -37,9 +37,9 @@ class Csv_Test extends SimpleTestBase{
String in1 = "'foo'", in2 = "{foo:'bar'}";
assertThrowsWithMessage(ParseException.class, "Not
implemented.", ()->Csv.to(in1, String.class));
- assertThrowsWithMessage(ParseException.class, "Not
implemented.", ()->assertString(Csv.to(stringReader(in1), String.class)));
- assertThrowsWithMessage(ParseException.class, "Not
implemented.", ()->assertObject(Csv.to(in2, Map.class, String.class,
String.class)));
- assertThrowsWithMessage(ParseException.class, "Not
implemented.", ()->assertObject(Csv.to(stringReader(in2), Map.class,
String.class, String.class)));
+ assertThrowsWithMessage(ParseException.class, "Not
implemented.", ()->Csv.to(stringReader(in1), String.class));
+ assertThrowsWithMessage(ParseException.class, "Not
implemented.", ()->Csv.to(in2, Map.class, String.class, String.class));
+ assertThrowsWithMessage(ParseException.class, "Not
implemented.", ()->Csv.to(stringReader(in2), Map.class, String.class,
String.class));
}
//-----------------------------------------------------------------------------------------------------------------
// Helper methods
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 dae5509d1..d02915286 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
@@ -338,7 +338,7 @@ public class ReflectionMapTest extends SimpleTestBase {
static ReflectionMap<Number> RM_F = create().append("F2, F1",
1).build();
@Test void f01_cdl() {
- assertOptional(RM_F.find(F1.class, null)).asJson().is("1");
+ assertString("1", RM_F.find(F1.class, null));
}
//------------------------------------------------------------------------------------------------------------------
