Skip to content

Commit 5e02a5b

Browse files
authored
Set generateAliasAsModel to false in tests (#7979)
* set generateAliasAsModel false in tests * add missing import
1 parent b5ce7ce commit 5e02a5b

1 file changed

Lines changed: 31 additions & 0 deletions

File tree

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import io.swagger.v3.parser.core.models.ParseOptions;
3636

3737
import org.openapitools.codegen.config.CodegenConfigurator;
38+
import org.openapitools.codegen.config.GlobalSettings;
3839
import org.openapitools.codegen.templating.mustache.CamelCaseLambda;
3940
import org.openapitools.codegen.templating.mustache.IndentedLambda;
4041
import org.openapitools.codegen.templating.mustache.LowercaseLambda;
@@ -2400,6 +2401,12 @@ public void testAdditionalPropertiesPresentInModelProperties() {
24002401
CodegenProperty mapWithAddPropsFalse;
24012402
CodegenProperty mapWithAddPropsSchema;
24022403

2404+
// make sure isGenerateAliasAsModel is false
2405+
boolean isGenerateAliasAsModel = ModelUtils.isGenerateAliasAsModel();
2406+
if (isGenerateAliasAsModel) {
2407+
GlobalSettings.setProperty("generateAliasAsModel", "false");
2408+
}
2409+
24032410
modelName = "ObjectModelWithRefAddPropsInProps";
24042411
sc = openAPI.getComponents().getSchemas().get(modelName);
24052412
cm = codegen.fromModel(modelName, sc);
@@ -2423,6 +2430,10 @@ public void testAdditionalPropertiesPresentInModelProperties() {
24232430
assertEquals(mapWithAddPropsFalse.getAdditionalProperties(), null);
24242431
mapWithAddPropsSchema = cm.getVars().get(3);
24252432
assertEquals(mapWithAddPropsSchema.getAdditionalProperties(), stringCp);
2433+
2434+
if (isGenerateAliasAsModel) { // restore the setting
2435+
GlobalSettings.setProperty("generateAliasAsModel", "true");
2436+
}
24262437
}
24272438

24282439
@Test
@@ -2443,6 +2454,12 @@ public void testAdditionalPropertiesPresentInParameters() {
24432454
CodegenParameter mapWithAddPropsFalse;
24442455
CodegenParameter mapWithAddPropsSchema;
24452456

2457+
// make sure isGenerateAliasAsModel is false
2458+
boolean isGenerateAliasAsModel = ModelUtils.isGenerateAliasAsModel();
2459+
if (isGenerateAliasAsModel) {
2460+
GlobalSettings.setProperty("generateAliasAsModel", "false");
2461+
}
2462+
24462463
path = "/ref_additional_properties/";
24472464
operation = openAPI.getPaths().get(path).getPost();
24482465
co = codegen.fromOperation(path, "POST", operation, null);
@@ -2466,6 +2483,10 @@ public void testAdditionalPropertiesPresentInParameters() {
24662483
assertEquals(mapWithAddPropsFalse.getAdditionalProperties(), null);
24672484
mapWithAddPropsSchema = co.queryParams.get(3);
24682485
assertEquals(mapWithAddPropsSchema.getAdditionalProperties(), stringCp);
2486+
2487+
if (isGenerateAliasAsModel) { // restore the setting
2488+
GlobalSettings.setProperty("generateAliasAsModel", "true");
2489+
}
24692490
}
24702491

24712492
@Test
@@ -2486,6 +2507,12 @@ public void testAdditionalPropertiesPresentInResponses() {
24862507
CodegenResponse mapWithAddPropsFalse;
24872508
CodegenResponse mapWithAddPropsSchema;
24882509

2510+
// make sure isGenerateAliasAsModel is false
2511+
boolean isGenerateAliasAsModel = ModelUtils.isGenerateAliasAsModel();
2512+
if (isGenerateAliasAsModel) {
2513+
GlobalSettings.setProperty("generateAliasAsModel", "false");
2514+
}
2515+
24892516
path = "/ref_additional_properties/";
24902517
operation = openAPI.getPaths().get(path).getPost();
24912518
co = codegen.fromOperation(path, "POST", operation, null);
@@ -2509,6 +2536,10 @@ public void testAdditionalPropertiesPresentInResponses() {
25092536
assertEquals(mapWithAddPropsFalse.getAdditionalProperties(), null);
25102537
mapWithAddPropsSchema = co.responses.get(3);
25112538
assertEquals(mapWithAddPropsSchema.getAdditionalProperties(), stringCp);
2539+
2540+
if (isGenerateAliasAsModel) { // restore the setting
2541+
GlobalSettings.setProperty("generateAliasAsModel", "true");
2542+
}
25122543
}
25132544

25142545
@Test

0 commit comments

Comments
 (0)