Skip to content

Commit fc8ec1a

Browse files
[kotlin-spring] simplify unit test for inner enum converter
1 parent ea3fabf commit fc8ec1a

1 file changed

Lines changed: 6 additions & 16 deletions

File tree

modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -774,21 +774,12 @@ public void contractWithEnumContainsEnumConverter() throws IOException {
774774

775775
@Test
776776
public void contractWithResolvedInnerEnumContainsEnumConverter() throws IOException {
777-
File output = Files.createTempDirectory("test").toFile();
778-
output.deleteOnExit();
779-
780-
final CodegenConfigurator configurator = new CodegenConfigurator()
781-
.setGeneratorName("kotlin-spring")
782-
.setInputSpec("src/test/resources/3_0/inner_enum.yaml")
783-
.addInlineSchemaOption("RESOLVE_INLINE_ENUMS", "true")
784-
.setOutputDir(output.getAbsolutePath().replace("\\", "/"));
785-
786-
final ClientOptInput clientOptInput = configurator.toClientOptInput();
787-
DefaultGenerator generator = new DefaultGenerator();
788-
generator.setGenerateMetadata(false);
789-
790-
Map<String, File> files = generator.opts(clientOptInput).generate().stream()
791-
.collect(Collectors.toMap(File::getName, Function.identity()));
777+
Map<String, File> files = generateFromContract(
778+
"src/test/resources/3_0/inner_enum.yaml",
779+
new HashMap<>(),
780+
new HashMap<>(),
781+
configurator -> configurator.addInlineSchemaOption("RESOLVE_INLINE_ENUMS", "true")
782+
);
792783

793784
File enumConverterFile = files.get("EnumConverterConfiguration.kt");
794785
assertThat(enumConverterFile).isNotNull();
@@ -1241,7 +1232,6 @@ public void testValidationsInQueryParams_issue21238_Api_Delegate() throws IOExce
12411232
"@NotNull", "@Valid", "@Pattern(regexp=\"^[a-zA-Z0-9]+[a-zA-Z0-9\\\\.\\\\-_]*[a-zA-Z0-9]+$\")");
12421233
}
12431234

1244-
12451235
private Map<String, File> generateFromContract(String url) throws IOException {
12461236
return generateFromContract(url, new HashMap<>(), new HashMap<>());
12471237
}

0 commit comments

Comments
 (0)