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 02d837a9e Unit test modernization.
02d837a9e is described below
commit 02d837a9e6bf44d5801f652329e4a7ddfe2cd9bf
Author: James Bognar <[email protected]>
AuthorDate: Thu Aug 7 12:57:39 2025 -0400
Unit test modernization.
---
.../http/remote/Remote_CommonInterfaces_Test.java | 38 +++++++++++-----------
.../apache/juneau/mstat/MethodExecStore_Test.java | 2 +-
.../org/apache/juneau/mstat/ThrownStore_Test.java | 6 ++--
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
index f7f17496e..6d69ddcaa 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_CommonInterfaces_Test.java
@@ -157,24 +157,24 @@ class Remote_CommonInterfaces_Test extends SimpleTestBase
{
// HttpClient goes into loop if status code is less than 200 so
we can't test those.
C x =
MockRestClient.create(C1.class).json().disableRedirectHandling().build().getRemote(C.class);
- assertObject(x.ok()).asString().isContains("HTTP/1.1 200");
- assertObject(x.accepted()).asString().isContains("HTTP/1.1
202");
-
assertObject(x.alreadyReported()).asString().isContains("HTTP/1.1 208");
- assertObject(x.created()).asString().isContains("HTTP/1.1 201");
- assertObject(x.found()).asString().isContains("HTTP/1.1 302");
- assertObject(x.iMUsed()).asString().isContains("HTTP/1.1 226");
-
assertObject(x.movedPermanently()).asString().isContains("HTTP/1.1 301");
-
assertObject(x.multipleChoices()).asString().isContains("HTTP/1.1 300");
- assertObject(x.multiStatus()).asString().isContains("HTTP/1.1
207");
- assertObject(x.noContent()).asString().isContains("HTTP/1.1
204");
-
assertObject(x.nonAuthoritiveInformation()).asString().isContains("HTTP/1.1
203");
- assertObject(x.notModified()).asString().isContains("HTTP/1.1
304");
-
assertObject(x.partialContent()).asString().isContains("HTTP/1.1 206");
-
assertObject(x.permanentRedirect()).asString().isContains("HTTP/1.1 308");
- assertObject(x.resetContent()).asString().isContains("HTTP/1.1
205");
- assertObject(x.seeOther()).asString().isContains("HTTP/1.1
303");
-
assertObject(x.temporaryRedirect()).asString().isContains("HTTP/1.1 307");
- assertObject(x.useProxy()).asString().isContains("HTTP/1.1
305");
+ assertContains("HTTP/1.1 200", x.ok());
+ assertContains("HTTP/1.1 202", x.accepted());
+ assertContains("HTTP/1.1 208", x.alreadyReported());
+ assertContains("HTTP/1.1 201", x.created());
+ assertContains("HTTP/1.1 302", x.found());
+ assertContains("HTTP/1.1 226", x.iMUsed());
+ assertContains("HTTP/1.1 301", x.movedPermanently());
+ assertContains("HTTP/1.1 300", x.multipleChoices());
+ assertContains("HTTP/1.1 207", x.multiStatus());
+ assertContains("HTTP/1.1 204", x.noContent());
+ assertContains("HTTP/1.1 203", x.nonAuthoritiveInformation());
+ assertContains("HTTP/1.1 304", x.notModified());
+ assertContains("HTTP/1.1 206", x.partialContent());
+ assertContains("HTTP/1.1 308", x.permanentRedirect());
+ assertContains("HTTP/1.1 205", x.resetContent());
+ assertContains("HTTP/1.1 303", x.seeOther());
+ assertContains("HTTP/1.1 307", x.temporaryRedirect());
+ assertContains("HTTP/1.1 305", x.useProxy());
}
//-----------------------------------------------------------------------------------------------------------------
@@ -850,6 +850,6 @@ class Remote_CommonInterfaces_Test extends SimpleTestBase {
@Test void h01_seeOtherRoot() {
IH x =
MockRestClient.create(H.class).json().disableRedirectHandling().build().getRemote(IH.class);
- assertObject(x.seeOtherRoot()).asString().isContains("HTTP/1.1
303 See Other");
+ assertContains("HTTP/1.1 303 See Other", x.seeOtherRoot());
}
}
\ 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 adc8762a0..c64c5aee3 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
@@ -176,6 +176,6 @@ class MethodExecStore_Test extends SimpleTestBase {
assertEquals(150, stats.getAvgTime());
assertEquals(300L, stats.getTotalTime());
- assertObject(stats).asString().isContains("300");
+ assertContains("300", stats);
}
}
\ No newline at end of file
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 0dc9b6142..c78365a31 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
@@ -279,7 +279,7 @@ class ThrownStore_Test extends SimpleTestBase {
assertNotEquals(0L, stats.getLastOccurrence());
assertEquals("bar", stats.getFirstMessage());
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
- assertObject(stats).asString().isContains("bar");
+ assertContains("bar", stats);
stats = stats.clone();
assertNotEquals(0L, stats.getHash());
@@ -288,7 +288,7 @@ class ThrownStore_Test extends SimpleTestBase {
assertNotEquals(0L, stats.getLastOccurrence());
assertEquals("bar", stats.getFirstMessage());
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
- assertObject(stats).asString().isContains("bar");
+ assertContains("bar", stats);
stats = stats.getCausedBy().get();
assertNotEquals(0L, stats.getHash());
@@ -297,7 +297,7 @@ class ThrownStore_Test extends SimpleTestBase {
assertNotEquals(0L, stats.getLastOccurrence());
assertEquals("foo", stats.getFirstMessage());
assertObject(stats.getStackTrace()).asJson().isContains("org.apache.juneau");
- assertObject(stats).asString().isContains("foo");
+ assertContains("foo", stats);
}
//------------------------------------------------------------------------------------------------------------------
