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 b0f772d95 Unit test modernization.
b0f772d95 is described below
commit b0f772d957cefae94b1ad8561c841acd04db33af
Author: James Bognar <[email protected]>
AuthorDate: Fri Aug 8 09:16:31 2025 -0400
Unit test modernization.
---
.../test/java/org/apache/juneau/AssertionHelpers.java | 8 +++++++-
.../java/org/apache/juneau/ComboRoundTripTest.java | 18 ++++++++----------
.../java/org/apache/juneau/ComboSerializeTest.java | 6 ++----
.../test/java/org/apache/juneau/SimpleTestBase.java | 6 ++++++
.../juneau/rest/client/RestCallException_Test.java | 3 +--
5 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/AssertionHelpers.java
b/juneau-utest/src/test/java/org/apache/juneau/AssertionHelpers.java
index 97672d6a6..ba9c4e912 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/AssertionHelpers.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/AssertionHelpers.java
@@ -185,7 +185,13 @@ public class AssertionHelpers {
return exception;
}
- private static String getMessages(Throwable t) {
+ public static <T extends Throwable> T assertThrowable(Class<? extends
Throwable> expectedType, String expectedSubstring, T t) {
+ var messages = AssertionHelpers.getMessages(t);
+ assertTrue(messages.contains(expectedSubstring), ss("Expected
message to contain: {0}.\nActual:\n{1}", expectedSubstring, messages));
+ return t;
+ }
+
+ static String getMessages(Throwable t) {
return Stream.iterate(t, Throwable::getCause).takeWhile(e -> e
!= null).map(Throwable::getMessage).collect(joining("\n"));
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/ComboRoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/ComboRoundTripTest.java
index 6b11c6dc6..10cc9b98e 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/ComboRoundTripTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/ComboRoundTripTest.java
@@ -13,8 +13,6 @@
package org.apache.juneau;
import static org.apache.juneau.AssertionHelpers.*;
-import static org.apache.juneau.assertions.AssertionPredicates.*;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
@@ -127,14 +125,14 @@ public abstract class ComboRoundTripTest {
} catch (AssertionError e) {
if (comboInput.exceptionMsg == null)
throw e;
-
assertThrowable(e).asMessages().isAny(contains(comboInput.exceptionMsg));
+ assertThrowable(Exception.class,
comboInput.exceptionMsg, e);
} catch (Exception e) {
if (comboInput.exceptionMsg == null) {
e.printStackTrace();
throw new AssertionError(comboInput.label + "/"
+ testName + " failed. exception=" + e.getLocalizedMessage());
}
-
assertThrowable(e).asMessages().isAny(contains(comboInput.exceptionMsg));
+ assertThrowable(Exception.class,
comboInput.exceptionMsg, e);
}
}
@@ -156,13 +154,13 @@ public abstract class ComboRoundTripTest {
} catch (AssertionError e) {
if (comboInput.exceptionMsg == null)
throw e;
-
assertThrowable(e).asMessages().isAny(contains(comboInput.exceptionMsg));
+ assertThrowable(Exception.class,
comboInput.exceptionMsg, e);
} catch (Throwable e) {
if (comboInput.exceptionMsg == null) {
e.printStackTrace();
throw new AssertionError(comboInput.label + "/"
+ testName + " failed. exception=" + e.getLocalizedMessage());
}
-
assertThrowable(e).asMessages().isAny(contains(comboInput.exceptionMsg));
+ assertThrowable(Exception.class,
comboInput.exceptionMsg, e);
}
}
@@ -181,13 +179,13 @@ public abstract class ComboRoundTripTest {
} catch (AssertionError e) {
if (comboInput.exceptionMsg == null)
throw e;
-
assertThrowable(e).asMessages().isAny(contains(comboInput.exceptionMsg));
+ assertThrowable(Exception.class,
comboInput.exceptionMsg, e);
} catch (Exception e) {
if (comboInput.exceptionMsg == null) {
e.printStackTrace();
throw new AssertionError(comboInput.label + "/"
+ testName + " failed. exception=" + e.getLocalizedMessage());
}
-
assertThrowable(e).asMessages().isAny(contains(comboInput.exceptionMsg));
+ assertThrowable(Exception.class,
comboInput.exceptionMsg, e);
}
}
@@ -205,13 +203,13 @@ public abstract class ComboRoundTripTest {
} catch (AssertionError e) {
if (comboInput.exceptionMsg == null)
throw e;
-
assertThrowable(e).asMessages().isAny(contains(comboInput.exceptionMsg));
+ assertThrowable(Exception.class,
comboInput.exceptionMsg, e);
} catch (Exception e) {
if (comboInput.exceptionMsg == null) {
e.printStackTrace();
throw new AssertionError(comboInput.label + "/"
+ testName + " failed. exception=" + e.getLocalizedMessage());
}
-
assertThrowable(e).asMessages().isAny(contains(comboInput.exceptionMsg));
+ assertThrowable(Exception.class,
comboInput.exceptionMsg, e);
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/ComboSerializeTest.java
b/juneau-utest/src/test/java/org/apache/juneau/ComboSerializeTest.java
index 517ed1b85..06ecd513b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/ComboSerializeTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/ComboSerializeTest.java
@@ -13,8 +13,6 @@
package org.apache.juneau;
import static org.apache.juneau.AssertionHelpers.*;
-import static org.apache.juneau.assertions.AssertionPredicates.*;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
@@ -85,13 +83,13 @@ public abstract class ComboSerializeTest {
} catch (AssertionError e) {
if (comboInput.exceptionMsg == null)
throw e;
-
assertThrowable(e).asMessages().isAny(contains(comboInput.exceptionMsg));
+ assertThrowable(Exception.class,
comboInput.exceptionMsg, e);
} catch (Exception e) {
if (comboInput.exceptionMsg == null) {
e.printStackTrace();
throw new AssertionError(comboInput.label + "/"
+ testName + " failed. exception=" + e.getLocalizedMessage());
}
-
assertThrowable(e).asMessages().isAny(contains(comboInput.exceptionMsg));
+ assertThrowable(Exception.class,
comboInput.exceptionMsg, e);
}
}
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 40c7417f1..36e21754c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/SimpleTestBase.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/SimpleTestBase.java
@@ -127,6 +127,12 @@ public abstract class SimpleTestBase {
return AssertionHelpers.assertThrowsWithMessage(expectedType,
expectedSubstring, executable);
}
+ protected static <T extends Throwable> T assertThrowable(Class<T>
expectedType, String expectedSubstring, T t) {
+ var messages = AssertionHelpers.getMessages(t);
+ assertTrue(messages.contains(expectedSubstring), ss("Expected
message to contain: {0}.\nActual:\n{1}", expectedSubstring, messages));
+ return t;
+ }
+
/**
* Asserts the entries in a map matches the expected strings after
they've been made readable.
*/
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestCallException_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestCallException_Test.java
index 17f0e15bf..ebe92ad4e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestCallException_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestCallException_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.client;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import java.io.*;
@@ -61,7 +60,7 @@ public class RestCallException_Test extends SimpleTestBase {
client().build().post("/echo",new
StringEntity("{f:")).run().getContent().as(ABean.class);
fail();
} catch (RestCallException e) {
-
assertThrowable(e.getCause(ParseException.class)).asMessage().isContains("Could
not find '}'");
+ assertThrowable(Exception.class, "Could not find '}'",
e.getCause(ParseException.class));
}
RestCallException e = new RestCallException(null, null, null);
