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 28a7ae9c7 Unit test modernization.
28a7ae9c7 is described below
commit 28a7ae9c789dcaa80f277b4e4b3ec61450d43a05
Author: James Bognar <[email protected]>
AuthorDate: Thu Aug 7 14:09:38 2025 -0400
Unit test modernization.
---
.../src/test/java/org/apache/juneau/SimpleTestBase.java | 11 +++++++++++
.../apache/juneau/http/annotation/ContentAnnotation_Test.java | 2 +-
.../juneau/http/annotation/FormDataAnnotation_Test.java | 2 +-
.../apache/juneau/http/annotation/HeaderAnnotation_Test.java | 2 +-
.../apache/juneau/http/annotation/PathAnnotation_Test.java | 2 +-
.../apache/juneau/http/annotation/QueryAnnotation_Test.java | 2 +-
.../juneau/http/annotation/ResponseAnnotation_Test.java | 2 +-
7 files changed, 17 insertions(+), 6 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 a794fa82d..51332c821 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/SimpleTestBase.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/SimpleTestBase.java
@@ -12,11 +12,17 @@
//
***************************************************************************************************************************
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.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.marshaller.*;
import org.apache.juneau.serializer.*;
import org.junit.jupiter.api.*;
@@ -203,6 +209,11 @@ public abstract class SimpleTestBase {
AssertionHelpers.assertEqualsAll(values);
}
+ protected static void assertJsonMatches(Object o, String pattern)
throws AssertionError {
+ var json = json(o);
+
assertTrue(StringUtils.getMatchPattern(pattern).matcher(json).matches(),
ss("JSON did not match pattern.\njson={0}", json));
+ }
+
/**
* Creates a map wrapper around a bean so that get/set operations on
properties
* can be done via generic get()/put() methods.
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 16fc7907a..129012049 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
@@ -40,7 +40,7 @@ class ContentAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().isMatches(""
+ assertJsonMatches(a1, ""
+ "{"
+ "description:['description'],"
+ "on:['on'],"
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 1d0262de1..da0f6e387 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
@@ -51,7 +51,7 @@ class FormDataAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().isMatches(""
+ assertJsonMatches(a1, ""
+ "{"
+ "def:'def',"
+ "description:['description'],"
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 bbbf030ce..c197e6eed 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
@@ -51,7 +51,7 @@ class HeaderAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().isMatches(""
+ assertJsonMatches(a1, ""
+ "{"
+ "def:'def',"
+ "description:['description'],"
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 5d41dfb1e..8c13dfc8d 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
@@ -51,7 +51,7 @@ class PathAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().isMatches(""
+ assertJsonMatches(a1, ""
+ "{"
+ "def:'def',"
+ "description:['description'],"
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 2d420ba81..ed03a7c28 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
@@ -51,7 +51,7 @@ class QueryAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().isMatches(""
+ assertJsonMatches(a1, ""
+ "{"
+ "def:'def',"
+ "description:['description'],"
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 2caf5747e..cc2830f53 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
@@ -52,7 +52,7 @@ class ResponseAnnotation_Test extends SimpleTestBase {
.build();
@Test void a01_basic() {
- assertObject(a1).asJson().isMatches(""
+ assertJsonMatches(a1, ""
+ "{"
+ "description:['description'],"
+ "examples:['examples'],"
