diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ConstantNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ConstantNamingConventionInspection.java index 45723bce72c1..7baa8c6cec2f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ConstantNamingConventionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ConstantNamingConventionInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2009 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2012 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,29 +61,23 @@ public class ConstantNamingConventionInspection extends ConventionInspection { public String buildErrorString(Object... infos) { final String fieldName = (String)infos[0]; if (fieldName.length() < getMinLength()) { - return InspectionGadgetsBundle.message( - "constant.naming.convention.problem.descriptor.short"); + return InspectionGadgetsBundle.message("constant.naming.convention.problem.descriptor.short"); } else if (fieldName.length() > getMaxLength()) { - return InspectionGadgetsBundle.message( - "constant.naming.convention.problem.descriptor.long"); + return InspectionGadgetsBundle.message("constant.naming.convention.problem.descriptor.long"); } - return InspectionGadgetsBundle.message( - "constant.naming.convention.problem.descriptor.regex.mismatch", - getRegex()); + return InspectionGadgetsBundle.message("constant.naming.convention.problem.descriptor.regex.mismatch", getRegex()); } @Override public Collection createExtraOptions() { return Arrays.asList( - new CheckBox(InspectionGadgetsBundle.message( - "constant.naming.convention.immutables.option"), this, - "onlyCheckImmutables")); + new CheckBox(InspectionGadgetsBundle.message("constant.naming.convention.immutables.option"), this, "onlyCheckImmutables")); } @Override protected String getDefaultRegex() { - return "[A-Z_\\d]*"; + return "[A-Z][A-Z_\\d]*"; } @Override @@ -109,8 +103,7 @@ public class ConstantNamingConventionInspection extends ConventionInspection { if (field instanceof PsiEnumConstant) { return; } - if (!field.hasModifierProperty(PsiModifier.STATIC) || - !field.hasModifierProperty(PsiModifier.FINAL)) { + if (!field.hasModifierProperty(PsiModifier.STATIC) || !field.hasModifierProperty(PsiModifier.FINAL)) { return; } final String name = field.getName(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/EnumeratedConstantNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/EnumeratedConstantNamingConventionInspection.java index a1e82a5a7956..330511733cda 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/EnumeratedConstantNamingConventionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/EnumeratedConstantNamingConventionInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2009 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2012 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,7 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.fixes.RenameFix; import org.jetbrains.annotations.NotNull; -public class EnumeratedConstantNamingConventionInspection - extends ConventionInspection { +public class EnumeratedConstantNamingConventionInspection extends ConventionInspection { private static final int DEFAULT_MIN_LENGTH = 5; private static final int DEFAULT_MAX_LENGTH = 32; @@ -31,8 +30,7 @@ public class EnumeratedConstantNamingConventionInspection @Override @NotNull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "enumerated.constant.naming.convention.display.name"); + return InspectionGadgetsBundle.message("enumerated.constant.naming.convention.display.name"); } @Override @@ -50,21 +48,17 @@ public class EnumeratedConstantNamingConventionInspection public String buildErrorString(Object... infos) { final String fieldName = (String)infos[0]; if (fieldName.length() < getMinLength()) { - return InspectionGadgetsBundle.message( - "enumerated.constant.naming.convention.problem.descriptor.short"); + return InspectionGadgetsBundle.message("enumerated.constant.naming.convention.problem.descriptor.short"); } else if (fieldName.length() > getMaxLength()) { - return InspectionGadgetsBundle.message( - "enumerated.constant.naming.convention.problem.descriptor.long"); + return InspectionGadgetsBundle.message("enumerated.constant.naming.convention.problem.descriptor.long"); } - return InspectionGadgetsBundle.message( - "enumerated.constant.naming.convention.problem.descriptor.regex.mismatch", - getRegex()); + return InspectionGadgetsBundle.message("enumerated.constant.naming.convention.problem.descriptor.regex.mismatch", getRegex()); } @Override protected String getDefaultRegex() { - return "[A-Z][A-Za-z\\d]*"; + return "[A-Z][A-Z_\\d]*"; } @Override diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/constant_naming_convention/ConstantNamingConvention.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/constant_naming_convention/ConstantNamingConvention.java new file mode 100644 index 000000000000..c6831a9181e6 --- /dev/null +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/constant_naming_convention/ConstantNamingConvention.java @@ -0,0 +1,7 @@ +package com.siyeh.igtest.naming.constant_naming_convention; + +class ConstantNamingConvention { + static final String A_B_C_D3 = ""; + static final String a = ""; + static final String aaaaaa = ""; +} \ No newline at end of file diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/constant_naming_convention/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/constant_naming_convention/expected.xml new file mode 100644 index 000000000000..18984482ee14 --- /dev/null +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/constant_naming_convention/expected.xml @@ -0,0 +1,16 @@ + + + + ConstantNamingConvention.java + 5 + Constant naming convention + Constant name <code>a</code> is too short #loc + + + + ConstantNamingConvention.java + 6 + Constant naming convention + Constant <code>aaaaaa</code> doesn't match regex '[A-Z][A-Z_\d]*' #loc + + \ No newline at end of file diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/enumerated_constant_naming_convention/EnumeratedConstantNamingConvention.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/enumerated_constant_naming_convention/EnumeratedConstantNamingConvention.java new file mode 100644 index 000000000000..e09cd6c95f1b --- /dev/null +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/enumerated_constant_naming_convention/EnumeratedConstantNamingConvention.java @@ -0,0 +1,7 @@ +package com.siyeh.igtest.naming.enumerated_constant_naming_convention; + +enum EnumeratedConstantNamingConvention { + A_B_C, + A, + aaaaaa +} \ No newline at end of file diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/enumerated_constant_naming_convention/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/enumerated_constant_naming_convention/expected.xml new file mode 100644 index 000000000000..7c95a6f2665c --- /dev/null +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/enumerated_constant_naming_convention/expected.xml @@ -0,0 +1,16 @@ + + + + EnumeratedConstantNamingConvention.java + 5 + Enumerated constant naming convention + Enumerated constant name <code>A</code> is too short #loc + + + + EnumeratedConstantNamingConvention.java + 6 + Enumerated constant naming convention + Enumerated constant <code>aaaaaa</code> doesn't match regex '[A-Z][A-Z_\d]*' #loc + + \ No newline at end of file diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/naming/ConstantNamingConventionInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/naming/ConstantNamingConventionInspectionTest.java new file mode 100644 index 000000000000..349e6e82d6d6 --- /dev/null +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/naming/ConstantNamingConventionInspectionTest.java @@ -0,0 +1,10 @@ +package com.siyeh.ig.naming; + +import com.siyeh.ig.IGInspectionTestCase; + +public class ConstantNamingConventionInspectionTest extends IGInspectionTestCase { + + public void test() throws Exception { + doTest("com/siyeh/igtest/naming/constant_naming_convention", new ConstantNamingConventionInspection()); + } +} \ No newline at end of file diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/naming/EnumeratedConstantNamingConventionInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/naming/EnumeratedConstantNamingConventionInspectionTest.java new file mode 100644 index 000000000000..9545709ee10e --- /dev/null +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/naming/EnumeratedConstantNamingConventionInspectionTest.java @@ -0,0 +1,10 @@ +package com.siyeh.ig.naming; + +import com.siyeh.ig.IGInspectionTestCase; + +public class EnumeratedConstantNamingConventionInspectionTest extends IGInspectionTestCase { + + public void test() throws Exception { + doTest("com/siyeh/igtest/naming/enumerated_constant_naming_convention", new EnumeratedConstantNamingConventionInspection()); + } +} \ No newline at end of file