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 04fb90d3f Test modernization
04fb90d3f is described below
commit 04fb90d3fa5d7b0a30bcae82fb9219eea0ddc0a9
Author: James Bognar <[email protected]>
AuthorDate: Wed Aug 27 15:38:22 2025 -0400
Test modernization
---
.../src/test/java/org/apache/juneau/TestUtils.java | 4 +-
.../httppart/HttpPartSchema_Response_Test.java | 86 +++------
.../java/org/apache/juneau/rest/Swagger_Test.java | 200 ++++++---------------
.../rest/annotation/Swagger_Header_Test.java | 12 +-
.../juneau/rest/annotation/Swagger_Path_Test.java | 12 +-
.../juneau/rest/annotation/Swagger_Query_Test.java | 24 +--
6 files changed, 89 insertions(+), 249 deletions(-)
diff --git a/juneau-utest/src/test/java/org/apache/juneau/TestUtils.java
b/juneau-utest/src/test/java/org/apache/juneau/TestUtils.java
index d61941b3e..72b68066b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/TestUtils.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/TestUtils.java
@@ -331,8 +331,8 @@ public class TestUtils extends Utils2 {
var pn = i == -1 ? name : name.substring(0, i);
var spn = i == -1 ? null : Utils.splitNestedInner(name);
var e = TestUtils.getEntry(o, pn);
- if (spn == null) return r(e);
- return spn.stream().map(x -> getReadableEntry(e,
x)).collect(joining(","));
+ if (spn == null || e == null) return r(e);
+ return spn.stream().map(x -> getReadableEntry(e,
x)).collect(joining(",","{","}"));
}
@SuppressWarnings("unchecked")
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Response_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Response_Test.java
index a5d87500e..3e769c424 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Response_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Response_Test.java
@@ -13,7 +13,6 @@
package org.apache.juneau.httppart;
import static org.apache.juneau.TestUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
@@ -115,77 +114,32 @@ class HttpPartSchema_Response_Test extends SimpleTestBase
{
@Test void a05_basic_nestedItems_onClass() {
var s = HttpPartSchema.create().apply(Response.class,
A05.class).noValidate().build();
- assertEquals(HttpPartDataType.NUMBER, s.getType());
- assertEquals(HttpPartFormat.INT32, s.getFormat());
- assertEquals(1, s.getMaximum());
- assertEquals(2, s.getMinimum());
- assertEquals(3, s.getMultipleOf());
- assertEquals("4", s.getPattern().pattern());
- assertEquals(1, s.getMaxLength().longValue());
- assertEquals(2, s.getMinLength().longValue());
- assertEquals(3, s.getMaxItems().longValue());
- assertEquals(4, s.getMinItems().longValue());
- assertEquals(5, s.getMaxProperties().longValue());
- assertEquals(6, s.getMinProperties().longValue());
- assertTrue(s.isExclusiveMaximum());
- assertTrue(s.isExclusiveMinimum());
- assertTrue(s.isUniqueItems());
- assertJson(s.getEnum(), "['e1','e2']");
- assertEquals("c1\nc2", s.getDefault());
+ assertBean(
+ s,
+
"type,format,maximum,minimum,multipleOf,pattern,maxLength,minLength,maxItems,minItems,maxProperties,minProperties,exclusiveMaximum,exclusiveMinimum,uniqueItems,enum,default",
+
"number,int32,1,2,3,4,1,2,3,4,5,6,true,true,true,[e1,e2],c1\nc2"
+ );
var items = s.getItems();
- assertEquals(HttpPartDataType.INTEGER, items.getType());
- assertEquals(HttpPartFormat.INT64, items.getFormat());
- assertEquals(HttpPartCollectionFormat.SSV,
items.getCollectionFormat());
- assertEquals(5, items.getMaximum());
- assertEquals(6, items.getMinimum());
- assertEquals(7, items.getMultipleOf());
- assertEquals("8", items.getPattern().pattern());
- assertEquals(5, items.getMaxLength().longValue());
- assertEquals(6, items.getMinLength().longValue());
- assertEquals(7, items.getMaxItems().longValue());
- assertEquals(8, items.getMinItems().longValue());
- assertFalse(items.isExclusiveMaximum());
- assertFalse(items.isExclusiveMinimum());
- assertFalse(items.isUniqueItems());
- assertJson(items.getEnum(), "['e3','e4']");
- assertEquals("c3\nc4", items.getDefault());
+ assertBean(
+ items,
+
"type,format,collectionFormat,maximum,minimum,multipleOf,pattern,maxLength,minLength,maxItems,minItems,exclusiveMaximum,exclusiveMinimum,uniqueItems,enum,default",
+
"integer,int64,ssv,5,6,7,8,5,6,7,8,false,false,false,[e3,e4],c3\nc4"
+ );
items = items.getItems();
- assertEquals(HttpPartDataType.STRING, items.getType());
- assertEquals(HttpPartFormat.FLOAT, items.getFormat());
- assertEquals(HttpPartCollectionFormat.TSV,
items.getCollectionFormat());
- assertEquals(9, items.getMaximum());
- assertEquals(10, items.getMinimum());
- assertEquals(11, items.getMultipleOf());
- assertEquals("12", items.getPattern().pattern());
- assertEquals(9, items.getMaxLength().longValue());
- assertEquals(10, items.getMinLength().longValue());
- assertEquals(11, items.getMaxItems().longValue());
- assertEquals(12, items.getMinItems().longValue());
- assertTrue(items.isExclusiveMaximum());
- assertTrue(items.isExclusiveMinimum());
- assertTrue(items.isUniqueItems());
- assertJson(items.getEnum(), "['e5','e6']");
- assertEquals("c5\nc6", items.getDefault());
+ assertBean(
+ items,
+
"type,format,collectionFormat,maximum,minimum,multipleOf,pattern,maxLength,minLength,maxItems,minItems,exclusiveMaximum,exclusiveMinimum,uniqueItems,enum,default",
+
"string,float,tsv,9,10,11,12,9,10,11,12,true,true,true,[e5,e6],c5\nc6"
+ );
items = items.getItems();
- assertEquals(HttpPartDataType.ARRAY, items.getType());
- assertEquals(HttpPartFormat.DOUBLE, items.getFormat());
- assertEquals(HttpPartCollectionFormat.PIPES,
items.getCollectionFormat());
- assertEquals(13, items.getMaximum());
- assertEquals(14, items.getMinimum());
- assertEquals(15, items.getMultipleOf());
- assertEquals("16", items.getPattern().pattern());
- assertEquals(13, items.getMaxLength().longValue());
- assertEquals(14, items.getMinLength().longValue());
- assertEquals(15, items.getMaxItems().longValue());
- assertEquals(16, items.getMinItems().longValue());
- assertFalse(items.isExclusiveMaximum());
- assertFalse(items.isExclusiveMinimum());
- assertFalse(items.isUniqueItems());
- assertJson(items.getEnum(), "['e7','e8']");
- assertEquals("c7\nc8", items.getDefault());
+ assertBean(
+ items,
+
"type,format,collectionFormat,maximum,minimum,multipleOf,pattern,maxLength,minLength,maxItems,minItems,exclusiveMaximum,exclusiveMinimum,uniqueItems,enum,default",
+
"array,double,pipes,13,14,15,16,13,14,15,16,false,false,false,[e7,e8],c7\nc8"
+ );
}
//-----------------------------------------------------------------------------------------------------------------
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 c47fab2fd..3d560437c 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
@@ -83,18 +83,10 @@ class Swagger_Test extends SimpleTestBase {
public static class A1 {}
@Test void a01_swagger_default() throws Exception {
- var x = getSwagger(new A1());
- assertEquals("2.0", x.getSwagger());
- assertEquals(null, x.getHost());
- assertEquals(null, x.getBasePath());
- assertEquals(null, x.getSchemes());
+ assertBean(getSwagger(new A1()),
"swagger,host,basePath,schemes", "2.0,null,null,null");
}
@Test void a01_swagger_default_withFile() throws Exception {
- var x = getSwaggerWithFile(new A1());
- assertEquals("0.0", x.getSwagger());
- assertEquals("s-host", x.getHost());
- assertEquals("s-basePath", x.getBasePath());
- assertJson(x.getSchemes(), "['s-scheme']");
+ assertBean(getSwaggerWithFile(new A1()),
"swagger,host,basePath,schemes", "0.0,s-host,s-basePath,[s-scheme]");
}
@@ -102,18 +94,10 @@ class Swagger_Test extends SimpleTestBase {
public static class A2 {}
@Test void a02_swagger_Swagger_value() throws Exception {
- var x = getSwagger(new A2());
- assertEquals("3.0", x.getSwagger());
- assertEquals("a-host", x.getHost());
- assertEquals("a-basePath", x.getBasePath());
- assertJson(x.getSchemes(), "['a-scheme']");
+ assertBean(getSwagger(new A2()),
"swagger,host,basePath,schemes", "3.0,a-host,a-basePath,[a-scheme]");
}
@Test void a02_swagger_Swagger_value_withFile() throws Exception {
- var x = getSwaggerWithFile(new A2());
- assertEquals("3.0", x.getSwagger());
- assertEquals("a-host", x.getHost());
- assertEquals("a-basePath", x.getBasePath());
- assertJson(x.getSchemes(), "['a-scheme']");
+ assertBean(getSwaggerWithFile(new A2()),
"swagger,host,basePath,schemes", "3.0,a-host,a-basePath,[a-scheme]");
}
//------------------------------------------------------------------------------------------------------------------
@@ -127,22 +111,19 @@ class Swagger_Test extends SimpleTestBase {
public static class B1 {}
@Test void b01a_info_Rest() throws Exception {
- var x = getSwagger(new B1()).getInfo();
- assertEquals("a-title", x.getTitle());
- assertEquals("a-description", x.getDescription());
- assertEquals(null, x.getVersion());
- assertEquals(null, x.getTermsOfService());
- assertEquals(null, x.getContact());
- assertEquals(null, x.getLicense());
+ assertBean(
+ getSwagger(new B1()).getInfo(),
+
"title,description,version,termsOfService,contact,license",
+ "a-title,a-description,null,null,null,null"
+ );
}
+
@Test void b01b_info_Rest_withFile() throws Exception {
- var x = getSwaggerWithFile(new B1()).getInfo();
- assertEquals("s-title", x.getTitle());
- assertEquals("s-description", x.getDescription());
- assertEquals("0.0.0", x.getVersion());
- assertEquals("s-termsOfService", x.getTermsOfService());
- assertJson(x.getContact(),
"{name:'s-name',url:'s-url',email:'s-email'}");
- assertJson(x.getLicense(), "{name:'s-name',url:'s-url'}");
+ assertBean(
+ getSwaggerWithFile(new B1()).getInfo(),
+
"title,description,version,termsOfService,contact{name,url,email},license{name,url}",
+
"s-title,s-description,0.0.0,s-termsOfService,{s-name,s-url,s-email},{s-name,s-url}"
+ );
}
@Rest(
@@ -153,14 +134,10 @@ class Swagger_Test extends SimpleTestBase {
public static class B2 {}
@Test void b02a_info_Rest_localized() throws Exception {
- var x = getSwagger(new B2()).getInfo();
- assertEquals("l-foo", x.getTitle());
- assertEquals("l-foo", x.getDescription());
+ assertBean(getSwagger(new B2()).getInfo(), "title,description",
"l-foo,l-foo");
}
@Test void b02b_info_Rest_localized_withFile() throws Exception {
- var x = getSwaggerWithFile(new B2()).getInfo();
- assertEquals("s-title", x.getTitle());
- assertEquals("s-description", x.getDescription());
+ assertBean(getSwaggerWithFile(new B2()).getInfo(),
"title,description", "s-title,s-description");
}
@Rest(
@@ -182,22 +159,18 @@ class Swagger_Test extends SimpleTestBase {
public static class B3 {}
@Test void b03a_info_Swagger_value() throws Exception {
- var x = getSwagger(new B3()).getInfo();
- assertEquals("b-title", x.getTitle());
- assertEquals("b-description", x.getDescription());
- assertEquals("2.0.0", x.getVersion());
- assertEquals("a-termsOfService", x.getTermsOfService());
- assertJson(x.getContact(),
"{name:'a-name',url:'a-url',email:'a-email'}");
- assertJson(x.getLicense(), "{name:'a-name',url:'a-url'}");
+ assertBean(
+ getSwagger(new B3()).getInfo(),
+
"title,description,version,termsOfService,contact{name,url,email},license{name,url}",
+
"b-title,b-description,2.0.0,a-termsOfService,{a-name,a-url,a-email},{a-name,a-url}"
+ );
}
@Test void b03b_info_Swagger_value_withFile() throws Exception {
- var x = getSwaggerWithFile(new B3()).getInfo();
- assertEquals("b-title", x.getTitle());
- assertEquals("b-description", x.getDescription());
- assertEquals("2.0.0", x.getVersion());
- assertEquals("a-termsOfService", x.getTermsOfService());
- assertJson(x.getContact(),
"{name:'a-name',url:'a-url',email:'a-email'}");
- assertJson(x.getLicense(), "{name:'a-name',url:'a-url'}");
+ assertBean(
+ getSwaggerWithFile(new B3()).getInfo(),
+
"title,description,version,termsOfService,contact{name,url,email},license{name,url}",
+
"b-title,b-description,2.0.0,a-termsOfService,{a-name,a-url,a-email},{a-name,a-url}"
+ );
}
@Rest(
@@ -209,10 +182,8 @@ class Swagger_Test extends SimpleTestBase {
public static class B4 {}
@Test void b04_info_Swagger_value_localised() throws Exception {
- assertEquals("l-bar", getSwagger(new
B4()).getInfo().getTitle());
- assertEquals("l-bar", getSwaggerWithFile(new
B4()).getInfo().getTitle());
- assertEquals("l-bar", getSwagger(new
B4()).getInfo().getDescription());
- assertEquals("l-bar", getSwaggerWithFile(new
B4()).getInfo().getDescription());
+ assertBean(getSwagger(new B4()), "info{title,description}",
"{l-bar,l-bar}");
+ assertBean(getSwaggerWithFile(new B4()),
"info{title,description}", "{l-bar,l-bar}");
}
@Rest(
@@ -241,21 +212,19 @@ class Swagger_Test extends SimpleTestBase {
@Test void b05a_info_Swagger_title() throws Exception {
var x = getSwagger(new B5()).getInfo();
- assertEquals("c-title", x.getTitle());
- assertEquals("c-description", x.getDescription());
- assertEquals("3.0.0", x.getVersion());
- assertEquals("b-termsOfService", x.getTermsOfService());
- assertJson(x.getContact(),
"{name:'b-name',url:'b-url',email:'b-email'}");
- assertJson(x.getLicense(), "{name:'b-name',url:'b-url'}");
+ assertBean(
+ x,
+
"title,description,version,termsOfService,contact{name,url,email},license{name,url}",
+
"c-title,c-description,3.0.0,b-termsOfService,{b-name,b-url,b-email},{b-name,b-url}"
+ );
}
@Test void b05b_info_Swagger_title_withFile() throws Exception {
var x = getSwaggerWithFile(new B5()).getInfo();
- assertEquals("c-title", x.getTitle());
- assertEquals("c-description", x.getDescription());
- assertEquals("3.0.0", x.getVersion());
- assertEquals("b-termsOfService", x.getTermsOfService());
- assertJson(x.getContact(),
"{name:'b-name',url:'b-url',email:'b-email'}");
- assertJson(x.getLicense(), "{name:'b-name',url:'b-url'}");
+ assertBean(
+ x,
+
"title,description,version,termsOfService,contact{name,url,email},license{name,url}",
+
"c-title,c-description,3.0.0,b-termsOfService,{b-name,b-url,b-email},{b-name,b-url}"
+ );
}
@Rest(
@@ -622,20 +591,11 @@ class Swagger_Test extends SimpleTestBase {
}
@Test void e01a_operation_summary_default() throws Exception {
- var x = getSwagger(new
E1()).getPaths().get("/path/{foo}").get("get");
- assertEquals("a", x.getOperationId());
- assertEquals(null, x.getSummary());
- assertEquals(null, x.getDescription());
- assertEquals(null, x.getDeprecated());
- assertEquals(null, x.getSchemes());
+ assertBean(getSwagger(new
E1()).getPaths().get("/path/{foo}").get("get"),
"operationId,summary,description,deprecated,schemes", "a,null,null,false,null");
}
+
@Test void e01b_operation_summary_default_withFile() throws Exception {
- var x = getSwaggerWithFile(new
E1()).getPaths().get("/path/{foo}").get("get");
- assertEquals("s-operationId", x.getOperationId());
- assertEquals("s-summary", x.getSummary());
- assertEquals("s-description", x.getDescription());
- assertJson(x.getDeprecated(), "true");
- assertJson(x.getSchemes(), "['s-scheme']");
+ assertBean(getSwaggerWithFile(new
E1()).getPaths().get("/path/{foo}").get("get"),
"operationId,summary,description,deprecated,schemes",
"s-operationId,s-summary,s-description,true,[s-scheme]");
}
@Rest(
@@ -651,20 +611,10 @@ class Swagger_Test extends SimpleTestBase {
}
@Test void e02a_operation_summary_swaggerOnClass() throws Exception {
- var x = getSwagger(new
E2()).getPaths().get("/path/{foo}").get("get");
- assertEquals("a-operationId", x.getOperationId());
- assertEquals("a-summary", x.getSummary());
- assertEquals("a-description", x.getDescription());
- assertJson(x.getDeprecated(), "false");
- assertJson(x.getSchemes(), "['a-scheme']");
+ assertBean(getSwagger(new
E2()).getPaths().get("/path/{foo}").get("get"),
"operationId,summary,description,deprecated,schemes",
"a-operationId,a-summary,a-description,false,[a-scheme]");
}
@Test void e02b_operation_summary_swaggerOnClass_withFile() throws
Exception {
- var x = getSwaggerWithFile(new
E2()).getPaths().get("/path/{foo}").get("get");
- assertEquals("a-operationId", x.getOperationId());
- assertEquals("a-summary", x.getSummary());
- assertEquals("a-description", x.getDescription());
- assertJson(x.getDeprecated(), "false");
- assertJson(x.getSchemes(), "['a-scheme']");
+ assertBean(getSwaggerWithFile(new
E2()).getPaths().get("/path/{foo}").get("get"),
"operationId,summary,description,deprecated,schemes",
"a-operationId,a-summary,a-description,false,[a-scheme]");
}
@Rest(
@@ -682,20 +632,10 @@ class Swagger_Test extends SimpleTestBase {
}
@Test void e03a_operation_summary_swaggerOnMethod() throws Exception {
- var x = getSwagger(new
E3()).getPaths().get("/path/{foo}").get("get");
- assertEquals("b-operationId", x.getOperationId());
- assertEquals("b-summary", x.getSummary());
- assertEquals("b-description", x.getDescription());
- assertJson(x.getDeprecated(), "false");
- assertJson(x.getSchemes(), "['b-scheme']");
+ assertBean(getSwagger(new
E3()).getPaths().get("/path/{foo}").get("get"),
"operationId,summary,description,deprecated,schemes",
"b-operationId,b-summary,b-description,false,[b-scheme]");
}
@Test void e03b_operation_summary_swaggerOnMethod_withFile() throws
Exception {
- var x = getSwaggerWithFile(new
E3()).getPaths().get("/path/{foo}").get("get");
- assertEquals("b-operationId", x.getOperationId());
- assertEquals("b-summary", x.getSummary());
- assertEquals("b-description", x.getDescription());
- assertJson(x.getDeprecated(), "false");
- assertJson(x.getSchemes(), "['b-scheme']");
+ assertBean(getSwaggerWithFile(new
E3()).getPaths().get("/path/{foo}").get("get"),
"operationId,summary,description,deprecated,schemes",
"b-operationId,b-summary,b-description,false,[b-scheme]");
}
@Rest(
@@ -719,18 +659,10 @@ class Swagger_Test extends SimpleTestBase {
}
@Test void e04a_operation_summary_swaggerOnAnnotation() throws
Exception {
- var x = getSwagger(new
E4()).getPaths().get("/path/{foo}").get("get");
- assertEquals("c-operationId", x.getOperationId());
- assertEquals("c-summary", x.getSummary());
- assertEquals("c-description", x.getDescription());
- assertJson(x.getSchemes(), "['d-scheme-1','d-scheme-2']");
+ assertBean(getSwagger(new
E4()).getPaths().get("/path/{foo}").get("get"),
"operationId,summary,description,schemes",
"c-operationId,c-summary,c-description,[d-scheme-1,d-scheme-2]");
}
@Test void e04b_operation_summary_swaggerOnAnnotation_withFile() throws
Exception {
- var x = getSwaggerWithFile(new
E4()).getPaths().get("/path/{foo}").get("get");
- assertEquals("c-operationId", x.getOperationId());
- assertEquals("c-summary", x.getSummary());
- assertEquals("c-description", x.getDescription());
- assertJson(x.getSchemes(), "['d-scheme-1','d-scheme-2']");
+ assertBean(getSwaggerWithFile(new
E4()).getPaths().get("/path/{foo}").get("get"),
"operationId,summary,description,schemes",
"c-operationId,c-summary,c-description,[d-scheme-1,d-scheme-2]");
}
@Rest(
@@ -755,20 +687,10 @@ class Swagger_Test extends SimpleTestBase {
}
@Test void e05a_operation_summary_swaggerOnAnnotation_localized()
throws Exception {
- var x = getSwagger(new
E5()).getPaths().get("/path/{foo}").get("get");
- assertEquals("l-foo", x.getOperationId());
- assertEquals("l-foo", x.getSummary());
- assertEquals("l-foo", x.getDescription());
- assertJson(x.getDeprecated(), "false");
- assertJson(x.getSchemes(), "['l-foo']");
+ assertBean(getSwagger(new
E5()).getPaths().get("/path/{foo}").get("get"),
"operationId,summary,description,deprecated,schemes",
"l-foo,l-foo,l-foo,false,[l-foo]");
}
@Test void
e05b_operation_summary_swaggerOnAnnotation_localized_withFile() throws
Exception {
- var x = getSwaggerWithFile(new
E5()).getPaths().get("/path/{foo}").get("get");
- assertEquals("l-foo", x.getOperationId());
- assertEquals("l-foo", x.getSummary());
- assertEquals("l-foo", x.getDescription());
- assertJson(x.getDeprecated(), "false");
- assertJson(x.getSchemes(), "['l-foo']");
+ assertBean(getSwaggerWithFile(new
E5()).getPaths().get("/path/{foo}").get("get"),
"operationId,summary,description,deprecated,schemes",
"l-foo,l-foo,l-foo,false,[l-foo]");
}
@Rest(
@@ -1287,23 +1209,11 @@ class Swagger_Test extends SimpleTestBase {
@Test void k01a_query_type_default() throws Exception {
var x = getSwagger(new
K1()).getPaths().get("/path/{foo}/query").get("get").getParameter("query",
"foo");
- assertEquals("object", x.getType());
- assertEquals(null, x.getDescription());
- assertEquals(null, x.getRequired());
- assertEquals(null, x.getAllowEmptyValue());
- assertEquals(null, x.getExclusiveMaximum());
- assertEquals(null, x.getExclusiveMinimum());
- assertEquals(null, x.getUniqueItems());
- assertEquals(null, x.getFormat());
- assertEquals(null, x.getCollectionFormat());
- assertEquals(null, x.getPattern());
- assertEquals(null, x.getMaximum());
- assertEquals(null, x.getMinimum());
- assertEquals(null, x.getMultipleOf());
- assertEquals(null, x.getMaxLength());
- assertEquals(null, x.getMinLength());
- assertEquals(null, x.getMaxItems());
- assertEquals(null, x.getMinItems());
+ assertBean(
+ x,
+
"type,description,required,allowEmptyValue,exclusiveMaximum,exclusiveMinimum,uniqueItems,format,collectionFormat,pattern,maximum,minimum,multipleOf,maxLength,minLength,maxItems,minItems",
+
"object,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null"
+ );
}
@Test void k01b_query_type_default_withFile() throws Exception {
var x = getSwaggerWithFile(new
K1()).getPaths().get("/path/{foo}/query").get("get").getParameter("query",
"foo");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Header_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Header_Test.java
index 94a81df61..2f1cc65b8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Header_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Header_Test.java
@@ -155,19 +155,13 @@ class Swagger_Header_Test extends SimpleTestBase {
var s = getSwagger(D.class);
var x = s.getParameterInfo("/a","get","header","H");
- assertEquals("H", x.getName());
- assertEquals("a\nb", x.getDescription());
- assertEquals("string", x.getType());
+ assertBean(x, "name,description,type", "H,a\nb,string");
x = s.getParameterInfo("/b","put","header","H");
- assertEquals("H", x.getName());
- assertEquals("a\nb", x.getDescription());
- assertEquals("string", x.getType());
+ assertBean(x, "name,description,type", "H,a\nb,string");
x = s.getParameterInfo("/c","post","header","H");
- assertEquals("H", x.getName());
- assertEquals("b\nc", x.getDescription());
- assertEquals("string", x.getType());
+ assertBean(x, "name,description,type", "H,b\nc,string");
x = s.getParameterInfo("/d","delete","header","H");
assertEquals("H", x.getName());
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
index bf9794db6..42b752cc2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
@@ -107,23 +107,17 @@ class Swagger_Path_Test extends SimpleTestBase {
var s = getSwagger(A.class);
var x = s.getParameterInfo("/a/{P}","get","path","P");
- assertEquals("P", x.getName());
- assertEquals("a\nb", x.getDescription());
- assertEquals("string", x.getType());
+ assertBean(x, "name,description,type", "P,a\nb,string");
assertJson(x.getEnum(), "['a','b']");
assertJson(x,
"{'in':'path',name:'P',type:'string',description:'a\\nb',required:true,'enum':['a','b']}");
x = s.getParameterInfo("/b/{P}","put","path","P");
- assertEquals("P", x.getName());
- assertEquals("a\nb", x.getDescription());
- assertEquals("string", x.getType());
+ assertBean(x, "name,description,type", "P,a\nb,string");
assertJson(x.getEnum(), "['a','b']");
assertJson(x,
"{'in':'path',name:'P',type:'string',description:'a\\nb',required:true,'enum':['a','b']}");
x = s.getParameterInfo("/c/{P}","post","path","P");
- assertEquals("P", x.getName());
- assertEquals("b\nc", x.getDescription());
- assertEquals("string", x.getType());
+ assertBean(x, "name,description,type", "P,b\nc,string");
assertJson(x.getEnum(), "['b','c']");
assertJson(x,
"{'in':'path',name:'P',type:'string',description:'b\\nc',required:true,'enum':['b','c']}");
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Query_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Query_Test.java
index 11be6004d..e060e88df 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Query_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Query_Test.java
@@ -70,19 +70,13 @@ class Swagger_Query_Test extends SimpleTestBase {
var s = getSwagger(A.class);
var x = s.getParameterInfo("/a","get","query","Q");
- assertEquals("Q", x.getName());
- assertEquals("a\nb", x.getDescription());
- assertEquals("string", x.getType());
+ assertBean(x, "name,description,type", "Q,a\nb,string");
x = s.getParameterInfo("/b","put","query","Q");
- assertEquals("Q", x.getName());
- assertEquals("a\nb", x.getDescription());
- assertEquals("string", x.getType());
+ assertBean(x, "name,description,type", "Q,a\nb,string");
x = s.getParameterInfo("/c","post","query","Q");
- assertEquals("Q", x.getName());
- assertEquals("b\nc", x.getDescription());
- assertEquals("string", x.getType());
+ assertBean(x, "name,description,type", "Q,b\nc,string");
x = s.getParameterInfo("/d","delete","query","Q");
assertEquals("Q", x.getName());
@@ -169,19 +163,13 @@ class Swagger_Query_Test extends SimpleTestBase {
var s = getSwagger(D.class);
var x = s.getParameterInfo("/a","get","query","Q");
- assertEquals("Q", x.getName());
- assertEquals("a\nb", x.getDescription());
- assertEquals("string", x.getType());
+ assertBean(x, "name,description,type", "Q,a\nb,string");
x = s.getParameterInfo("/b","put","query","Q");
- assertEquals("Q", x.getName());
- assertEquals("a\nb", x.getDescription());
- assertEquals("string", x.getType());
+ assertBean(x, "name,description,type", "Q,a\nb,string");
x = s.getParameterInfo("/c","post","query","Q");
- assertEquals("Q", x.getName());
- assertEquals("b\nc", x.getDescription());
- assertEquals("string", x.getType());
+ assertBean(x, "name,description,type", "Q,b\nc,string");
x = s.getParameterInfo("/d","delete","query","Q");
assertEquals("Q", x.getName());
