Skip to content

Commit a3004f7

Browse files
HugoMarioHugoMario
committed
fixed tests
1 parent 2e17d9f commit a3004f7

File tree

5 files changed

+82
-22
lines changed

5 files changed

+82
-22
lines changed

‎src/test/java/io/swagger/codegen/v3/generators/AbstractCodegenTest.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package io.swagger.codegen.v3.generators;
2+
3+
import io.swagger.v3.oas.models.Components;
4+
import io.swagger.v3.oas.models.OpenAPI;
5+
import io.swagger.v3.oas.models.media.Schema;
6+
import org.mockito.Mockito;
7+
import org.testng.annotations.BeforeTest;
8+
9+
import java.util.HashMap;
10+
import java.util.Map;
11+
12+
public abstract class AbstractCodegenTest {
13+
14+
protected OpenAPI openAPI;
15+
protected Schema schema;
16+
17+
@BeforeTest
18+
public void setUp() {
19+
this.openAPI = Mockito.mock(OpenAPI.class);
20+
final Components components = Mockito.mock(Components.class);
21+
final Map<String, Schema> schemas = Mockito.mock(HashMap.class);
22+
this.schema = Mockito.mock(Schema.class);
23+
24+
Mockito.when(openAPI.getComponents()).thenReturn(components);
25+
Mockito.when(components.getSchemas()).thenReturn(schemas);
26+
}
27+
}

‎src/test/java/io/swagger/codegen/v3/generators/java/JavaCXFClientCodegenTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import io.swagger.codegen.v3.CodegenOperation;
44
import io.swagger.codegen.v3.CodegenResponse;
5+
import io.swagger.codegen.v3.generators.AbstractCodegenTest;
56
import io.swagger.v3.oas.models.Operation;
67
import io.swagger.v3.oas.models.media.ArraySchema;
78
import io.swagger.v3.oas.models.media.Content;
@@ -17,7 +18,7 @@
1718
import java.util.HashMap;
1819
import java.util.Map;
1920

