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 13a0fbbdc Unit test modernization.
13a0fbbdc is described below
commit 13a0fbbdcd0a04d12dff245904f0583e387cf91f
Author: James Bognar <[email protected]>
AuthorDate: Thu Aug 7 14:17:19 2025 -0400
Unit test modernization.
---
.../src/test/java/org/apache/juneau/SimpleTestBase.java | 7 ++++---
.../juneau/http/annotation/ContentAnnotation_Test.java | 1 -
.../juneau/http/annotation/FormDataAnnotation_Test.java | 1 -
.../apache/juneau/http/annotation/HeaderAnnotation_Test.java | 1 -
.../apache/juneau/http/annotation/PathAnnotation_Test.java | 1 -
.../apache/juneau/http/annotation/QueryAnnotation_Test.java | 1 -
.../juneau/http/annotation/ResponseAnnotation_Test.java | 1 -
.../org/apache/juneau/http/header/HeaderBeanMeta_Test.java | 12 ++++++------
.../java/org/apache/juneau/http/part/PartBeanMeta_Test.java | 12 ++++++------
.../jsonschema/annotation/ExternalDocsAnnotation_Test.java | 5 +++--
.../java/org/apache/juneau/mstat/MethodExecStore_Test.java | 6 +++---
11 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/SimpleTestBase.java
b/juneau-utest/src/test/java/org/apache/juneau/SimpleTestBase.java
index 51332c821..0284e37a7 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/SimpleTestBase.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/SimpleTestBase.java
@@ -12,13 +12,10 @@
//
***************************************************************************************************************************
package org.apache.juneau;
-import static org.apache.juneau.common.internal.ArgUtils.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
import java.util.function.*;
-import java.util.regex.*;
import java.util.stream.*;
import org.apache.juneau.assertions.*;
@@ -230,6 +227,10 @@ public abstract class SimpleTestBase {
return x;
}
+ public static void assertSameObject(Object o1, Object o2) {
+ assertTrue(o1 == o2, "Not the same object.");
+ }
+
/**
* Simplified string supplier with message arguments.
*/
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ContentAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ContentAnnotation_Test.java
index 129012049..84546d9fa 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ContentAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ContentAnnotation_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.junit.jupiter.api.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/FormDataAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/FormDataAnnotation_Test.java
index da0f6e387..c9a00b8ad 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/FormDataAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/FormDataAnnotation_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.oapi.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HeaderAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HeaderAnnotation_Test.java
index c197e6eed..73cee43d8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HeaderAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/HeaderAnnotation_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.oapi.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/PathAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/PathAnnotation_Test.java
index 8c13dfc8d..c35a85dae 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/PathAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/PathAnnotation_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.oapi.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/QueryAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/QueryAnnotation_Test.java
index ed03a7c28..2fbccf2b5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/QueryAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/QueryAnnotation_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.oapi.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseAnnotation_Test.java
index cc2830f53..277e14d36 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/ResponseAnnotation_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.http.annotation;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java
index 30407b689..32a820cb9 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java
@@ -71,23 +71,23 @@ class HeaderBeanMeta_Test extends SimpleTestBase {
@Test void a01_basic() {
HeaderBeanMeta<A1> a1 = HeaderBeanMeta.of(A1.class);
assertSame(a1, HeaderBeanMeta.of(A1.class));
- assertObject(a1.construct("X",
"foo")).isJson("{name:'X',value:'foo'}");
+ assertJson(a1.construct("X", "foo"), "{name:'X',value:'foo'}");
assertThrown(()->a1.construct("foo")).asMessage().isContains("Constructor for
type "+TNAME+"$A1 requires a name as the first argument.");
assertString(a1.getSchema().getName()).isNull();
HeaderBeanMeta<A2> a2 = HeaderBeanMeta.of(A2.class);
- assertObject(a2.construct("X",
"foo")).isJson("{name:'X',value:'foo'}");
+ assertJson(a2.construct("X", "foo"), "{name:'X',value:'foo'}");
assertThrown(()->a2.construct("foo")).asMessage().isContains("Constructor for
type "+TNAME+"$A2 requires a name as the first argument.");
assertString(a2.getSchema().getName()).isNull();
HeaderBeanMeta<A3> a3 = HeaderBeanMeta.of(A3.class);
- assertObject(a3.construct("X", "foo")).isJson("{value:'foo'}");
- assertObject(a3.construct("foo")).isJson("{value:'foo'}");
+ assertJson(a3.construct("X", "foo"), "{value:'foo'}");
+ assertJson(a3.construct("foo"), "{value:'foo'}");
assertEquals("A3", a3.getSchema().getName());
HeaderBeanMeta<A4> a4 = HeaderBeanMeta.of(A4.class);
- assertObject(a4.construct("X", "foo")).isJson("{value:'foo'}");
- assertObject(a4.construct("foo")).isJson("{value:'foo'}");
+ assertJson(a4.construct("X", "foo"), "{value:'foo'}");
+ assertJson(a4.construct("foo"), "{value:'foo'}");
assertEquals("A4", a4.getSchema().getName());
HeaderBeanMeta<A5> a5 = HeaderBeanMeta.of(A5.class);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java
index 4e4822a59..10b71f35f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java
@@ -77,23 +77,23 @@ class PartBeanMeta_Test extends SimpleTestBase {
@Test void a01_basic() {
PartBeanMeta<A1> a1 = PartBeanMeta.of(A1.class);
assertSame(a1, PartBeanMeta.of(A1.class));
- assertObject(a1.construct("X",
"foo")).isJson("{name:'X',value:'foo'}");
+ assertJson(a1.construct("X", "foo"), "{name:'X',value:'foo'}");
assertThrown(()->a1.construct("foo")).asMessage().isContains("Constructor for
type "+TNAME+"$A1 requires a name as the first argument.");
assertString(a1.getSchema().getName()).isNull();
PartBeanMeta<A2> a2 = PartBeanMeta.of(A2.class);
- assertObject(a2.construct("X",
"foo")).isJson("{name:'X',value:'foo'}");
+ assertJson(a2.construct("X", "foo"), "{name:'X',value:'foo'}");
assertThrown(()->a2.construct("foo")).asMessage().isContains("Constructor for
type "+TNAME+"$A2 requires a name as the first argument.");
assertString(a2.getSchema().getName()).isNull();
PartBeanMeta<A3> a3 = PartBeanMeta.of(A3.class);
- assertObject(a3.construct("X", "foo")).isJson("{value:'foo'}");
- assertObject(a3.construct("foo")).isJson("{value:'foo'}");
+ assertJson(a3.construct("X", "foo"), "{value:'foo'}");
+ assertJson(a3.construct("foo"), "{value:'foo'}");
assertEquals("A3", a3.getSchema().getName());
PartBeanMeta<A4> a4 = PartBeanMeta.of(A4.class);
- assertObject(a4.construct("X", "foo")).isJson("{value:'foo'}");
- assertObject(a4.construct("foo")).isJson("{value:'foo'}");
+ assertJson(a4.construct("X", "foo"), "{value:'foo'}");
+ assertJson(a4.construct("foo"), "{value:'foo'}");
assertEquals("A4", a4.getSchema().getName());
PartBeanMeta<A5> a5 = PartBeanMeta.of(A5.class);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation_Test.java
index c657267e3..866677a55 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ExternalDocsAnnotation_Test.java
@@ -35,11 +35,12 @@ class ExternalDocsAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asString().is(""
+ assertString(""
+ "{"
+ "description:['description'],"
+ "url:'url'"
- + "}"
+ + "}",
+ a1
);
}
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 c64c5aee3..326e9428c 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
@@ -120,12 +120,12 @@ class MethodExecStore_Test extends SimpleTestBase {
MethodExecStore store =
MethodExecStore.create().thrownStore(s).build();
store.getStats(m).error(new Throwable());
assertSize(1, s.getStats());
- assertObject(store.getThrownStore()).isSame(s);
+ assertSameObject(s, store.getThrownStore());
ThrownStore s2 = ThrownStore.create().build();
BeanStore bs =
BeanStore.create().build().addBean(ThrownStore.class, s2);
store = MethodExecStore.create(bs).build();
- assertObject(store.getThrownStore()).isSame(s2);
+ assertSameObject(s2, store.getThrownStore());
}
//------------------------------------------------------------------------------------------------------------------
@@ -156,7 +156,7 @@ class MethodExecStore_Test extends SimpleTestBase {
MethodExecStats stats = store.getStats(m);
assertNotEquals(0L, stats.getGuid());
- assertObject(stats.getMethod()).isSame(m);
+ assertSameObject(m, stats.getMethod());
assertEquals(0, stats.getRuns());
assertEquals(0, stats.getRunning());
