[cleanup] erefactor/AutoRefactor - TestNG asserts (#9861)

AutoRefactor cleanup 'TestNGAssert' applied by erefactor:

Refactors to a proper use of TestNG assertions.

For AutoRefactor see https://github.com/JnRouvignac/AutoRefactor
For erefactor see https://github.com/cal101/erefactor
This commit is contained in:
cal
2021-07-04 08:49:47 +02:00
committed by GitHub
parent 611a3effa6
commit d2e79be728
20 changed files with 264 additions and 265 deletions

View File

@@ -76,8 +76,8 @@ public class DefaultCodegenTest {
final DefaultCodegen codegen = new DefaultCodegen();
Assert.assertEquals(codegen.hasBodyParameter(openAPI, pingOperation), false);
Assert.assertEquals(codegen.hasBodyParameter(openAPI, createOperation), true);
Assert.assertFalse(codegen.hasBodyParameter(openAPI, pingOperation));
Assert.assertTrue(codegen.hasBodyParameter(openAPI, createOperation));
}
@Test(expectedExceptions = RuntimeException.class)
@@ -174,7 +174,7 @@ public class DefaultCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
}
@Test
@@ -184,7 +184,7 @@ public class DefaultCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
@Test
@@ -194,7 +194,7 @@ public class DefaultCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
@Test
@@ -248,7 +248,7 @@ public class DefaultCodegenTest {
codegen.setDisallowAdditionalPropertiesIfNotPresent(true);
Schema schema = openAPI.getComponents().getSchemas().get("AdditionalPropertiesClass");
Assert.assertEquals(schema.getAdditionalProperties(), null);
Assert.assertNull(schema.getAdditionalProperties());
Schema addProps = ModelUtils.getAdditionalProperties(openAPI, schema);
// The petstore-with-fake-endpoints-models-for-testing.yaml does not set the
@@ -337,7 +337,7 @@ public class DefaultCodegenTest {
*/
Schema schema = openAPI.getComponents().getSchemas().get("AdditionalPropertiesClass");
Assert.assertEquals(schema.getAdditionalProperties(), null);
Assert.assertNull(schema.getAdditionalProperties());
Schema addProps = ModelUtils.getAdditionalProperties(openAPI, schema);
// The petstore-with-fake-endpoints-models-for-testing.yaml does not set the
@@ -939,19 +939,19 @@ public class DefaultCodegenTest {
// to test allOf with double refs
Schema supermanSchema = openAPI.getComponents().getSchemas().get("SuperMan");
CodegenModel supermanModel = codegen.fromModel("SuperMan", supermanSchema);
Assert.assertEquals(supermanModel.parent, null);
Assert.assertNull(supermanModel.parent);
Assert.assertEquals(supermanModel.allParents, null);
// to test allOf with single ref
Schema superboySchema = openAPI.getComponents().getSchemas().get("SuperBoy");
CodegenModel superboyModel = codegen.fromModel("SuperBoy", superboySchema);
Assert.assertEquals(superboyModel.parent, null);
Assert.assertNull(superboyModel.parent);
Assert.assertEquals(superboyModel.allParents, null);
// to test allOf with single ref and no "type: object" in the (last) inline schema
Schema superbabySchema = openAPI.getComponents().getSchemas().get("SuperBaby");
CodegenModel superbabyModel = codegen.fromModel("SuperBaby", superbabySchema);
Assert.assertEquals(superbabyModel.parent, null);
Assert.assertNull(superbabyModel.parent);
Assert.assertEquals(superbabyModel.allParents, null);
}
@@ -1093,7 +1093,7 @@ public class DefaultCodegenTest {
for (String leafModelName: leafModelNames) {
Schema leafSc = openAPI.getComponents().getSchemas().get(leafModelName);
CodegenModel leafCm = codegen.fromModel(leafModelName, leafSc);
Assert.assertEquals(leafCm.discriminator, null);
Assert.assertNull(leafCm.discriminator);
}
// the Pet discriminator map contains all animals + Reptile (children + grandchildren)
@@ -1124,7 +1124,7 @@ public class DefaultCodegenTest {
modelName = "Reptile";
sc = openAPI.getComponents().getSchemas().get(modelName);
CodegenModel reptile = codegen.fromModel(modelName, sc);
Assert.assertEquals(reptile.discriminator, null);
Assert.assertNull(reptile.discriminator);
// the MyPets discriminator contains Cat and Lizard
CodegenDiscriminator myPetDisc = new CodegenDiscriminator();
@@ -1140,7 +1140,7 @@ public class DefaultCodegenTest {
modelName = "MyPetsNoDisc";
sc = openAPI.getComponents().getSchemas().get(modelName);
CodegenModel myPetsNoDisc = codegen.fromModel(modelName, sc);
Assert.assertEquals(myPetsNoDisc.discriminator, null);
Assert.assertNull(myPetsNoDisc.discriminator);
CodegenModel cm;
@@ -1156,13 +1156,13 @@ public class DefaultCodegenTest {
modelName = "B";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
Assert.assertEquals(cm.discriminator, null);
Assert.assertNull(cm.discriminator);
// the mapping in b is in C
modelName = "C";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
Assert.assertEquals(cm.discriminator, null);
Assert.assertNull(cm.discriminator);
}
@Test
@@ -1922,7 +1922,7 @@ public class DefaultCodegenTest {
openAPI.getComponents().getSchemas().get("MyParameterTextField")
);
Assert.assertTrue(typeAliasModel.isAlias);
Assert.assertEquals("string", typeAliasModel.dataType);
Assert.assertEquals(typeAliasModel.dataType, "string");
CodegenModel composedModel = codegen.fromModel(
"ComposedModel",
@@ -2192,7 +2192,7 @@ public class DefaultCodegenTest {
@Test
public void setStyle() {
CodegenParameter parameter = codegenParameter("/set_style");
assertEquals("form", parameter.style);
assertEquals(parameter.style, "form");
}
@Test
@@ -2528,26 +2528,26 @@ public class DefaultCodegenTest {
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.getAdditionalProperties(), anyTypeSchema);
assertEquals(cm.getAdditionalPropertiesIsAnyType(), true);
assertTrue(cm.getAdditionalPropertiesIsAnyType());
modelName = "AdditionalPropertiesTrue";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.getAdditionalProperties(), anyTypeSchema);
assertEquals(cm.getAdditionalPropertiesIsAnyType(), true);
assertTrue(cm.getAdditionalPropertiesIsAnyType());
modelName = "AdditionalPropertiesFalse";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.getAdditionalProperties(), null);
assertEquals(cm.getAdditionalPropertiesIsAnyType(), false);
assertNull(cm.getAdditionalProperties());
assertFalse(cm.getAdditionalPropertiesIsAnyType());
modelName = "AdditionalPropertiesSchema";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
CodegenProperty stringCp = codegen.fromProperty("", new Schema().type("string"));
assertEquals(cm.getAdditionalProperties(), stringCp);
assertEquals(cm.getAdditionalPropertiesIsAnyType(), false);
assertFalse(cm.getAdditionalPropertiesIsAnyType());
}
@Test
@@ -2578,32 +2578,32 @@ public class DefaultCodegenTest {
cm = codegen.fromModel(modelName, sc);
mapWithAddPropsUnset = cm.getVars().get(0);
assertEquals(mapWithAddPropsUnset.getAdditionalProperties(), anyTypeSchema);
assertEquals(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType(), true);
assertTrue(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType());
mapWithAddPropsTrue = cm.getVars().get(1);
assertEquals(mapWithAddPropsTrue.getAdditionalProperties(), anyTypeSchema);
assertEquals(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType(), true);
assertTrue(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType());
mapWithAddPropsFalse = cm.getVars().get(2);
assertEquals(mapWithAddPropsFalse.getAdditionalProperties(), null);
assertEquals(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType(), false);
assertNull(mapWithAddPropsFalse.getAdditionalProperties());
assertFalse(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType());
mapWithAddPropsSchema = cm.getVars().get(3);
assertEquals(mapWithAddPropsSchema.getAdditionalProperties(), stringCp);
assertEquals(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType(), false);
assertFalse(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType());
modelName = "ObjectModelWithAddPropsInProps";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
mapWithAddPropsUnset = cm.getVars().get(0);
assertEquals(mapWithAddPropsUnset.getAdditionalProperties(), anyTypeSchema);
assertEquals(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType(), true);
assertTrue(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType());
mapWithAddPropsTrue = cm.getVars().get(1);
assertEquals(mapWithAddPropsTrue.getAdditionalProperties(), anyTypeSchema);
assertEquals(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType(), true);
assertTrue(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType());
mapWithAddPropsFalse = cm.getVars().get(2);
assertEquals(mapWithAddPropsFalse.getAdditionalProperties(), null);
assertEquals(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType(), false);
assertNull(mapWithAddPropsFalse.getAdditionalProperties());
assertFalse(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType());
mapWithAddPropsSchema = cm.getVars().get(3);
assertEquals(mapWithAddPropsSchema.getAdditionalProperties(), stringCp);
assertEquals(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType(), false);
assertFalse(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType());
if (isGenerateAliasAsModel) { // restore the setting
GlobalSettings.setProperty("generateAliasAsModel", "true");
@@ -2639,32 +2639,32 @@ public class DefaultCodegenTest {
co = codegen.fromOperation(path, "POST", operation, null);
mapWithAddPropsUnset = co.queryParams.get(0);
assertEquals(mapWithAddPropsUnset.getAdditionalProperties(), anyTypeSchema);
assertEquals(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType(), true);
assertTrue(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType());
mapWithAddPropsTrue = co.queryParams.get(1);
assertEquals(mapWithAddPropsTrue.getAdditionalProperties(), anyTypeSchema);
assertEquals(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType(), true);
assertTrue(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType());
mapWithAddPropsFalse = co.queryParams.get(2);
assertEquals(mapWithAddPropsFalse.getAdditionalProperties(), null);
assertEquals(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType(), false);
assertNull(mapWithAddPropsFalse.getAdditionalProperties());
assertFalse(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType());
mapWithAddPropsSchema = co.queryParams.get(3);
assertEquals(mapWithAddPropsSchema.getAdditionalProperties(), stringCp);
assertEquals(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType(), false);
assertFalse(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType());
path = "/additional_properties/";
operation = openAPI.getPaths().get(path).getPost();
co = codegen.fromOperation(path, "POST", operation, null);
mapWithAddPropsUnset = co.queryParams.get(0);
assertEquals(mapWithAddPropsUnset.getAdditionalProperties(), anyTypeSchema);
assertEquals(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType(), true);
assertTrue(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType());
mapWithAddPropsTrue = co.queryParams.get(1);
assertEquals(mapWithAddPropsTrue.getAdditionalProperties(), anyTypeSchema);
assertEquals(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType(), true);
assertTrue(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType());
mapWithAddPropsFalse = co.queryParams.get(2);
assertEquals(mapWithAddPropsFalse.getAdditionalProperties(), null);
assertEquals(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType(), false);
assertNull(mapWithAddPropsFalse.getAdditionalProperties());
assertFalse(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType());
mapWithAddPropsSchema = co.queryParams.get(3);
assertEquals(mapWithAddPropsSchema.getAdditionalProperties(), stringCp);
assertEquals(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType(), false);
assertFalse(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType());
if (isGenerateAliasAsModel) { // restore the setting
GlobalSettings.setProperty("generateAliasAsModel", "true");
@@ -2700,32 +2700,32 @@ public class DefaultCodegenTest {
co = codegen.fromOperation(path, "POST", operation, null);
mapWithAddPropsUnset = co.responses.get(0);
assertEquals(mapWithAddPropsUnset.getAdditionalProperties(), anyTypeSchema);
assertEquals(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType(), true);
assertTrue(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType());
mapWithAddPropsTrue = co.responses.get(1);
assertEquals(mapWithAddPropsTrue.getAdditionalProperties(), anyTypeSchema);
assertEquals(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType(), true);
assertTrue(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType());
mapWithAddPropsFalse = co.responses.get(2);
assertEquals(mapWithAddPropsFalse.getAdditionalProperties(), null);
assertEquals(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType(), false);
assertNull(mapWithAddPropsFalse.getAdditionalProperties());
assertFalse(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType());
mapWithAddPropsSchema = co.responses.get(3);
assertEquals(mapWithAddPropsSchema.getAdditionalProperties(), stringCp);
assertEquals(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType(), false);
assertFalse(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType());
path = "/additional_properties/";
operation = openAPI.getPaths().get(path).getPost();
co = codegen.fromOperation(path, "POST", operation, null);
mapWithAddPropsUnset = co.responses.get(0);
assertEquals(mapWithAddPropsUnset.getAdditionalProperties(), anyTypeSchema);
assertEquals(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType(), true);
assertTrue(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType());
mapWithAddPropsTrue = co.responses.get(1);
assertEquals(mapWithAddPropsTrue.getAdditionalProperties(), anyTypeSchema);
assertEquals(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType(), true);
assertTrue(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType());
mapWithAddPropsFalse = co.responses.get(2);
assertEquals(mapWithAddPropsFalse.getAdditionalProperties(), null);
assertEquals(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType(), false);
assertNull(mapWithAddPropsFalse.getAdditionalProperties());
assertFalse(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType());
mapWithAddPropsSchema = co.responses.get(3);
assertEquals(mapWithAddPropsSchema.getAdditionalProperties(), stringCp);
assertEquals(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType(), false);
assertFalse(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType());
if (isGenerateAliasAsModel) { // restore the setting
GlobalSettings.setProperty("generateAliasAsModel", "true");
@@ -2745,31 +2745,31 @@ public class DefaultCodegenTest {
modelName = "DateWithValidation";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.isString, false);
assertEquals(cm.isDate, true);
assertFalse(cm.isString);
assertTrue(cm.isDate);
modelName = "NullModel";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.isNull, true);
assertTrue(cm.isNull);
modelName = "ObjectWithTypeNullProperties";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.getVars().get(0).isNull, true);
assertEquals(cm.getVars().get(1).getItems().isNull, true);
assertEquals(cm.getAdditionalProperties().isNull, true);
assertTrue(cm.getVars().get(0).isNull);
assertTrue(cm.getVars().get(1).getItems().isNull);
assertTrue(cm.getAdditionalProperties().isNull);
modelName = "ArrayOfNulls";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.getItems().isNull, true);
assertTrue(cm.getItems().isNull);
modelName = "ObjectWithDateWithValidation";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.getVars().get(0).isString, false);
assertEquals(cm.getVars().get(0).isDate, true);
assertFalse(cm.getVars().get(0).isString);
assertTrue(cm.getVars().get(0).isDate);
String path;
Operation operation;
@@ -2778,68 +2778,68 @@ public class DefaultCodegenTest {
path = "/ref_date_with_validation/{date}";
operation = openAPI.getPaths().get(path).getPost();
co = codegen.fromOperation(path, "POST", operation, null);
assertEquals(co.pathParams.get(0).isString, false);
assertEquals(co.pathParams.get(0).isDate, true);
assertEquals(co.bodyParams.get(0).isString, false);
assertEquals(co.bodyParams.get(0).isDate, true);
assertEquals(co.responses.get(0).isString, false);
assertEquals(co.responses.get(0).isDate, true);
assertFalse(co.pathParams.get(0).isString);
assertTrue(co.pathParams.get(0).isDate);
assertFalse(co.bodyParams.get(0).isString);
assertTrue(co.bodyParams.get(0).isDate);
assertFalse(co.responses.get(0).isString);
assertTrue(co.responses.get(0).isDate);
path = "/date_with_validation/{date}";
operation = openAPI.getPaths().get(path).getPost();
co = codegen.fromOperation(path, "POST", operation, null);
assertEquals(co.pathParams.get(0).isString, false);
assertEquals(co.pathParams.get(0).isDate, true);
assertEquals(co.bodyParams.get(0).isString, false);
assertEquals(co.bodyParams.get(0).isDate, true);
assertEquals(co.responses.get(0).isString, false);
assertEquals(co.responses.get(0).isDate, true);
assertFalse(co.pathParams.get(0).isString);
assertTrue(co.pathParams.get(0).isDate);
assertFalse(co.bodyParams.get(0).isString);
assertTrue(co.bodyParams.get(0).isDate);
assertFalse(co.responses.get(0).isString);
assertTrue(co.responses.get(0).isDate);
modelName = "DateTimeWithValidation";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.isString, false);
assertEquals(cm.isDateTime, true);
assertFalse(cm.isString);
assertTrue(cm.isDateTime);
modelName = "ObjectWithDateTimeWithValidation";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.getVars().get(0).isString, false);
assertEquals(cm.getVars().get(0).isDateTime, true);
assertFalse(cm.getVars().get(0).isString);
assertTrue(cm.getVars().get(0).isDateTime);
path = "/ref_date_time_with_validation/{dateTime}";
operation = openAPI.getPaths().get(path).getPost();
co = codegen.fromOperation(path, "POST", operation, null);
assertEquals(co.pathParams.get(0).isString, false);
assertEquals(co.pathParams.get(0).isDateTime, true);
assertEquals(co.bodyParams.get(0).isString, false);
assertEquals(co.bodyParams.get(0).isDateTime, true);
assertEquals(co.responses.get(0).isString, false);
assertEquals(co.responses.get(0).isDateTime, true);
assertFalse(co.pathParams.get(0).isString);
assertTrue(co.pathParams.get(0).isDateTime);
assertFalse(co.bodyParams.get(0).isString);
assertTrue(co.bodyParams.get(0).isDateTime);
assertFalse(co.responses.get(0).isString);
assertTrue(co.responses.get(0).isDateTime);
path = "/date_time_with_validation/{dateTime}";
operation = openAPI.getPaths().get(path).getPost();
co = codegen.fromOperation(path, "POST", operation, null);
assertEquals(co.pathParams.get(0).isString, false);
assertEquals(co.pathParams.get(0).isDateTime, true);
assertEquals(co.bodyParams.get(0).isString, false);
assertEquals(co.bodyParams.get(0).isDateTime, true);
assertEquals(co.responses.get(0).isString, false);
assertEquals(co.responses.get(0).isDateTime, true);
assertFalse(co.pathParams.get(0).isString);
assertTrue(co.pathParams.get(0).isDateTime);
assertFalse(co.bodyParams.get(0).isString);
assertTrue(co.bodyParams.get(0).isDateTime);
assertFalse(co.responses.get(0).isString);
assertTrue(co.responses.get(0).isDateTime);
path = "/null/{param}";
operation = openAPI.getPaths().get(path).getPost();
co = codegen.fromOperation(path, "POST", operation, null);
assertEquals(co.pathParams.get(0).isNull, true);
assertEquals(co.bodyParams.get(0).isNull, true);
assertEquals(co.responses.get(0).isNull, true);
assertTrue(co.pathParams.get(0).isNull);
assertTrue(co.bodyParams.get(0).isNull);
assertTrue(co.responses.get(0).isNull);
path = "/ref_null/{param}";
operation = openAPI.getPaths().get(path).getPost();
co = codegen.fromOperation(path, "POST", operation, null);
assertEquals(co.pathParams.get(0).isNull, true);
assertEquals(co.bodyParams.get(0).isNull, true);
assertEquals(co.responses.get(0).isNull, true);
assertTrue(co.pathParams.get(0).isNull);
assertTrue(co.bodyParams.get(0).isNull);
assertTrue(co.responses.get(0).isNull);
}
@Test
@@ -2906,7 +2906,7 @@ public class DefaultCodegenTest {
for (String modelName : modelNames) {
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.getHasValidation(), true);
assertTrue(cm.getHasValidation());
}
}
@@ -2923,7 +2923,7 @@ public class DefaultCodegenTest {
List<CodegenProperty> props = cm.getVars();
assertEquals(props.size(), 50);
for (CodegenProperty prop : props) {
assertEquals(prop.getHasValidation(), true);
assertTrue(prop.getHasValidation());
}
}
@@ -2939,7 +2939,7 @@ public class DefaultCodegenTest {
List<CodegenParameter> params = co.queryParams;
assertEquals(params.size(), 50);
for (CodegenParameter param : params) {
assertEquals(param.getHasValidation(), true);
assertTrue(param.getHasValidation());
}
}
@@ -2955,7 +2955,7 @@ public class DefaultCodegenTest {
List<CodegenParameter> params = co.headerParams;
assertEquals(params.size(), 50);
for (CodegenParameter param : params) {
assertEquals(param.getHasValidation(), true);
assertTrue(param.getHasValidation());
}
}
@@ -2971,7 +2971,7 @@ public class DefaultCodegenTest {
List<CodegenParameter> params = co.cookieParams;
assertEquals(params.size(), 50);
for (CodegenParameter param : params) {
assertEquals(param.getHasValidation(), true);
assertTrue(param.getHasValidation());
}
}
@@ -2987,7 +2987,7 @@ public class DefaultCodegenTest {
List<CodegenParameter> params = co.pathParams;
assertEquals(params.size(), 50);
for (CodegenParameter param : params) {
assertEquals(param.getHasValidation(), true);
assertTrue(param.getHasValidation());
}
}
@@ -3058,8 +3058,8 @@ public class DefaultCodegenTest {
path = "/"+modelName;
operation = openAPI.getPaths().get(path).getPost();
co = codegen.fromOperation(path, "POST", operation, null);
assertEquals(co.bodyParam.getHasValidation(), true);
assertEquals(co.responses.get(0).getHasValidation(), true);
assertTrue(co.bodyParam.getHasValidation());
assertTrue(co.responses.get(0).getHasValidation());
}
}
@@ -3102,7 +3102,7 @@ public class DefaultCodegenTest {
assertEquals(co.bodyParams.get(0).requiredVars, requiredVars);
// CodegenOperation puts the inline schema into schemas and refs it
assertEquals(co.responses.get(0).isModel, true);
assertTrue(co.responses.get(0).isModel);
assertEquals(co.responses.get(0).baseType, "objectData");
modelName = "objectData";
sc = openAPI.getComponents().getSchemas().get(modelName);
@@ -3115,7 +3115,7 @@ public class DefaultCodegenTest {
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
CodegenProperty cp = cm.getVars().get(0);
assertEquals(cp.isModel, true);
assertTrue(cp.isModel);
assertEquals(cp.complexType, "objectData");
}
@@ -3141,7 +3141,7 @@ public class DefaultCodegenTest {
for (String modelName : modelNames) {
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.getHasVars(), false);
assertFalse(cm.getHasVars());
}
modelNames = Arrays.asList(
@@ -3153,7 +3153,7 @@ public class DefaultCodegenTest {
for (String modelName : modelNames) {
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.getHasVars(), true);
assertTrue(cm.getHasVars());
}
}
@@ -3177,19 +3177,19 @@ public class DefaultCodegenTest {
for (String modelName : modelNames) {
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.vars.get(0).getHasVars(), false);
assertFalse(cm.vars.get(0).getHasVars());
}
String modelName;
modelName = "ArrayWithObjectWithPropsInItems";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.getItems().getHasVars(), true);
assertTrue(cm.getItems().getHasVars());
modelName = "ObjectWithObjectWithPropsInAdditionalProperties";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.getAdditionalProperties().getHasVars(), true);
assertTrue(cm.getAdditionalProperties().getHasVars());
}
@Test
@@ -3206,14 +3206,14 @@ public class DefaultCodegenTest {
path = "/array_with_validations_in_items/{items}";
operation = openAPI.getPaths().get(path).getPost();
co = codegen.fromOperation(path, "POST", operation, null);
assertEquals(co.pathParams.get(0).getHasVars(), false);
assertEquals(co.bodyParam.getHasVars(), false);
assertFalse(co.pathParams.get(0).getHasVars());
assertFalse(co.bodyParam.getHasVars());
path = "/object_with_optional_and_required_props/{objectData}";
operation = openAPI.getPaths().get(path).getPost();
co = codegen.fromOperation(path, "POST", operation, null);
assertEquals(co.pathParams.get(0).getHasVars(), true);
assertEquals(co.bodyParam.getHasVars(), true);
assertTrue(co.pathParams.get(0).getHasVars());
assertTrue(co.bodyParam.getHasVars());
}
@Test
@@ -3230,13 +3230,13 @@ public class DefaultCodegenTest {
path = "/additional_properties/";
operation = openAPI.getPaths().get(path).getPost();
co = codegen.fromOperation(path, "POST", operation, null);
assertEquals(co.responses.get(0).getHasVars(), false);
assertFalse(co.responses.get(0).getHasVars());
path = "/object_with_optional_and_required_props/{objectData}";
operation = openAPI.getPaths().get(path).getPost();
co = codegen.fromOperation(path, "POST", operation, null);
// does not have vars because the inline schema was extracted into a component ref
assertEquals(co.responses.get(0).getHasVars(), false);
assertFalse(co.responses.get(0).getHasVars());
}
@Test
@@ -3268,7 +3268,7 @@ public class DefaultCodegenTest {
for (String modelName : modelNamesWithoutRequired) {
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.getHasRequired(), false);
assertFalse(cm.getHasRequired());
}
List<String> modelNamesWithRequired = Arrays.asList(
@@ -3284,7 +3284,7 @@ public class DefaultCodegenTest {
for (String modelName : modelNamesWithRequired) {
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.getHasRequired(), true);
assertTrue(cm.getHasRequired());
}
}
@@ -3328,12 +3328,12 @@ public class DefaultCodegenTest {
for (CodegenProperty var : cm.getVars()) {
boolean hasRequired = var.getHasRequired();
if (modelNamesWithoutRequired.contains(var.name)) {
assertEquals(hasRequired, false);
assertFalse(hasRequired);
} else if (modelNamesWithRequired.contains(var.name)) {
assertEquals(hasRequired, true);
assertTrue(hasRequired);
} else {
// All variables must be in the above sets
assertEquals(true, false);
fail();
}
}
}
@@ -3378,12 +3378,12 @@ public class DefaultCodegenTest {
for (CodegenParameter param : co.pathParams) {
boolean hasRequired = param.getHasRequired();
if (modelNamesWithoutRequired.contains(param.baseName)) {
assertEquals(hasRequired, false);
assertFalse(hasRequired);
} else if (modelNamesWithRequired.contains(param.baseName)) {
assertEquals(hasRequired, true);
assertTrue(hasRequired);
} else {
// All variables must be in the above sets
assertEquals(true, false);
fail();
}
}
}
@@ -3428,12 +3428,12 @@ public class DefaultCodegenTest {
for (CodegenResponse cr : co.responses) {
boolean hasRequired = cr.getHasRequired();
if (modelNamesWithoutRequired.contains(cr.message)) {
assertEquals(hasRequired, false);
assertFalse(hasRequired);
} else if (modelNamesWithRequired.contains(cr.message)) {
assertEquals(hasRequired, true);
assertTrue(hasRequired);
} else {
// All variables must be in the above sets
assertEquals(true, false);
fail();
}
}
}
@@ -3452,50 +3452,50 @@ public class DefaultCodegenTest {
modelName = "UnboundedInteger";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.isUnboundedInteger, true);
assertEquals(cm.isInteger, true);
assertEquals(cm.isShort, false);
assertEquals(cm.isLong, false);
assertTrue(cm.isUnboundedInteger);
assertTrue(cm.isInteger);
assertFalse(cm.isShort);
assertFalse(cm.isLong);
modelName = "Int32";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.isUnboundedInteger, false);
assertEquals(cm.isInteger, true);
assertEquals(cm.isShort, true);
assertEquals(cm.isLong, false);
assertFalse(cm.isUnboundedInteger);
assertTrue(cm.isInteger);
assertTrue(cm.isShort);
assertFalse(cm.isLong);
modelName = "Int64";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.isUnboundedInteger, false);
assertEquals(cm.isInteger, false);
assertEquals(cm.isShort, false);
assertEquals(cm.isLong, true);
assertFalse(cm.isUnboundedInteger);
assertFalse(cm.isInteger);
assertFalse(cm.isShort);
assertTrue(cm.isLong);
modelName = "ObjectModelWithIntegerProps";
sc = openAPI.getComponents().getSchemas().get(modelName);
cm = codegen.fromModel(modelName, sc);
assertEquals(cm.isUnboundedInteger, false);
assertEquals(cm.isInteger, false);
assertEquals(cm.isShort, false);
assertEquals(cm.isLong, false);
assertFalse(cm.isUnboundedInteger);
assertFalse(cm.isInteger);
assertFalse(cm.isShort);
assertFalse(cm.isLong);
CodegenProperty cp;
cp = cm.vars.get(0);
assertEquals(cp.isUnboundedInteger, true);
assertEquals(cp.isInteger, true);
assertEquals(cp.isShort, false);
assertEquals(cp.isLong, false);
assertTrue(cp.isUnboundedInteger);
assertTrue(cp.isInteger);
assertFalse(cp.isShort);
assertFalse(cp.isLong);
cp = cm.vars.get(1);
assertEquals(cp.isUnboundedInteger, false);
assertEquals(cp.isInteger, true);
assertEquals(cp.isShort, true);
assertEquals(cp.isLong, false);
assertFalse(cp.isUnboundedInteger);
assertTrue(cp.isInteger);
assertTrue(cp.isShort);
assertFalse(cp.isLong);
cp = cm.vars.get(2);
assertEquals(cp.isUnboundedInteger, false);
assertEquals(cp.isInteger, false);
assertEquals(cp.isShort, false);
assertEquals(cp.isLong, true);
assertFalse(cp.isUnboundedInteger);
assertFalse(cp.isInteger);
assertFalse(cp.isShort);
assertTrue(cp.isLong);
String path;
Operation operation;
@@ -3507,58 +3507,58 @@ public class DefaultCodegenTest {
operation = openAPI.getPaths().get(path).getPost();
co = codegen.fromOperation(path, "POST", operation, null);
cpa = co.pathParams.get(0);
assertEquals(cpa.isUnboundedInteger, true);
assertEquals(cpa.isInteger, true);
assertEquals(cpa.isShort, false);
assertEquals(cpa.isLong, false);
assertTrue(cpa.isUnboundedInteger);
assertTrue(cpa.isInteger);
assertFalse(cpa.isShort);
assertFalse(cpa.isLong);
cpa = co.bodyParam;
assertEquals(cpa.isUnboundedInteger, true);
assertEquals(cpa.isInteger, true);
assertEquals(cpa.isShort, false);
assertEquals(cpa.isLong, false);
assertTrue(cpa.isUnboundedInteger);
assertTrue(cpa.isInteger);
assertFalse(cpa.isShort);
assertFalse(cpa.isLong);
cr = co.responses.get(0);
assertEquals(cr.isUnboundedInteger, true);
assertEquals(cr.isInteger, true);
assertEquals(cr.isShort, false);
assertEquals(cr.isLong, false);
assertTrue(cr.isUnboundedInteger);
assertTrue(cr.isInteger);
assertFalse(cr.isShort);
assertFalse(cr.isLong);
path = "/Int32";
operation = openAPI.getPaths().get(path).getPost();
co = codegen.fromOperation(path, "POST", operation, null);
cpa = co.pathParams.get(0);
assertEquals(cpa.isUnboundedInteger, false);
assertEquals(cpa.isInteger, true);
assertEquals(cpa.isShort, true);
assertEquals(cpa.isLong, false);
assertFalse(cpa.isUnboundedInteger);
assertTrue(cpa.isInteger);
assertTrue(cpa.isShort);
assertFalse(cpa.isLong);
cpa = co.bodyParam;
assertEquals(cpa.isUnboundedInteger, false);
assertEquals(cpa.isInteger, true);
assertEquals(cpa.isShort, true);
assertEquals(cpa.isLong, false);
assertFalse(cpa.isUnboundedInteger);
assertTrue(cpa.isInteger);
assertTrue(cpa.isShort);
assertFalse(cpa.isLong);
cr = co.responses.get(0);
assertEquals(cr.isUnboundedInteger, false);
assertEquals(cr.isInteger, true);
assertEquals(cr.isShort, true);
assertEquals(cr.isLong, false);
assertFalse(cr.isUnboundedInteger);
assertTrue(cr.isInteger);
assertTrue(cr.isShort);
assertFalse(cr.isLong);
path = "/Int64";
operation = openAPI.getPaths().get(path).getPost();
co = codegen.fromOperation(path, "POST", operation, null);
cpa = co.pathParams.get(0);
assertEquals(cpa.isUnboundedInteger, false);
assertEquals(cpa.isInteger, false);
assertEquals(cpa.isShort, false);
assertEquals(cpa.isLong, true);
assertFalse(cpa.isUnboundedInteger);
assertFalse(cpa.isInteger);
assertFalse(cpa.isShort);
assertTrue(cpa.isLong);
cpa = co.bodyParam;
assertEquals(cpa.isUnboundedInteger, false);
assertEquals(cpa.isInteger, false);
assertEquals(cpa.isShort, false);
assertEquals(cpa.isLong, true);
assertFalse(cpa.isUnboundedInteger);
assertFalse(cpa.isInteger);
assertFalse(cpa.isShort);
assertTrue(cpa.isLong);
cr = co.responses.get(0);
assertEquals(cr.isUnboundedInteger, false);
assertEquals(cr.isInteger, false);
assertEquals(cr.isShort, false);
assertEquals(cr.isLong, true);
assertFalse(cr.isUnboundedInteger);
assertFalse(cr.isInteger);
assertFalse(cr.isShort);
assertTrue(cr.isLong);
}
@Test

