Class defaults should be pascal case

This commit is contained in:
Jeff Hube
2019-05-10 16:10:34 -04:00
parent 48617ee51c
commit 4bcdfba353
2 changed files with 11 additions and 11 deletions

View File

@@ -16,22 +16,22 @@ import net.sourceforge.pmd.properties.PropertyDescriptor;
public class ClassRegexNamingConventionsRule extends AbstractRegexNamingConventionsRule {
private static final Map<String, String> DESCRIPTOR_TO_DISPLAY_NAME = new HashMap<>();
private static final String TITLE_CASE = "[a-zA-Z0-9]+";
private static final String PASCAL_CASE = "[A-Z][a-zA-Z0-9]*";
private static final PropertyDescriptor<Pattern> TEST_CLASS_REGEX = prop("testClassPattern", "test class",
DESCRIPTOR_TO_DISPLAY_NAME).defaultValue(TITLE_CASE).build();
DESCRIPTOR_TO_DISPLAY_NAME).defaultValue(PASCAL_CASE).build();
private static final PropertyDescriptor<Pattern> ABSTRACT_CLASS_REGEX = prop("abstractClassPattern", "abstract class",
DESCRIPTOR_TO_DISPLAY_NAME).defaultValue(TITLE_CASE).build();
DESCRIPTOR_TO_DISPLAY_NAME).defaultValue(PASCAL_CASE).build();
private static final PropertyDescriptor<Pattern> CLASS_REGEX = prop("classPattern", "class",
DESCRIPTOR_TO_DISPLAY_NAME).defaultValue(TITLE_CASE).build();
DESCRIPTOR_TO_DISPLAY_NAME).defaultValue(PASCAL_CASE).build();
private static final PropertyDescriptor<Pattern> INTERFACE_REGEX = prop("interfacePattern", "interface",
DESCRIPTOR_TO_DISPLAY_NAME).defaultValue(TITLE_CASE).build();
DESCRIPTOR_TO_DISPLAY_NAME).defaultValue(PASCAL_CASE).build();
private static final PropertyDescriptor<Pattern> ENUM_REGEX = prop("enumPattern", "enum",
DESCRIPTOR_TO_DISPLAY_NAME).defaultValue(TITLE_CASE).build();
DESCRIPTOR_TO_DISPLAY_NAME).defaultValue(PASCAL_CASE).build();
public ClassRegexNamingConventionsRule() {
definePropertyDescriptor(TEST_CLASS_REGEX);

View File

@@ -52,7 +52,7 @@ public class Foo {
<description>test class default is title case</description>
<expected-problems>1</expected-problems>
<expected-messages>
<message>The test class name 'TEST_CLASS' doesn't match '[a-zA-Z0-9]+'</message>
<message>The test class name 'TEST_CLASS' doesn't match '[A-Z][a-zA-Z0-9]*'</message>
</expected-messages>
<code><![CDATA[
@isTest
@@ -64,7 +64,7 @@ public class TEST_CLASS { }
<description>abstract class default is title case</description>
<expected-problems>1</expected-problems>
<expected-messages>
<message>The abstract class name 'ABSTRACT_CLASS' doesn't match '[a-zA-Z0-9]+'</message>
<message>The abstract class name 'ABSTRACT_CLASS' doesn't match '[A-Z][a-zA-Z0-9]*'</message>
</expected-messages>
<code><![CDATA[
public abstract class ABSTRACT_CLASS { }
@@ -75,7 +75,7 @@ public abstract class ABSTRACT_CLASS { }
<description>class default is title case</description>
<expected-problems>1</expected-problems>
<expected-messages>
<message>The class name 'FOO_CLASS' doesn't match '[a-zA-Z0-9]+'</message>
<message>The class name 'FOO_CLASS' doesn't match '[A-Z][a-zA-Z0-9]*'</message>
</expected-messages>
<code><![CDATA[
public class FOO_CLASS { }
@@ -86,7 +86,7 @@ public class FOO_CLASS { }
<description>interface default is title case</description>
<expected-problems>1</expected-problems>
<expected-messages>
<message>The interface name 'FOO_INTERFACE' doesn't match '[a-zA-Z0-9]+'</message>
<message>The interface name 'FOO_INTERFACE' doesn't match '[A-Z][a-zA-Z0-9]*'</message>
</expected-messages>
<code><![CDATA[
public interface FOO_INTERFACE { }
@@ -97,7 +97,7 @@ public interface FOO_INTERFACE { }
<description>enum default is title case</description>
<expected-problems>1</expected-problems>
<expected-messages>
<message>The enum name 'FOO_ENUM' doesn't match '[a-zA-Z0-9]+'</message>
<message>The enum name 'FOO_ENUM' doesn't match '[A-Z][a-zA-Z0-9]*'</message>
</expected-messages>
<code><![CDATA[
public class Foo {