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 a3354d241 Unit test modernization.
a3354d241 is described below
commit a3354d2419ce641124a7db807ccf10fc29839ab0
Author: James Bognar <[email protected]>
AuthorDate: Thu Aug 7 10:38:52 2025 -0400
Unit test modernization.
---
juneau-utest/src/test/java/org/apache/juneau/Version_Test.java | 4 ++--
.../src/test/java/org/apache/juneau/cp/FileFinder_Test.java | 10 +++++-----
.../src/test/java/org/apache/juneau/http/BasicHeader_Test.java | 2 --
.../org/apache/juneau/http/response/HttpException_Test.java | 2 --
.../java/org/apache/juneau/mstat/MethodExecStore_Test.java | 2 +-
5 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/Version_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/Version_Test.java
index 0cb023c6d..40be5cc35 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/Version_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/Version_Test.java
@@ -33,8 +33,8 @@ class Version_Test extends SimpleTestBase {
assertEquals(1, x.getPart(0).orElse(null));
assertEquals(2, x.getPart(1).orElse(null));
assertEquals(3, x.getPart(2).orElse(null));
- assertInteger(x.getPart(-1).orElse(null)).isNull();
- assertInteger(x.getPart(3).orElse(null)).isNull();
+ assertNull(x.getPart(-1).orElse(null));
+ assertNull(x.getPart(3).orElse(null));
x = of("1..x");
assertString("1.0.2147483647", x);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
index 571f9407c..d6e6d8217 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
@@ -595,19 +595,19 @@ public class FileFinder_Test extends SimpleTestBase { //
NOSONAR - Needs to be
Set<LocalDir> s = null;
s = set(new LocalDir(Paths.get("test")), new
LocalDir(Paths.get("test")));
- assertCollection(s).isSize(1);
+ assertSize(1, s);
s = set(new LocalDir(Paths.get("test")), new
LocalDir(Paths.get("test","test")));
- assertCollection(s).isSize(2);
+ assertSize(2, s);
s = set(new LocalDir(List.class,null), new
LocalDir(List.class,null));
- assertCollection(s).isSize(1);
+ assertSize(1, s);
s = set(new LocalDir(List.class,null), new
LocalDir(List.class,"foo"));
- assertCollection(s).isSize(2);
+ assertSize(2, s);
s = set(new LocalDir(List.class,null), new
LocalDir(String.class,null));
- assertCollection(s).isSize(2);
+ assertSize(2, s);
}
@Test void e02_caching() throws Exception {
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 b7ad4917f..9a6aea67d 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
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.junit.Assert.*;
import java.util.function.*;
@@ -94,7 +93,6 @@ class BasicHeader_Test extends SimpleTestBase {
@SuppressWarnings("unlikely-arg-type")
@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();
assertTrue(h1.equals(h2));
assertFalse(h1.equals(h3));
assertFalse(h1.equals(h4));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpException_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpException_Test.java
index 7769bae74..fd76c4da6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpException_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/response/HttpException_Test.java
@@ -104,7 +104,5 @@ public class HttpException_Test extends SimpleTestBase {
x = new BasicHttpException(100, new RuntimeException(),
"foo{0}","<bar>&baz");
assertEquals("foo<bar>&baz\nCaused by (RuntimeException)",
x.getFullStackMessage(false));
assertEquals("foo bar baz\nCaused by (RuntimeException)",
x.getFullStackMessage(true));
-
- assertInteger(x.hashCode()).isExists();
}
}
\ No newline at end of file
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 388b30d54..252d17145 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
@@ -141,7 +141,7 @@ class MethodExecStore_Test extends SimpleTestBase {
assertSize(1, store.getStats(m).getThrownStore().getStats());
assertSize(1, store.getStats(m).getThrownStore().getStats());
- assertCollection(store.getStats()).isSize(1);
+ assertSize(1, store.getStats());
}
//------------------------------------------------------------------------------------------------------------------