View File

@@ -30,7 +30,7 @@ public class AndroidClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
Assert.assertEquals(codegen.modelPackage(), "org.openapitools.client.model");
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "org.openapitools.client.model");
Assert.assertEquals(codegen.apiPackage(), "org.openapitools.client.api");

View File

@@ -30,7 +30,7 @@ public class CSharpClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
}
@Test
@@ -40,7 +40,7 @@ public class CSharpClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
@Test
@@ -50,7 +50,7 @@ public class CSharpClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
}

View File

@@ -78,7 +78,7 @@ public class CSharpModelTest {
final CodegenProperty property = generated.vars.get(1);
Assert.assertEquals(property.baseName, "examples");
Assert.assertEquals(property.name, "Examples");
Assert.assertEquals(property.defaultValue, null);
Assert.assertNull(property.defaultValue);
Assert.assertEquals(property.dataType, "Collection<string>");
Assert.assertEquals(property.baseType, "Collection");
Assert.assertEquals(property.containerType, "array");

View File

@@ -38,7 +38,7 @@ public class DartClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
}
@Test
@@ -48,7 +48,7 @@ public class DartClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
@Test
@@ -58,7 +58,7 @@ public class DartClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
@Test
@@ -77,11 +77,11 @@ public class DartClientCodegenTest {
Assert.fail(errorString, e);
}
Assert.assertEquals(reservedWordsList.size() > 20, true);
Assert.assertEquals(codegen.reservedWords().size() == reservedWordsList.size(), true);
Assert.assertTrue(reservedWordsList.size() > 20);
Assert.assertEquals(codegen.reservedWords().size(), reservedWordsList.size());
for(String keyword : reservedWordsList) {
// reserved words are stored in lowercase
Assert.assertEquals(codegen.reservedWords().contains(keyword.toLowerCase(Locale.ROOT)), true, String.format(Locale.ROOT, "%s, part of %s, was not found in %s", keyword, reservedWordsList, codegen.reservedWords().toString()));
Assert.assertTrue(codegen.reservedWords().contains(keyword.toLowerCase(Locale.ROOT)), String.format(Locale.ROOT, "%s, part of %s, was not found in %s", keyword, reservedWordsList, codegen.reservedWords().toString()));
}
}

