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 7e1cc2359 Test modernization
7e1cc2359 is described below
commit 7e1cc2359f21a39f60c53e89f157ca8f93f4779b
Author: James Bognar <[email protected]>
AuthorDate: Sun Aug 24 14:48:36 2025 -0400
Test modernization
---
.../java/org/apache/juneau/Annotations_Test.java | 36 ++++++----------------
.../test/java/org/apache/juneau/JsonMapTest.java | 4 +--
.../org/apache/juneau/json/CommonParserTest.java | 2 +-
.../test/java/org/apache/juneau/json/JsonTest.java | 11 +++----
.../apache/juneau/objecttools/ObjectRest_Test.java | 6 ++--
.../java/org/apache/juneau/rest/Swagger_Test.java | 2 +-
.../rest/annotation/ResponseHeader_Test.java | 4 +--
.../apache/juneau/uon/CommonParser_UonTest.java | 4 +--
.../urlencoding/CommonParser_UrlEncodingTest.java | 4 +--
.../org/apache/juneau/xml/CommonParserTest.java | 4 +--
10 files changed, 30 insertions(+), 47 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/Annotations_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/Annotations_Test.java
index 9f51ac7c2..863ab8464 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/Annotations_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/Annotations_Test.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau;
-import static org.junit.Assert.*;
-
import org.apache.juneau.annotation.*;
import org.junit.jupiter.api.*;
@@ -22,15 +20,12 @@ class Annotations_Test extends SimpleTestBase {
//====================================================================================================
// Bean with explicitly specified properties.
//====================================================================================================
- @Test void testBeanWithExplicitProperties() throws Exception {
+ @Test void a01_beanWithExplicitProperties() throws Exception {
var bc = BeanContext.DEFAULT;
// Basic test
var bm =
bc.newBeanMap(Person1.class).load("{age:21,name:'foobar'}");
- assertNotNull(bm);
- assertNotNull(bm.getBean());
- assertEquals(21, bm.get("age"));
- assertEquals("foobar", bm.get("name"));
+ assertBean(bm.getBean(), "name,age", "foobar,21");
bm.put("age", 65);
bm.put("name", "futbol");
@@ -48,15 +43,12 @@ class Annotations_Test extends SimpleTestBase {
public void setName(String v) { name = v; }
}
- @Test void testBeanWithExplicitProperties2() throws Exception {
+ @Test void a02_beanWithExplicitProperties2() throws Exception {
var bc = BeanContext.DEFAULT;
// Basic test
var bm =
bc.newBeanMap(Person2.class).load("{age:21,name:'foobar'}");
- assertNotNull(bm);
- assertNotNull(bm.getBean());
- assertEquals(21, bm.get("age"));
- assertEquals("foobar", bm.get("name"));
+ assertBean(bm.getBean(), "name,age", "foobar,21");
bm.put("age", 65);
bm.put("name", "futbol");
@@ -74,15 +66,12 @@ class Annotations_Test extends SimpleTestBase {
public void setName(String v) { name = v; }
}
- @Test void testBeanWithExplicitProperties3() throws Exception {
+ @Test void a03_beanWithExplicitProperties3() throws Exception {
var bc = BeanContext.DEFAULT;
// Basic test
var bm =
bc.newBeanMap(Person3.class).load("{age:21,name:'foobar'}");
- assertNotNull(bm);
- assertNotNull(bm.getBean());
- assertEquals(21, bm.get("age"));
- assertEquals("foobar", bm.get("name"));
+ assertBean(bm.getBean(), "name,age", "foobar,21");
bm.put("age", 65);
bm.put("name", "futbol");
@@ -94,21 +83,18 @@ class Annotations_Test extends SimpleTestBase {
@Bean(properties="age",p="name")
public static class Person3 {
public int age;
-
+
private String name;
public String getName() { return name; }
public void setName(String v) { name = v; }
}
- @Test void testBeanWithExplicitProperties_usingConfig() throws
Exception {
+ @Test void a04_beanWithExplicitProperties_usingConfig() throws
Exception {
var bc =
BeanContext.DEFAULT.copy().applyAnnotations(PersonConfig.class).build();
// Basic test
var bm =
bc.newBeanMap(Person4.class).load("{age:21,name:'foobar'}");
- assertNotNull(bm);
- assertNotNull(bm.getBean());
- assertEquals(21, bm.get("age"));
- assertEquals("foobar", bm.get("name"));
+ assertBean(bm.getBean(), "name,age", "foobar,21");
bm.put("age", 65);
bm.put("name", "futbol");
@@ -131,13 +117,11 @@ class Annotations_Test extends SimpleTestBase {
//====================================================================================================
// Private/protected/default fields should be ignored.
//====================================================================================================
- @Test void testForOnlyPublicFields() throws Exception {
+ @Test void a05_forOnlyPublicFields() throws Exception {
var bc = BeanContext.DEFAULT;
// Make sure only public fields are detected
var bm = bc.newBeanMap(A.class).load("{publicField:123}");
- assertNotNull("F1", bm);
- assertNotNull("F2", bm.getBean());
assertJson(bm.getBean(), "{publicField:123}");
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/JsonMapTest.java
b/juneau-utest/src/test/java/org/apache/juneau/JsonMapTest.java
index a371c3a3e..38c094e23 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/JsonMapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/JsonMapTest.java
@@ -253,8 +253,8 @@ class JsonMapTest extends SimpleTestBase {
// testComparison
//====================================================================================================
@Test void testComparison() throws Exception {
- JsonMap m1 = JsonMap.ofJson("{ firstName:'John',
lastName:'Smith', age:123, isDeceased:false }");
- JsonMap m2 = JsonMap.ofJson("{ age:123, isDeceased:false,
lastName:'Smith', firstName:'John' }");
+ var m1 = JsonMap.ofJson("{ firstName:'John', lastName:'Smith',
age:123, isDeceased:false }");
+ var m2 = JsonMap.ofJson("{ age:123, isDeceased:false,
lastName:'Smith', firstName:'John' }");
assertEquals(m1, m2);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/json/CommonParserTest.java
b/juneau-utest/src/test/java/org/apache/juneau/json/CommonParserTest.java
index accc322cf..6055d8140 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/json/CommonParserTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/json/CommonParserTest.java
@@ -128,7 +128,7 @@ class CommonParserTest extends SimpleTestBase {
//====================================================================================================
@Test void testCollectionPropertiesWithNoSetters() throws Exception {
JsonParser p = JsonParser.DEFAULT;
- String json = "{ints:[1,2,3],beans:[{a:1,b:2}]}";
+ var json = "{ints:[1,2,3],beans:[{a:1,b:2}]}";
C t = p.parse(json, C.class);
assertEquals(3, t.getInts().size());
assertEquals(2, t.getBeans().get(0).b);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/json/JsonTest.java
b/juneau-utest/src/test/java/org/apache/juneau/json/JsonTest.java
index 6ddc77794..c72c84acd 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/json/JsonTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/json/JsonTest.java
@@ -18,7 +18,6 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.json.annotation.*;
-import org.apache.juneau.serializer.*;
import org.junit.jupiter.api.*;
@SuppressWarnings({"serial"})
@@ -28,8 +27,8 @@ class JsonTest extends SimpleTestBase{
// testBasic
//====================================================================================================
@Test void testBasic() throws Exception {
- Map<String,Object> m = new LinkedHashMap<>();
- List<Object> l = new LinkedList<>();
+ var m = new LinkedHashMap<String,Object>();
+ var l = new LinkedList<Object>();
var s1 =
JsonSerializer.create().json5().keepNullProperties().build();
var s2 =
JsonSerializer.create().simpleAttrs().keepNullProperties().build();
@@ -91,7 +90,7 @@ class JsonTest extends SimpleTestBase{
}
@Test void testReservedKeywordAttributes() {
- Map<String,Object> m = new LinkedHashMap<>();
+ var m = new LinkedHashMap<String,Object>();
// Keys with reserved names.
for (String attr : new
String[]{"","true","false","null","try","123","1x","-123",".123"}) {
@@ -136,7 +135,7 @@ class JsonTest extends SimpleTestBase{
// Indentation
//====================================================================================================
@Test void testIndentation() throws Exception {
- JsonMap m =
JsonMap.ofJson("{J:{B:['c',{D:'e'},['f',{G:'h'},1,false]]},I:'j'}");
+ var m =
JsonMap.ofJson("{J:{B:['c',{D:'e'},['f',{G:'h'},1,false]]},I:'j'}");
String e = """
{
J: {
@@ -196,7 +195,7 @@ class JsonTest extends SimpleTestBase{
t = p.parse(r, A.class);
assertEquals(1, t.f1);
- Map<String,A> m = new LinkedHashMap<>();
+ var m = new LinkedHashMap<String,A>();
m.put("bar", A.create());
r = s.serialize(m);
assertEquals("{bar:{foo:{f1:1}}}", r);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
index 3f691a2a2..befd1d0d8 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/objecttools/ObjectRest_Test.java
@@ -166,7 +166,7 @@ class ObjectRest_Test extends SimpleTestBase {
assertEquals("{}", s);
// Make sure doing a PUT against "" or "/" replaces the root
object.
- JsonMap m2 = JsonMap.ofJson("{x:1}");
+ var m2 = JsonMap.ofJson("{x:1}");
model.put("", m2);
s = model.get("").toString();
assertEquals("{x:1}", s);
@@ -319,8 +319,8 @@ class ObjectRest_Test extends SimpleTestBase {
//====================================================================================================
@Test void f01_getMethods() throws Exception {
var model = ObjectRest.create(new A());
- JsonList l = JsonList.ofJson("[{a:'b'}]");
- JsonMap m = JsonMap.ofJson("{a:'b'}");
+ var l = JsonList.ofJson("[{a:'b'}]");
+ var m = JsonMap.ofJson("{a:'b'}");
assertNull(model.get("f1"));
assertEquals(0, model.get("f2"));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
index af416043c..7a5f73898 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
@@ -1964,7 +1964,7 @@ class Swagger_Test extends SimpleTestBase {
@Test void t01_bodyWithReadOnlyProperty() throws Exception {
var p = MockRestClient.build(T1.class);
org.apache.juneau.bean.swagger.Swagger s =
JsonParser.DEFAULT.parse(p.get("/api").accept("application/json").run().getContent().asString(),
org.apache.juneau.bean.swagger.Swagger.class);
- Operation o = s.getOperation("/", "get");
+ var o = s.getOperation("/", "get");
ResponseInfo ri = o.getResponse("200");
assertEquals("{\n\tf1: 1,\n\tf2: 2\n}",
ri.getExamples().get("application/json5"));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseHeader_Test.java
index d88b12124..c8d5bdcf8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/ResponseHeader_Test.java
@@ -144,7 +144,7 @@ class ResponseHeader_Test extends SimpleTestBase {
x = s.getResponseInfo("/d","get",100).getHeader("H");
assertNotNull(x);
- Operation x2 = s.getOperation("/e","get");
+ var x2 = s.getOperation("/e","get");
assertNotNull(x2.getResponse(100).getHeader("H"));
assertNotNull(x2.getResponse(101).getHeader("H"));
@@ -232,7 +232,7 @@ class ResponseHeader_Test extends SimpleTestBase {
x = sc.getResponseInfo("/d","get",100).getHeader("H");
assertNotNull(x);
- Operation x2 = sc.getOperation("/e","get");
+ var x2 = sc.getOperation("/e","get");
assertNotNull(x2.getResponse(100).getHeader("H"));
assertNotNull(x2.getResponse(101).getHeader("H"));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
b/juneau-utest/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
index 9df37eee8..9e8c80255 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/uon/CommonParser_UonTest.java
@@ -120,7 +120,7 @@ class CommonParser_UonTest extends SimpleTestBase {
ReaderParser p2 = UonParser.DEFAULT;
- String json = "(ints=@(1,2,3),beans=@((a=1,b=2)))";
+ var json = "(ints=@(1,2,3),beans=@((a=1,b=2)))";
C t = p2.parse(json, C.class);
assertEquals(3, t.getInts().size());
assertEquals(2, t.getBeans().get(0).b);
@@ -140,7 +140,7 @@ class CommonParser_UonTest extends SimpleTestBase {
@Test void testParserListeners() throws Exception {
var p2 =
UonParser.create().ignoreUnknownBeanProperties().listener(MyParserListener.class).build();
- String in = "(a=1,unknownProperty=foo,b=2)";
+ var in = "(a=1,unknownProperty=foo,b=2)";
p2.parse(in, B.class);
assertEquals(1, MyParserListener.events.size());
assertEquals("unknownProperty, line 1, column 5",
MyParserListener.events.get(0));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
index 1374fbdff..b1886b184 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/CommonParser_UrlEncodingTest.java
@@ -121,7 +121,7 @@ class CommonParser_UrlEncodingTest extends SimpleTestBase {
ReaderParser p2 = UrlEncodingParser.DEFAULT;
- String json = "ints=@(1,2,3)&beans=@((a=1,b=2))";
+ var json = "ints=@(1,2,3)&beans=@((a=1,b=2))";
C t = p2.parse(json, C.class);
assertEquals(3, t.getInts().size());
assertEquals(2, t.getBeans().get(0).b);
@@ -141,7 +141,7 @@ class CommonParser_UrlEncodingTest extends SimpleTestBase {
@Test void testParserListeners() throws Exception {
var p2 =
UrlEncodingParser.create().ignoreUnknownBeanProperties().listener(MyParserListener.class).build();
- String in = "a=1&unknownProperty=foo&b=2";
+ var in = "a=1&unknownProperty=foo&b=2";
p2.parse(in, B.class);
assertEquals(1, MyParserListener.events.size());
assertEquals("unknownProperty, line 1, column 4",
MyParserListener.events.get(0));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/xml/CommonParserTest.java
b/juneau-utest/src/test/java/org/apache/juneau/xml/CommonParserTest.java
index b742a068c..e42c654d9 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/xml/CommonParserTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/xml/CommonParserTest.java
@@ -124,7 +124,7 @@ class CommonParserTest extends SimpleTestBase{
ReaderParser p = XmlParser.DEFAULT;
- String in = "<object><ints
_type='array'><number>1</number><number>2</number><number>3</number></ints><beans
_type='array'><object><a _type='number'>1</a><b
_type='number'>2</b></object></beans></object>";
+ var in = "<object><ints
_type='array'><number>1</number><number>2</number><number>3</number></ints><beans
_type='array'><object><a _type='number'>1</a><b
_type='number'>2</b></object></beans></object>";
C t = p.parse(in, C.class);
assertEquals(3, t.getInts().size());
assertEquals(2, t.getBeans().get(0).b);
@@ -144,7 +144,7 @@ class CommonParserTest extends SimpleTestBase{
@Test void testParserListeners() throws Exception {
var p =
XmlParser.create().ignoreUnknownBeanProperties().listener(MyParserListener.class).build();
- String in = "<object><a _type='number'>1</a><unknownProperty
_type='string'>foo</unknownProperty><b _type='number'>2</b></object>";
+ var in = "<object><a _type='number'>1</a><unknownProperty
_type='string'>foo</unknownProperty><b _type='number'>2</b></object>";
p.parse(in, B.class);
assertEquals(1, MyParserListener.events.size());
// XML parser may or may not support line numbers.
