Repository: cxf Updated Branches: refs/heads/3.0.x-fixes d13b22b37 -> f49297cff
Fixing Sagger2 systests Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f49297cf Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f49297cf Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f49297cf Branch: refs/heads/3.0.x-fixes Commit: f49297cffa234d2838106bad65869fb57068c95a Parents: d13b22b Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Fri Mar 18 15:51:13 2016 +0100 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Fri Mar 18 17:14:55 2016 +0100 ---------------------------------------------------------------------- .../AbstractSwagger2ServiceDescriptionTest.java | 1 + ...gger2NonAnnotatedServiceDescriptionTest.java | 2 +- .../jaxrs/description/swagger2-noano-yaml.txt | 4 ++- .../systest/jaxrs/description/swagger2-yaml.txt | 33 ++++++++++++++++++-- 4 files changed, 36 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f49297cf/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java index 3332f47..bf4b168 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwagger2ServiceDescriptionTest.java @@ -55,6 +55,7 @@ public abstract class AbstractSwagger2ServiceDescriptionTest extends AbstractBus this.runAsFilter = runAsFilter; } + @Override protected void run() { final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean(); sf.setResourceClasses(BookStoreSwagger2.class); http://git-wip-us.apache.org/repos/asf/cxf/blob/f49297cf/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java index f47af93..dd56fe2 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2NonAnnotatedServiceDescriptionTest.java @@ -77,6 +77,6 @@ public class Swagger2NonAnnotatedServiceDescriptionTest extends AbstractSwagger2 @Override protected String getExpectedFileYaml() { - return "swagger2-noano-json.txt"; + return "swagger2-noano-yaml.txt"; } } http://git-wip-us.apache.org/repos/asf/cxf/blob/f49297cf/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-yaml.txt ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-yaml.txt b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-yaml.txt index 8bd33ee..5ef0eb4 100644 --- a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-yaml.txt +++ b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-noano-yaml.txt @@ -29,12 +29,14 @@ paths: /bookstore/names: get: operationId: "getBookNames" + produces: + - "application/json" parameters: - name: "page" in: "query" required: false type: "integer" - default: "1" + default: 1 format: "int32" responses: default: http://git-wip-us.apache.org/repos/asf/cxf/blob/f49297cf/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-yaml.txt ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-yaml.txt b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-yaml.txt index 75c34d0..1947c41 100644 --- a/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-yaml.txt +++ b/systests/jaxrs/src/test/resources/org/apache/cxf/systest/jaxrs/description/swagger2-yaml.txt @@ -29,7 +29,7 @@ paths: description: "Page to fetch" required: true type: "integer" - default: "1" + default: 1 format: "int32" responses: 200: @@ -38,6 +38,35 @@ paths: type: "array" items: $ref: "#/definitions/Book" + /bookstore/name/{id}: + get: + operationId: "getBookName" + parameters: + - name: "id" + in: "path" + required: true + type: "string" + responses: + 200: + description: "successful operation" + schema: + type: "string" + headers: {} + /bookstore/names: + get: + operationId: "getBookNames" + produces: + - "application/json" + parameters: + - name: "page" + in: "query" + required: false + type: "integer" + default: 1 + format: "int32" + responses: + default: + description: "successful operation" /bookstore/{id}: get: tags: @@ -84,4 +113,4 @@ definitions: type: "integer" format: "int64" xml: - name: "Book" + name: "Book" \ No newline at end of file
