35
35
@ SuppressWarnings ("static-method" )
36
36
public class InlineModelResolverTest {
37
37
@ Test
38
- public void resolveInlineModelTestWithoutTitle () throws Exception {
38
+ public void resolveInlineModelTestWithoutTitle () {
39
39
OpenAPI openapi = new OpenAPI ();
40
40
openapi .setComponents (new Components ());
41
41
openapi .getComponents ().addSchemas ("User" , new ObjectSchema ()
@@ -44,33 +44,31 @@ public void resolveInlineModelTestWithoutTitle() throws Exception {
44
44
.addProperties ("name" , new StringSchema ())
45
45
.addProperties ("address" , new ObjectSchema ()
46
46
.description ("description" )
47
- //._default("default")
48
- //.access("access")
49
47
.readOnly (false )
50
48
.description ("description" )
51
49
.name ("name" )
52
50
.addProperties ("street" , new StringSchema ())
53
51
.addProperties ("city" , new StringSchema ())));
54
52
55
- assertNotNull ((( Schema ) openapi .getComponents ().getSchemas ().get ("User" )).getProperties ().get ("address" ));
53
+ assertNotNull ((openapi .getComponents ().getSchemas ().get ("User" )).getProperties ().get ("address" ));
56
54
57
55
new InlineModelResolver ().flatten (openapi );
58
56
59
- Schema user = ( Schema ) openapi .getComponents ().getSchemas ().get ("User" );
57
+ Schema user = openapi .getComponents ().getSchemas ().get ("User" );
60
58
61
59
assertNotNull (user );
62
60
assertNotNull (user .getProperties ().get ("address" ));
63
61
assertNotNull (((Schema ) user .getProperties ().get ("address" )).get$ref ());
64
62
assertEquals (((Schema ) user .getProperties ().get ("address" )).get$ref (), "#/components/schemas/User_address" );
65
63
66
- Schema address = ( Schema ) openapi .getComponents ().getSchemas ().get ("User_address" );
64
+ Schema address = openapi .getComponents ().getSchemas ().get ("User_address" );
67
65
assertNotNull (address );
68
66
assertNotNull (address .getProperties ().get ("city" ));
69
67
assertNotNull (address .getProperties ().get ("street" ));
70
68
}
71
69
72
70
@ Test
73
- public void resolveInlineModelTestWithTitle () throws Exception {
71
+ public void resolveInlineModelTestWithTitle () {
74
72
OpenAPI openapi = new OpenAPI ();
75
73
openapi .setComponents (new Components ());
76
74
openapi .getComponents ().addSchemas ("User" , new ObjectSchema ()
@@ -87,19 +85,19 @@ public void resolveInlineModelTestWithTitle() throws Exception {
87
85
88
86
new InlineModelResolver ().flatten (openapi );
89
87
90
- Schema user = ( Schema ) openapi .getComponents ().getSchemas ().get ("User" );
88
+ Schema user = openapi .getComponents ().getSchemas ().get ("User" );
91
89
92
90
assertNotNull (user );
93
91
assertTrue (user .getProperties ().get ("address" ) instanceof Schema );
94
92
95
- Schema address = ( Schema ) openapi .getComponents ().getSchemas ().get ("UserAddressTitle" );
93
+ Schema address = openapi .getComponents ().getSchemas ().get ("UserAddressTitle" );
96
94
assertNotNull (address );
97
95
assertNotNull (address .getProperties ().get ("city" ));
98
96
assertNotNull (address .getProperties ().get ("street" ));
99
97
}
100
98
101
99
@ Test
102
- public void resolveInlineModel2EqualInnerModels () throws Exception {
100
+ public void resolveInlineModel2EqualInnerModels () {
103
101
OpenAPI openapi = new OpenAPI ();
104
102
openapi .setComponents (new Components ());
105
103
openapi .getComponents ().addSchemas ("User" , new ObjectSchema ()
@@ -132,18 +130,18 @@ public void resolveInlineModel2EqualInnerModels() throws Exception {
132
130
ObjectSchema user = (ObjectSchema ) openapi .getComponents ().getSchemas ().get ("User" );
133
131
134
132
assertNotNull (user );
135
- assertTrue (user .getProperties ().get ("address" ) instanceof Schema );
133
+ assertNotNull (user .getProperties ().get ("address" ));
136
134
137
- Schema address = ( Schema ) openapi .getComponents ().getSchemas ().get ("UserAddressTitle" );
135
+ Schema address = openapi .getComponents ().getSchemas ().get ("UserAddressTitle" );
138
136
assertNotNull (address );
139
137
assertNotNull (address .getProperties ().get ("city" ));
140
138
assertNotNull (address .getProperties ().get ("street" ));
141
- Schema duplicateAddress = ( Schema ) openapi .getComponents ().getSchemas ().get ("UserAddressTitle_0" );
139
+ Schema duplicateAddress = openapi .getComponents ().getSchemas ().get ("UserAddressTitle_0" );
142
140
assertNull (duplicateAddress );
143
141
}
144
142
145
143
@ Test
146
- public void resolveInlineModel2DifferentInnerModelsWIthSameTitle () throws Exception {
144
+ public void resolveInlineModel2DifferentInnerModelsWIthSameTitle () {
147
145
OpenAPI openapi = new OpenAPI ();
148
146
openapi .setComponents (new Components ());
149
147
openapi .getComponents ().addSchemas ("User" , new ObjectSchema ()
@@ -174,24 +172,24 @@ public void resolveInlineModel2DifferentInnerModelsWIthSameTitle() throws Except
174
172
175
173
new InlineModelResolver ().flatten (openapi );
176
174
177
- Schema user = ( Schema ) openapi .getComponents ().getSchemas ().get ("User" );
175
+ Schema user = openapi .getComponents ().getSchemas ().get ("User" );
178
176
179
177
assertNotNull (user );
180
178
assertTrue (user .getProperties ().get ("address" ) instanceof Schema );
181
179
182
- Schema address = ( Schema ) openapi .getComponents ().getSchemas ().get ("UserAddressTitle" );
180
+ Schema address = openapi .getComponents ().getSchemas ().get ("UserAddressTitle" );
183
181
assertNotNull (address );
184
182
assertNotNull (address .getProperties ().get ("city" ));
185
183
assertNotNull (address .getProperties ().get ("street" ));
186
- Schema duplicateAddress = ( Schema ) openapi .getComponents ().getSchemas ().get ("UserAddressTitle_1" );
184
+ Schema duplicateAddress = openapi .getComponents ().getSchemas ().get ("UserAddressTitle_1" );
187
185
assertNotNull (duplicateAddress );
188
186
assertNotNull (duplicateAddress .getProperties ().get ("city" ));
189
187
assertNotNull (duplicateAddress .getProperties ().get ("street" ));
190
188
assertNotNull (duplicateAddress .getProperties ().get ("apartment" ));
191
189
}
192
190
193
191
@ Test
194
- public void testInlineResponseModel () throws Exception {
192
+ public void testInlineResponseModel () {
195
193
OpenAPI openapi = new OpenAPI ();
196
194
openapi .setComponents (new Components ());
197
195
@@ -222,18 +220,18 @@ public void testInlineResponseModel() throws Exception {
222
220
ApiResponse response = responses .get ("200" );
223
221
assertNotNull (response );
224
222
Schema schema = response .getContent ().get ("application/json" ).getSchema ();
225
- assertTrue (schema instanceof Schema );
223
+ assertNotNull (schema );
226
224
assertEquals (1 , schema .getExtensions ().size ());
227
225
assertEquals ("ext-prop" , schema .getExtensions ().get ("x-ext" ));
228
226
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 ());
231
229
assertNotNull (model .getProperties ().get ("name" ));
232
230
assertTrue (model .getProperties ().get ("name" ) instanceof StringSchema );
233
231
}
234
232
235
233
@ Test
236
- public void testInlineResponseModelWithTitle () throws Exception {
234
+ public void testInlineResponseModelWithTitle () {
237
235
OpenAPI openapi = new OpenAPI ();
238
236
openapi .setComponents (new Components ());
239
237
@@ -264,12 +262,12 @@ public void testInlineResponseModelWithTitle() throws Exception {
264
262
ApiResponse response = responses .get ("200" );
265
263
assertNotNull (response );
266
264
Schema schema = response .getContent ().get ("application/json" ).getSchema ();
267
- assertTrue (schema instanceof Schema );
265
+ assertNotNull (schema );
268
266
assertEquals (1 , schema .getExtensions ().size ());
269
267
assertEquals ("ext-prop" , schema .getExtensions ().get ("x-ext" ));
270
268
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 ());
273
271
assertNotNull (model .getProperties ().get ("name" ));
274
272
assertTrue (model .getProperties ().get ("name" ) instanceof StringSchema );
275
273
}
0 commit comments