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 6e6ccc566 Unit test modernization.
6e6ccc566 is described below
commit 6e6ccc5663c725396236c7a62d373f36d4e185e6
Author: James Bognar <[email protected]>
AuthorDate: Thu Aug 7 17:24:45 2025 -0400
Unit test modernization.
---
.../java/org/apache/juneau/AssertionHelpers.java | 6 ++
.../java/org/apache/juneau/SimpleTestBase.java | 5 ++
.../config/store/ConfigClasspathStoreTest.java | 38 ++++------
.../java/org/apache/juneau/cp/BeanStore_Test.java | 3 +-
.../juneau/html/HtmlDocConfigAnnotation_Test.java | 81 ++++++++--------------
5 files changed, 56 insertions(+), 77 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 a6303af4f..97672d6a6 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/AssertionHelpers.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/AssertionHelpers.java
@@ -106,6 +106,12 @@ public class AssertionHelpers {
assertTrue(a2.contains(expected), ss("String did not contain
expected substring. expected={0}, actual={1}", expected, a2));
}
+ public static void assertContainsAll(String expected, Object actual) {
+ var a2 = r(actual);
+ for (var e : StringUtils.split(expected))
+ assertTrue(a2.contains(e), ss("String did not contain
expected substring. expected={0}, actual={1}", e, a2));
+ }
+
public static void assertEmpty(Optional<?> o) {
assertTrue(o != null && o.isEmpty(), "Optional was not empty.");
}
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 2fec1af20..86ecb65fa 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/SimpleTestBase.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/SimpleTestBase.java
@@ -12,6 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau;
+import static org.apache.juneau.assertions.Assertions.*;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
@@ -86,6 +87,10 @@ public abstract class SimpleTestBase {
AssertionHelpers.assertContains(expected, actual);
}
+ protected static void assertContainsAll(String expected, Object actual)
{
+ AssertionHelpers.assertContainsAll(expected, actual);
+ }
+
protected static void assertEmpty(Optional<?> o) {
AssertionHelpers.assertEmpty(o);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigClasspathStoreTest.java
b/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigClasspathStoreTest.java
index 5ee757289..cba7e86e6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigClasspathStoreTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigClasspathStoreTest.java
@@ -12,50 +12,42 @@
//
***************************************************************************************************************************
package org.apache.juneau.config.store;
-import static org.apache.juneau.assertions.Assertions.*;
import static org.apache.juneau.utest.utils.Utils2.*;
-import static org.junit.Assert.*;
-import static org.junit.runners.MethodSorters.*;
-
+import static org.junit.jupiter.api.Assertions.*;
import java.util.concurrent.*;
-import org.junit.*;
+import org.apache.juneau.*;
+import org.junit.jupiter.api.*;
-@FixMethodOrder(NAME_ASCENDING)
-public class ConfigClasspathStoreTest {
+class ConfigClasspathStoreTest extends SimpleTestBase {
- @Test
- public void testNoFile() throws Exception {
+ @Test void testNoFile() throws Exception {
ClasspathStore fs = ClasspathStore.create().build();
assertEquals("", fs.read("X.cfg"));
}
- @Test
- public void testRealFiles() throws Exception {
+ @Test void testRealFiles() throws Exception {
ClasspathStore fs = ClasspathStore.create().build();
- assertString(fs.read("foo1.cfg")).isContains("bar1");
- assertString(fs.read("sub/foo2.cfg")).isContains("bar2");
+ assertContains("bar1", fs.read("foo1.cfg"));
+ assertContains("bar2", fs.read("sub/foo2.cfg"));
assertEquals("", fs.read("sub/bad.cfg"));
assertEquals("", fs.read("bad/bad.cfg"));
}
- @Test
- public void testOverwriteRealFiles() throws Exception {
+ @Test void testOverwriteRealFiles() throws Exception {
ClasspathStore fs = ClasspathStore.create().build();
- assertString(fs.read("foo1.cfg")).isContains("bar1");
+ assertContains("bar1", fs.read("foo1.cfg"));
fs.write("foo1.cfg", fs.read("foo1.cfg"), "xxx");
assertEquals("xxx", fs.read("foo1.cfg"));
}
- @Test
- public void testSimpleCreate() throws Exception {
+ @Test void testSimpleCreate() throws Exception {
ClasspathStore fs = ClasspathStore.create().build();
assertNull(fs.write("X.cfg", null, "foo"));
assertEquals("foo", fs.read("X.cfg"));
}
- @Test
- public void testFailOnMismatch() throws Exception {
+ @Test void testFailOnMismatch() throws Exception {
ClasspathStore fs = ClasspathStore.create().build();
assertNotNull(fs.write("X.cfg", "xxx", "foo"));
assertEquals("", fs.read("X.cfg"));
@@ -67,8 +59,7 @@ public class ConfigClasspathStoreTest {
assertEquals("bar", fs.read("X.cfg"));
}
- @Test
- public void testUpdate() throws Exception {
+ @Test void testUpdate() throws Exception {
ClasspathStore fs = ClasspathStore.create().build();
final CountDownLatch latch = new CountDownLatch(2);
@@ -87,8 +78,7 @@ public class ConfigClasspathStoreTest {
throw new Exception("CountDownLatch never reached
zero.");
}
- @Test
- public void testExists() throws Exception {
+ @Test void testExists() throws Exception {
ClasspathStore.DEFAULT.write("foo.cfg", null, "foo");
assertTrue(ClasspathStore.DEFAULT.exists("foo.cfg"));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
index 38ba3f8ef..0428c38e7 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
@@ -62,7 +62,8 @@ class BeanStore_Test extends SimpleTestBase {
@Test void a01_builderCopyConstructor() {
BeanStore b1p =
BeanStore.create().readOnly().threadSafe().build();
BeanStore b1c = BeanStore.create().parent(b1p).build();
-
assertString(b1c.toString()).isContains("readOnly:true","threadSafe:true");
+ assertContains("readOnly:true", b1c.toString());
+ assertContains("threadSafe:true", b1c.toString());
}
@Test void a02_readOnly() {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotation_Test.java
index 28de6732e..3e36ad8c6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotation_Test.java
@@ -12,8 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.html;
-import static org.apache.juneau.assertions.Assertions.*;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import static org.junit.runners.MethodSorters.*;
import java.util.*;
@@ -25,30 +24,29 @@ import org.apache.juneau.html.annotation.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
-import org.junit.*;
+import org.junit.jupiter.api.*;
/**
* Tests the @HtmlDocConfig annotation.
*/
-@FixMethodOrder(NAME_ASCENDING)
-public class HtmlDocConfigAnnotation_Test {
+class HtmlDocConfigAnnotation_Test extends SimpleTestBase {
private static void check(String expected, Object o) {
assertEquals(expected, TO_STRING.apply(o));
}
private static final Function<Object,String> TO_STRING = t -> {
- if (t.getClass().isArray())
- return
HtmlDocConfigAnnotation_Test.TO_STRING.apply(ArrayUtils.toList(t,
Object.class));
- if (t instanceof Collection)
- return ((Collection<?>)t)
- .stream()
- .map(HtmlDocConfigAnnotation_Test.TO_STRING)
- .collect(Collectors.joining(","));
- if (t instanceof HtmlDocTemplate)
- return t.getClass().getSimpleName();
- return t.toString();
- };
+ if (t.getClass().isArray())
+ return
HtmlDocConfigAnnotation_Test.TO_STRING.apply(ArrayUtils.toList(t,
Object.class));
+ if (t instanceof Collection)
+ return ((Collection<?>)t)
+ .stream()
+ .map(HtmlDocConfigAnnotation_Test.TO_STRING)
+ .collect(Collectors.joining(","));
+ if (t instanceof HtmlDocTemplate)
+ return t.getClass().getSimpleName();
+ return t.toString();
+ };
static VarResolverSession sr =
VarResolver.create().vars(XVar.class).build().createSession();
@@ -73,8 +71,7 @@ public class HtmlDocConfigAnnotation_Test {
static class A {}
static ClassInfo a = ClassInfo.of(A.class);
- @Test
- public void basic() {
+ @Test void basic() {
AnnotationWorkList al = AnnotationWorkList.of(sr,
a.getAnnotationList());
HtmlDocSerializerSession x =
HtmlDocSerializer.create().apply(al).build().getSession();
check("foo", x.getAside());
@@ -99,8 +96,7 @@ public class HtmlDocConfigAnnotation_Test {
static class B {}
static ClassInfo b = ClassInfo.of(B.class);
- @Test
- public void defaults() {
+ @Test void defaults() {
AnnotationWorkList al = AnnotationWorkList.of(sr,
b.getAnnotationList());
HtmlDocSerializerSession x =
HtmlDocSerializer.create().apply(al).build().getSession();
check("", x.getAside());
@@ -124,8 +120,7 @@ public class HtmlDocConfigAnnotation_Test {
static class C {}
static ClassInfo c = ClassInfo.of(C.class);
- @Test
- public void noAnnotation() {
+ @Test void noAnnotation() {
AnnotationWorkList al = AnnotationWorkList.of(sr,
c.getAnnotationList());
HtmlDocSerializerSession x =
HtmlDocSerializer.create().apply(al).build().getSession();
check("", x.getAside());
@@ -160,8 +155,7 @@ public class HtmlDocConfigAnnotation_Test {
static class D1 extends A {}
static ClassInfo d1 = ClassInfo.of(D1.class);
- @Test
- public void inheritance1() {
+ @Test void inheritance1() {
AnnotationWorkList al = AnnotationWorkList.of(sr,
d1.getAnnotationList());
HtmlDocSerializerSession x =
HtmlDocSerializer.create().apply(al).build().getSession();
check("foo2,foo", x.getAside());
@@ -189,8 +183,7 @@ public class HtmlDocConfigAnnotation_Test {
static class D2 extends A {}
static ClassInfo d2 = ClassInfo.of(D2.class);
- @Test
- public void inheritance2() {
+ @Test void inheritance2() {
AnnotationWorkList al = AnnotationWorkList.of(sr,
d2.getAnnotationList());
HtmlDocSerializerSession x =
HtmlDocSerializer.create().apply(al).build().getSession();
check("foo,foo2", x.getAside());
@@ -218,8 +211,7 @@ public class HtmlDocConfigAnnotation_Test {
static class D3 extends A {}
static ClassInfo d3 = ClassInfo.of(D3.class);
- @Test
- public void inheritance3() {
+ @Test void inheritance3() {
AnnotationWorkList al = AnnotationWorkList.of(sr,
d3.getAnnotationList());
HtmlDocSerializerSession x =
HtmlDocSerializer.create().apply(al).build().getSession();
check("foo2", x.getAside());
@@ -247,8 +239,7 @@ public class HtmlDocConfigAnnotation_Test {
static class D4 extends A {}
static ClassInfo d4 = ClassInfo.of(D4.class);
- @Test
- public void inheritance4() {
+ @Test void inheritance4() {
AnnotationWorkList al = AnnotationWorkList.of(sr,
d4.getAnnotationList());
HtmlDocSerializerSession x =
HtmlDocSerializer.create().apply(al).build().getSession();
check("", x.getAside());
@@ -302,8 +293,7 @@ public class HtmlDocConfigAnnotation_Test {
}
}
- @Test
- public void widgets_basic() {
+ @Test void widgets_basic() {
AnnotationWorkList al = AnnotationWorkList.of(sr,
e.getAnnotationList());
HtmlDocSerializerSession x =
HtmlDocSerializer.create().apply(al).build().getSession();
check("$W{E}", x.getAside());
@@ -320,19 +310,11 @@ public class HtmlDocConfigAnnotation_Test {
check("BasicHtmlDocTemplate", x.getTemplate());
}
- @Test
- public void widgets_resolution() throws Exception {
+ @Test void widgets_resolution() throws Exception {
AnnotationWorkList al = AnnotationWorkList.of(sr,
e.getAnnotationList());
HtmlDocSerializerSession x =
HtmlDocSerializer.create().apply(al).build().getSession();
String r = x.serialize(null).replaceAll("[\r\n]+", "|");
- assertString(r).isContains(
- "<aside>xxx</aside>",
- "<footer>xxx</footer>",
- "<head>xxx",
- "<style>@import \"xxx\"; xxx zzz</style>",
- "<nav><ol><li>xxx</li></ol>xxx</nav>",
- "<script>xxx| yyy|</script>"
- );
+
assertContainsAll("<aside>xxx</aside>,<footer>xxx</footer>,<head>xxx,<style>@import
\"xxx\"; xxx zzz</style>,<nav><ol><li>xxx</li></ol>xxx</nav>,<script>xxx|
yyy|</script>", r);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -374,36 +356,31 @@ public class HtmlDocConfigAnnotation_Test {
static ClassInfo f4 = ClassInfo.of(F4.class);
static ClassInfo f5 = ClassInfo.of(F5.class);
- @Test
- public void e01_rankedAnnotations_f1() {
+ @Test void e01_rankedAnnotations_f1() {
AnnotationWorkList al = AnnotationWorkList.of(sr,
f1.getAnnotationList());
HtmlDocSerializerSession x =
HtmlDocSerializer.create().apply(al).build().getSession();
check("f1", x.getAside());
}
- @Test
- public void e02_rankedAnnotations_f2() {
+ @Test void e02_rankedAnnotations_f2() {
AnnotationWorkList al = AnnotationWorkList.of(sr,
f2.getAnnotationList());
HtmlDocSerializerSession x =
HtmlDocSerializer.create().apply(al).build().getSession();
check("f1", x.getAside());
}
- @Test
- public void e03_rankedAnnotations_f3() {
+ @Test void e03_rankedAnnotations_f3() {
AnnotationWorkList al = AnnotationWorkList.of(sr,
f3.getAnnotationList());
HtmlDocSerializerSession x =
HtmlDocSerializer.create().apply(al).build().getSession();
check("f3", x.getAside());
}
- @Test
- public void e04_rankedAnnotations_f4() {
+ @Test void e04_rankedAnnotations_f4() {
AnnotationWorkList al = AnnotationWorkList.of(sr,
f4.getAnnotationList());
HtmlDocSerializerSession x =
HtmlDocSerializer.create().apply(al).build().getSession();
check("f3", x.getAside());
}
- @Test
- public void e05_rankedAnnotations_f5() {
+ @Test void e05_rankedAnnotations_f5() {
AnnotationWorkList al = AnnotationWorkList.of(sr,
f5.getAnnotationList());
HtmlDocSerializerSession x =
HtmlDocSerializer.create().apply(al).build().getSession();
check("f5", x.getAside());
