Skip to content

Commit 9334dd3

Browse files
authored
Improve test codes of InlineModelResolver (#1787)
* Delete unnecessary "throws" * Delete unnecessary cast expressions * Tweak redundant assertions * Delete unnecessary comment
1 parent d6fa9e6 commit 9334dd3

File tree

1 file changed

+23
-25
lines changed

1 file changed

+23
-25
lines changed

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

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
@SuppressWarnings("static-method")
3636
public class InlineModelResolverTest {
3737
@Test
38-
public void resolveInlineModelTestWithoutTitle() throws Exception {
38+
public void resolveInlineModelTestWithoutTitle() {
3939
OpenAPI openapi = new OpenAPI();
4040
openapi.setComponents(new Components());
4141
openapi.getComponents().addSchemas("User", new ObjectSchema()
@@ -44,33 +44,31 @@ public void resolveInlineModelTestWithoutTitle() throws Exception {
4444
.addProperties("name", new StringSchema())
4545
.addProperties("address", new ObjectSchema()
4646
.description("description")
47-
//._default("default")
48-
//.access("access")
4947
.readOnly(false)
5048
.description("description")
5149
.name("name")
5250
.addProperties("street", new StringSchema())
5351
.addProperties("city", new StringSchema())));
5452

55-
assertNotNull(((Schema) openapi.getComponents().getSchemas().get("User")).getProperties().get("address"));
53+
assertNotNull((openapi.getComponents().getSchemas().get("User")).getProperties().get("address"));
5654

5755
new InlineModelResolver().flatten(openapi);
5856

59-
Schema user = (Schema) openapi.getComponents().getSchemas().get("User");
57+
Schema user = openapi.getComponents().getSchemas().get("User");
6058

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

66-
Schema address = (Schema) openapi.getComponents().getSchemas().get("User_address");
64+
Schema address = openapi.getComponents().getSchemas().get("User_address");
6765
assertNotNull(address);
6866
assertNotNull(address.getProperties().get("city"));
6967
assertNotNull(address.getProperties().get("street"));
7068
}
7169

7270
@Test
73-
public void resolveInlineModelTestWithTitle() throws Exception {
71+
public void resolveInlineModelTestWithTitle() {
7472
OpenAPI openapi = new OpenAPI();
7573
openapi.setComponents(new Components());
7674
openapi.getComponents().addSchemas("User", new ObjectSchema()
@@ -87,19 +85,19 @@ public void resolveInlineModelTestWithTitle() throws Exception {
8785

8886
new InlineModelResolver().flatten(openapi);
8987

90-
Schema user = (Schema) openapi.getComponents().getSchemas().get("User");
88+
Schema user = openapi.getComponents().getSchemas().get("User");
9189

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

95-
Schema address = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle");
93+
Schema address = openapi.getComponents().getSchemas().get("UserAddressTitle");
9694
assertNotNull(address);
9795
assertNotNull(address.getProperties().get("city"));
9896
assertNotNull(address.getProperties().get("street"));
9997
}
10098

10199
@Test
102-
public void resolveInlineModel2EqualInnerModels() throws Exception {
100+
public void resolveInlineModel2EqualInnerModels() {
103101
OpenAPI openapi = new OpenAPI();
104102
openapi.setComponents(new Components());
105103
openapi.getComponents().addSchemas("User", new ObjectSchema()
@@ -132,18 +130,18 @@ public void resolveInlineModel2EqualInnerModels() throws Exception {
132130
ObjectSchema user = (ObjectSchema) openapi.getComponents().getSchemas().get("User");
133131

134132
assertNotNull(user);
135-
assertTrue(user.getProperties().get("address") instanceof Schema);
133+
assertNotNull(user.getProperties().get("address"));
136134

137-
Schema address = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle");
135+
Schema address = openapi.getComponents().getSchemas().get("UserAddressTitle");
138136
assertNotNull(address);
139137
assertNotNull(address.getProperties().get("city"));
140138
assertNotNull(address.getProperties().get("street"));
141-
Schema duplicateAddress = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle_0");
139+
Schema duplicateAddress = openapi.getComponents().getSchemas().get("UserAddressTitle_0");
142140
assertNull(duplicateAddress);
143141
}
144142

145143
@Test
146-
public void resolveInlineModel2DifferentInnerModelsWIthSameTitle() throws Exception {
144+
public void resolveInlineModel2DifferentInnerModelsWIthSameTitle() {
147145
OpenAPI openapi = new OpenAPI();
148146
openapi.setComponents(new Components());
149147
openapi.getComponents().addSchemas("User", new ObjectSchema()
@@ -174,24 +172,24 @@ public void resolveInlineModel2DifferentInnerModelsWIthSameTitle() throws Except
174172

175173
new InlineModelResolver().flatten(openapi);
176174

177-
Schema user = (Schema) openapi.getComponents().getSchemas().get("User");
175+
Schema user = openapi.getComponents().getSchemas().get("User");
178176

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

182-
Schema address = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle");
180+
Schema address = openapi.getComponents().getSchemas().get("UserAddressTitle");
183181
assertNotNull(address);
184182
assertNotNull(address.getProperties().get("city"));
185183
assertNotNull(address.getProperties().get("street"));
186-
Schema duplicateAddress = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle_1");
184+
Schema duplicateAddress = openapi.getComponents().getSchemas().get("UserAddressTitle_1");
187185
assertNotNull(duplicateAddress);
188186
assertNotNull(duplicateAddress.getProperties().get("city"));
189187
assertNotNull(duplicateAddress.getProperties().get("street"));
190188
assertNotNull(duplicateAddress.getProperties().get("apartment"));
191189
}
192190

193191
@Test
194-
public void testInlineResponseModel() throws Exception {
192+
public void testInlineResponseModel() {
195193
OpenAPI openapi = new OpenAPI();
196194
openapi.setComponents(new Components());
197195

@@ -222,18 +220,18 @@ public void testInlineResponseModel() throws Exception {
222220
ApiResponse response = responses.get("200");
223221
assertNotNull(response);
224222
Schema schema = response.getContent().get("application/json").getSchema();
225-
assertTrue(schema instanceof Schema);
223+
assertNotNull(schema);
226224
assertEquals(1, schema.getExtensions().size());
227225
assertEquals("ext-prop", schema.getExtensions().get("x-ext"));
228226

229-
Schema model = (Schema) openapi.getComponents().getSchemas().get("inline_response_200");
230-
assertTrue(model.getProperties().size() == 1);
227+
Schema model = openapi.getComponents().getSchemas().get("inline_response_200");
228+
assertEquals(1, model.getProperties().size());
231229
assertNotNull(model.getProperties().get("name"));
232230
assertTrue(model.getProperties().get("name") instanceof StringSchema);
233231
}
234232

235233
@Test
236-
public void testInlineResponseModelWithTitle() throws Exception {
234+
public void testInlineResponseModelWithTitle() {
237235
OpenAPI openapi = new OpenAPI();
238236
openapi.setComponents(new Components());
239237

@@ -264,12 +262,12 @@ public void testInlineResponseModelWithTitle() throws Exception {
264262
ApiResponse response = responses.get("200");
265263
assertNotNull(response);
266264
Schema schema = response.getContent().get("application/json").getSchema();
267-
assertTrue(schema instanceof Schema);
265+
assertNotNull(schema);
268266
assertEquals(1, schema.getExtensions().size());
269267
assertEquals("ext-prop", schema.getExtensions().get("x-ext"));
270268

271-
Schema model = (Schema) openapi.getComponents().getSchemas().get("GetBarResponse");
272-
assertTrue(model.getProperties().size() == 1);
269+
Schema model = openapi.getComponents().getSchemas().get("GetBarResponse");
270+
assertEquals(1, model.getProperties().size());
273271
assertNotNull(model.getProperties().get("name"));
274272
assertTrue(model.getProperties().get("name") instanceof StringSchema);
275273
}

0 commit comments

Comments
 (0)