Skip to content

Commit 4c61e41

Browse files
committed
adjust enumpascal case exclusion to include type and enum value
1 parent 228cc70 commit 4c61e41

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

ctp-validators/src/main/kotlin/com/commercetools/rmf/validators/EnumValuePascalCaseRule.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ class EnumValuePascalCaseRule(severity: RuleSeverity, options: List<RuleOption>?
1515
override fun caseStringType(type: StringType): List<Diagnostic> {
1616
val validationResults: MutableList<Diagnostic> = ArrayList()
1717

18-
if (exclude.contains(type.name).not() && type.name != "string" && type.enum.isNullOrEmpty().not()) {
18+
if (type.name != "string" && type.enum.isNullOrEmpty().not()) {
1919
type.enum.forEach { enumValue ->
2020
val enumName = enumValue.value as? String
21-
if (enumName != null && !isPascalCase(enumName)) {
21+
if (enumName != null && exclude.contains("${type.name}:${enumName}").not() && !isPascalCase(enumName)) {
2222
validationResults.add(
2323
error(
2424
type,

ctp-validators/src/test/groovy/com/commercetools/rmf/validators/ValidatorRulesTest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,12 +456,12 @@ class ValidatorRulesTest extends Specification implements ValidatorFixtures {
456456

457457
def "enum value pascal case rule with exclusions"() {
458458
when:
459-
def options = singletonList(new RuleOption(RuleOptionType.EXCLUDE.toString(), "InvalidLowercaseEnum"))
459+
def options = singletonList(new RuleOption(RuleOptionType.EXCLUDE.toString(), "InvalidLowercaseEnum:platform"))
460460
def validators = Arrays.asList(new TypesValidator(Arrays.asList(EnumValuePascalCaseRule.create(options))))
461461
def uri = uriFromClasspath("/enum-value-pascal-case-rule.raml")
462462
def result = new RamlModelBuilder(validators).buildApi(uri)
463463
then:
464-
result.validationResults.size() == 14
464+
result.validationResults.size() == 16
465465
}
466466

467467
}

0 commit comments

Comments
 (0)