loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Add test case for InlineModelResolver: inline array schema (#1772)

Browse Source 
* Add test case

* Delete legacy test case

* Add a test case: inline array schema

* Delete legacy test case

* Fix test yaml
This commit is contained in:
Akihito Nakano 2018-12-30 10:32:02 +09:00 committed by GitHub
parent 6a4f3385d8
commit 77b5cea518
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java
View File

@ -274,60 +274,22 @@ public class InlineModelResolverTest {
assertTrue(model.getProperties().get("name") instanceof StringSchema);
}
/*
@Test
public void resolveInlineArraySchemaWithTitle() throws Exception {
OpenAPI openapi = new OpenAPI();
public void resolveInlineArraySchemaWithTitle() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI();
new InlineModelResolver().flatten(openAPI);
openapi.getComponents().addSchemas("User", new ArraySchema()
.items(new ObjectSchema()
.title("InnerUserTitle")
.access("access")
.readOnly(false)
.required(true)
.description("description")
.name("name")
.addProperties("street", new StringSchema())
.addProperties("city", new StringSchema())));
assertTrue(openAPI.getComponents().getSchemas().get("Users") instanceof ArraySchema);
new InlineModelResolver().flatten(openapi);
ArraySchema users = (ArraySchema) openAPI.getComponents().getSchemas().get("Users");
assertTrue(users.getItems() instanceof ObjectSchema);
Schema model = openapi.getComponents().getSchemas().get("User");
assertTrue(model instanceof ArraySchema);
Schema user = openapi.getComponents().getSchemas().get("InnerUserTitle");
assertNotNull(user);
assertEquals("description", user.getDescription());
ObjectSchema user = (ObjectSchema) users.getItems();
assertEquals("User", user.getTitle());
assertTrue(user.getProperties().get("street") instanceof StringSchema);
assertTrue(user.getProperties().get("city") instanceof StringSchema);
}
/*
@Test
public void resolveInlineArraySchemaWithoutTitle() throws Exception {
OpenAPI openapi = new OpenAPI();
openapi.getComponents().addSchemas("User", new ArraySchema()
.items(new ObjectSchema()
._default("default")
.access("access")
.readOnly(false)
.required(true)
.description("description")
.name("name")
.addProperties("street", new StringSchema())
.addProperties("city", new StringSchema())));
new InlineModelResolver().flatten(openapi);
Schema model = openapi.getComponents().getSchemas().get("User");
assertTrue(model instanceof ArraySchema);
Model user = openapi.getComponents().getSchemas().get("User_inner");
assertNotNull(user);
assertEquals("description", user.getDescription());
}
*/
@Test
public void resolveInlineRequestBody() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI();
@ -385,30 +347,22 @@ public class InlineModelResolverTest {
ObjectSchema impl = (ObjectSchema) body;
assertNotNull(impl.getProperties().get("address"));
}
}
*/
@Test
public void notResolveNonModelBodyParameter() throws Exception {
OpenAPI openapi = new OpenAPI();
public void nonModelRequestBody() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI();
new InlineModelResolver().flatten(openAPI);
openapi.path("/hello", new Path()
.get(new Operation()
.parameter(new BodyParameter()
.name("body")
.schema(new ObjectSchema()
.type("string")
.format("binary")))));
MediaType mediaType = openAPI.getPaths().get("/non_model_request_body").getPost().getRequestBody().getContent().get("multipart/form-data");
new InlineModelResolver().flatten(openapi);
Operation operation = openapi.getPaths().get("/hello").getGet();
BodyParameter bp = (BodyParameter)operation.getParameters().get(0);
assertTrue(bp.getSchema() instanceof ObjectSchema);
ObjectSchema m = (ObjectSchema) bp.getSchema();
assertEquals("string", m.getType());
assertEquals("binary", m.getFormat());
assertTrue(mediaType.getSchema() instanceof BinarySchema);
assertEquals("string", mediaType.getSchema().getType());
assertEquals("binary", mediaType.getSchema().getFormat());
}
/*
@Test
public void resolveInlineArrayBodyParameter() throws Exception {
OpenAPI openapi = new OpenAPI();

24
modules/openapi-generator/src/test/resources/3_0/inline_model_resolver.yaml
View File

@ -41,5 +41,27 @@ paths:
responses:
'200':
description: OK
/non_model_request_body:
post:
requestBody:
content:
multipart/form-data:
schema:
type: string
format: binary
operationId: nonModelRequestBody
responses:
'200':
description: OK
components:
schemas:
schemas:
Users:
type: array
items:
title: User
type: object
properties:
street:
type: string
city:
type: string