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 e663ba324 Test modernization
e663ba324 is described below
commit e663ba3241e561e1866116a63404926a19696340
Author: James Bognar <[email protected]>
AuthorDate: Thu Aug 28 11:19:40 2025 -0400
Test modernization
---
.../apache/juneau/dto/swagger/SchemaInfo_Test.java | 41 ++++------------------
.../apache/juneau/dto/swagger/Swagger_Test.java | 25 ++++---------
2 files changed, 13 insertions(+), 53 deletions(-)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/SchemaInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/SchemaInfo_Test.java
index 362ff6481..e27be40a5 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/SchemaInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/SchemaInfo_Test.java
@@ -33,13 +33,13 @@ class SchemaInfo_Test extends SimpleTestBase {
*/
@Test void a01_gettersAndSetters() {
var t = new SchemaInfo();
- assertEquals("foo", t.setFormat("foo").getFormat());
+ assertBean(t.setFormat("foo"), "format", "foo");
assertNull(t.setFormat(null).getFormat());
- assertEquals("foo", t.setTitle("foo").getTitle());
+ assertBean(t.setTitle("foo"), "title", "foo");
assertNull(t.setTitle(null).getTitle());
- assertEquals("foo", t.setDescription("foo").getDescription());
+ assertBean(t.setDescription("foo"), "description", "foo");
assertNull(t.setDescription(null).getDescription());
- assertEquals("foo", t.setDefault("foo").getDefault());
+ assertBean(t.setDefault("foo"), "default", "foo");
assertString("foo", t.setDefault(new
StringBuilder("foo")).getDefault());
assertNull(t.setDefault(null).getDefault());
assertEquals(123, t.setMultipleOf(123).getMultipleOf());
@@ -197,36 +197,9 @@ class SchemaInfo_Test extends SimpleTestBase {
assertJson(t,
"{format:'i',title:'m',description:'e','default':'a',multipleOf:123.0,maximum:123.0,exclusiveMaximum:true,minimum:123.0,exclusiveMinimum:true,maxLength:123,minLength:123,pattern:'k',maxItems:123,minItems:123,uniqueItems:true,maxProperties:123,minProperties:123,requiredProperties:['x'],'enum':['b'],type:'n',items:{type:'j'},allOf:['d'],properties:{l:{l1:1}},additionalProperties:{c:['c1']},discriminator:'f',readOnly:true,xml:{name:'o'},externalDocs:{url:'h'},example:'g','$r
[...]
- assertEquals("a", t.get("default", String.class));
- assertEquals("['b']", t.get("enum", String.class));
- assertEquals("{c:['c1']}", t.get("additionalProperties",
String.class));
- assertEquals("['d']", t.get("allOf", String.class));
- assertEquals("e", t.get("description", String.class));
- assertEquals("f", t.get("discriminator", String.class));
- assertEquals("g", t.get("example", String.class));
- assertEquals("true", t.get("exclusiveMaximum", String.class));
- assertEquals("true", t.get("exclusiveMinimum", String.class));
- assertEquals("{url:'h'}", t.get("externalDocs", String.class));
- assertEquals("i", t.get("format", String.class));
- assertEquals("{type:'j'}", t.get("items", String.class));
- assertEquals("123.0", t.get("maximum", String.class));
- assertEquals("123", t.get("maxItems", String.class));
- assertEquals("123", t.get("maxLength", String.class));
- assertEquals("123", t.get("maxProperties", String.class));
- assertEquals("123.0", t.get("minimum", String.class));
- assertEquals("123", t.get("minItems", String.class));
- assertEquals("123", t.get("minLength", String.class));
- assertEquals("123", t.get("minProperties", String.class));
- assertEquals("123.0", t.get("multipleOf", String.class));
- assertEquals("k", t.get("pattern", String.class));
- assertEquals("{l:{l1:1}}", t.get("properties", String.class));
- assertEquals("true", t.get("readOnly", String.class));
- assertEquals("['x']", t.get("requiredProperties",
String.class));
- assertEquals("m", t.get("title", String.class));
- assertEquals("n", t.get("type", String.class));
- assertEquals("true", t.get("uniqueItems", String.class));
- assertEquals("{name:'o'}", t.get("xml", String.class));
- assertEquals("ref", t.get("$ref", String.class));
+ assertMapped(t, (obj,prop) -> obj.get(prop, String.class),
+
"default,enum,additionalProperties,allOf,description,discriminator,example,exclusiveMaximum,exclusiveMinimum,externalDocs,format,items,maximum,maxItems,maxLength,maxProperties,minimum,minItems,minLength,minProperties,multipleOf,pattern,properties,readOnly,requiredProperties,title,type,uniqueItems,xml,$ref",
+
"a,['b'],{c:['c1']},['d'],e,f,g,true,true,{url:'h'},i,{type:'j'},123.0,123,123,123,123.0,123,123,123,123.0,k,{l:{l1:1}},true,['x'],m,n,true,{name:'o'},ref");
assertType(StringBuilder.class, t.get("default", Object.class));
assertType(Set.class, t.get("enum", Object.class));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Swagger_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Swagger_Test.java
index e2fb885c7..cc2ef7b50 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Swagger_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/dto/swagger/Swagger_Test.java
@@ -35,12 +35,12 @@ class Swagger_Test extends SimpleTestBase {
*/
@Test void a01_gettersAndSetters() {
var t = new Swagger();
- assertEquals("foo", t.setSwagger("foo").getSwagger());
+ assertBean(t.setSwagger("foo"), "swagger", "foo");
assertNull(t.setSwagger(null).getSwagger());
assertJson(t.setInfo(info("foo", "bar")).getInfo(),
"{title:'foo',version:'bar'}");
- assertEquals("foo", t.setHost("foo").getHost());
+ assertBean(t.setHost("foo"), "host", "foo");
assertNull(t.setHost(null).getHost());
- assertEquals("foo", t.setBasePath("foo").getBasePath());
+ assertBean(t.setBasePath("foo"), "basePath", "foo");
assertNull(t.setBasePath(null).getBasePath());
assertJson(t.setSchemes(set("foo","bar")).getSchemes(),
"['foo','bar']");
assertJson(t.setSchemes(set()).getSchemes(), "[]");
@@ -147,22 +147,9 @@ class Swagger_Test extends SimpleTestBase {
assertJson(t,
"{swagger:'n',info:{title:'f1',version:'f2'},tags:[{name:'o'}],externalDocs:{url:'d'},basePath:'a',schemes:['k1'],consumes:['text/b'],produces:['text/i'],paths:{h:{h1:{operationId:'h2'}}},definitions:{c:{type:'c1'}},parameters:{g:{'in':'g1',name:'g2'}},responses:{j:{description:'j1'}},securityDefinitions:{m:{type:'m1'}},security:[{l1:['l2']}],'$ref':'ref'}");
- assertEquals("a", t.get("basePath", String.class));
- assertEquals("['text/b']", t.get("consumes", String.class));
- assertEquals("{c:{type:'c1'}}", t.get("definitions",
String.class));
- assertEquals("{url:'d'}", t.get("externalDocs", String.class));
- assertEquals("e", t.get("host", String.class));
- assertEquals("{title:'f1',version:'f2'}", t.get("info",
String.class));
- assertEquals("{g:{'in':'g1',name:'g2'}}", t.get("parameters",
String.class));
- assertEquals("{h:{h1:{operationId:'h2'}}}", t.get("paths",
String.class));
- assertEquals("['text/i']", t.get("produces", String.class));
- assertEquals("{j:{description:'j1'}}", t.get("responses",
String.class));
- assertEquals("['k1']", t.get("schemes", String.class));
- assertEquals("[{l1:['l2']}]", t.get("security", String.class));
- assertEquals("{m:{type:'m1'}}", t.get("securityDefinitions",
String.class));
- assertEquals("n", t.get("swagger", String.class));
- assertEquals("[{name:'o'}]", t.get("tags", String.class));
- assertEquals("ref", t.get("$ref", String.class));
+ assertMapped(t, (obj,prop) -> obj.get(prop, String.class),
+
"basePath,consumes,definitions,externalDocs,host,info,parameters,paths,produces,responses,schemes,security,securityDefinitions,swagger,tags,$ref",
+
"a,['text/b'],{c:{type:'c1'}},{url:'d'},e,{title:'f1',version:'f2'},{g:{'in':'g1',name:'g2'}},{h:{h1:{operationId:'h2'}}},['text/i'],{j:{description:'j1'}},['k1'],[{l1:['l2']}],{m:{type:'m1'}},n,[{name:'o'}],ref");
assertType(String.class, t.get("basePath", Object.class));
assertType(Set.class, t.get("consumes", Object.class));