View File

@@ -37,7 +37,7 @@ public class DartDioClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
}
@Test
@@ -47,7 +47,7 @@ public class DartDioClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
@Test
@@ -57,7 +57,7 @@ public class DartDioClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
@Test
@@ -74,11 +74,11 @@ public class DartDioClientCodegenTest {
Assert.fail(errorString, e);
}
Assert.assertEquals(reservedWordsList.size() > 20, true);
Assert.assertEquals(codegen.reservedWords().size() == reservedWordsList.size(), true);
Assert.assertTrue(reservedWordsList.size() > 20);
Assert.assertEquals(codegen.reservedWords().size(), reservedWordsList.size());
for(String keyword : reservedWordsList) {
// reserved words are stored in lowercase
Assert.assertEquals(codegen.reservedWords().contains(keyword.toLowerCase(Locale.ROOT)), true, String.format(Locale.ROOT, "%s, part of %s, was not found in %s", keyword, reservedWordsList, codegen.reservedWords().toString()));
Assert.assertTrue(codegen.reservedWords().contains(keyword.toLowerCase(Locale.ROOT)), String.format(Locale.ROOT, "%s, part of %s, was not found in %s", keyword, reservedWordsList, codegen.reservedWords().toString()));
}
}

View File

@@ -38,7 +38,7 @@ public class DartDioNextClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
}
@Test
@@ -48,7 +48,7 @@ public class DartDioNextClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
@Test
@@ -58,7 +58,7 @@ public class DartDioNextClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
@Test
@@ -75,11 +75,11 @@ public class DartDioNextClientCodegenTest {
Assert.fail(errorString, e);
}
Assert.assertEquals(reservedWordsList.size() > 20, true);
Assert.assertEquals(codegen.reservedWords().size() == reservedWordsList.size(), true);
Assert.assertTrue(reservedWordsList.size() > 20);
Assert.assertEquals(codegen.reservedWords().size(), reservedWordsList.size());
for(String keyword : reservedWordsList) {
// reserved words are stored in lowercase
Assert.assertEquals(codegen.reservedWords().contains(keyword.toLowerCase(Locale.ROOT)), true, String.format(Locale.ROOT, "%s, part of %s, was not found in %s", keyword, reservedWordsList, codegen.reservedWords().toString()));
Assert.assertTrue(codegen.reservedWords().contains(keyword.toLowerCase(Locale.ROOT)), String.format(Locale.ROOT, "%s, part of %s, was not found in %s", keyword, reservedWordsList, codegen.reservedWords().toString()));
}
}