20-
public class JavaCXFClientCodegenTest {
21+
public class JavaCXFClientCodegenTest extends AbstractCodegenTest {
2122

2223
@Test
2324
public void responseWithoutContent() throws Exception {
@@ -26,13 +27,14 @@ public void responseWithoutContent() throws Exception {
2627
Operation operation = new Operation().responses(new ApiResponses()
2728
.addApiResponse("200", new ApiResponse()
2829
.description("Return a list of pets")
29-
.content(new Content().addMediaType("application/json",
30+
.content(new Content().addMediaType("application/json",
3031
new MediaType().schema(listOfPets))))
3132
.addApiResponse("400", new ApiResponse()
3233
.description("Error")));
3334
final Map<String, Schema> allDefinitions = Collections.singletonMap("Pet", new ObjectSchema());
3435

3536
final JavaCXFClientCodegen codegen = new JavaCXFClientCodegen();
37+
codegen.preprocessOpenAPI(openAPI);
3638
final CodegenOperation co = codegen.fromOperation("getAllPets", "GET", operation, allDefinitions);
3739

3840
Map<String, Object> objs = new HashMap<>();

‎src/test/java/io/swagger/codegen/v3/generators/java/JavaModelTest.java

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import io.swagger.codegen.v3.CodegenResponse;
1111
import io.swagger.codegen.v3.DefaultGenerator;
1212
import io.swagger.codegen.v3.config.CodegenConfigurator;
13+
import io.swagger.codegen.v3.generators.AbstractCodegenTest;
1314
import io.swagger.codegen.v3.generators.DefaultCodegenConfig;
1415
import io.swagger.v3.oas.models.Operation;
1516
import io.swagger.v3.oas.models.media.ArraySchema;
@@ -43,7 +44,7 @@
4344

4445
import static io.swagger.codegen.v3.generators.handlebars.ExtensionHelper.getBooleanValue;
4546

46-
public class JavaModelTest {
47+
public class JavaModelTest extends AbstractCodegenTest {
4748
private TemporaryFolder folder = new TemporaryFolder();
4849

4950
@Test(description = "convert a simple java model")
@@ -57,6 +58,7 @@ public void simpleModelTest() {
5758
.addRequiredItem("id")
5859
.addRequiredItem("name");
5960
final DefaultCodegenConfig codegen = new JavaClientCodegen();
61+
codegen.preprocessOpenAPI(openAPI);
6062
final CodegenModel cm = codegen.fromModel("sample", model);
6163

6264
Assert.assertEquals(cm.name, "sample");
@@ -169,6 +171,7 @@ public void mapWithListPropertyTest() {
169171
.additionalProperties(new ArraySchema().items(new Schema().$ref("Pet"))))
170172
.addRequiredItem("id");
171173
final DefaultCodegenConfig codegen = new JavaClientCodegen();
174+
codegen.preprocessOpenAPI(openAPI);
172175
final CodegenModel cm = codegen.fromModel("sample", schema);
173176

174177
Assert.assertEquals(cm.name, "sample");
@@ -196,6 +199,7 @@ public void list2DPropertyTest() {
196199
.addProperties("list2D", new ArraySchema().items(
197200
new ArraySchema().items(new Schema().$ref("Pet"))));
198201
final DefaultCodegenConfig codegen = new JavaClientCodegen();
202+
codegen.preprocessOpenAPI(openAPI);
199203
final CodegenModel cm = codegen.fromModel("sample", model);
200204

201205
Assert.assertEquals(cm.vars.size(), 1);
@@ -219,6 +223,7 @@ public void complexPropertiesTest() {
219223
.description("a sample model")
220224
.addProperties("children", new Schema().$ref("#/components/schemas/Children"));
221225
final DefaultCodegenConfig codegen = new JavaClientCodegen();
226+
codegen.preprocessOpenAPI(openAPI);
222227
final CodegenModel cm = codegen.fromModel("sample", schema);
223228

224229
Assert.assertEquals(cm.name, "sample");
@@ -245,6 +250,7 @@ public void complexListPropertyTest() {
245250
.addProperties("children", new ArraySchema()
246251
.items(new Schema().$ref("#/components/schemas/Children")));
247252
final DefaultCodegenConfig codegen = new JavaClientCodegen();
253+
codegen.preprocessOpenAPI(openAPI);
248254
final CodegenModel cm = codegen.fromModel("sample", schema);
249255

250256
Assert.assertEquals(cm.name, "sample");
@@ -273,6 +279,7 @@ public void complexMapPropertyTest() {
273279
.addProperties("children", new MapSchema()
274280
.additionalProperties(new Schema().$ref("#/components/schemas/Children")));
275281
final DefaultCodegenConfig codegen = new JavaClientCodegen();
282+
codegen.preprocessOpenAPI(openAPI);
276283
final CodegenModel cm = codegen.fromModel("sample", schema);
277284

278285
Assert.assertEquals(cm.name, "sample");
@@ -310,6 +317,7 @@ public void arrayModelWithItemNameTest() {
310317

311318

312319
final DefaultCodegenConfig codegen = new JavaClientCodegen();
320+
codegen.preprocessOpenAPI(openAPI);
313321
final CodegenModel cm = codegen.fromModel("sample", schema);
314322

315323
Assert.assertEquals(cm.name, "sample");
@@ -344,6 +352,7 @@ public void arrayModelTest() {
344352
.name("arraySchema")
345353
.description("an array model");
346354
final DefaultCodegenConfig codegen = new JavaClientCodegen();
355+
codegen.preprocessOpenAPI(openAPI);
347356
final CodegenModel cm = codegen.fromModel("sample", schema);
348357

349358
Assert.assertEquals(cm.name, "sample");
@@ -354,14 +363,15 @@ public void arrayModelTest() {
354363
Assert.assertEquals(cm.imports.size(), 4);
355364
Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Schema", "List", "ArrayList", "Children")).size(), 4);
356365
}
357-
366+
358367
@Test(description = "convert an array model")
359368
public void arrayModelTestUsingOas2() {
360369
final Schema schema = new ArraySchema()
361370
.items(new Schema().name("elobjeto").$ref("#/components/schemas/Children"))
362371
.name("arraySchema")
363372
.description("an array model");
364373
final DefaultCodegenConfig codegen = new JavaClientCodegen();
374+
codegen.preprocessOpenAPI(openAPI);
365375
codegen.setUseOas2(true);
366376
final CodegenModel cm = codegen.fromModel("sample", schema);
367377

@@ -380,6 +390,7 @@ public void mapModelTest() {
380390
.description("an map model")
381391
.additionalProperties(new Schema().$ref("#/components/schemas/Children"));
382392
final DefaultCodegenConfig codegen = new JavaClientCodegen();
393+
codegen.preprocessOpenAPI(openAPI);
383394
final CodegenModel cm = codegen.fromModel("sample", schema);
384395

385396
Assert.assertEquals(cm.name, "sample");
@@ -390,13 +401,14 @@ public void mapModelTest() {
390401
Assert.assertEquals(cm.imports.size(), 4);
391402
Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Schema", "Map", "HashMap", "Children")).size(), 4);
392403
}
393-
404+
394405
@Test(description = "convert an map model")
395406
public void mapModelTestUsingOas2() {
396407
final Schema schema = new MapSchema()
397408
.description("an map model")
398409
.additionalProperties(new Schema().$ref("#/components/schemas/Children"));
399410
final DefaultCodegenConfig codegen = new JavaClientCodegen();
411+
codegen.preprocessOpenAPI(openAPI);
400412
codegen.setUseOas2(true);
401413
final CodegenModel cm = codegen.fromModel("sample", schema);
402414

@@ -408,7 +420,7 @@ public void mapModelTestUsingOas2() {
408420
Assert.assertEquals(cm.imports.size(), 4);
409421
Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("ApiModel", "Map", "HashMap", "Children")).size(), 4);
410422
}
411-
423+
412424
@Test(description = "convert a model with upper-case property names")
413425
public void upperCaseNamesTest() {
414426
final Schema schema = new Schema()
@@ -823,6 +835,7 @@ public void longPropertyInReferencedSchemaTest() {
823835
.addProperties("Long1", new Schema<>().$ref("#/components/schemas/LongProperty"))
824836
.addProperties("Long2", new IntegerSchema().format("int64"));
825837
final DefaultCodegenConfig codegen = new JavaClientCodegen();
838+
codegen.preprocessOpenAPI(openAPI);
826839
final Map<String, Schema> allDefinitions = Collections.singletonMap("LongProperty", longProperty);
827840
final CodegenModel cm = codegen.fromModel("test", TestSchema, allDefinitions);
828841

@@ -851,6 +864,7 @@ public void integerPropertyInReferencedSchemaTest() {
851864
.addProperties("Integer2", new IntegerSchema().format("int32"));
852865
final Map<String, Schema> allDefinitions = Collections.singletonMap("IntegerProperty", longProperty);
853866
final DefaultCodegenConfig codegen = new JavaClientCodegen();
867+
codegen.preprocessOpenAPI(openAPI);
854868
final CodegenModel cm = codegen.fromModel("test", testSchema, allDefinitions);
855869

856870
Assert.assertEquals(cm.vars.size(), 2);
@@ -877,6 +891,7 @@ public void arraySchemaTest() {
877891
.items(new Schema<>().$ref("#/components/schemas/Pet")));
878892
final Map<String, Schema> allDefinitions = Collections.singletonMap("Pet", new ObjectSchema());
879893
final DefaultCodegenConfig codegen = new JavaClientCodegen();
894+
codegen.preprocessOpenAPI(openAPI);
880895
final CodegenModel cm = codegen.fromModel("test", testSchema, allDefinitions);
881896

882897
Assert.assertEquals(cm.vars.size(), 1);
@@ -897,13 +912,14 @@ public void arraySchemaTestInRequestBody() {
897912
.items(new Schema<>().$ref("#/components/schemas/Pet"));
898913
Operation operation = new Operation()
899914
.requestBody(new RequestBody()
900-
.content(new Content().addMediaType("application/json",
915+
.content(new Content().addMediaType("application/json",
901916
new MediaType().schema(testSchema))))
902917
.responses(
903918
new ApiResponses().addApiResponse("204", new ApiResponse()
904919
.description("Ok response")));
905920
final Map<String, Schema> allDefinitions = Collections.singletonMap("Pet", new ObjectSchema());
906921
final DefaultCodegenConfig codegen = new JavaClientCodegen();
922+
codegen.preprocessOpenAPI(openAPI);
907923
final CodegenOperation co = codegen.fromOperation("testSchema", "GET", operation, allDefinitions);
908924

909925
Assert.assertEquals(co.bodyParams.size(), 1);
@@ -926,10 +942,11 @@ public void arraySchemaTestInOperationResponse() {
926942
Operation operation = new Operation().responses(
927943
new ApiResponses().addApiResponse("200", new ApiResponse()
928944
.description("Ok response")
929-
.content(new Content().addMediaType("application/json",
945+
.content(new Content().addMediaType("application/json",
930946
new MediaType().schema(testSchema)))));
931947
final Map<String, Schema> allDefinitions = Collections.singletonMap("Pet", new ObjectSchema());
932948
final DefaultCodegenConfig codegen = new JavaClientCodegen();
949+
codegen.preprocessOpenAPI(openAPI);
933950
final CodegenOperation co = codegen.fromOperation("testSchema", "GET", operation, allDefinitions);
934951

935952
Assert.assertEquals(co.responses.size(), 1);
@@ -949,6 +966,7 @@ public void arrayOfArraySchemaTest() {
949966
.items(new Schema<>().$ref("#/components/schemas/Pet"))));
950967
final Map<String, Schema> allDefinitions = Collections.singletonMap("Pet", new ObjectSchema());
951968
final DefaultCodegenConfig codegen = new JavaClientCodegen();
969+
codegen.preprocessOpenAPI(openAPI);
952970
final CodegenModel cm = codegen.fromModel("test", testSchema, allDefinitions);
953971

954972
Assert.assertEquals(cm.vars.size(), 1);
@@ -970,13 +988,14 @@ public void arrayOfArraySchemaTestInRequestBody() {
970988
.items(new Schema<>().$ref("#/components/schemas/Pet")));
971989
Operation operation = new Operation()
972990
.requestBody(new RequestBody()
973-
.content(new Content().addMediaType("application/json",
991+
.content(new Content().addMediaType("application/json",
974992
new MediaType().schema(testSchema))))
975993
.responses(
976994
new ApiResponses().addApiResponse("204", new ApiResponse()
977995
.description("Ok response")));
978996
final Map<String, Schema> allDefinitions = Collections.singletonMap("Pet", new ObjectSchema());
979997
final DefaultCodegenConfig codegen = new JavaClientCodegen();
998+
codegen.preprocessOpenAPI(openAPI);
980999
final CodegenOperation co = codegen.fromOperation("testSchema", "GET", operation, allDefinitions);
9811000

9821001
Assert.assertEquals(co.bodyParams.size(), 1);
@@ -1000,10 +1019,11 @@ public void arrayOfArraySchemaTestInOperationResponse() {
10001019
Operation operation = new Operation().responses(
10011020
new ApiResponses().addApiResponse("200", new ApiResponse()
10021021
.description("Ok response")
1003-
.content(new Content().addMediaType("application/json",
1022+
.content(new Content().addMediaType("application/json",
10041023
new MediaType().schema(testSchema)))));
10051024
final Map<String, Schema> allDefinitions = Collections.singletonMap("Pet", new ObjectSchema());
10061025
final DefaultCodegenConfig codegen = new JavaClientCodegen();
1026+
codegen.preprocessOpenAPI(openAPI);
10071027
final CodegenOperation co = codegen.fromOperation("testSchema", "GET", operation, allDefinitions);
10081028

10091029
Assert.assertEquals(co.responses.size(), 1);

0 commit comments

Comments
 (0)