forked from OpenAPITools/openapi-generator
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adding usePythonSrcRootInImports logic to AbstractPythonConnexionServ…
…erCodegen. (OpenAPITools#9558)
- Loading branch information
Showing
6 changed files
with
140 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 114 additions & 0 deletions
114
...c/test/java/org/openapitools/codegen/python/AbstractPythonConnexionServerCodegenTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| package org.openapitools.codegen.python; | ||
|
|
||
| import static org.openapitools.codegen.languages.AbstractPythonConnexionServerCodegen.PYTHON_SRC_ROOT; | ||
| import static org.openapitools.codegen.languages.AbstractPythonConnexionServerCodegen.USE_PYTHON_SRC_ROOT_IN_IMPORTS; | ||
|
|
||
| import java.io.File; | ||
| import java.util.Collections; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
|
|
||
| import com.google.common.collect.ImmutableMap; | ||
| import org.apache.commons.lang3.ObjectUtils; | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.openapitools.codegen.CodegenConstants; | ||
| import org.openapitools.codegen.languages.AbstractPythonConnexionServerCodegen; | ||
| import org.testng.Assert; | ||
| import org.testng.annotations.DataProvider; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| public class AbstractPythonConnexionServerCodegenTest { | ||
|
|
||
| /** | ||
| * Passing "description" as first param to succinctly identify the significance of test parameters. | ||
| */ | ||
| @Test(dataProvider = "data") | ||
| public void test(String description, Map<String, Object> additionalProperties, String modelName, | ||
| ExpectedValues expectedValues) { | ||
| AbstractPythonConnexionServerCodegen codegen = new MockAbstractPythonConnexionServerCodegen("", false); | ||
| codegen.additionalProperties().putAll(additionalProperties); | ||
| codegen.processOpts(); | ||
| String pythonSrcRoot = Objects.toString(codegen.additionalProperties().get(PYTHON_SRC_ROOT), null); | ||
| Assert.assertEquals(pythonSrcRoot, expectedValues.pythonSrcRoot); | ||
| Assert.assertEquals(codegen.apiPackage(), expectedValues.expectedApiPackage); | ||
| Assert.assertEquals(codegen.modelFileFolder(), expectedValues.expectedModelFileFolder); | ||
| Assert.assertEquals(codegen.apiFileFolder(), expectedValues.expectedApiFileFolder); | ||
| Assert.assertEquals(codegen.toModelImport(modelName), expectedValues.expectedImport); | ||
| } | ||
|
|
||
| @DataProvider | ||
| public Object[][] data() { | ||
| return new Object[][]{ | ||
| new Object[]{ | ||
| "Default setup", | ||
| Collections.emptyMap(), | ||
| "TestModel", | ||
| new ExpectedValues("from openapi_server.models.test_model import TestModel", | ||
| "openapi_server.controllers", | ||
| platformAgnosticPath("generated-code", "connexion", "openapi_server", "models"), | ||
| platformAgnosticPath("generated-code", "connexion", "openapi_server", "controllers"), | ||
| null) | ||
| }, | ||
| new Object[]{ | ||
| "Default setup with Python src root", | ||
| ImmutableMap.of(PYTHON_SRC_ROOT, "test_root"), | ||
| "TestModel", | ||
| new ExpectedValues("from openapi_server.models.test_model import TestModel", | ||
| "openapi_server.controllers", | ||
| platformAgnosticPath("generated-code", "connexion", "test_root", "openapi_server", "models"), | ||
| platformAgnosticPath("generated-code", "connexion", "test_root", "openapi_server", "controllers"), | ||
| "test_root") | ||
| }, | ||
| new Object[]{ | ||
| "Python src in import", | ||
| ImmutableMap.of(PYTHON_SRC_ROOT, "test_root", USE_PYTHON_SRC_ROOT_IN_IMPORTS, "true"), | ||
| "TestModel", | ||
| new ExpectedValues("from test_root.openapi_server.models.test_model import TestModel", | ||
| "test_root.openapi_server.controllers", | ||
| platformAgnosticPath("generated-code", "connexion", "test_root", "openapi_server", "models"), | ||
| platformAgnosticPath("generated-code", "connexion", "test_root", "openapi_server", "controllers"), | ||
| null) | ||
| }, | ||
| new Object[]{ | ||
| "Python src in import with specified package", | ||
| ImmutableMap.of(PYTHON_SRC_ROOT, "test_root", | ||
| USE_PYTHON_SRC_ROOT_IN_IMPORTS, "true", | ||
| CodegenConstants.PACKAGE_NAME, "test_package"), | ||
| "TestModel", | ||
| new ExpectedValues("from test_root.test_package.models.test_model import TestModel", | ||
| "test_root.test_package.controllers", | ||
| platformAgnosticPath("generated-code", "connexion", "test_root", "test_package", "models"), | ||
| platformAgnosticPath("generated-code", "connexion", "test_root", "test_package", "controllers"), | ||
| null) | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| private static String platformAgnosticPath(String... nodes) { | ||
| return StringUtils.join(nodes, File.separatorChar); | ||
| } | ||
|
|
||
| private static class MockAbstractPythonConnexionServerCodegen extends AbstractPythonConnexionServerCodegen { | ||
| public MockAbstractPythonConnexionServerCodegen(String templateDirectory, boolean fixBodyNameValue) { | ||
| super(templateDirectory, fixBodyNameValue); | ||
| } | ||
| } | ||
|
|
||
| private static class ExpectedValues { | ||
| public final String expectedImport; | ||
| public final String expectedApiPackage; | ||
| public final String expectedModelFileFolder; | ||
| public final String expectedApiFileFolder; | ||
| public final String pythonSrcRoot; | ||
|
|
||
| public ExpectedValues(String expectedImport, String expectedApiPackage, String expectedModelFileFolder, | ||
| String expectedApiFileFolder, String pythonSrcRoot) { | ||
| this.expectedImport = expectedImport; | ||
| this.expectedApiPackage = expectedApiPackage; | ||
| this.expectedModelFileFolder = expectedModelFileFolder; | ||
| this.expectedApiFileFolder = expectedApiFileFolder; | ||
| this.pythonSrcRoot = pythonSrcRoot != null ? pythonSrcRoot + File.separatorChar : null; | ||
| } | ||
| } | ||
|
|
||
| } |