Skip to content

Improve test codes of InlineModelResolver #1787

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
ackintosh merged 4 commits into from
Jan 1, 2019
Merged

Improve test codes of InlineModelResolver #1787

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94aee21
Delete unnecessary "throws"
ackintosh Jan 1, 2019
b3f002b
Delete unnecessary cast expressions
ackintosh Jan 1, 2019
9ab507a
Tweak redundant assertions
ackintosh Jan 1, 2019
3ef4284
Delete unnecessary comment
ackintosh Jan 1, 2019
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
Prev Previous commit
Next Next commit
Delete unnecessary cast expressions
  • Loading branch information
@ackintosh
ackintosh committed Jan 1, 2019
commit b3f002b261f08ce0fd935364dbb645391a96e39b
24 changes: 12 additions & 12 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 @@ -52,18 +52,18 @@ public void resolveInlineModelTestWithoutTitle() {
.addProperties("street", new StringSchema())
.addProperties("city", new StringSchema())));

assertNotNull(((Schema) openapi.getComponents().getSchemas().get("User")).getProperties().get("address"));
assertNotNull((openapi.getComponents().getSchemas().get("User")).getProperties().get("address"));

new InlineModelResolver().flatten(openapi);

Schema user = (Schema) openapi.getComponents().getSchemas().get("User");
Schema user = openapi.getComponents().getSchemas().get("User");

assertNotNull(user);
assertNotNull(user.getProperties().get("address"));
assertNotNull(((Schema) user.getProperties().get("address")).get$ref());
assertEquals(((Schema) user.getProperties().get("address")).get$ref(), "#/components/schemas/User_address");

Schema address = (Schema) openapi.getComponents().getSchemas().get("User_address");
Schema address = openapi.getComponents().getSchemas().get("User_address");
assertNotNull(address);
assertNotNull(address.getProperties().get("city"));
assertNotNull(address.getProperties().get("street"));
Expand All @@ -87,12 +87,12 @@ public void resolveInlineModelTestWithTitle() {

new InlineModelResolver().flatten(openapi);

Schema user = (Schema) openapi.getComponents().getSchemas().get("User");
Schema user = openapi.getComponents().getSchemas().get("User");

assertNotNull(user);
assertTrue(user.getProperties().get("address") instanceof Schema);

Schema address = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle");
Schema address = openapi.getComponents().getSchemas().get("UserAddressTitle");
assertNotNull(address);
assertNotNull(address.getProperties().get("city"));
assertNotNull(address.getProperties().get("street"));
Expand Down Expand Up @@ -134,11 +134,11 @@ public void resolveInlineModel2EqualInnerModels() {
assertNotNull(user);
assertTrue(user.getProperties().get("address") instanceof Schema);

Schema address = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle");
Schema address = openapi.getComponents().getSchemas().get("UserAddressTitle");
assertNotNull(address);
assertNotNull(address.getProperties().get("city"));
assertNotNull(address.getProperties().get("street"));
Schema duplicateAddress = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle_0");
Schema duplicateAddress = openapi.getComponents().getSchemas().get("UserAddressTitle_0");
assertNull(duplicateAddress);
}

Expand Down Expand Up @@ -174,16 +174,16 @@ public void resolveInlineModel2DifferentInnerModelsWIthSameTitle() {

new InlineModelResolver().flatten(openapi);

Schema user = (Schema) openapi.getComponents().getSchemas().get("User");
Schema user = openapi.getComponents().getSchemas().get("User");

assertNotNull(user);
assertTrue(user.getProperties().get("address") instanceof Schema);

Schema address = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle");
Schema address = openapi.getComponents().getSchemas().get("UserAddressTitle");
assertNotNull(address);
assertNotNull(address.getProperties().get("city"));
assertNotNull(address.getProperties().get("street"));
Schema duplicateAddress = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle_1");
Schema duplicateAddress = openapi.getComponents().getSchemas().get("UserAddressTitle_1");
assertNotNull(duplicateAddress);
assertNotNull(duplicateAddress.getProperties().get("city"));
assertNotNull(duplicateAddress.getProperties().get("street"));
Expand Down Expand Up @@ -226,7 +226,7 @@ public void testInlineResponseModel() {
assertEquals(1, schema.getExtensions().size());
assertEquals("ext-prop", schema.getExtensions().get("x-ext"));

Schema model = (Schema) openapi.getComponents().getSchemas().get("inline_response_200");
Schema model = openapi.getComponents().getSchemas().get("inline_response_200");
assertTrue(model.getProperties().size() == 1);
assertNotNull(model.getProperties().get("name"));
assertTrue(model.getProperties().get("name") instanceof StringSchema);
Expand Down Expand Up @@ -268,7 +268,7 @@ public void testInlineResponseModelWithTitle() {
assertEquals(1, schema.getExtensions().size());
assertEquals("ext-prop", schema.getExtensions().get("x-ext"));

Schema model = (Schema) openapi.getComponents().getSchemas().get("GetBarResponse");
Schema model = openapi.getComponents().getSchemas().get("GetBarResponse");
assertTrue(model.getProperties().size() == 1);
assertNotNull(model.getProperties().get("name"));
assertTrue(model.getProperties().get("name") instanceof StringSchema);
Expand Down