Skip to content

[kotlin] Fixing merge conflict and re-running CI for #4565 #4977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimschubert merged 10 commits into from
Jan 12, 2020
Merged

[kotlin] Fixing merge conflict and re-running CI for #4565 #4977

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ed33b9a
[fix-kotlinArrayEnumEmbedded] added test
nekkiy Nov 18, 2019
83816ee
[imp-AddKotlinDynamicCompiler] add kotlin compiler
nekkiy Nov 19, 2019
0e93e0d
Merge branch 'master' into fix-kotlinArrayEnumEmbedded
nekkiy Nov 19, 2019
e1bd6d6
Merge branch 'imp-addKotlinDynamicCompiller' into fix-kotlinArrayEnum…
nekkiy Nov 19, 2019
3ab9611
[fix-kotlinArrayEnumEmbedded] modify test to runtime compilation
nekkiy Nov 19, 2019
9ce6521
[fix-kotlinArrayEnumEmbedded] fix embedded enum array
nekkiy Nov 21, 2019
61c36c2
[fix-kotlinArrayEnumEmbedded] fix redundant >
nekkiy Nov 21, 2019
96b465d
Merge branch 'master' into fix-kotlinArrayEnumEmbedded
nekkiy Nov 27, 2019
2f07900
Merge branch 'master' into nekkiy-fix-kotlinArrayEnumEmbedded
jimschubert Jan 11, 2020
3912db1
Add new gen props to bin/ci/kotlin-client-string.json
jimschubert Jan 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[fix-kotlinArrayEnumEmbedded] modify test to runtime compilation
  • Loading branch information
@nekkiy
nekkiy committed Nov 19, 2019
commit 3ab9611366aa6138d6c5513d873a6304b08bcc8d
33 changes: 13 additions & 20 deletions ...r/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@
import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.servers.Server;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.ClientOptInput;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.MockDefaultGenerator;
import org.openapitools.codegen.TestUtils;
import org.apache.commons.io.FileUtils;
import org.openapitools.codegen.*;
import org.openapitools.codegen.config.CodegenConfigurator;
import org.openapitools.codegen.kotlin.KotlinTestUtils;
import org.openapitools.codegen.languages.AbstractJavaCodegen;
import org.openapitools.codegen.languages.JavaClientCodegen;
import org.openapitools.codegen.languages.KotlinSpringServerCodegen;
Expand All @@ -21,36 +20,30 @@

import java.io.File;
import java.nio.file.Files;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

public class KotlinSpringServerCodegenTest {

@Test(description = "test embedded enum array")
@Test(description = "test embedded enum array", enabled = false) //TODO fix me
public void embeddedEnumArrayTest() throws Exception {
String baseModelPackage = "zz";
File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
output.deleteOnExit();
String outputPath = output.getAbsolutePath().replace('\\', '/');
System.out.println(output.getAbsolutePath());
OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/issue______kotlinArrayEnumEmbedded.yaml");
KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen();
codegen.setOutputDir(output.getAbsolutePath());
codegen.additionalProperties().put(CodegenConstants.MODEL_PACKAGE, "zz.yyyy.model.xxxx");

codegen.additionalProperties().put(CodegenConstants.MODEL_PACKAGE, baseModelPackage + ".yyyy.model.xxxx");
ClientOptInput input = new ClientOptInput();
input.openAPI(openAPI);
input.config(codegen);

MockDefaultGenerator generator = new MockDefaultGenerator();
DefaultGenerator generator = new DefaultGenerator();
generator.opts(input).generate();

String filePath = new File(output, "src/main/kotlin/zz/yyyy/model/xxxx/EmbeddedEnumArray.kt").getAbsolutePath().replace("\\", "/");
String kotlinEmbArray = generator.getFiles().get(filePath);
System.out.println("=====================");
System.out.println(kotlinEmbArray);
System.out.println("=====================");



File resultSourcePath = new File(output, "src/main/kotlin");
File outputModel = Files.createTempDirectory("test").toFile().getCanonicalFile();
FileUtils.copyDirectory(new File(resultSourcePath, baseModelPackage), new File(outputModel, baseModelPackage));
KotlinTestUtils.buildModule(Collections.singletonList(outputModel.getAbsolutePath()), Thread.currentThread().getContextClassLoader());
}

@Test
Expand Down