Skip to content

Add test case for InlineModelResolver: inline array schema #1772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 30, 2018
Merged

Add test case for InlineModelResolver: inline array schema #1772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
38d9430
Add test case
ackintosh Dec 29, 2018
7acd054
Delete legacy test case
ackintosh Dec 29, 2018
5391b5c
Add a test case: inline array schema
ackintosh Dec 29, 2018
74eeeed
Delete legacy test case
ackintosh Dec 29, 2018
efed31a
Fix test yaml
ackintosh Dec 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 21 additions & 67 deletions ...les/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,60 +274,22 @@ public void testInlineResponseModelWithTitle() throws Exception {
assertTrue(model.getProperties().get("name") instanceof StringSchema);
}



/*
@Test
public void resolveInlineArraySchemaWithTitle() throws Exception {
OpenAPI openapi = new 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())));
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);

new InlineModelResolver().flatten(openapi);
assertTrue(openAPI.getComponents().getSchemas().get("Users") instanceof ArraySchema);

Schema model = openapi.getComponents().getSchemas().get("User");
assertTrue(model instanceof ArraySchema);
ArraySchema users = (ArraySchema) openAPI.getComponents().getSchemas().get("Users");
assertTrue(users.getItems() instanceof ObjectSchema);

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();
Expand Down Expand Up @@ -385,30 +347,22 @@ public void resolveInlineBodyParameterWithTitle() throws Exception {

ObjectSchema impl = (ObjectSchema) body;
assertNotNull(impl.getProperties().get("address"));
}
}
*/

@Test
public void notResolveNonModelBodyParameter() throws Exception {
OpenAPI openapi = new OpenAPI();

openapi.path("/hello", new Path()
.get(new Operation()
.parameter(new BodyParameter()
.name("body")
.schema(new ObjectSchema()
.type("string")
.format("binary")))));
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);

new InlineModelResolver().flatten(openapi);
MediaType mediaType = openAPI.getPaths().get("/non_model_request_body").getPost().getRequestBody().getContent().get("multipart/form-data");

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();
Expand Down
24 changes: 23 additions & 1 deletion modules/openapi-generator/src/test/resources/3_0/inline_model_resolver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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