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 d30059d95 Unit test modernization.
d30059d95 is described below
commit d30059d955789057c9412c4f05f19c251c86fc55
Author: James Bognar <james.bog...@salesforce.com>
AuthorDate: Thu Aug 7 12:53:03 2025 -0400
Unit test modernization.
---
.../test/java/org/apache/juneau/Version_Test.java | 3 +--
.../juneau/config/ConfigMapListenerTest.java | 31 +++++++++++-----------
.../apache/juneau/dto/swagger/Contact_Test.java | 2 +-
.../dto/swagger/ExternalDocumentation_Test.java | 2 +-
.../org/apache/juneau/http/header/Accept_Test.java | 3 +--
.../juneau/rest/util/UrlPathMatcher_Test.java | 3 +--
6 files changed, 20 insertions(+), 24 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 40be5cc35..0972149d9 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
@@ -13,7 +13,6 @@
package org.apache.juneau;
import static org.apache.juneau.Version.*;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
@@ -24,7 +23,7 @@ class Version_Test extends SimpleTestBase {
@Test void a01_basic() {
assertNull(of(null));
- assertObject(of("")).asString().is("0");
+ assertString("0", of(""));
Version x = of("1.2.3");
assertEquals(1, x.getMajor().orElse(null));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMapListenerTest.java
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMapListenerTest.java
index 939bbffa1..7550497bd 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMapListenerTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigMapListenerTest.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.config;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import java.util.*;
import java.util.concurrent.*;
@@ -39,7 +38,7 @@ class ConfigMapListenerTest extends SimpleTestBase {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
- assertObject(events).asString().is("[SET(foo =
baz)]");
+ assertString("[SET(foo = baz)]", events);
}
};
@@ -65,7 +64,7 @@ class ConfigMapListenerTest extends SimpleTestBase {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
- assertObject(events).asString().is("[SET(S1/foo
= baz)]");
+ assertString("[SET(S1/foo = baz)]", events);
}
};
@@ -93,7 +92,7 @@ class ConfigMapListenerTest extends SimpleTestBase {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
- assertObject(events).asString().is("[SET(k =
vb), SET(S1/k1 = v1b)]");
+ assertString("[SET(k = vb),SET(S1/k1 = v1b)]",
events);
}
};
@@ -118,7 +117,7 @@ class ConfigMapListenerTest extends SimpleTestBase {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
- assertObject(events).asString().is("[SET(k^* =
kb # C), SET(S1/k1^* = k1b # C1)]");
+ assertString("[SET(k^* = kb # C),SET(S1/k1^* =
k1b # C1)]", events);
}
};
@@ -149,7 +148,7 @@ class ConfigMapListenerTest extends SimpleTestBase {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
- assertObject(events).asString().is("[SET(k^* =
kb # Cb), SET(S1/k1^* = k1b # Cb1)]");
+ assertString("[SET(k^* = kb # Cb),SET(S1/k1^* =
k1b # Cb1)]", events);
}
};
@@ -181,7 +180,7 @@ class ConfigMapListenerTest extends SimpleTestBase {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
-
assertObject(events).asString().is("[REMOVE_ENTRY(k), REMOVE_ENTRY(S1/k1)]");
+
assertString("[REMOVE_ENTRY(k),REMOVE_ENTRY(S1/k1)]", events);
}
};
@@ -212,7 +211,7 @@ class ConfigMapListenerTest extends SimpleTestBase {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
-
assertObject(events).asString().is("[REMOVE_ENTRY(k), REMOVE_ENTRY(S1/k1)]");
+
assertString("[REMOVE_ENTRY(k),REMOVE_ENTRY(S1/k1)]", events);
}
};
@@ -241,7 +240,7 @@ class ConfigMapListenerTest extends SimpleTestBase {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
- assertObject(events).asString().is("[SET(S3/k3
= v3)]");
+ assertString("[SET(S3/k3 = v3)]", events);
}
};
@@ -275,7 +274,7 @@ class ConfigMapListenerTest extends SimpleTestBase {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
- assertObject(events).asString().is("[SET(S3/k3
= v3)]");
+ assertString("[SET(S3/k3 = v3)]", events);
}
};
@@ -319,7 +318,7 @@ class ConfigMapListenerTest extends SimpleTestBase {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
-
assertObject(events).asString().is("[REMOVE_ENTRY(k), REMOVE_ENTRY(S1/k1),
REMOVE_ENTRY(S2/k2)]");
+
assertString("[REMOVE_ENTRY(k),REMOVE_ENTRY(S1/k1),REMOVE_ENTRY(S2/k2)]",
events);
}
};
@@ -349,7 +348,7 @@ class ConfigMapListenerTest extends SimpleTestBase {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
- assertObject(events).asString().is("[SET(k = v
# cv), SET(S1/k1 = v1 # cv1), SET(S2/k2 = v2 # cv2)]");
+ assertString("[SET(k = v # cv),SET(S1/k1 = v1 #
cv1),SET(S2/k2 = v2 # cv2)]", events);
}
};
@@ -394,7 +393,7 @@ class ConfigMapListenerTest extends SimpleTestBase {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
-
assertObject(events).asString().is(eventList.poll());
+ assertString(eventList.poll(), events);
}
};
@@ -431,7 +430,7 @@ class ConfigMapListenerTest extends SimpleTestBase {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws Exception
{
-
assertObject(events).asString().is(eventList.poll());
+ assertString(eventList.poll(), events);
}
};
@@ -476,7 +475,7 @@ class ConfigMapListenerTest extends SimpleTestBase {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws
Exception {
-
assertObject(events).asString().is(eventList.poll());
+ assertString(eventList.poll(), events);
}
};
@@ -517,7 +516,7 @@ class ConfigMapListenerTest extends SimpleTestBase {
LatchedListener l = new LatchedListener(latch) {
@Override
public void check(ConfigEvents events) throws
Exception {
-
assertObject(events).asString().is(eventList.poll());
+ assertString(eventList.poll(), events);
}
};
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Contact_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Contact_Test.java
index 65c71fc73..31d54d4c2 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Contact_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Contact_Test.java
@@ -61,7 +61,7 @@ class Contact_Test extends SimpleTestBase {
assertJson(t,
"{name:'foo',url:'bar',email:'baz','$ref':'qux'}");
assertObject(t.get("name",
String.class)).isType(String.class).is("foo");
- assertObject(t.get("url",
URI.class)).isType(URI.class).asString().is("bar");
+ assertString("bar", t.get("url", URI.class));
assertObject(t.get("email",
String.class)).isType(String.class).is("baz");
assertObject(t.get("$ref",
String.class)).isType(String.class).is("qux");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ExternalDocumentation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ExternalDocumentation_Test.java
index 7d016495d..8aab070a3 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ExternalDocumentation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/ExternalDocumentation_Test.java
@@ -57,7 +57,7 @@ class ExternalDocumentation_Test extends SimpleTestBase {
assertJson(t, "{description:'foo',url:'bar','$ref':'baz'}");
assertObject(t.get("description",
String.class)).isType(String.class).is("foo");
- assertObject(t.get("url",
URI.class)).isType(URI.class).asString().is("bar");
+ assertString("bar", t.get("url", URI.class));
assertObject(t.get("$ref",
String.class)).isType(String.class).is("baz");
t.set("null", null).set(null, "null");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/Accept_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/Accept_Test.java
index 48089ab23..badc0b90e 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/header/Accept_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/header/Accept_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.header;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.utest.utils.Utils2.*;
@@ -70,7 +69,7 @@ class Accept_Test extends SimpleTestBase {
assertNull(new
Accept((String)null).asMediaRanges().orElse(null));
assertEquals(-1, new
Accept((String)null).match(alist(MediaType.JSON)));
assertNull(new Accept((String)null).getRange(0));
- assertObject(new
Accept(MediaRanges.of("application/json"))).asString().is("Accept:
application/json");
+ assertString("Accept: application/json", new
Accept(MediaRanges.of("application/json")));
}
//------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/util/UrlPathMatcher_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/util/UrlPathMatcher_Test.java
index 0e635fec1..3f0a6c001 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/util/UrlPathMatcher_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/util/UrlPathMatcher_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.util;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.rest.util.UrlPathMatcher.*;
import static org.junit.Assert.*;
import java.util.*;
@@ -24,7 +23,7 @@ import org.junit.jupiter.api.*;
class UrlPathMatcher_Test extends SimpleTestBase {
private void check(UrlPathMatcher p, String path, String expected) {
- assertObject(p.match(UrlPath.of(path))).asString().is(expected);
+ assertString(expected, p.match(UrlPath.of(path)));
}
private void shouldNotMatch(UrlPathMatcher p, String...paths) {
