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

Improve test codes of InlineModelResolver (#1787)

Browse Source 
* Delete unnecessary "throws"

* Delete unnecessary cast expressions

* Tweak redundant assertions

* Delete unnecessary comment
This commit is contained in:
Akihito Nakano 2019-01-01 13:14:23 +09:00 committed by GitHub
parent d6fa9e60c6
commit 9334dd391a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ import static org.testng.AssertJUnit.*;
@SuppressWarnings("static-method") @SuppressWarnings("static-method")
public class InlineModelResolverTest { public class InlineModelResolverTest {
@Test @Test
public void resolveInlineModelTestWithoutTitle() throws Exception { public void resolveInlineModelTestWithoutTitle() {
OpenAPI openapi = new OpenAPI(); OpenAPI openapi = new OpenAPI();
openapi.setComponents(new Components()); openapi.setComponents(new Components());
openapi.getComponents().addSchemas("User", new ObjectSchema() openapi.getComponents().addSchemas("User", new ObjectSchema()
@ -44,33 +44,31 @@ public class InlineModelResolverTest {
.addProperties("name", new StringSchema()) .addProperties("name", new StringSchema())
.addProperties("address", new ObjectSchema() .addProperties("address", new ObjectSchema()
.description("description") .description("description")
//._default("default")
//.access("access")
.readOnly(false) .readOnly(false)
.description("description") .description("description")
.name("name") .name("name")
.addProperties("street", new StringSchema()) .addProperties("street", new StringSchema())
.addProperties("city", 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); new InlineModelResolver().flatten(openapi);
Schema user = (Schema) openapi.getComponents().getSchemas().get("User"); Schema user = openapi.getComponents().getSchemas().get("User");
assertNotNull(user); assertNotNull(user);
assertNotNull(user.getProperties().get("address")); assertNotNull(user.getProperties().get("address"));
assertNotNull(((Schema) user.getProperties().get("address")).get$ref()); assertNotNull(((Schema) user.getProperties().get("address")).get$ref());
assertEquals(((Schema) user.getProperties().get("address")).get$ref(), "#/components/schemas/User_address"); 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);
assertNotNull(address.getProperties().get("city")); assertNotNull(address.getProperties().get("city"));
assertNotNull(address.getProperties().get("street")); assertNotNull(address.getProperties().get("street"));
} }
@Test @Test
public void resolveInlineModelTestWithTitle() throws Exception { public void resolveInlineModelTestWithTitle() {
OpenAPI openapi = new OpenAPI(); OpenAPI openapi = new OpenAPI();
openapi.setComponents(new Components()); openapi.setComponents(new Components());
openapi.getComponents().addSchemas("User", new ObjectSchema() openapi.getComponents().addSchemas("User", new ObjectSchema()
@ -87,19 +85,19 @@ public class InlineModelResolverTest {
new InlineModelResolver().flatten(openapi); new InlineModelResolver().flatten(openapi);
Schema user = (Schema) openapi.getComponents().getSchemas().get("User"); Schema user = openapi.getComponents().getSchemas().get("User");
assertNotNull(user); assertNotNull(user);
assertTrue(user.getProperties().get("address") instanceof Schema); 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);
assertNotNull(address.getProperties().get("city")); assertNotNull(address.getProperties().get("city"));
assertNotNull(address.getProperties().get("street")); assertNotNull(address.getProperties().get("street"));
} }
@Test @Test
public void resolveInlineModel2EqualInnerModels() throws Exception { public void resolveInlineModel2EqualInnerModels() {
OpenAPI openapi = new OpenAPI(); OpenAPI openapi = new OpenAPI();
openapi.setComponents(new Components()); openapi.setComponents(new Components());
openapi.getComponents().addSchemas("User", new ObjectSchema() openapi.getComponents().addSchemas("User", new ObjectSchema()
@ -132,18 +130,18 @@ public class InlineModelResolverTest {
ObjectSchema user = (ObjectSchema) openapi.getComponents().getSchemas().get("User"); ObjectSchema user = (ObjectSchema) openapi.getComponents().getSchemas().get("User");
assertNotNull(user); assertNotNull(user);
assertTrue(user.getProperties().get("address") instanceof Schema); assertNotNull(user.getProperties().get("address"));
Schema address = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle"); Schema address = openapi.getComponents().getSchemas().get("UserAddressTitle");
assertNotNull(address); assertNotNull(address);
assertNotNull(address.getProperties().get("city")); assertNotNull(address.getProperties().get("city"));
assertNotNull(address.getProperties().get("street")); assertNotNull(address.getProperties().get("street"));
Schema duplicateAddress = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle_0"); Schema duplicateAddress = openapi.getComponents().getSchemas().get("UserAddressTitle_0");
assertNull(duplicateAddress); assertNull(duplicateAddress);
} }
@Test @Test
public void resolveInlineModel2DifferentInnerModelsWIthSameTitle() throws Exception { public void resolveInlineModel2DifferentInnerModelsWIthSameTitle() {
OpenAPI openapi = new OpenAPI(); OpenAPI openapi = new OpenAPI();
openapi.setComponents(new Components()); openapi.setComponents(new Components());
openapi.getComponents().addSchemas("User", new ObjectSchema() openapi.getComponents().addSchemas("User", new ObjectSchema()
@ -174,16 +172,16 @@ public class InlineModelResolverTest {
new InlineModelResolver().flatten(openapi); new InlineModelResolver().flatten(openapi);
Schema user = (Schema) openapi.getComponents().getSchemas().get("User"); Schema user = openapi.getComponents().getSchemas().get("User");
assertNotNull(user); assertNotNull(user);
assertTrue(user.getProperties().get("address") instanceof Schema); 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);
assertNotNull(address.getProperties().get("city")); assertNotNull(address.getProperties().get("city"));
assertNotNull(address.getProperties().get("street")); 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);
assertNotNull(duplicateAddress.getProperties().get("city")); assertNotNull(duplicateAddress.getProperties().get("city"));
assertNotNull(duplicateAddress.getProperties().get("street")); assertNotNull(duplicateAddress.getProperties().get("street"));
@ -191,7 +189,7 @@ public class InlineModelResolverTest {
} }
@Test @Test
public void testInlineResponseModel() throws Exception { public void testInlineResponseModel() {
OpenAPI openapi = new OpenAPI(); OpenAPI openapi = new OpenAPI();
openapi.setComponents(new Components()); openapi.setComponents(new Components());
@ -222,18 +220,18 @@ public class InlineModelResolverTest {
ApiResponse response = responses.get("200"); ApiResponse response = responses.get("200");
assertNotNull(response); assertNotNull(response);
Schema schema = response.getContent().get("application/json").getSchema(); Schema schema = response.getContent().get("application/json").getSchema();
assertTrue(schema instanceof Schema); assertNotNull(schema);
assertEquals(1, schema.getExtensions().size()); assertEquals(1, schema.getExtensions().size());
assertEquals("ext-prop", schema.getExtensions().get("x-ext")); 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); assertEquals(1, model.getProperties().size());
assertNotNull(model.getProperties().get("name")); assertNotNull(model.getProperties().get("name"));
assertTrue(model.getProperties().get("name") instanceof StringSchema); assertTrue(model.getProperties().get("name") instanceof StringSchema);
} }
@Test @Test
public void testInlineResponseModelWithTitle() throws Exception { public void testInlineResponseModelWithTitle() {
OpenAPI openapi = new OpenAPI(); OpenAPI openapi = new OpenAPI();
openapi.setComponents(new Components()); openapi.setComponents(new Components());
@ -264,12 +262,12 @@ public class InlineModelResolverTest {
ApiResponse response = responses.get("200"); ApiResponse response = responses.get("200");
assertNotNull(response); assertNotNull(response);
Schema schema = response.getContent().get("application/json").getSchema(); Schema schema = response.getContent().get("application/json").getSchema();
assertTrue(schema instanceof Schema); assertNotNull(schema);
assertEquals(1, schema.getExtensions().size()); assertEquals(1, schema.getExtensions().size());
assertEquals("ext-prop", schema.getExtensions().get("x-ext")); 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); assertEquals(1, model.getProperties().size());
assertNotNull(model.getProperties().get("name")); assertNotNull(model.getProperties().get("name"));
assertTrue(model.getProperties().get("name") instanceof StringSchema); assertTrue(model.getProperties().get("name") instanceof StringSchema);
} }