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

[clean-up] Centralize Swagger-Parser calls in the unit tests (#2110)

Browse Source
This commit is contained in:
Jérémie Bresson 2019-02-12 06:09:21 +01:00 committed by GitHub
parent fd0847864a
commit f1fa0a80ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 113 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/openapi-generator/src/test/java/org/openapitools/codegen/AbstractIntegrationTest.java
View File

@ -17,7 +17,6 @@
package org.openapitools.codegen; package org.openapitools.codegen;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import org.openapitools.codegen.testutils.IntegrationTestPathsConfig; import org.openapitools.codegen.testutils.IntegrationTestPathsConfig;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -53,7 +52,7 @@ public abstract class AbstractIntegrationTest {
IntegrationTestPathsConfig integrationTestPathsConfig = getIntegrationTestPathsConfig(); IntegrationTestPathsConfig integrationTestPathsConfig = getIntegrationTestPathsConfig();
String specContent = Files.readFile(integrationTestPathsConfig.getSpecPath().toFile()); String specContent = Files.readFile(integrationTestPathsConfig.getSpecPath().toFile());
OpenAPI openAPI = new OpenAPIParser().readContents(specContent, null, null).getOpenAPI(); OpenAPI openAPI = TestUtils.parseContent(specContent);
CodegenConfig codegenConfig = getCodegenConfig(); CodegenConfig codegenConfig = getCodegenConfig();

26
modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
View File

@ -17,7 +17,6 @@
package org.openapitools.codegen; package org.openapitools.codegen;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
@ -27,7 +26,6 @@ import io.swagger.v3.oas.models.parameters.QueryParameter;
import io.swagger.v3.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.oas.models.responses.ApiResponses; import io.swagger.v3.oas.models.responses.ApiResponses;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.utils.ModelUtils; import org.openapitools.codegen.utils.ModelUtils;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -119,7 +117,7 @@ public class DefaultCodegenTest {
@Test @Test
public void testGetProducesInfo() throws Exception { public void testGetProducesInfo() throws Exception {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/produces.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/produces.yaml");
final DefaultCodegen codegen = new DefaultCodegen(); final DefaultCodegen codegen = new DefaultCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
@ -190,7 +188,7 @@ public class DefaultCodegenTest {
@Test @Test
public void testFormParameterHasDefaultValue() { public void testFormParameterHasDefaultValue() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
final DefaultCodegen codegen = new DefaultCodegen(); final DefaultCodegen codegen = new DefaultCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
@ -202,7 +200,7 @@ public class DefaultCodegenTest {
@Test @Test
public void testEnsureNoDuplicateProduces() { public void testEnsureNoDuplicateProduces() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/two-responses.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/two-responses.yaml");
final DefaultCodegen codegen = new DefaultCodegen(); final DefaultCodegen codegen = new DefaultCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
@ -237,7 +235,7 @@ public class DefaultCodegenTest {
@Test @Test
public void testGetSchemaTypeWithComposedSchemaWithOneOf() { public void testGetSchemaTypeWithComposedSchemaWithOneOf() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/composed-oneof.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/composed-oneof.yaml");
final DefaultCodegen codegen = new DefaultCodegen(); final DefaultCodegen codegen = new DefaultCodegen();
Operation operation = openAPI.getPaths().get("/state").getPost(); Operation operation = openAPI.getPaths().get("/state").getPost();
@ -355,7 +353,7 @@ public class DefaultCodegenTest {
@Test @Test
public void testExample1() { public void testExample1() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/examples.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/examples.yaml");
final DefaultCodegen codegen = new DefaultCodegen(); final DefaultCodegen codegen = new DefaultCodegen();
Operation operation = openAPI.getPaths().get("/example1/singular").getGet(); Operation operation = openAPI.getPaths().get("/example1/singular").getGet();
@ -373,7 +371,7 @@ public class DefaultCodegenTest {
@Test @Test
public void testExample2() { public void testExample2() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/examples.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/examples.yaml");
final DefaultCodegen codegen = new DefaultCodegen(); final DefaultCodegen codegen = new DefaultCodegen();
Operation operation = openAPI.getPaths().get("/example2/singular").getGet(); Operation operation = openAPI.getPaths().get("/example2/singular").getGet();
@ -385,7 +383,7 @@ public class DefaultCodegenTest {
@Test @Test
public void testExample3() { public void testExample3() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/examples.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/examples.yaml");
final DefaultCodegen codegen = new DefaultCodegen(); final DefaultCodegen codegen = new DefaultCodegen();
Operation operation = openAPI.getPaths().get("/example3/singular").getGet(); Operation operation = openAPI.getPaths().get("/example3/singular").getGet();
@ -403,7 +401,7 @@ public class DefaultCodegenTest {
@Test @Test
public void testExample4() { public void testExample4() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/examples.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/examples.yaml");
final DefaultCodegen codegen = new DefaultCodegen(); final DefaultCodegen codegen = new DefaultCodegen();
Operation operation = openAPI.getPaths().get("/example4/singular").getPost(); Operation operation = openAPI.getPaths().get("/example4/singular").getPost();
@ -421,7 +419,7 @@ public class DefaultCodegenTest {
@Test @Test
public void testDiscriminator() { public void testDiscriminator() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
DefaultCodegen codegen = new DefaultCodegen(); DefaultCodegen codegen = new DefaultCodegen();
Schema animal = openAPI.getComponents().getSchemas().get("Animal"); Schema animal = openAPI.getComponents().getSchemas().get("Animal");
@ -437,7 +435,7 @@ public class DefaultCodegenTest {
@Test @Test
public void testDiscriminatorWithCustomMapping() { public void testDiscriminatorWithCustomMapping() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/allOf.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/allOf.yaml");
DefaultCodegen codegen = new DefaultCodegen(); DefaultCodegen codegen = new DefaultCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
@ -454,7 +452,7 @@ public class DefaultCodegenTest {
@Test @Test
public void testParentName() { public void testParentName() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/allOf.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/allOf.yaml");
DefaultCodegen codegen = new DefaultCodegen(); DefaultCodegen codegen = new DefaultCodegen();
Schema child = openAPI.getComponents().getSchemas().get("Child"); Schema child = openAPI.getComponents().getSchemas().get("Child");
@ -465,7 +463,7 @@ public class DefaultCodegenTest {
@Test @Test
public void testCallbacks() { public void testCallbacks() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/callbacks.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/callbacks.yaml");
final CodegenConfig codegen = new DefaultCodegen(); final CodegenConfig codegen = new DefaultCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);

17
modules/openapi-generator/src/test/java/org/openapitools/codegen/ExampleGeneratorTest.java
View File

@ -1,8 +1,6 @@
package org.openapitools.codegen; package org.openapitools.codegen;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.examples.ExampleGenerator; import org.openapitools.codegen.examples.ExampleGenerator;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -14,8 +12,7 @@ import static org.testng.AssertJUnit.assertNull;
public class ExampleGeneratorTest { public class ExampleGeneratorTest {
@Test @Test
public void generateFromResponseSchemaWithPrimitiveType() { public void generateFromResponseSchemaWithPrimitiveType() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/example_generator_test.yaml", null, new OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/example_generator_test.yaml");
ParseOptions()).getOpenAPI();
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
@ -44,8 +41,7 @@ public class ExampleGeneratorTest {
@Test @Test
public void generateFromResponseSchemaWithNoExample() { public void generateFromResponseSchemaWithNoExample() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/example_generator_test.yaml", null, new OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/example_generator_test.yaml");
ParseOptions()).getOpenAPI();
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
@ -71,8 +67,7 @@ public class ExampleGeneratorTest {
@Test @Test
public void generateFromResponseSchemaWithArrayOfModel() { public void generateFromResponseSchemaWithArrayOfModel() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/example_generator_test.yaml", null, new OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/example_generator_test.yaml");
ParseOptions()).getOpenAPI();
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
@ -101,8 +96,7 @@ public class ExampleGeneratorTest {
@Test @Test
public void generateFromResponseSchemaWithArrayOfPrimitiveTypes() { public void generateFromResponseSchemaWithArrayOfPrimitiveTypes() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/example_generator_test.yaml", null, new OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/example_generator_test.yaml");
ParseOptions()).getOpenAPI();
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
@ -131,8 +125,7 @@ public class ExampleGeneratorTest {
@Test @Test
public void generateFromResponseSchemaWithModel() { public void generateFromResponseSchemaWithModel() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/example_generator_test.yaml", null, new OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/example_generator_test.yaml");
ParseOptions()).getOpenAPI();
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);

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

@ -17,7 +17,6 @@
package org.openapitools.codegen; package org.openapitools.codegen;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
@ -26,7 +25,6 @@ import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.oas.models.responses.ApiResponses; import io.swagger.v3.oas.models.responses.ApiResponses;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.utils.ModelUtils; import org.openapitools.codegen.utils.ModelUtils;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -277,7 +275,7 @@ public class InlineModelResolverTest {
@Test @Test
public void resolveInlineRequestBodyWhenNoComponents() { public void resolveInlineRequestBodyWhenNoComponents() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_request_body_no_components.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_request_body_no_components.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
assertNotNull(openAPI.getComponents()); assertNotNull(openAPI.getComponents());
@ -286,7 +284,7 @@ public class InlineModelResolverTest {
@Test @Test
public void resolveInlineArraySchemaWithTitle() { public void resolveInlineArraySchemaWithTitle() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
assertTrue(openAPI.getComponents().getSchemas().get("Users") instanceof ArraySchema); assertTrue(openAPI.getComponents().getSchemas().get("Users") instanceof ArraySchema);
@ -302,7 +300,7 @@ public class InlineModelResolverTest {
@Test @Test
public void resolveInlineRequestBody() { public void resolveInlineRequestBody() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
RequestBody requestBodyReference = openAPI RequestBody requestBodyReference = openAPI
@ -326,7 +324,7 @@ public class InlineModelResolverTest {
@Test @Test
public void resolveInlineRequestBodyWithRequired() { public void resolveInlineRequestBodyWithRequired() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
RequestBody requestBodyReference = openAPI.getPaths().get("/resolve_inline_request_body_with_required").getPost().getRequestBody(); RequestBody requestBodyReference = openAPI.getPaths().get("/resolve_inline_request_body_with_required").getPost().getRequestBody();
@ -338,7 +336,7 @@ public class InlineModelResolverTest {
@Test @Test
public void resolveInlineRequestBodyWithTitle() { public void resolveInlineRequestBodyWithTitle() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
RequestBody requestBodyReference = openAPI.getPaths().get("/resolve_inline_request_body_with_title").getPost().getRequestBody(); RequestBody requestBodyReference = openAPI.getPaths().get("/resolve_inline_request_body_with_title").getPost().getRequestBody();
@ -347,7 +345,7 @@ public class InlineModelResolverTest {
@Test @Test
public void nonModelRequestBody() { public void nonModelRequestBody() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
MediaType mediaType = openAPI MediaType mediaType = openAPI
@ -365,7 +363,7 @@ public class InlineModelResolverTest {
@Test @Test
public void resolveInlineArrayRequestBody() { public void resolveInlineArrayRequestBody() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
MediaType mediaType = openAPI MediaType mediaType = openAPI
@ -389,7 +387,7 @@ public class InlineModelResolverTest {
@Test @Test
public void resolveInlineArrayRequestBodyWithTitle() { public void resolveInlineArrayRequestBodyWithTitle() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
ArraySchema requestBodySchema = (ArraySchema) openAPI ArraySchema requestBodySchema = (ArraySchema) openAPI
@ -407,7 +405,7 @@ public class InlineModelResolverTest {
@Test @Test
public void resolveInlineArrayResponse() { public void resolveInlineArrayResponse() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
MediaType mediaType = openAPI MediaType mediaType = openAPI
@ -430,7 +428,7 @@ public class InlineModelResolverTest {
@Test @Test
public void resolveInlineArrayResponseWithTitle() { public void resolveInlineArrayResponseWithTitle() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
MediaType mediaType = openAPI MediaType mediaType = openAPI
@ -448,7 +446,7 @@ public class InlineModelResolverTest {
@Test @Test
public void resolveInlineObjectResponseWithAdditionalProperties() { public void resolveInlineObjectResponseWithAdditionalProperties() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
MediaType mediaType = openAPI MediaType mediaType = openAPI
@ -469,7 +467,7 @@ public class InlineModelResolverTest {
@Test @Test
public void arbitraryObjectRequestBody() { public void arbitraryObjectRequestBody() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
MediaType mediaType = openAPI MediaType mediaType = openAPI
@ -485,7 +483,7 @@ public class InlineModelResolverTest {
@Test @Test
public void arbitraryObjectRequestBodyProperty() { public void arbitraryObjectRequestBodyProperty() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
MediaType mediaType = openAPI MediaType mediaType = openAPI
@ -504,7 +502,7 @@ public class InlineModelResolverTest {
@Test @Test
public void arbitraryRequestBodyArray() { public void arbitraryRequestBodyArray() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
MediaType mediaType = openAPI MediaType mediaType = openAPI
@ -524,7 +522,7 @@ public class InlineModelResolverTest {
@Test @Test
public void arbitraryRequestBodyArrayProperty() { public void arbitraryRequestBodyArrayProperty() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
MediaType mediaType = openAPI MediaType mediaType = openAPI
@ -546,7 +544,7 @@ public class InlineModelResolverTest {
@Test @Test
public void arbitraryObjectResponse() { public void arbitraryObjectResponse() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
MediaType mediaType = openAPI MediaType mediaType = openAPI
@ -564,7 +562,7 @@ public class InlineModelResolverTest {
@Test @Test
public void arbitraryObjectResponseArray() { public void arbitraryObjectResponseArray() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
MediaType mediaType = openAPI MediaType mediaType = openAPI
@ -583,7 +581,7 @@ public class InlineModelResolverTest {
@Test @Test
public void arbitraryObjectResponseArrayInline() { public void arbitraryObjectResponseArrayInline() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
MediaType mediaType = openAPI MediaType mediaType = openAPI
@ -608,7 +606,7 @@ public class InlineModelResolverTest {
@Test @Test
public void arbitraryObjectResponseWithAdditionalProperty() { public void arbitraryObjectResponseWithAdditionalProperty() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
MediaType mediaType = openAPI MediaType mediaType = openAPI
@ -629,7 +627,7 @@ public class InlineModelResolverTest {
@Test @Test
public void arbitraryObjectModelInline() { public void arbitraryObjectModelInline() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
ObjectSchema model = (ObjectSchema) openAPI.getComponents().getSchemas().get("ArbitraryObjectModelInline"); ObjectSchema model = (ObjectSchema) openAPI.getComponents().getSchemas().get("ArbitraryObjectModelInline");
@ -641,7 +639,7 @@ public class InlineModelResolverTest {
@Test @Test
public void arbitraryObjectModelWithArrayInlineWithoutTitle() { public void arbitraryObjectModelWithArrayInlineWithoutTitle() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
assertTrue(openAPI.getComponents().getSchemas().get("ArbitraryObjectModelWithArrayInlineWithoutTitle") instanceof ArraySchema); assertTrue(openAPI.getComponents().getSchemas().get("ArbitraryObjectModelWithArrayInlineWithoutTitle") instanceof ArraySchema);
@ -658,7 +656,7 @@ public class InlineModelResolverTest {
@Test @Test
public void arbitraryObjectModelWithArrayInlineWithTitle() { public void arbitraryObjectModelWithArrayInlineWithTitle() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
assertTrue(openAPI.getComponents().getSchemas().get("ArbitraryObjectModelWithArrayInlineWithTitle") instanceof ArraySchema); assertTrue(openAPI.getComponents().getSchemas().get("ArbitraryObjectModelWithArrayInlineWithTitle") instanceof ArraySchema);
@ -677,7 +675,7 @@ public class InlineModelResolverTest {
@Test @Test
public void emptyExampleOnStringTypeModels() { public void emptyExampleOnStringTypeModels() {
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/inline_model_resolver.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
new InlineModelResolver().flatten(openAPI); new InlineModelResolver().flatten(openAPI);
MediaType mediaType = openAPI MediaType mediaType = openAPI

10
modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java
View File

@ -1,10 +1,12 @@
package org.openapitools.codegen; package org.openapitools.codegen;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.servers.Server;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.MockDefaultGenerator.WrittenTemplateBasedFile; import org.openapitools.codegen.MockDefaultGenerator.WrittenTemplateBasedFile;
import org.testng.Assert; import org.testng.Assert;
@ -14,6 +16,14 @@ import java.util.Optional;
public class TestUtils { public class TestUtils {
public static OpenAPI parseSpec(String specFilePath) {
return new OpenAPIParser().readLocation(specFilePath, null, new ParseOptions()).getOpenAPI();
}
public static OpenAPI parseContent(String jsonOrYaml) {
return new OpenAPIParser().readContents(jsonOrYaml, null, null).getOpenAPI();
}
public static OpenAPI createOpenAPI() { public static OpenAPI createOpenAPI() {
OpenAPI openAPI = new OpenAPI(); OpenAPI openAPI = new OpenAPI();
openAPI.setComponents(new Components()); openAPI.setComponents(new Components());

9
modules/openapi-generator/src/test/java/org/openapitools/codegen/bash/BashTest.java
View File

@ -17,13 +17,12 @@
package org.openapitools.codegen.bash; package org.openapitools.codegen.bash;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenParameter; import org.openapitools.codegen.CodegenParameter;
import org.openapitools.codegen.DefaultCodegen; import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.BashClientCodegen; import org.openapitools.codegen.languages.BashClientCodegen;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -35,8 +34,7 @@ public class BashTest {
public void petstoreOperationTest() { public void petstoreOperationTest() {
final OpenAPI openAPI final OpenAPI openAPI
= new OpenAPIParser() = TestUtils.parseSpec("src/test/resources/2_0/petstore-bash.json");
.readLocation("src/test/resources/2_0/petstore-bash.json", null, new ParseOptions()).getOpenAPI();
final DefaultCodegen codegen = new BashClientCodegen(); final DefaultCodegen codegen = new BashClientCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
final Operation findPetsByStatusOperation final Operation findPetsByStatusOperation
@ -65,8 +63,7 @@ public class BashTest {
public void petstoreParameterExampleTest() { public void petstoreParameterExampleTest() {
final OpenAPI openAPI final OpenAPI openAPI
= new OpenAPIParser() = TestUtils.parseSpec("src/test/resources/2_0/petstore-bash.json");
.readLocation("src/test/resources/2_0/petstore-bash.json", null, new ParseOptions()).getOpenAPI();
final DefaultCodegen codegen = new BashClientCodegen(); final DefaultCodegen codegen = new BashClientCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
final Operation addPetOperation final Operation addPetOperation

4
modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartModelTest.java
View File

@ -17,11 +17,9 @@
package org.openapitools.codegen.dart; package org.openapitools.codegen.dart;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.*; import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.*; import org.openapitools.codegen.*;
import org.openapitools.codegen.languages.DartClientCodegen; import org.openapitools.codegen.languages.DartClientCodegen;
import org.testng.Assert; import org.testng.Assert;
@ -311,7 +309,7 @@ public class DartModelTest {
// datetime (or primitive type) not yet supported in HTTP request body // datetime (or primitive type) not yet supported in HTTP request body
@Test(description = "returns DateTime when using `--model-name-prefix`") @Test(description = "returns DateTime when using `--model-name-prefix`")
public void dateTest() { public void dateTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/datePropertyTest.json", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/datePropertyTest.json");
final DefaultCodegen codegen = new DartClientCodegen(); final DefaultCodegen codegen = new DartClientCodegen();
codegen.setModelNamePrefix("foo"); codegen.setModelNamePrefix("foo");
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);

5
modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoClientCodegenTest.java
View File

@ -17,13 +17,12 @@
package org.openapitools.codegen.go; package org.openapitools.codegen.go;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenParameter; import org.openapitools.codegen.CodegenParameter;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.GoClientCodegen; import org.openapitools.codegen.languages.GoClientCodegen;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -61,7 +60,7 @@ public class GoClientCodegenTest {
@Test(description = "test example value for body parameter") @Test(description = "test example value for body parameter")
public void bodyParameterTest() { public void bodyParameterTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
final GoClientCodegen codegen = new GoClientCodegen(); final GoClientCodegen codegen = new GoClientCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
final String path = "/fake"; final String path = "/fake";

4
modules/openapi-generator/src/test/java/org/openapitools/codegen/html/StaticHtmlGeneratorTest.java
View File

@ -17,13 +17,11 @@
package org.openapitools.codegen.html; package org.openapitools.codegen.html;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.media.IntegerSchema; import io.swagger.v3.oas.models.media.IntegerSchema;
import io.swagger.v3.oas.models.media.ObjectSchema; import io.swagger.v3.oas.models.media.ObjectSchema;
import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema; import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.CodegenModel; import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.TestUtils; import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.StaticHtmlGenerator; import org.openapitools.codegen.languages.StaticHtmlGenerator;
@ -48,7 +46,7 @@ public class StaticHtmlGeneratorTest {
@Test @Test
public void testSpecWithoutSchema() throws Exception { public void testSpecWithoutSchema() throws Exception {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/ping.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/ping.yaml");
final StaticHtmlGenerator codegen = new StaticHtmlGenerator(); final StaticHtmlGenerator codegen = new StaticHtmlGenerator();
codegen.preprocessOpenAPI(openAPI); codegen.preprocessOpenAPI(openAPI);

5
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
View File

@ -17,11 +17,10 @@
package org.openapitools.codegen.java; package org.openapitools.codegen.java;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenType; import org.openapitools.codegen.CodegenType;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.AbstractJavaCodegen; import org.openapitools.codegen.languages.AbstractJavaCodegen;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -59,7 +58,7 @@ public class AbstractJavaCodegenTest {
@Test @Test
public void testPreprocessOpenAPI() throws Exception { public void testPreprocessOpenAPI() throws Exception {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/petstore.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/petstore.yaml");
final AbstractJavaCodegen codegen = new P_AbstractJavaCodegen(); final AbstractJavaCodegen codegen = new P_AbstractJavaCodegen();
codegen.preprocessOpenAPI(openAPI); codegen.preprocessOpenAPI(openAPI);

8
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
View File

@ -18,13 +18,11 @@
package org.openapitools.codegen.java; package org.openapitools.codegen.java;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.*; import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.parser.core.models.ParseOptions;
import io.swagger.v3.parser.util.SchemaTypeUtil; import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.openapitools.codegen.*; import org.openapitools.codegen.*;
import org.openapitools.codegen.MockDefaultGenerator.WrittenTemplateBasedFile; import org.openapitools.codegen.MockDefaultGenerator.WrittenTemplateBasedFile;
@ -195,7 +193,7 @@ public class JavaClientCodegenTest {
@Test @Test
public void testGetSchemaTypeWithComposedSchemaWithAllOf() { public void testGetSchemaTypeWithComposedSchemaWithAllOf() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/composed-allof.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/composed-allof.yaml");
final JavaClientCodegen codegen = new JavaClientCodegen(); final JavaClientCodegen codegen = new JavaClientCodegen();
Operation operation = openAPI.getPaths().get("/ping").getPost(); Operation operation = openAPI.getPaths().get("/ping").getPost();
@ -305,7 +303,7 @@ public class JavaClientCodegenTest {
@Test @Test
public void testReferencedHeader() { public void testReferencedHeader() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/issue855.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/issue855.yaml");
JavaClientCodegen codegen = new JavaClientCodegen(); JavaClientCodegen codegen = new JavaClientCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
@ -320,7 +318,7 @@ public class JavaClientCodegenTest {
@Test @Test
public void testFreeFormObjects() { public void testFreeFormObjects() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/issue796.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/issue796.yaml");
JavaClientCodegen codegen = new JavaClientCodegen(); JavaClientCodegen codegen = new JavaClientCodegen();
Schema test1 = openAPI.getComponents().getSchemas().get("MapTest1"); Schema test1 = openAPI.getComponents().getSchemas().get("MapTest1");

6
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java
View File

@ -18,7 +18,6 @@
package org.openapitools.codegen.java; package org.openapitools.codegen.java;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
@ -28,7 +27,6 @@ import io.swagger.v3.oas.models.parameters.QueryParameter;
import io.swagger.v3.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.oas.models.responses.ApiResponses; import io.swagger.v3.oas.models.responses.ApiResponses;
import io.swagger.v3.parser.core.models.ParseOptions;
import io.swagger.v3.parser.util.SchemaTypeUtil; import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.junit.rules.TemporaryFolder; import org.junit.rules.TemporaryFolder;
import org.openapitools.codegen.*; import org.openapitools.codegen.*;
@ -1222,9 +1220,7 @@ public class JavaModelTest {
config.setHideGenerationTimestamp(true); config.setHideGenerationTimestamp(true);
config.setOutputDir(output.getAbsolutePath()); config.setOutputDir(output.getAbsolutePath());
final OpenAPIParser openApiParser = new OpenAPIParser(); final OpenAPI openAPI = TestUtils.parseSpec(inputSpec);
final ParseOptions options = new ParseOptions();
final OpenAPI openAPI = openApiParser.readLocation(inputSpec, null, options).getOpenAPI();
final ClientOptInput opts = new ClientOptInput(); final ClientOptInput opts = new ClientOptInput();
opts.setConfig(config); opts.setConfig(config);

6
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJerseyServerCodegenTest.java
View File

@ -1,9 +1,7 @@
package org.openapitools.codegen.java.jaxrs; package org.openapitools.codegen.java.jaxrs;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.servers.Server;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.*; import org.openapitools.codegen.*;
import org.openapitools.codegen.MockDefaultGenerator.WrittenTemplateBasedFile; import org.openapitools.codegen.MockDefaultGenerator.WrittenTemplateBasedFile;
import org.openapitools.codegen.languages.JavaJerseyServerCodegen; import org.openapitools.codegen.languages.JavaJerseyServerCodegen;
@ -86,7 +84,7 @@ public class JavaJerseyServerCodegenTest {
File output = Files.createTempDirectory("test").toFile(); File output = Files.createTempDirectory("test").toFile();
output.deleteOnExit(); output.deleteOnExit();
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/tags.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/tags.yaml");
JavaJerseyServerCodegen codegen = new JavaJerseyServerCodegen(); JavaJerseyServerCodegen codegen = new JavaJerseyServerCodegen();
codegen.setUseTags(false); codegen.setUseTags(false);
codegen.setOutputDir(output.getAbsolutePath()); codegen.setOutputDir(output.getAbsolutePath());
@ -166,7 +164,7 @@ public class JavaJerseyServerCodegenTest {
File output = Files.createTempDirectory("test").toFile(); File output = Files.createTempDirectory("test").toFile();
output.deleteOnExit(); output.deleteOnExit();
OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/tags.yaml", null, new ParseOptions()).getOpenAPI(); OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/tags.yaml");
JavaJerseyServerCodegen codegen = new JavaJerseyServerCodegen(); JavaJerseyServerCodegen codegen = new JavaJerseyServerCodegen();
codegen.setUseTags(true); codegen.setUseTags(true);
codegen.setOutputDir(output.getAbsolutePath()); codegen.setOutputDir(output.getAbsolutePath());

5
modules/openapi-generator/src/test/java/org/openapitools/codegen/javascript/JavascriptClientCodegenTest.java
View File

@ -17,13 +17,12 @@
package org.openapitools.codegen.javascript; package org.openapitools.codegen.javascript;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel; import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty; import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.JavascriptClientCodegen; import org.openapitools.codegen.languages.JavascriptClientCodegen;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -67,7 +66,7 @@ public class JavascriptClientCodegenTest {
@Test(description = "test defaultValueWithParam for model's properties") @Test(description = "test defaultValueWithParam for model's properties")
public void bodyParameterTest() { public void bodyParameterTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/petstore.yaml");
final JavascriptClientCodegen codegen = new JavascriptClientCodegen(); final JavascriptClientCodegen codegen = new JavascriptClientCodegen();
final Schema pet = openAPI.getComponents().getSchemas().get("Pet"); final Schema pet = openAPI.getComponents().getSchemas().get("Pet");
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);

12
modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java
View File

@ -18,12 +18,10 @@
package org.openapitools.codegen.objc; package org.openapitools.codegen.objc;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.PathItem;
import io.swagger.v3.oas.models.media.*; import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.parser.core.models.ParseOptions;
import io.swagger.v3.parser.util.SchemaTypeUtil; import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.openapitools.codegen.*; import org.openapitools.codegen.*;
import org.openapitools.codegen.languages.ObjcClientCodegen; import org.openapitools.codegen.languages.ObjcClientCodegen;
@ -304,7 +302,7 @@ public class ObjcModelTest {
@Test(description = "test udid") @Test(description = "test udid")
public void udidAndPasswordDataModelTest() { public void udidAndPasswordDataModelTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
final Schema definition = openAPI.getComponents().getSchemas().get("format_test"); final Schema definition = openAPI.getComponents().getSchemas().get("format_test");
@ -319,7 +317,7 @@ public class ObjcModelTest {
@Test(description = "test mixedProperties") @Test(description = "test mixedProperties")
public void mixedPropertiesDataModelTest() { public void mixedPropertiesDataModelTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
final Schema definition = openAPI.getComponents().getSchemas().get("MixedPropertiesAndAdditionalPropertiesClass"); final Schema definition = openAPI.getComponents().getSchemas().get("MixedPropertiesAndAdditionalPropertiesClass");
@ -331,7 +329,7 @@ public class ObjcModelTest {
@Test(description = "test isArrayModel") @Test(description = "test isArrayModel")
public void isArrayModelModelTest() { public void isArrayModelModelTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
final Schema definition = openAPI.getComponents().getSchemas().get("AnimalFarm"); final Schema definition = openAPI.getComponents().getSchemas().get("AnimalFarm");
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
@ -344,7 +342,7 @@ public class ObjcModelTest {
@Test(description = "test binary data") @Test(description = "test binary data")
public void binaryDataModelTest() { public void binaryDataModelTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/binaryDataTest.json", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/binaryDataTest.json");
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
final String path = "/tests/binaryResponse"; final String path = "/tests/binaryResponse";
final Operation p = openAPI.getPaths().get(path).getPost(); final Operation p = openAPI.getPaths().get(path).getPost();
@ -359,7 +357,7 @@ public class ObjcModelTest {
@Test(description = "create proper imports per #316") @Test(description = "create proper imports per #316")
public void issue316Test() { public void issue316Test() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/postBodyTest.json", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/postBodyTest.json");
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);

5
modules/openapi-generator/src/test/java/org/openapitools/codegen/perl/PerlClientCodegenTest.java
View File

@ -17,12 +17,11 @@
package org.openapitools.codegen.perl; package org.openapitools.codegen.perl;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.PerlClientCodegen; import org.openapitools.codegen.languages.PerlClientCodegen;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -60,7 +59,7 @@ public class PerlClientCodegenTest {
@Test @Test
public void testIssue677() { public void testIssue677() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/issue677.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/issue677.yaml");
final PerlClientCodegen codegen = new PerlClientCodegen(); final PerlClientCodegen codegen = new PerlClientCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);

8
modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpModelTest.java
View File

@ -17,11 +17,9 @@
package org.openapitools.codegen.php; package org.openapitools.codegen.php;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.*; import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.*; import org.openapitools.codegen.*;
import org.openapitools.codegen.languages.PhpClientCodegen; import org.openapitools.codegen.languages.PhpClientCodegen;
import org.testng.Assert; import org.testng.Assert;
@ -304,7 +302,7 @@ public class PhpModelTest {
@Test(description = "test enum array model") @Test(description = "test enum array model")
public void enumArrayModelTest() { public void enumArrayModelTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
final DefaultCodegen codegen = new PhpClientCodegen(); final DefaultCodegen codegen = new PhpClientCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
final Map<String, Schema> schemas = openAPI.getComponents().getSchemas(); final Map<String, Schema> schemas = openAPI.getComponents().getSchemas();
@ -339,7 +337,7 @@ public class PhpModelTest {
@Test(description = "test enum model for values (numeric, string, etc)") @Test(description = "test enum model for values (numeric, string, etc)")
public void enumMdoelValueTest() { public void enumMdoelValueTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
final DefaultCodegen codegen = new PhpClientCodegen(); final DefaultCodegen codegen = new PhpClientCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
final Schema definition = openAPI.getComponents().getSchemas().get("Enum_Test"); final Schema definition = openAPI.getComponents().getSchemas().get("Enum_Test");
@ -378,7 +376,7 @@ public class PhpModelTest {
// datetime (or primitive type) not yet supported in HTTP request body // datetime (or primitive type) not yet supported in HTTP request body
@Test(description = "returns DateTime when using `--model-name-prefix`") @Test(description = "returns DateTime when using `--model-name-prefix`")
public void dateTest() { public void dateTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/datePropertyTest.json", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/datePropertyTest.json");
final DefaultCodegen codegen = new PhpClientCodegen(); final DefaultCodegen codegen = new PhpClientCodegen();
codegen.setModelNamePrefix("foo"); codegen.setModelNamePrefix("foo");
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);

11
modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientCodegenTest.java
View File

@ -17,14 +17,12 @@
package org.openapitools.codegen.python; package org.openapitools.codegen.python;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.StringSchema; import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenProperty; import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.PythonClientCodegen; import org.openapitools.codegen.languages.PythonClientCodegen;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -65,9 +63,7 @@ public class PythonClientCodegenTest {
@Test(description = "test enum null/nullable patterns") @Test(description = "test enum null/nullable patterns")
public void testEnumNull() { public void testEnumNull() {
final OpenAPI openAPI = new OpenAPIParser() final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/issue_1997.yaml");
.readLocation("src/test/resources/3_0/issue_1997.yaml", null, new ParseOptions()).getOpenAPI();
StringSchema prop = (StringSchema) openAPI.getComponents().getSchemas().get("Type").getProperties().get("prop"); StringSchema prop = (StringSchema) openAPI.getComponents().getSchemas().get("Type").getProperties().get("prop");
ArrayList<Object> expected = new ArrayList<>(Arrays.asList("A", "B", "C")); ArrayList<Object> expected = new ArrayList<>(Arrays.asList("A", "B", "C"));
@ -77,8 +73,7 @@ public class PythonClientCodegenTest {
@Test(description = "test regex patterns") @Test(description = "test regex patterns")
public void testRegularExpressionOpenAPISchemaVersion3() { public void testRegularExpressionOpenAPISchemaVersion3() {
final OpenAPI openAPI = new OpenAPIParser() final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/issue_1517.yaml");
.readLocation("src/test/resources/3_0/issue_1517.yaml", null, new ParseOptions()).getOpenAPI();
final PythonClientCodegen codegen = new PythonClientCodegen(); final PythonClientCodegen codegen = new PythonClientCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
final String path = "/ping"; final String path = "/ping";

4
modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonTest.java
View File

@ -18,11 +18,9 @@
package org.openapitools.codegen.python; package org.openapitools.codegen.python;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.*; import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.parser.core.models.ParseOptions;
import io.swagger.v3.parser.util.SchemaTypeUtil; import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.openapitools.codegen.*; import org.openapitools.codegen.*;
import org.openapitools.codegen.languages.PythonClientCodegen; import org.openapitools.codegen.languages.PythonClientCodegen;
@ -34,7 +32,7 @@ public class PythonTest {
@Test(description = "convert a python model with dots") @Test(description = "convert a python model with dots")
public void modelTest() { public void modelTest() {
final OpenAPI openAPI= new OpenAPIParser().readLocation("src/test/resources/2_0/v1beta3.json", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI= TestUtils.parseSpec("src/test/resources/2_0/v1beta3.json");
final DefaultCodegen codegen = new PythonClientCodegen(); final DefaultCodegen codegen = new PythonClientCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);

38
modules/openapi-generator/src/test/java/org/openapitools/codegen/ruby/RubyClientCodegenTest.java
View File

@ -17,11 +17,9 @@
package org.openapitools.codegen.ruby; package org.openapitools.codegen.ruby;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.junit.rules.TemporaryFolder; import org.junit.rules.TemporaryFolder;
import org.openapitools.codegen.*; import org.openapitools.codegen.*;
@ -62,7 +60,7 @@ public class RubyClientCodegenTest {
public void testGenerateRubyClientWithHtmlEntity() throws Exception { public void testGenerateRubyClientWithHtmlEntity() throws Exception {
final File output = folder.getRoot(); final File output = folder.getRoot();
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/pathWithHtmlEntity.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/pathWithHtmlEntity.yaml");
CodegenConfig codegenConfig = new RubyClientCodegen(); CodegenConfig codegenConfig = new RubyClientCodegen();
codegenConfig.setOutputDir(output.getAbsolutePath()); codegenConfig.setOutputDir(output.getAbsolutePath());
@ -124,7 +122,7 @@ public class RubyClientCodegenTest {
public void testBooleanDefaultValue() throws Exception { public void testBooleanDefaultValue() throws Exception {
final File output = folder.getRoot(); final File output = folder.getRoot();
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/npe1.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/npe1.yaml");
CodegenConfig codegenConfig = new RubyClientCodegen(); CodegenConfig codegenConfig = new RubyClientCodegen();
codegenConfig.setOutputDir(output.getAbsolutePath()); codegenConfig.setOutputDir(output.getAbsolutePath());
@ -147,7 +145,7 @@ public class RubyClientCodegenTest {
@Test(description = "verify enum parameters (query, form, header)") @Test(description = "verify enum parameters (query, form, header)")
public void enumParameterTest() { public void enumParameterTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
final DefaultCodegen codegen = new RubyClientCodegen(); final DefaultCodegen codegen = new RubyClientCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
final String path = "/fake"; final String path = "/fake";
@ -162,7 +160,7 @@ public class RubyClientCodegenTest {
@Test(description = "test example value for body parameter") @Test(description = "test example value for body parameter")
public void bodyParameterTest() { public void bodyParameterTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
final RubyClientCodegen codegen = new RubyClientCodegen(); final RubyClientCodegen codegen = new RubyClientCodegen();
codegen.setModuleName("OnlinePetstore"); codegen.setModuleName("OnlinePetstore");
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
@ -177,7 +175,7 @@ public class RubyClientCodegenTest {
@Test(description = "test nullable for properties") @Test(description = "test nullable for properties")
public void nullablePropertyTest() { public void nullablePropertyTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/petstore_oas3_test.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/petstore_oas3_test.yaml");
final RubyClientCodegen codegen = new RubyClientCodegen(); final RubyClientCodegen codegen = new RubyClientCodegen();
codegen.setModuleName("OnlinePetstore"); codegen.setModuleName("OnlinePetstore");
final String path = "/pet"; final String path = "/pet";
@ -206,7 +204,7 @@ public class RubyClientCodegenTest {
@Test(description = "test properties without nullable") @Test(description = "test properties without nullable")
public void propertiesWithoutNullableTest() { public void propertiesWithoutNullableTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/petstore_oas3_test.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/petstore_oas3_test.yaml");
final RubyClientCodegen codegen = new RubyClientCodegen(); final RubyClientCodegen codegen = new RubyClientCodegen();
codegen.setModuleName("OnlinePetstore"); codegen.setModuleName("OnlinePetstore");
final String path = "/pet"; final String path = "/pet";
@ -292,7 +290,7 @@ public class RubyClientCodegenTest {
@Test(description = "test nullable for parameters (OAS3)") @Test(description = "test nullable for parameters (OAS3)")
public void nullableParameterOAS3Test() { public void nullableParameterOAS3Test() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/petstore_oas3_test.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/petstore_oas3_test.yaml");
final RubyClientCodegen codegen = new RubyClientCodegen(); final RubyClientCodegen codegen = new RubyClientCodegen();
codegen.setModuleName("OnlinePetstore"); codegen.setModuleName("OnlinePetstore");
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
@ -314,7 +312,7 @@ public class RubyClientCodegenTest {
@Test(description = "test nullable for parameters (OAS2)") @Test(description = "test nullable for parameters (OAS2)")
public void nullableParameterOAS2Test() { public void nullableParameterOAS2Test() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore-nullable.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/petstore-nullable.yaml");
final RubyClientCodegen codegen = new RubyClientCodegen(); final RubyClientCodegen codegen = new RubyClientCodegen();
codegen.setModuleName("OnlinePetstore"); codegen.setModuleName("OnlinePetstore");
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
@ -338,7 +336,7 @@ public class RubyClientCodegenTest {
@Test(description = "test anyOf (OAS3)") @Test(description = "test anyOf (OAS3)")
public void anyOfTest() { public void anyOfTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/anyOf.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/anyOf.yaml");
final RubyClientCodegen codegen = new RubyClientCodegen(); final RubyClientCodegen codegen = new RubyClientCodegen();
codegen.setModuleName("OnlinePetstore"); codegen.setModuleName("OnlinePetstore");
@ -354,7 +352,7 @@ public class RubyClientCodegenTest {
@Test(description = "test oneOf (OAS3)") @Test(description = "test oneOf (OAS3)")
public void oneOfTest() { public void oneOfTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/oneOf.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/oneOf.yaml");
final RubyClientCodegen codegen = new RubyClientCodegen(); final RubyClientCodegen codegen = new RubyClientCodegen();
codegen.setModuleName("OnlinePetstore"); codegen.setModuleName("OnlinePetstore");
@ -370,7 +368,7 @@ public class RubyClientCodegenTest {
@Test(description = "test allOf (OAS3)") @Test(description = "test allOf (OAS3)")
public void allOfTest() { public void allOfTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/allOf.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/allOf.yaml");
final RubyClientCodegen codegen = new RubyClientCodegen(); final RubyClientCodegen codegen = new RubyClientCodegen();
codegen.setModuleName("OnlinePetstore"); codegen.setModuleName("OnlinePetstore");
@ -390,7 +388,7 @@ public class RubyClientCodegenTest {
@Test(description = "test allOf with only allOf and duplicated properties(OAS3)") @Test(description = "test allOf with only allOf and duplicated properties(OAS3)")
public void allOfDuplicatedPropertiesTest() { public void allOfDuplicatedPropertiesTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/allOfDuplicatedProperties.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/allOfDuplicatedProperties.yaml");
final RubyClientCodegen codegen = new RubyClientCodegen(); final RubyClientCodegen codegen = new RubyClientCodegen();
codegen.setModuleName("OnlinePetstore"); codegen.setModuleName("OnlinePetstore");
@ -419,7 +417,7 @@ public class RubyClientCodegenTest {
@Test(description = "test allOf with discriminator and duplicated properties(OAS3) for Child model") @Test(description = "test allOf with discriminator and duplicated properties(OAS3) for Child model")
public void allOfMappingDuplicatedPropertiesTestForChild() { public void allOfMappingDuplicatedPropertiesTestForChild() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/allOfMappingDuplicatedProperties.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/allOfMappingDuplicatedProperties.yaml");
final RubyClientCodegen codegen = new RubyClientCodegen(); final RubyClientCodegen codegen = new RubyClientCodegen();
codegen.setModuleName("OnlinePetstore"); codegen.setModuleName("OnlinePetstore");
@ -474,7 +472,7 @@ public class RubyClientCodegenTest {
@Test(description = "test allOf with discriminator and duplicated properties(OAS3) for Adult model") @Test(description = "test allOf with discriminator and duplicated properties(OAS3) for Adult model")
public void allOfMappingDuplicatedPropertiesTestForAdult() { public void allOfMappingDuplicatedPropertiesTestForAdult() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/allOfMappingDuplicatedProperties.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/allOfMappingDuplicatedProperties.yaml");
final RubyClientCodegen codegen = new RubyClientCodegen(); final RubyClientCodegen codegen = new RubyClientCodegen();
codegen.setModuleName("OnlinePetstore"); codegen.setModuleName("OnlinePetstore");
@ -534,7 +532,7 @@ public class RubyClientCodegenTest {
@Test(description = "test example string imported from x-example parameterr (OAS2)") @Test(description = "test example string imported from x-example parameterr (OAS2)")
public void exampleStringFromExampleParameterOAS2Test() { public void exampleStringFromExampleParameterOAS2Test() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore-nullable.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/petstore-nullable.yaml");
final RubyClientCodegen codegen = new RubyClientCodegen(); final RubyClientCodegen codegen = new RubyClientCodegen();
codegen.setModuleName("OnlinePetstore"); codegen.setModuleName("OnlinePetstore");
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
@ -549,8 +547,7 @@ public class RubyClientCodegenTest {
@Test(description = "test example string imported from example in schema (OAS3)") @Test(description = "test example string imported from example in schema (OAS3)")
public void exampleStringFromXExampleParameterOAS3Test() { public void exampleStringFromXExampleParameterOAS3Test() {
final OpenAPI openAPI = new OpenAPIParser() final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/petstore_oas3_test.yaml");
.readLocation("src/test/resources/3_0/petstore_oas3_test.yaml", null, new ParseOptions()).getOpenAPI();
final RubyClientCodegen codegen = new RubyClientCodegen(); final RubyClientCodegen codegen = new RubyClientCodegen();
codegen.setModuleName("OnlinePetstore"); codegen.setModuleName("OnlinePetstore");
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
@ -571,8 +568,7 @@ public class RubyClientCodegenTest {
*/ */
@Test(description = "test regex patterns") @Test(description = "test regex patterns")
public void exampleRegexParameterValidationOAS3Test() { public void exampleRegexParameterValidationOAS3Test() {
final OpenAPI openAPI = new OpenAPIParser() final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/test_regex.yaml");
.readLocation("src/test/resources/3_0/test_regex.yaml", null, new ParseOptions()).getOpenAPI();
final RubyClientCodegen codegen = new RubyClientCodegen(); final RubyClientCodegen codegen = new RubyClientCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
final String path = "/ping"; final String path = "/ping";

7
modules/openapi-generator/src/test/java/org/openapitools/codegen/swift3/Swift3CodegenTest.java
View File

@ -17,12 +17,11 @@
package org.openapitools.codegen.swift3; package org.openapitools.codegen.swift3;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.DefaultCodegen; import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.Swift3Codegen; import org.openapitools.codegen.languages.Swift3Codegen;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -90,7 +89,7 @@ public class Swift3CodegenTest {
@Test(description = "returns NSData when response format is binary", enabled = false) @Test(description = "returns NSData when response format is binary", enabled = false)
public void binaryDataTest() { public void binaryDataTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/binaryDataTest.json", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/binaryDataTest.json");
final DefaultCodegen codegen = new Swift3Codegen(); final DefaultCodegen codegen = new Swift3Codegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
final String path = "/tests/binaryResponse"; final String path = "/tests/binaryResponse";
@ -105,7 +104,7 @@ public class Swift3CodegenTest {
@Test(description = "returns ISOFullDate when response format is date", enabled = false) @Test(description = "returns ISOFullDate when response format is date", enabled = false)
public void dateTest() { public void dateTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/datePropertyTest.json", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/datePropertyTest.json");
final DefaultCodegen codegen = new Swift3Codegen(); final DefaultCodegen codegen = new Swift3Codegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
final String path = "/tests/dateResponse"; final String path = "/tests/dateResponse";

7
modules/openapi-generator/src/test/java/org/openapitools/codegen/swift4/Swift4CodegenTest.java
View File

@ -17,12 +17,11 @@
package org.openapitools.codegen.swift4; package org.openapitools.codegen.swift4;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.DefaultCodegen; import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.Swift4Codegen; import org.openapitools.codegen.languages.Swift4Codegen;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -93,7 +92,7 @@ public class Swift4CodegenTest {
public void binaryDataTest() { public void binaryDataTest() {
// TODO update json file // TODO update json file
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/binaryDataTest.json", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/binaryDataTest.json");
final DefaultCodegen codegen = new Swift4Codegen(); final DefaultCodegen codegen = new Swift4Codegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
final String path = "/tests/binaryResponse"; final String path = "/tests/binaryResponse";
@ -108,7 +107,7 @@ public class Swift4CodegenTest {
@Test(description = "returns Date when response format is date", enabled = true) @Test(description = "returns Date when response format is date", enabled = true)
public void dateTest() { public void dateTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/datePropertyTest.json", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/datePropertyTest.json");
final DefaultCodegen codegen = new Swift4Codegen(); final DefaultCodegen codegen = new Swift4Codegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
final String path = "/tests/dateResponse"; final String path = "/tests/dateResponse";

6
modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java
View File

@ -18,10 +18,8 @@
package org.openapitools.codegen.typescript.fetch; package org.openapitools.codegen.typescript.fetch;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.media.*; import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.parser.core.models.ParseOptions;
import io.swagger.v3.parser.util.SchemaTypeUtil; import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.openapitools.codegen.CodegenModel; import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty; import org.openapitools.codegen.CodegenProperty;
@ -227,7 +225,7 @@ public class TypeScriptFetchModelTest {
@Test(description = "test enum array model") @Test(description = "test enum array model")
public void enumArrayMdoelTest() { public void enumArrayMdoelTest() {
// TODO: update yaml file. // TODO: update yaml file.
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
final DefaultCodegen codegen = new TypeScriptFetchClientCodegen(); final DefaultCodegen codegen = new TypeScriptFetchClientCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
final Schema schema = openAPI.getComponents().getSchemas().get("EnumArrays"); final Schema schema = openAPI.getComponents().getSchemas().get("EnumArrays");
@ -264,7 +262,7 @@ public class TypeScriptFetchModelTest {
@Test(description = "test enum model for values (numeric, string, etc)") @Test(description = "test enum model for values (numeric, string, etc)")
public void enumMdoelValueTest() { public void enumMdoelValueTest() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
final DefaultCodegen codegen = new TypeScriptFetchClientCodegen(); final DefaultCodegen codegen = new TypeScriptFetchClientCodegen();
codegen.setOpenAPI(openAPI); codegen.setOpenAPI(openAPI);
final Schema schema = openAPI.getComponents().getSchemas().get("Enum_Test"); final Schema schema = openAPI.getComponents().getSchemas().get("Enum_Test");

2
modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypescriptAngularApiVersionTest.java
View File

@ -3,7 +3,7 @@ package org.openapitools.codegen.typescript.typescriptangular;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.openapitools.codegen.*; import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.languages.TypeScriptAngularClientCodegen; import org.openapitools.codegen.languages.TypeScriptAngularClientCodegen;
public class TypescriptAngularApiVersionTest { public class TypescriptAngularApiVersionTest {

12
modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java
View File

@ -17,13 +17,11 @@
package org.openapitools.codegen.utils; package org.openapitools.codegen.utils;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.media.*; import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.parameters.Parameter;
import io.swagger.v3.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.TestUtils; import org.openapitools.codegen.TestUtils;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -37,7 +35,7 @@ public class ModelUtilsTest {
@Test @Test
public void testGetAllUsedSchemas() { public void testGetAllUsedSchemas() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/unusedSchemas.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/unusedSchemas.yaml");
List<String> allUsedSchemas = ModelUtils.getAllUsedSchemas(openAPI); List<String> allUsedSchemas = ModelUtils.getAllUsedSchemas(openAPI);
Assert.assertEquals(allUsedSchemas.size(), 32); Assert.assertEquals(allUsedSchemas.size(), 32);
@ -77,7 +75,7 @@ public class ModelUtilsTest {
@Test @Test
public void testGetUnusedSchemas() { public void testGetUnusedSchemas() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/unusedSchemas.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/unusedSchemas.yaml");
List<String> unusedSchemas = ModelUtils.getUnusedSchemas(openAPI); List<String> unusedSchemas = ModelUtils.getUnusedSchemas(openAPI);
Assert.assertEquals(unusedSchemas.size(), 4); Assert.assertEquals(unusedSchemas.size(), 4);
//UnusedObj is not used at all: //UnusedObj is not used at all:
@ -92,7 +90,7 @@ public class ModelUtilsTest {
@Test @Test
public void testSchemasUsedOnlyInFormParam() { public void testSchemasUsedOnlyInFormParam() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/unusedSchemas.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/unusedSchemas.yaml");
List<String> unusedSchemas = ModelUtils.getSchemasUsedOnlyInFormParam(openAPI); List<String> unusedSchemas = ModelUtils.getSchemasUsedOnlyInFormParam(openAPI);
Assert.assertEquals(unusedSchemas.size(), 3); Assert.assertEquals(unusedSchemas.size(), 3);
//SomeObj2 is only used in an 'application/x-www-form-urlencoded' request //SomeObj2 is only used in an 'application/x-www-form-urlencoded' request
@ -105,14 +103,14 @@ public class ModelUtilsTest {
@Test @Test
public void testNoComponentsSection() { public void testNoComponentsSection() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/3_0/ping.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/ping.yaml");
List<String> unusedSchemas = ModelUtils.getSchemasUsedOnlyInFormParam(openAPI); List<String> unusedSchemas = ModelUtils.getSchemasUsedOnlyInFormParam(openAPI);
Assert.assertEquals(unusedSchemas.size(), 0); Assert.assertEquals(unusedSchemas.size(), 0);
} }
@Test @Test
public void testGlobalProducesConsumes() { public void testGlobalProducesConsumes() {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/globalProducesConsumesTest.yaml", null, new ParseOptions()).getOpenAPI(); final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/globalProducesConsumesTest.yaml");
List<String> unusedSchemas = ModelUtils.getSchemasUsedOnlyInFormParam(openAPI); List<String> unusedSchemas = ModelUtils.getSchemasUsedOnlyInFormParam(openAPI);
Assert.assertEquals(unusedSchemas.size(), 0); Assert.assertEquals(unusedSchemas.size(), 0);
} }