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 753c90597 Unit test modernization.
753c90597 is described below
commit 753c9059752ebdf28223e1540c200fb5748f81bf
Author: James Bognar <james.bog...@salesforce.com>
AuthorDate: Thu Aug 7 09:03:18 2025 -0400
Unit test modernization.
---
.../test/java/org/apache/juneau/BeanMapTest.java | 10 ++++-----
.../apache/juneau/config/ConfigImportsTest.java | 3 +--
.../java/org/apache/juneau/config/ConfigTest.java | 24 +++++++++++-----------
.../org/apache/juneau/html/CommonParser_Test.java | 3 +--
.../org/apache/juneau/reflect/ClassInfoTest.java | 16 +++++++--------
.../rest/client/RestClient_Response_Body_Test.java | 2 +-
.../apache/juneau/rest/util/RestUtils_Test.java | 9 ++++----
.../org/apache/juneau/utils/MethodInvokerTest.java | 12 +++++------
.../apache/juneau/utils/StringVarResolverTest.java | 3 +--
9 files changed, 39 insertions(+), 43 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
index 57f4cbfee..8da3e5ad8 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapTest.java
@@ -996,7 +996,7 @@ class BeanMapTest extends SimpleTestBase {
t = p.parse(json, O.class);
assertEquals(123, t.foo);
- assertThrown(()->JsonParser.DEFAULT.parse(json,
O.class)).isExists();
+ assertThrows(Exception.class,
()->JsonParser.DEFAULT.parse(json, O.class));
// XML
String xml = "<object><baz type='number'>789</baz><foo
type='number'>123</foo><bar type='number'>456</bar></object>";
@@ -1004,7 +1004,7 @@ class BeanMapTest extends SimpleTestBase {
t = p.parse(xml, O.class);
assertEquals(123, t.foo);
- assertThrown(()->XmlParser.DEFAULT.parse(json,
O.class)).isExists();
+ assertThrows(Exception.class, ()->XmlParser.DEFAULT.parse(json,
O.class));
// HTML
String html = "<table
_type='object'><tr><th><string>key</string></th><th><string>value</string></th></tr><tr><td><string>baz</string></td><td><number>789</number></td></tr><tr><td><string>foo</string></td><td><number>123</number></td></tr><tr><td><string>bar</string></td><td><number>456</number></td></tr></table>";
@@ -1012,7 +1012,7 @@ class BeanMapTest extends SimpleTestBase {
t = p.parse(html, O.class);
assertEquals(123, t.foo);
- assertThrown(()->HtmlParser.DEFAULT.parse(json,
O.class)).isExists();
+ assertThrows(Exception.class,
()->HtmlParser.DEFAULT.parse(json, O.class));
// UON
String uon = "(baz=789,foo=123,bar=456)";
@@ -1020,7 +1020,7 @@ class BeanMapTest extends SimpleTestBase {
t = p.parse(uon, O.class);
assertEquals(123, t.foo);
- assertThrown(()->UonParser.DEFAULT.parse(json,
O.class)).isExists();
+ assertThrows(Exception.class, ()->UonParser.DEFAULT.parse(json,
O.class));
// URL-Encoding
String urlencoding = "baz=789&foo=123&bar=456";
@@ -1028,7 +1028,7 @@ class BeanMapTest extends SimpleTestBase {
t = p.parse(urlencoding, O.class);
assertEquals(123, t.foo);
- assertThrown(()->UrlEncodingParser.DEFAULT.parse(json,
O.class)).isExists();
+ assertThrows(Exception.class,
()->UrlEncodingParser.DEFAULT.parse(json, O.class));
}
public static class O {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigImportsTest.java
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigImportsTest.java
index 2319899e1..808dd1837 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigImportsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigImportsTest.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.config;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
@@ -85,7 +84,7 @@ class ConfigImportsTest extends SimpleTestBase {
ms.write("A1", "", "<A2>\nx=1");
ms.write("A2", "", "<A1>\ny=2");
ms.write("B", "", "<A2>");
-
assertThrown(()->Config.create("B").store(ms).build()).isExists();
+ assertThrows(Exception.class,
()->Config.create("B").store(ms).build());
}
@Test void importNotFound() {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
index d76708176..d8d4aa6df 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
@@ -292,10 +292,10 @@ public class ConfigTest {
@Test
public void getInt1BadValues() {
Config c = init("a1=foo", "a2=2.3", "a3=[1]", "a4=false");
- assertThrown(()->c.get("a1").asInteger().orElse(0)).isExists();
- assertThrown(()->c.get("a2").asInteger().orElse(0)).isExists();
- assertThrown(()->c.get("a3").asInteger().orElse(0)).isExists();
- assertThrown(()->c.get("a4").asInteger().orElse(0)).isExists();
+ assertThrows(Exception.class,
()->c.get("a1").asInteger().orElse(0));
+ assertThrows(Exception.class,
()->c.get("a2").asInteger().orElse(0));
+ assertThrows(Exception.class,
()->c.get("a3").asInteger().orElse(0));
+ assertThrows(Exception.class,
()->c.get("a4").asInteger().orElse(0));
}
//====================================================================================================
@@ -316,10 +316,10 @@ public class ConfigTest {
@Test
public void getInt2BadValues() {
Config c = init("a1=foo", "a2=2.3", "a3=[1]", "a4=false");
- assertThrown(()->c.get("a1").asInteger().orElse(-1)).isExists();
- assertThrown(()->c.get("a2").asInteger().orElse(-1)).isExists();
- assertThrown(()->c.get("a3").asInteger().orElse(-1)).isExists();
- assertThrown(()->c.get("a4").asInteger().orElse(-1)).isExists();
+ assertThrows(Exception.class,
()->c.get("a1").asInteger().orElse(-1));
+ assertThrows(Exception.class,
()->c.get("a2").asInteger().orElse(-1));
+ assertThrows(Exception.class,
()->c.get("a3").asInteger().orElse(-1));
+ assertThrows(Exception.class,
()->c.get("a4").asInteger().orElse(-1));
}
//====================================================================================================
@@ -388,10 +388,10 @@ public class ConfigTest {
@Test
public void getLong1BadValues() {
Config c = init("a1=foo", "a2=2.3", "a3=[1]", "a4=false");
- assertThrown(()->c.get("a1").as(long.class)).isExists();
- assertThrown(()->c.get("a2").as(long.class)).isExists();
- assertThrown(()->c.get("a3").as(long.class)).isExists();
- assertThrown(()->c.get("a4").as(long.class)).isExists();
+ assertThrows(Exception.class, ()->c.get("a1").as(long.class));
+ assertThrows(Exception.class, ()->c.get("a2").as(long.class));
+ assertThrows(Exception.class, ()->c.get("a3").as(long.class));
+ assertThrows(Exception.class, ()->c.get("a4").as(long.class));
}
//====================================================================================================
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/html/CommonParser_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/html/CommonParser_Test.java
index 471d99282..88fedc1e5 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/html/CommonParser_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/html/CommonParser_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.html;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.Assert.*;
import java.util.*;
@@ -100,7 +99,7 @@ class CommonParser_Test extends SimpleTestBase {
t = p.parse(in, B.class);
assertEquals(1, t.a);
assertEquals(2, t.b);
- assertThrown(()->HtmlParser.DEFAULT.parse(in,
B.class)).isExists();
+ assertThrows(Exception.class, ()->HtmlParser.DEFAULT.parse(in,
B.class));
}
public static class B {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
index 0caad0052..d3f2ae380 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
@@ -1114,10 +1114,10 @@ public class ClassInfoTest {
@Test
public void isAll_invalid() {
ClassInfo a = aClass;
- assertThrown(()->a.isAll(HAS_PARAMS)).isExists();
- assertThrown(()->a.isAll(HAS_NO_PARAMS)).isExists();
- assertThrown(()->a.isAll(TRANSIENT)).isExists();
- assertThrown(()->a.isAll(NOT_TRANSIENT)).isExists();
+ assertThrows(Exception.class, ()->a.isAll(HAS_PARAMS));
+ assertThrows(Exception.class, ()->a.isAll(HAS_NO_PARAMS));
+ assertThrows(Exception.class, ()->a.isAll(TRANSIENT));
+ assertThrows(Exception.class, ()->a.isAll(NOT_TRANSIENT));
}
@Test
@@ -1219,10 +1219,10 @@ public class ClassInfoTest {
@Test
public void isAny_invalid() {
ClassInfo a = aClass;
- assertThrown(()->a.isAny(HAS_PARAMS)).isExists();
- assertThrown(()->a.isAny(HAS_NO_PARAMS)).isExists();
- assertThrown(()->a.isAny(TRANSIENT)).isExists();
- assertThrown(()->a.isAny(NOT_TRANSIENT)).isExists();
+ assertThrows(Exception.class, ()->a.isAny(HAS_PARAMS));
+ assertThrows(Exception.class, ()->a.isAny(HAS_NO_PARAMS));
+ assertThrows(Exception.class, ()->a.isAny(TRANSIENT));
+ assertThrows(Exception.class, ()->a.isAny(NOT_TRANSIENT));
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
index c8f6ac025..846e89b25 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Body_Test.java
@@ -215,7 +215,7 @@ class RestClient_Response_Body_Test extends SimpleTestBase {
plainTestClient().entity(stringEntity("foo")).get().run().assertContent().as(A7a.class).is(x->x.x.equals("foo"));
plainTestClient().entity(stringEntity("foo")).get().run().assertContent().as(A7b.class).is(x->x.x.equals("foo"));
-
assertThrown(()->plainTestClient().entity(stringEntity("foo")).headers(header("Content-Type","foo")).get().run().getContent().as(A7c.class)).isExists().asMessages().isAny(contains("Unsupported
media-type"));
+ assertThrows(Exception.class,
()->plainTestClient().entity(stringEntity("foo")).headers(header("Content-Type","foo")).get().run().getContent().as(A7c.class),
"Unsupported media-type");
assertThrown(()->testClient().entity(stringEntity("")).get().run().getContent().as(A7c.class)).asMessages().isContains("foo");
Future<ABean> x8 =
testClient().entity(stringEntity("{f:1}")).get().run().getContent().asFuture(ABean.class);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/util/RestUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/util/RestUtils_Test.java
index 488e338bc..93cdf2d59 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/util/RestUtils_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/util/RestUtils_Test.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.util;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.rest.util.RestUtils.*;
import static org.junit.Assert.*;
@@ -65,7 +64,7 @@ class RestUtils_Test extends SimpleTestBase {
for (String s : new String[]{
"http:/hostname?foo"}) {
- assertThrown(()->trimPathInfo(new StringBuffer(s), "",
"")).isExists();
+ assertThrows(Exception.class, ()->trimPathInfo(new
StringBuffer(s), "", ""));
}
e = "http://hostname";;
@@ -95,7 +94,7 @@ class RestUtils_Test extends SimpleTestBase {
"http://hostname?foo";,
"http://hostname/fo?bar";,
"http:/hostname/foo"}) {
- assertThrown(()->trimPathInfo(new StringBuffer(s), "/",
"/foo")).isExists();
+ assertThrows(Exception.class, ()->trimPathInfo(new
StringBuffer(s), "/", "/foo"));
}
e = "http://hostname/foo/bar";;
@@ -112,7 +111,7 @@ class RestUtils_Test extends SimpleTestBase {
"http://hostname/foo2/bar";,
"http://hostname/foo/bar2";
}) {
- assertThrown(()->trimPathInfo(new StringBuffer(s),
"/foo/bar", "/foo/bar")).isExists();
+ assertThrows(Exception.class, ()->trimPathInfo(new
StringBuffer(s), "/foo/bar", "/foo/bar"));
}
e = "http://hostname/foo/bar";;
@@ -129,7 +128,7 @@ class RestUtils_Test extends SimpleTestBase {
"http://hostname/foo2/bar";,
"http://hostname/foo/bar2";
}) {
- assertThrown(()->trimPathInfo(new StringBuffer(s),
"/foo", "/bar")).isExists();
+ assertThrows(Exception.class, ()->trimPathInfo(new
StringBuffer(s), "/foo", "/bar"));
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/MethodInvokerTest.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/MethodInvokerTest.java
index c4bb37808..17f7594bc 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/utils/MethodInvokerTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/utils/MethodInvokerTest.java
@@ -62,9 +62,9 @@ public class MethodInvokerTest {
MethodInvoker mi = create(m);
A a = new A();
- assertThrown(()->mi.invoke(a)).isExists();
- assertThrown(()->mi.invoke(a)).isExists();
- assertThrown(()->mi.invoke(a)).isExists();
+ assertThrows(Exception.class, ()->mi.invoke(a));
+ assertThrows(Exception.class, ()->mi.invoke(a));
+ assertThrows(Exception.class, ()->mi.invoke(a));
assertBean(mi.getStats()).asPropertyMap("runs","errors").asJson().is("{runs:3,errors:3}");
}
@@ -76,9 +76,9 @@ public class MethodInvokerTest {
MethodInvoker mi = create(m);
A a = new A();
- assertThrown(()->mi.invoke(a, "x")).isExists();
- assertThrown(()->mi.invoke(a)).isExists();
- assertThrown(()->mi.invoke(a, 1, "x")).isExists();
+ assertThrows(Exception.class, ()->mi.invoke(a, "x"));
+ assertThrows(Exception.class, ()->mi.invoke(a));
+ assertThrows(Exception.class, ()->mi.invoke(a, 1, "x"));
assertBean(mi.getStats()).asPropertyMap("runs","errors").asJson().is("{runs:3,errors:3}");
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java
b/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java
index 9452c1f21..6ac78ca58 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/utils/StringVarResolverTest.java
@@ -12,7 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.utils;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.common.internal.StringUtils.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
@@ -206,7 +205,7 @@ class StringVarResolverTest extends SimpleTestBase {
// Should reject names with characters outside A-Za-z
for (Class<? extends Var> c : new Class[]{InvalidVar1.class,
InvalidVar2.class, InvalidVar3.class, InvalidVar4.class, InvalidVar5.class}) {
-
assertThrown(()->VarResolver.create().vars(c).build()).isExists();
+ assertThrows(Exception.class,
()->VarResolver.create().vars(c).build());
}
VarResolver vr = vrb.build();
