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 66675b3e49 Fix TestUtils base class regression (extends Shorts ->
extends BasicTestUtils)
66675b3e49 is described below
commit 66675b3e493ebdc289f79f5226318ca84e1d4ab4
Author: James Bognar <[email protected]>
AuthorDate: Sun Jul 12 21:04:17 2026 -0400
Fix TestUtils base class regression (extends Shorts -> extends
BasicTestUtils)
Several module-local TestUtils.java test-utility classes were left extending
the Shorts static-import facade instead of BasicTestUtils, the intended test
infrastructure base class (which itself extends Shorts, so no functionality
is lost). Restores the correct class hierarchy in 8 files across
juneau-bean-atom, juneau-bean-common, juneau-bean-hal, juneau-bean-html5,
juneau-bean-jsonapi, juneau-bean-jsonpatch, juneau-bean-jsonschema, and
juneau-marshall-rdf.
Co-authored-by: Cursor <[email protected]>
---
.../juneau-bean-atom/src/test/java/org/apache/juneau/TestUtils.java | 4 +---
.../juneau-bean-common/src/test/java/org/apache/juneau/TestUtils.java | 4 +---
.../juneau-bean-hal/src/test/java/org/apache/juneau/TestUtils.java | 4 +---
.../juneau-bean-html5/src/test/java/org/apache/juneau/TestUtils.java | 4 +---
.../src/test/java/org/apache/juneau/TestUtils.java | 4 +---
.../src/test/java/org/apache/juneau/TestUtils.java | 4 +---
.../src/test/java/org/apache/juneau/TestUtils.java | 4 +---
.../src/test/java/org/apache/juneau/TestUtils.java | 3 +--
8 files changed, 8 insertions(+), 23 deletions(-)
diff --git
a/juneau-bean/juneau-bean-atom/src/test/java/org/apache/juneau/TestUtils.java
b/juneau-bean/juneau-bean-atom/src/test/java/org/apache/juneau/TestUtils.java
index 4b1036ce18..40bacaa062 100644
---
a/juneau-bean/juneau-bean-atom/src/test/java/org/apache/juneau/TestUtils.java
+++
b/juneau-bean/juneau-bean-atom/src/test/java/org/apache/juneau/TestUtils.java
@@ -19,15 +19,13 @@ package org.apache.juneau;
import static org.apache.juneau.marshall.marshaller.MarshallUtils.*;
import static org.junit.jupiter.api.Assertions.*;
-import org.apache.juneau.commons.utils.*;
-
/**
* Test utilities for the juneau-marshall module.
*
* <p>Contains a marshall-compatible subset of the methods available in the
full {@code TestUtils}
* in {@code juneau-integration-tests}. Methods that depend on {@code
juneau-rest-*} modules are excluded.</p>
*/
-public class TestUtils extends Shorts {
+public class TestUtils extends BasicTestUtils {
public static String json(Object o) {
return json5(o);
diff --git
a/juneau-bean/juneau-bean-common/src/test/java/org/apache/juneau/TestUtils.java
b/juneau-bean/juneau-bean-common/src/test/java/org/apache/juneau/TestUtils.java
index 4547ef1d1d..d3aa71b702 100644
---
a/juneau-bean/juneau-bean-common/src/test/java/org/apache/juneau/TestUtils.java
+++
b/juneau-bean/juneau-bean-common/src/test/java/org/apache/juneau/TestUtils.java
@@ -19,15 +19,13 @@ package org.apache.juneau;
import static org.apache.juneau.marshall.marshaller.MarshallUtils.*;
import static org.junit.jupiter.api.Assertions.*;
-import org.apache.juneau.commons.utils.*;
-
/**
* Test utilities for the juneau-marshall module.
*
* <p>Contains a marshall-compatible subset of the methods available in the
full {@code TestUtils}
* in {@code juneau-integration-tests}. Methods that depend on {@code
juneau-rest-*} modules are excluded.</p>
*/
-public class TestUtils extends Shorts {
+public class TestUtils extends BasicTestUtils {
public static String assertJson(String expected, Object value) {
assertEquals(expected, json5(value));
diff --git
a/juneau-bean/juneau-bean-hal/src/test/java/org/apache/juneau/TestUtils.java
b/juneau-bean/juneau-bean-hal/src/test/java/org/apache/juneau/TestUtils.java
index 4547ef1d1d..d3aa71b702 100644
--- a/juneau-bean/juneau-bean-hal/src/test/java/org/apache/juneau/TestUtils.java
+++ b/juneau-bean/juneau-bean-hal/src/test/java/org/apache/juneau/TestUtils.java
@@ -19,15 +19,13 @@ package org.apache.juneau;
import static org.apache.juneau.marshall.marshaller.MarshallUtils.*;
import static org.junit.jupiter.api.Assertions.*;
-import org.apache.juneau.commons.utils.*;
-
/**
* Test utilities for the juneau-marshall module.
*
* <p>Contains a marshall-compatible subset of the methods available in the
full {@code TestUtils}
* in {@code juneau-integration-tests}. Methods that depend on {@code
juneau-rest-*} modules are excluded.</p>
*/
-public class TestUtils extends Shorts {
+public class TestUtils extends BasicTestUtils {
public static String assertJson(String expected, Object value) {
assertEquals(expected, json5(value));
diff --git
a/juneau-bean/juneau-bean-html5/src/test/java/org/apache/juneau/TestUtils.java
b/juneau-bean/juneau-bean-html5/src/test/java/org/apache/juneau/TestUtils.java
index 4547ef1d1d..d3aa71b702 100644
---
a/juneau-bean/juneau-bean-html5/src/test/java/org/apache/juneau/TestUtils.java
+++
b/juneau-bean/juneau-bean-html5/src/test/java/org/apache/juneau/TestUtils.java
@@ -19,15 +19,13 @@ package org.apache.juneau;
import static org.apache.juneau.marshall.marshaller.MarshallUtils.*;
import static org.junit.jupiter.api.Assertions.*;
-import org.apache.juneau.commons.utils.*;
-
/**
* Test utilities for the juneau-marshall module.
*
* <p>Contains a marshall-compatible subset of the methods available in the
full {@code TestUtils}
* in {@code juneau-integration-tests}. Methods that depend on {@code
juneau-rest-*} modules are excluded.</p>
*/
-public class TestUtils extends Shorts {
+public class TestUtils extends BasicTestUtils {
public static String assertJson(String expected, Object value) {
assertEquals(expected, json5(value));
diff --git
a/juneau-bean/juneau-bean-jsonapi/src/test/java/org/apache/juneau/TestUtils.java
b/juneau-bean/juneau-bean-jsonapi/src/test/java/org/apache/juneau/TestUtils.java
index 4547ef1d1d..d3aa71b702 100644
---
a/juneau-bean/juneau-bean-jsonapi/src/test/java/org/apache/juneau/TestUtils.java
+++
b/juneau-bean/juneau-bean-jsonapi/src/test/java/org/apache/juneau/TestUtils.java
@@ -19,15 +19,13 @@ package org.apache.juneau;
import static org.apache.juneau.marshall.marshaller.MarshallUtils.*;
import static org.junit.jupiter.api.Assertions.*;
-import org.apache.juneau.commons.utils.*;
-
/**
* Test utilities for the juneau-marshall module.
*
* <p>Contains a marshall-compatible subset of the methods available in the
full {@code TestUtils}
* in {@code juneau-integration-tests}. Methods that depend on {@code
juneau-rest-*} modules are excluded.</p>
*/
-public class TestUtils extends Shorts {
+public class TestUtils extends BasicTestUtils {
public static String assertJson(String expected, Object value) {
assertEquals(expected, json5(value));
diff --git
a/juneau-bean/juneau-bean-jsonpatch/src/test/java/org/apache/juneau/TestUtils.java
b/juneau-bean/juneau-bean-jsonpatch/src/test/java/org/apache/juneau/TestUtils.java
index 4547ef1d1d..d3aa71b702 100644
---
a/juneau-bean/juneau-bean-jsonpatch/src/test/java/org/apache/juneau/TestUtils.java
+++
b/juneau-bean/juneau-bean-jsonpatch/src/test/java/org/apache/juneau/TestUtils.java
@@ -19,15 +19,13 @@ package org.apache.juneau;
import static org.apache.juneau.marshall.marshaller.MarshallUtils.*;
import static org.junit.jupiter.api.Assertions.*;
-import org.apache.juneau.commons.utils.*;
-
/**
* Test utilities for the juneau-marshall module.
*
* <p>Contains a marshall-compatible subset of the methods available in the
full {@code TestUtils}
* in {@code juneau-integration-tests}. Methods that depend on {@code
juneau-rest-*} modules are excluded.</p>
*/
-public class TestUtils extends Shorts {
+public class TestUtils extends BasicTestUtils {
public static String assertJson(String expected, Object value) {
assertEquals(expected, json5(value));
diff --git
a/juneau-bean/juneau-bean-jsonschema/src/test/java/org/apache/juneau/TestUtils.java
b/juneau-bean/juneau-bean-jsonschema/src/test/java/org/apache/juneau/TestUtils.java
index 4547ef1d1d..d3aa71b702 100644
---
a/juneau-bean/juneau-bean-jsonschema/src/test/java/org/apache/juneau/TestUtils.java
+++
b/juneau-bean/juneau-bean-jsonschema/src/test/java/org/apache/juneau/TestUtils.java
@@ -19,15 +19,13 @@ package org.apache.juneau;
import static org.apache.juneau.marshall.marshaller.MarshallUtils.*;
import static org.junit.jupiter.api.Assertions.*;
-import org.apache.juneau.commons.utils.*;
-
/**
* Test utilities for the juneau-marshall module.
*
* <p>Contains a marshall-compatible subset of the methods available in the
full {@code TestUtils}
* in {@code juneau-integration-tests}. Methods that depend on {@code
juneau-rest-*} modules are excluded.</p>
*/
-public class TestUtils extends Shorts {
+public class TestUtils extends BasicTestUtils {
public static String assertJson(String expected, Object value) {
assertEquals(expected, json5(value));
diff --git
a/juneau-core/juneau-marshall-rdf/src/test/java/org/apache/juneau/TestUtils.java
b/juneau-core/juneau-marshall-rdf/src/test/java/org/apache/juneau/TestUtils.java
index b91b2d9471..da7cbdd81e 100644
---
a/juneau-core/juneau-marshall-rdf/src/test/java/org/apache/juneau/TestUtils.java
+++
b/juneau-core/juneau-marshall-rdf/src/test/java/org/apache/juneau/TestUtils.java
@@ -19,7 +19,6 @@ package org.apache.juneau;
import static org.apache.juneau.marshall.marshaller.MarshallUtils.*;
import static org.junit.jupiter.api.Assertions.*;
-import org.apache.juneau.commons.utils.*;
import org.apache.juneau.marshall.xml.*;
/**
@@ -28,7 +27,7 @@ import org.apache.juneau.marshall.xml.*;
* <p>Contains a marshall-compatible subset of the methods available in the
full {@code TestUtils}
* in {@code juneau-integration-tests}. Methods that depend on {@code
juneau-rest-*} modules are excluded.</p>
*/
-public class TestUtils extends Shorts {
+public class TestUtils extends BasicTestUtils {
public static String assertJson(String expected, Object value) {
assertEquals(expected, json5(value));
