Skip to content
This repository was archived by the owner on Dec 25, 2024. It is now read-only.

Commit 08c940c

Browse files
spacetherspacether
committed
FIxes tests in JavaClientCodegenTest
1 parent 479d915 commit 08c940c

1 file changed

Lines changed: 7 additions & 191 deletions

File tree

‎modules/openapi-json-schema-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java‎

Lines changed: 7 additions & 191 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public void arraysInRequestBody() {
9696
body1, new HashSet<String>(), null, null);
9797
Assert.assertEquals(codegenParameter1.description, "A list of ids");
9898
Assert.assertEquals(codegenParameter1.getContent().get("application/json").getSchema().dataType, "List<String>");
99-
Assert.assertEquals(codegenParameter1.getContent().get("application/json").getSchema().baseType, "String");
99+
Assert.assertEquals(codegenParameter1.getContent().get("application/json").getSchema().baseType, "List");
100100

101101
RequestBody body2 = new RequestBody();
102102
body2.setDescription("A list of list of values");
@@ -118,7 +118,7 @@ public void arraysInRequestBody() {
118118
body3, new HashSet<String>(), null, null);
119119
Assert.assertEquals(codegenParameter3.description, "A list of points");
120120
Assert.assertEquals(codegenParameter3.getContent().get("application/json").getSchema().dataType, "List<Point>");
121-
Assert.assertEquals(codegenParameter3.getContent().get("application/json").getSchema().baseType, "Point");
121+
Assert.assertEquals(codegenParameter3.getContent().get("application/json").getSchema().baseType, "List");
122122
}
123123

124124
@Test
@@ -446,38 +446,6 @@ public void testJdkHttpClient() throws Exception {
446446
"import java.net.http.HttpRequest;");
447447
}
448448

