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 d230f8896 Unit test modernization.
d230f8896 is described below
commit d230f8896d7e6af1b2c4b38cfe5a84339aaf56df
Author: James Bognar <[email protected]>
AuthorDate: Thu Aug 7 10:59:22 2025 -0400
Unit test modernization.
---
.../java/org/apache/juneau/config/ConfigTest.java | 28 +++++++++++-----------
.../apache/juneau/http/BasicHttpResource_Test.java | 11 ++++-----
.../juneau/http/SerializedHttpEntity_Test.java | 3 +--
.../apache/juneau/mstat/MethodExecStore_Test.java | 6 ++---
.../org/apache/juneau/mstat/ThrownStore_Test.java | 28 +++++++++++-----------
.../rest/client/RestClient_Response_Body_Test.java | 6 ++---
6 files changed, 40 insertions(+), 42 deletions(-)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
index 066d87008..7f2132649 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
@@ -357,13 +357,13 @@ class ConfigTest extends SimpleTestBase {
//====================================================================================================
@Test void getLong1() {
Config c = init("a1=1", "a2=2", "[S]", "b1=1", "b2=");
- assertLong(c.get("a1").asLong().orElse(0L)).is(1L);
- assertLong(c.get("a2").asLong().orElse(0L)).is(2L);
- assertLong(c.get("a3").asLong().orElse(0L)).is(0L);
- assertLong(c.get("S/b1").asLong().orElse(0L)).is(1L);
- assertLong(c.get("S/b2").asLong().orElse(0L)).is(0L);
- assertLong(c.get("S/b3").asLong().orElse(0L)).is(0L);
- assertLong(c.get("T/c1").asLong().orElse(0L)).is(0L);
+ assertEquals(1L, c.get("a1").asLong().orElse(0L));
+ assertEquals(2L, c.get("a2").asLong().orElse(0L));
+ assertEquals(0L, c.get("a3").asLong().orElse(0L));
+ assertEquals(1L, c.get("S/b1").asLong().orElse(0L));
+ assertEquals(0L, c.get("S/b2").asLong().orElse(0L));
+ assertEquals(0L, c.get("S/b3").asLong().orElse(0L));
+ assertEquals(0L, c.get("T/c1").asLong().orElse(0L));
}
@Test void getLong1BadValues() {
@@ -379,13 +379,13 @@ class ConfigTest extends SimpleTestBase {
//====================================================================================================
@Test void getLong2() {
Config c = init("a1=1", "a2=2", "[S]", "b1=1", "b2=");
- assertLong(c.get("a1").asLong().orElse(Long.MAX_VALUE)).is(1L);
- assertLong(c.get("a2").asLong().orElse(Long.MAX_VALUE)).is(2L);
-
assertLong(c.get("a3").asLong().orElse(Long.MAX_VALUE)).is(Long.MAX_VALUE);
-
assertLong(c.get("S/b1").asLong().orElse(Long.MAX_VALUE)).is(1L);
-
assertLong(c.get("S/b2").asLong().orElse(Long.MAX_VALUE)).is(Long.MAX_VALUE);
-
assertLong(c.get("S/b3").asLong().orElse(Long.MAX_VALUE)).is(Long.MAX_VALUE);
-
assertLong(c.get("T/c1").asLong().orElse(Long.MAX_VALUE)).is(Long.MAX_VALUE);
+ assertEquals(1L, c.get("a1").asLong().orElse(Long.MAX_VALUE));
+ assertEquals(2L, c.get("a2").asLong().orElse(Long.MAX_VALUE));
+ assertEquals(Long.MAX_VALUE,
c.get("a3").asLong().orElse(Long.MAX_VALUE));
+ assertEquals(1L, c.get("S/b1").asLong().orElse(Long.MAX_VALUE));
+ assertEquals(Long.MAX_VALUE,
c.get("S/b2").asLong().orElse(Long.MAX_VALUE));
+ assertEquals(Long.MAX_VALUE,
c.get("S/b3").asLong().orElse(Long.MAX_VALUE));
+ assertEquals(Long.MAX_VALUE,
c.get("T/c1").asLong().orElse(Long.MAX_VALUE));
}
@Test void getLong2BadValues() {
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 ddef167d3..2d2d15d20 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
@@ -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.apache.juneau.http.HttpResources.*;
import static org.apache.juneau.utest.utils.Utils2.*;
@@ -93,12 +92,12 @@ class BasicHttpResource_Test extends SimpleTestBase {
assertTrue(x.isRepeatable());
x.writeTo(new ByteArrayOutputStream());
- assertLong(stringResource("foo").getContentLength()).is(3L);
-
assertLong(byteArrayResource("foo".getBytes()).getContentLength()).is(3L);
- assertLong(fileResource(f).getContentLength()).is(0L);
+ assertEquals(3L, stringResource("foo").getContentLength());
+ assertEquals(3L,
byteArrayResource("foo".getBytes()).getContentLength());
+ assertEquals(0L, fileResource(f).getContentLength());
-
assertLong(readerResource(reader("foo")).getContentLength()).is(-1L);
-
assertLong(readerResource(reader("foo")).setContentLength(3).getContentLength()).is(3L);
+ assertEquals(-1L,
readerResource(reader("foo")).getContentLength());
+ assertEquals(3L,
readerResource(reader("foo")).setContentLength(3).getContentLength());
x = stringResource("foo",
contentType("text/plain")).setContentEncoding("identity");
assertEquals("text/plain", x.getContentType().getValue());
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
index 01417551d..086dbb9e5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpEntities.*;
import static org.apache.juneau.httppart.HttpPartSchema.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -79,7 +78,7 @@ class SerializedHttpEntity_Test extends SimpleTestBase {
}
@Test void a07_getContentLength() {
-
assertLong(serializedEntity(ABean.get(),null).getContentLength()).is(-1L);
+ assertEquals(-1L,
serializedEntity(ABean.get(),null).getContentLength());
}
@Test void a08_getContent() {
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 252d17145..a3f88fe1e 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
@@ -155,7 +155,7 @@ class MethodExecStore_Test extends SimpleTestBase {
MethodExecStore store =
MethodExecStore.create().thrownStore(s).build();
MethodExecStats stats = store.getStats(m);
- assertLong(stats.getGuid()).isNot(0L);
+ assertNotEquals(0L, stats.getGuid());
assertObject(stats.getMethod()).isSame(m);
assertEquals(0, stats.getRuns());
@@ -164,7 +164,7 @@ class MethodExecStore_Test extends SimpleTestBase {
assertEquals(0, stats.getMinTime());
assertEquals(0, stats.getMaxTime());
assertEquals(0, stats.getAvgTime());
- assertLong(stats.getTotalTime()).is(0L);
+ assertEquals(0L, stats.getTotalTime());
stats.started().finished(100*1000000).started().finished(200*1000000).started().error(new
Throwable());
@@ -174,7 +174,7 @@ class MethodExecStore_Test extends SimpleTestBase {
assertEquals(100, stats.getMinTime());
assertEquals(200, stats.getMaxTime());
assertEquals(150, stats.getAvgTime());
- assertLong(stats.getTotalTime()).is(300L);
+ assertEquals(300L, stats.getTotalTime());
assertObject(stats).asString().isContains("300");
}
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 53c7368d2..47d621155 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
@@ -42,8 +42,8 @@ class ThrownStore_Test extends SimpleTestBase {
assertEquals(2, db.add(t1).getCount());
assertEquals(1, db.add(t2).getCount());
-
assertLong(db.getStats(t1).get().getHash()).is(db.getStats(t1).get().getHash());
-
assertLong(db.getStats(t1).get().getHash()).isNot(db.getStats(t2).get().getHash());
+ assertEquals(db.getStats(t1).get().getHash(),
db.getStats(t1).get().getHash());
+ assertNotEquals(db.getStats(t2).get().getHash(),
db.getStats(t1).get().getHash());
}
@Test void a02_getStats() {
@@ -273,28 +273,28 @@ class ThrownStore_Test extends SimpleTestBase {
ThrownStore store = ThrownStore.create().build();
ThrownStats stats = store.add(t2);
- assertLong(stats.getHash()).isNot(0L);
- assertLong(stats.getGuid()).isNot(0L);
- assertLong(stats.getFirstOccurrence()).isNot(0L);
- assertLong(stats.getLastOccurrence()).isNot(0L);
+ assertNotEquals(0L, stats.getHash());
+ assertNotEquals(0L, stats.getGuid());
+ assertNotEquals(0L, stats.getFirstOccurrence());
+ assertNotEquals(0L, stats.getLastOccurrence());
assertEquals("bar", stats.getFirstMessage());
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
assertObject(stats).asString().isContains("bar");
stats = stats.clone();
- assertLong(stats.getHash()).isNot(0L);
- assertLong(stats.getGuid()).isNot(0L);
- assertLong(stats.getFirstOccurrence()).isNot(0L);
- assertLong(stats.getLastOccurrence()).isNot(0L);
+ assertNotEquals(0L, stats.getHash());
+ assertNotEquals(0L, stats.getGuid());
+ assertNotEquals(0L, stats.getFirstOccurrence());
+ assertNotEquals(0L, stats.getLastOccurrence());
assertEquals("bar", stats.getFirstMessage());
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
assertObject(stats).asString().isContains("bar");
stats = stats.getCausedBy().get();
- assertLong(stats.getHash()).isNot(0L);
- assertLong(stats.getGuid()).isNot(0L);
- assertLong(stats.getFirstOccurrence()).isNot(0L);
- assertLong(stats.getLastOccurrence()).isNot(0L);
+ assertNotEquals(0L, stats.getHash());
+ assertNotEquals(0L, stats.getGuid());
+ assertNotEquals(0L, stats.getFirstOccurrence());
+ assertNotEquals(0L, stats.getLastOccurrence());
assertEquals("foo", stats.getFirstMessage());
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
assertObject(stats).asString().isContains("foo");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
index aa84394a8..a93e06efb 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
@@ -262,10 +262,10 @@ class RestClient_Response_Body_Test extends
SimpleTestBase {
ResponseContent x2 =
testClient().entity(inputStreamEntity("foo")).get().run().getContent();
assertFalse(x2.isRepeatable());
- assertLong(x2.getContentLength()).is(-1L);
+ assertEquals(-1L, x2.getContentLength());
x2.cache().asString();
assertTrue(x2.isRepeatable());
- assertLong(x2.getContentLength()).is(3L);
+ assertEquals(3L, x2.getContentLength());
assertFalse(x2.isChunked());
@@ -296,7 +296,7 @@ class RestClient_Response_Body_Test extends SimpleTestBase {
@Test void b02_head() throws Exception {
assertFalse(client().build().head("").run().getContent().isRepeatable());
assertFalse(client().build().head("").run().getContent().isChunked());
-
assertLong(client().build().head("").run().getContent().getContentLength()).is(-1L);
+ assertEquals(-1L,
client().build().head("").run().getContent().getContentLength());
client().build().head("").run().getContent().getContentType().assertValue().isNull();
client().build().head("").run().getContent().getContentEncoding().assertValue().isNull();
client().build().head("").run().getContent().writeTo(new
ByteArrayOutputStream());