View File

@@ -31,7 +31,7 @@ public class AbstractEiffelCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
@Test
@@ -41,7 +41,7 @@ public class AbstractEiffelCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
}
@Test
@@ -51,7 +51,7 @@ public class AbstractEiffelCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
}
private static class P_AbstractEiffelCodegen extends AbstractEiffelCodegen {

View File

@@ -30,7 +30,7 @@ public class EiffelClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
}
@Test
@@ -40,7 +40,7 @@ public class EiffelClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
@Test
@@ -50,7 +50,7 @@ public class EiffelClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
}

View File

@@ -65,7 +65,7 @@ public class FSharpServerCodegenTest {
Object[] keys = sorted.keySet().toArray();
Assert.assertTrue("wheel".equals(keys[0]));
Assert.assertEquals(keys[0], "wheel");
Assert.assertTrue("bike".equals(keys[1]) || "car".equals(keys[1]));
Assert.assertTrue("bike".equals(keys[2]) || "car".equals(keys[2]));
Assert.assertEquals(keys[3], "parent");

View File

@@ -38,7 +38,7 @@ public class AbstractGoCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
@Test
@@ -48,7 +48,7 @@ public class AbstractGoCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
}
@Test
@@ -58,7 +58,7 @@ public class AbstractGoCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
}
@Test