449-
@Test
450-
public void testJdkHttpClientWithAndWithoutDiscriminator() throws Exception {
451-
Map<String, Object> properties = new HashMap<>();
452-
properties.put(CodegenConstants.API_PACKAGE, "xyz.abcdef.api");
453-
properties.put(CodegenConstants.MODEL_PACKAGE, "xyz.abcdef.model");
454-
properties.put(CodegenConstants.INVOKER_PACKAGE, "xyz.abcdef.invoker");
455-
456-
File output = Files.createTempDirectory("test").toFile();
457-
output.deleteOnExit();
458-
459-
final CodegenConfigurator configurator = new CodegenConfigurator()
460-
.setGeneratorName("java")
461-
.setLibrary(JavaClientCodegen.NATIVE)
462-
.setAdditionalProperties(properties)
463-
.setInputSpec("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml")
464-
.setOutputDir(output.getAbsolutePath().replace("\\", "/"));
465-
466-
final ClientOptInput clientOptInput = configurator.toClientOptInput();
467-
DefaultGenerator generator = new DefaultGenerator();
468-
generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true");
469-
generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "true");
470-
List<File> files = generator.opts(clientOptInput).generate();
471-
472-
Assert.assertEquals(files.size(), 162);
473-
validateJavaSourceFiles(files);
474-
475-
TestUtils.assertFileContains(Paths.get(output + "/src/main/java/xyz/abcdef/model/Dog.java"),
476-
"import xyz.abcdef.invoker.JSON;");
477-
TestUtils.assertFileNotContains(Paths.get(output + "/src/main/java/xyz/abcdef/model/DogAllOf.java"),
478-
"import xyz.abcdef.invoker.JSON;");
479-
}
480-
481449
@Test
482450
public void testJdkHttpAsyncClient() throws Exception {
483451
Map<String, Object> properties = new HashMap<>();
@@ -741,6 +709,11 @@ private CodegenParameter createStringParam(String name) {
741709
CodegenParameter codegenParameter = new CodegenParameter();
742710
codegenParameter.paramName = name;
743711
codegenParameter.baseName = name;
712+
Schema sc = new Schema();
713+
sc.setType("string");
714+
final JavaClientCodegen codegen = new JavaClientCodegen();
715+
CodegenProperty cp = codegen.fromProperty("schema", sc, false, false, null);
716+
codegenParameter.setSchema(cp);
744717
return codegenParameter;
745718
}
746719

@@ -1191,65 +1164,6 @@ public void testRestTemplateWithFreeFormInQueryParameters() throws IOException {
11911164
final Path defaultApi = Paths.get(output + "/src/main/java/xyz/abcdef/ApiClient.java");
11921165
TestUtils.assertFileContains(defaultApi, "value instanceof Map");
11931166
}
1194-
1195-
/**
1196-
* See https://github.com/OpenAPITools/openapi-generator/issues/8352
1197-
*/
1198-
@Test
1199-
public void testWebClientWithFreeFormInQueryParameters() throws IOException {
1200-
final Map<String, Object> properties = new HashMap<>();
1201-
properties.put(CodegenConstants.API_PACKAGE, "xyz.abcdef.api");
1202-
1203-
final File output = Files.createTempDirectory("test")
1204-
.toFile();
1205-
output.deleteOnExit();
1206-
1207-
final CodegenConfigurator configurator = new CodegenConfigurator().setGeneratorName("java")
1208-
.setLibrary(JavaClientCodegen.WEBCLIENT)
1209-
.setAdditionalProperties(properties)
1210-
.setInputSpec("src/test/resources/3_0/issue8352.yaml")
1211-
.setOutputDir(output.getAbsolutePath()
1212-
.replace("\\", "/"));
1213-
1214-
final DefaultGenerator generator = new DefaultGenerator();
1215-
final List<File> files = generator.opts(configurator.toClientOptInput())
1216-
.generate();
1217-
files.forEach(File::deleteOnExit);
1218-
1219-
validateJavaSourceFiles(files);
1220-
1221-
final Path defaultApi = Paths.get(output + "/src/main/java/xyz/abcdef/ApiClient.java");
1222-
TestUtils.assertFileContains(defaultApi, "value instanceof Map");
1223-
}
1224-
1225-
/**
1226-
* See https://github.com/OpenAPITools/openapi-generator/issues/11242
1227-
*/
1228-
@Test
1229-
public void testNativeClientWhiteSpacePathParamEncoding() throws IOException {
1230-
Map<String, Object> properties = new HashMap<>();
1231-
properties.put(CodegenConstants.API_PACKAGE, "xyz.abcdef.api");
1232-
1233-
File output = Files.createTempDirectory("test").toFile();
1234-
output.deleteOnExit();
1235-
1236-
final CodegenConfigurator configurator = new CodegenConfigurator()
1237-
.setGeneratorName("java")
1238-
.setLibrary(JavaClientCodegen.NATIVE)
1239-
.setAdditionalProperties(properties)
1240-
.setInputSpec("src/test/resources/3_0/issue11242.yaml")
1241-
.setOutputDir(output.getAbsolutePath().replace("\\", "/"));
1242-
1243-
final ClientOptInput clientOptInput = configurator.toClientOptInput();
1244-
DefaultGenerator generator = new DefaultGenerator();
1245-
List<File> files = generator.opts(clientOptInput).generate();
1246-
1247-
Assert.assertEquals(files.size(), 35);
1248-
validateJavaSourceFiles(files);
1249-
1250-
TestUtils.assertFileContains(Paths.get(output + "/src/main/java/xyz/abcdef/ApiClient.java"),
1251-
"public static String urlEncode(String s) { return URLEncoder.encode(s, UTF_8).replaceAll(\"\\\\+\", \"%20\"); }");
1252-
}
12531167

12541168
@Test
12551169
public void testExtraAnnotationsNative() throws IOException {
@@ -1321,70 +1235,6 @@ public void testExtraAnnotationsApache() throws IOException {
13211235
testExtraAnnotations(JavaClientCodegen.APACHE);
13221236
}
13231237

1324-
@Test
1325-
public void testDefaultMicroprofileRestClientVersion() throws Exception {
1326-
File output = Files.createTempDirectory("test").toFile();
1327-
1328-
final CodegenConfigurator configurator = new CodegenConfigurator()
1329-
.setGeneratorName("java")
1330-
.setLibrary(JavaClientCodegen.MICROPROFILE)
1331-
.setInputSpec("src/test/resources/3_0/petstore.yaml")
1332-
.setOutputDir(output.getAbsolutePath().replace("\\", "/"));
1333-
1334-
final ClientOptInput clientOptInput = configurator.toClientOptInput();
1335-
DefaultGenerator generator = new DefaultGenerator();
1336-
List<File> files = generator.opts(clientOptInput).generate();
1337-
1338-
TestUtils.ensureContainsFile(files, output, "pom.xml");
1339-
1340-
validateJavaSourceFiles(files);
1341-
1342-
TestUtils.assertFileContains(Paths.get(output + "/pom.xml"),
1343-
"<microprofile.rest.client.api.version>2.0</microprofile.rest.client.api.version>");
1344-
TestUtils.assertFileContains(Paths.get(output + "/pom.xml"),
1345-
"<smallrye.rest.client.version>1.2.1</smallrye.rest.client.version>");
1346-
TestUtils.assertFileContains(Paths.get(output + "/pom.xml"),
1347-
"<java.version>1.8</java.version>");
1348-
TestUtils.assertFileContains(Paths.get(output + "/src/main/java/org/openapitools/client/api/PetApi.java"),
1349-
"import javax.");
1350-
1351-
output.deleteOnExit();
1352-
}
1353-
1354-
@Test
1355-
public void testMicroprofileRestClientVersion_1_4_1() throws Exception {
1356-
Map<String, Object> properties = new HashMap<>();
1357-
properties.put(JavaClientCodegen.MICROPROFILE_REST_CLIENT_VERSION, "1.4.1");
1358-
1359-
File output = Files.createTempDirectory("test").toFile();
1360-
1361-
final CodegenConfigurator configurator = new CodegenConfigurator()
1362-
.setAdditionalProperties(properties)
1363-
.setGeneratorName("java")
1364-
.setLibrary(JavaClientCodegen.MICROPROFILE)
1365-
.setInputSpec("src/test/resources/3_0/petstore.yaml")
1366-
.setOutputDir(output.getAbsolutePath().replace("\\", "/"));
1367-
1368-
final ClientOptInput clientOptInput = configurator.toClientOptInput();
1369-
DefaultGenerator generator = new DefaultGenerator();
1370-
List<File> files = generator.opts(clientOptInput).generate();
1371-
1372-
TestUtils.ensureContainsFile(files, output, "pom.xml");
1373-
1374-
validateJavaSourceFiles(files);
1375-
1376-
TestUtils.assertFileContains(Paths.get(output + "/pom.xml"),
1377-
"<microprofile.rest.client.api.version>1.4.1</microprofile.rest.client.api.version>");
1378-
TestUtils.assertFileContains(Paths.get(output + "/pom.xml"),
1379-
"<smallrye.rest.client.version>1.2.1</smallrye.rest.client.version>");
1380-
TestUtils.assertFileContains(Paths.get(output + "/pom.xml"),
1381-
"<java.version>1.8</java.version>");
1382-
TestUtils.assertFileContains(Paths.get(output + "/src/main/java/org/openapitools/client/api/PetApi.java"),
1383-
"import javax.");
1384-
1385-
output.deleteOnExit();
1386-
}
1387-
13881238
@Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Version incorrectVersion of MicroProfile Rest Client is not supported or incorrect. Supported versions are 1.4.1, 2.0, 3.0")
13891239
public void testMicroprofileRestClientIncorrectVersion() throws Exception {
13901240
Map<String, Object> properties = new HashMap<>();
@@ -1406,40 +1256,6 @@ public void testMicroprofileRestClientIncorrectVersion() throws Exception {
14061256
fail("Expected an exception that did not occur");
14071257
}
14081258

1409-
@Test
1410-
public void testMicroprofileRestClientVersion_3_0() throws Exception {
1411-
Map<String, Object> properties = new HashMap<>();
1412-
properties.put(JavaClientCodegen.MICROPROFILE_REST_CLIENT_VERSION, "3.0");
1413-
1414-
File output = Files.createTempDirectory("test").toFile();
1415-
1416-
final CodegenConfigurator configurator = new CodegenConfigurator()
1417-
.setAdditionalProperties(properties)
1418-
.setGeneratorName("java")
1419-
.setLibrary(JavaClientCodegen.MICROPROFILE)
1420-
.setInputSpec("src/test/resources/3_0/petstore.yaml")
1421-
.setOutputDir(output.getAbsolutePath().replace("\\", "/"));
1422-
1423-
final ClientOptInput clientOptInput = configurator.toClientOptInput();
1424-
DefaultGenerator generator = new DefaultGenerator();
1425-
List<File> files = generator.opts(clientOptInput).generate();
1426-
1427-
TestUtils.ensureContainsFile(files, output, "pom.xml");
1428-
1429-
validateJavaSourceFiles(files);
1430-
1431-
TestUtils.assertFileContains(Paths.get(output + "/pom.xml"),
1432-
"<microprofile.rest.client.api.version>3.0</microprofile.rest.client.api.version>");
1433-
TestUtils.assertFileContains(Paths.get(output + "/pom.xml"),
1434-
"<jersey.mp.rest.client.version>3.0.4</jersey.mp.rest.client.version>");
1435-
TestUtils.assertFileContains(Paths.get(output + "/pom.xml"),
1436-
"<java.version>11</java.version>");
1437-
TestUtils.assertFileContains(Paths.get(output + "/src/main/java/org/openapitools/client/api/PetApi.java"),
1438-
"import jakarta.");
1439-
1440-
output.deleteOnExit();
1441-
}
1442-
14431259
@Test
14441260
public void testMicroprofileGenerateCorrectJsonbCreator_issue12622() throws Exception {
14451261
Map<String, Object> properties = new HashMap<>();

0 commit comments

Comments
 (0)