View File

@@ -36,7 +36,7 @@ public class GoClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
}
@Test
@@ -46,7 +46,7 @@ public class GoClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
@Test
@@ -56,7 +56,7 @@ public class GoClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
@Test(description = "test example value for body parameter")

View File

@@ -30,7 +30,7 @@ public class HaskellHttpClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
}
@Test
@@ -40,7 +40,7 @@ public class HaskellHttpClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
@Test
@@ -50,7 +50,7 @@ public class HaskellHttpClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
}
}

View File

@@ -24,6 +24,5 @@ public class HaskellModelTest {
@Test(description = "convert a haskell model with dots")
public void modelTest() {
Assert.assertEquals(true, true);
}
}

View File

@@ -131,7 +131,7 @@ public class AbstractJavaCodegenTest {
codegen.preprocessOpenAPI(openAPI);
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
Assert.assertEquals(codegen.modelPackage(), "invalidPackageName");
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "invalidPackageName");
Assert.assertEquals(codegen.apiPackage(), "invalidPackageName");
@@ -160,7 +160,7 @@ public class AbstractJavaCodegenTest {
codegen.preprocessOpenAPI(openAPI);
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
Assert.assertEquals(codegen.modelPackage(), "xyz.yyyyy.zzzzzzz.model");
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "xyz.yyyyy.zzzzzzz.model");
Assert.assertEquals(codegen.apiPackage(), "xyz.yyyyy.zzzzzzz.api");
@@ -188,7 +188,7 @@ public class AbstractJavaCodegenTest {
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
Assert.assertEquals(codegen.modelPackage(), "xyz.yyyyy.model.oooooo");
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "xyz.yyyyy.model.oooooo");
Assert.assertEquals(codegen.apiPackage(), "xyz.yyyyy.api.oooooo");

View File

@@ -79,7 +79,7 @@ public class JavaCXFClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
Assert.assertEquals(codegen.modelPackage(), "org.openapitools.model");
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "org.openapitools.model");
@@ -97,7 +97,7 @@ public class JavaCXFClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
Assert.assertEquals(codegen.modelPackage(), "org.openapitools.model");
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "org.openapitools.model");
Assert.assertEquals(codegen.apiPackage(), "org.openapitools.api");
@@ -114,7 +114,7 @@ public class JavaCXFClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
Assert.assertEquals(codegen.modelPackage(), "org.openapitools.model");
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "org.openapitools.model");
Assert.assertEquals(codegen.apiPackage(), "org.openapitools.api");

View File

@@ -146,7 +146,7 @@ public class JavaClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
Assert.assertEquals(codegen.modelPackage(), "org.openapitools.client.model");
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "org.openapitools.client.model");
@@ -168,7 +168,7 @@ public class JavaClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
Assert.assertEquals(codegen.modelPackage(), "xyz.yyyyy.zzzzzzz.model");
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "xyz.yyyyy.zzzzzzz.model");
Assert.assertEquals(codegen.apiPackage(), "xyz.yyyyy.zzzzzzz.api");
@@ -190,7 +190,7 @@ public class JavaClientCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
Assert.assertEquals(codegen.modelPackage(), "xyz.yyyyy.zzzzzzz.mmmmm.model");
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "xyz.yyyyy.zzzzzzz.mmmmm.model");
Assert.assertEquals(codegen.apiPackage(), "xyz.yyyyy.zzzzzzz.aaaaa.api");
@@ -526,10 +526,10 @@ public class JavaClientCodegenTest {
ApiResponse ok_200 = openAPI.getComponents().getResponses().get("OK_200");
CodegenResponse response = codegen.fromResponse("200", ok_200);
Assert.assertEquals(1, response.headers.size());
Assert.assertEquals(response.headers.size(), 1);
CodegenProperty header = response.headers.get(0);
Assert.assertEquals("UUID", header.dataType);
Assert.assertEquals("Request", header.baseName);
Assert.assertEquals(header.dataType, "UUID");
Assert.assertEquals(header.baseName, "Request");
}
@Test
@@ -746,9 +746,9 @@ public class JavaClientCodegenTest {
@Test
public void escapeName() {
final JavaClientCodegen codegen = new JavaClientCodegen();
assertEquals("_default", codegen.toApiVarName("Default"));
assertEquals("_int", codegen.toApiVarName("int"));
assertEquals("pony", codegen.toApiVarName("pony"));
assertEquals(codegen.toApiVarName("Default"), "_default");
assertEquals(codegen.toApiVarName("int"), "_int");
assertEquals(codegen.toApiVarName("pony"), "pony");
}
@Test

View File

@@ -52,7 +52,7 @@ public class JavaModelEnumTest {
Assert.assertEquals(enumVar.dataType, "String");
Assert.assertEquals(enumVar.datatypeWithEnum, "NameEnum");
Assert.assertEquals(enumVar.name, "name");
Assert.assertEquals(enumVar.defaultValue, null);
Assert.assertNull(enumVar.defaultValue);
Assert.assertEquals(enumVar.baseType, "String");
Assert.assertTrue(enumVar.isEnum);
}
@@ -83,7 +83,7 @@ public class JavaModelEnumTest {
Assert.assertEquals(enumVar.mostInnerItems.dataType, "String");
Assert.assertEquals(enumVar.mostInnerItems.datatypeWithEnum, "NameEnum");
Assert.assertEquals(enumVar.mostInnerItems.name, "name");
Assert.assertEquals(enumVar.mostInnerItems.defaultValue, null);
Assert.assertNull(enumVar.mostInnerItems.defaultValue);
Assert.assertEquals(enumVar.mostInnerItems.baseType, "String");
Assert.assertEquals(enumVar.mostInnerItems.baseType, enumVar.items.baseType);
@@ -116,7 +116,7 @@ public class JavaModelEnumTest {
Assert.assertEquals(enumVar.mostInnerItems.dataType, "String");
Assert.assertEquals(enumVar.mostInnerItems.datatypeWithEnum, "NameEnum");
Assert.assertEquals(enumVar.mostInnerItems.name, "name");
Assert.assertEquals(enumVar.mostInnerItems.defaultValue, null);
Assert.assertNull(enumVar.mostInnerItems.defaultValue);
Assert.assertEquals(enumVar.mostInnerItems.baseType, "String");
Assert.assertEquals(enumVar.mostInnerItems.baseType, enumVar.items.items.baseType);

View File

@@ -71,7 +71,7 @@ public class JavaModelTest {
Assert.assertEquals(property1.setter, "setId");
Assert.assertEquals(property1.dataType, "Long");
Assert.assertEquals(property1.name, "id");
Assert.assertEquals(property1.defaultValue, null);
Assert.assertNull(property1.defaultValue);
Assert.assertEquals(property1.baseType, "Long");
Assert.assertTrue(property1.required);
Assert.assertFalse(property1.isContainer);
@@ -84,7 +84,7 @@ public class JavaModelTest {
Assert.assertEquals(property2.setter, "setName");
Assert.assertEquals(property2.dataType, "String");
Assert.assertEquals(property2.name, "name");
Assert.assertEquals(property2.defaultValue, null);
Assert.assertNull(property2.defaultValue);
Assert.assertEquals(property2.baseType, "String");
Assert.assertEquals(property2.example, "Tony");
Assert.assertTrue(property2.required);
@@ -98,7 +98,7 @@ public class JavaModelTest {
Assert.assertEquals(property3.setter, "setCreatedAt");
Assert.assertEquals(property3.dataType, "Date");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertEquals(property3.defaultValue, null);
Assert.assertNull(property3.defaultValue);
Assert.assertEquals(property3.baseType, "Date");
Assert.assertFalse(property3.required);
Assert.assertFalse(property3.isContainer);
@@ -274,7 +274,7 @@ public class JavaModelTest {
Assert.assertEquals(property.setter, "setAtSomeColonRestrictedPercentCharactersHashToExclamationHandlePlus");
Assert.assertEquals(property.dataType, "Boolean");
Assert.assertEquals(property.name, "atSomeColonRestrictedPercentCharactersHashToExclamationHandlePlus");
Assert.assertEquals(property.defaultValue, null);
Assert.assertNull(property.defaultValue);
Assert.assertEquals(property.baseType, "Boolean");
Assert.assertFalse(property.required);
Assert.assertFalse(property.isContainer);
@@ -491,7 +491,7 @@ public class JavaModelTest {
Assert.assertEquals(property.setter, "setNAME");
Assert.assertEquals(property.dataType, "String");
Assert.assertEquals(property.name, "NAME");
Assert.assertEquals(property.defaultValue, null);
Assert.assertNull(property.defaultValue);
Assert.assertEquals(property.baseType, "String");
Assert.assertTrue(property.required);
Assert.assertFalse(property.isContainer);
@@ -518,7 +518,7 @@ public class JavaModelTest {
Assert.assertEquals(property.setter, "setNAME1");
Assert.assertEquals(property.dataType, "String");
Assert.assertEquals(property.name, "NAME1");
Assert.assertEquals(property.defaultValue, null);
Assert.assertNull(property.defaultValue);
Assert.assertEquals(property.baseType, "String");
Assert.assertTrue(property.required);
Assert.assertFalse(property.isContainer);
@@ -545,7 +545,7 @@ public class JavaModelTest {
Assert.assertEquals(property.setter, "setpId");
Assert.assertEquals(property.dataType, "String");
Assert.assertEquals(property.name, "pId");
Assert.assertEquals(property.defaultValue, null);
Assert.assertNull(property.defaultValue);
Assert.assertEquals(property.baseType, "String");
Assert.assertTrue(property.required);
Assert.assertFalse(property.isContainer);
@@ -572,7 +572,7 @@ public class JavaModelTest {
Assert.assertEquals(property.setter, "setAtTName");
Assert.assertEquals(property.dataType, "String");
Assert.assertEquals(property.name, "atTName");
Assert.assertEquals(property.defaultValue, null);
Assert.assertNull(property.defaultValue);
Assert.assertEquals(property.baseType, "String");
Assert.assertTrue(property.required);
Assert.assertFalse(property.isContainer);
@@ -599,7 +599,7 @@ public class JavaModelTest {
Assert.assertEquals(property.setter, "setATTNAME");
Assert.assertEquals(property.dataType, "String");
Assert.assertEquals(property.name, "ATT_NAME");
Assert.assertEquals(property.defaultValue, null);
Assert.assertNull(property.defaultValue);
Assert.assertEquals(property.baseType, "String");
Assert.assertTrue(property.required);
Assert.assertFalse(property.isContainer);
@@ -668,7 +668,7 @@ public class JavaModelTest {
Assert.assertEquals(property.setter, "setInputBinaryData");
Assert.assertEquals(property.dataType, "byte[]");
Assert.assertEquals(property.name, "inputBinaryData");
Assert.assertEquals(property.defaultValue, null);
Assert.assertNull(property.defaultValue);
Assert.assertEquals(property.baseType, "byte[]");
Assert.assertFalse(property.required);
Assert.assertFalse(property.isContainer);
@@ -694,7 +694,7 @@ public class JavaModelTest {
Assert.assertEquals(property.setter, "setU");
Assert.assertEquals(property.dataType, "String");
Assert.assertEquals(property.name, "u");
Assert.assertEquals(property.defaultValue, null);
Assert.assertNull(property.defaultValue);
Assert.assertEquals(property.baseType, "String");
Assert.assertFalse(property.isContainer);
}
@@ -839,7 +839,7 @@ public class JavaModelTest {
Assert.assertEquals(property2.setter, "setName");
Assert.assertEquals(property2.dataType, "String");
Assert.assertEquals(property2.name, "name");
Assert.assertEquals(property2.defaultValue, null);
Assert.assertNull(property2.defaultValue);
Assert.assertEquals(property2.baseType, "String");
Assert.assertEquals(property2.example, "Tony");
Assert.assertTrue(property2.required);
@@ -854,7 +854,7 @@ public class JavaModelTest {
Assert.assertEquals(property3.setter, "setCreatedAt");
Assert.assertEquals(property3.dataType, "Date");
Assert.assertEquals(property3.name, "createdAt");
Assert.assertEquals(property3.defaultValue, null);
Assert.assertNull(property3.defaultValue);
Assert.assertEquals(property3.baseType, "Date");
Assert.assertFalse(property3.required);
Assert.assertFalse(property3.isContainer);

View File

@@ -51,7 +51,7 @@ public class AbstractJavaJAXRSServerCodegenTest {
codegen.preprocessOpenAPI(openAPI);
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
Assert.assertFalse(codegen.isHideGenerationTimestamp());
Assert.assertEquals(codegen.modelPackage(), "org.openapitools.model");
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "org.openapitools.model");
Assert.assertEquals(codegen.apiPackage(), "org.openapitools.api");
@@ -71,7 +71,7 @@ public class AbstractJavaJAXRSServerCodegenTest {
codegen.processOpts();
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
Assert.assertEquals(codegen.modelPackage(), "xx.yyyyyyyy.model");
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "xx.yyyyyyyy.model");
Assert.assertEquals(codegen.apiPackage(), "xx.yyyyyyyy.api");
@@ -95,7 +95,7 @@ public class AbstractJavaJAXRSServerCodegenTest {
codegen.preprocessOpenAPI(openAPI);
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
Assert.assertTrue(codegen.isHideGenerationTimestamp());
Assert.assertEquals(codegen.modelPackage(), "xyz.yyyyy.mmmmm.model");
Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "xyz.yyyyy.mmmmm.model");
Assert.assertEquals(codegen.apiPackage(), "xyz.yyyyy.aaaaa.api");