Issue checkstyle#9746: update AbstractClassNameCheckTest.java use uni…

…que Input file in each test method
Ritik2604 · Mar 29, 2021 · 59164c8 · 59164c8
1 parent d728b6e
commit 59164c8
Show file tree

Hide file tree

Showing 6 changed files with 127 additions and 21 deletions.
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheckTest.java
@@ -46,11 +46,11 @@ public void testIllegalAbstractClassName() throws Exception {
         final String pattern = "^Abstract.+$";
 
         final String[] expected = {
-            "3:1: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "InputAbstractClassName",
+            "14:15: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "InputAbstractClassName",
                 pattern),
-            "6:1: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractClassName",
+            "17:15: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractClassName",
                 pattern),
-            "10:5: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractInnerClass",
+            "20:15: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractInnerClass",
                 pattern),
         };
 
@@ -64,17 +64,17 @@ public void testCustomFormat() throws Exception {
         checkConfig.addAttribute("ignoreName", "false");
         checkConfig.addAttribute("ignoreModifier", "true");
         checkConfig.addAttribute("format", "^NonAbstract.+$");
-
+        final String pattern = "^NonAbstract.+$";
         final String[] expected = {
-            "3:1: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "InputAbstractClassName",
-                "^NonAbstract.+$"),
-            "9:1: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "AbstractClassOther",
-                "^NonAbstract.+$"),
-            "21:1: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "AbstractClassName2",
-                "^NonAbstract.+$"),
+            "14:15: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "InputAbstractClassName",
+                pattern),
+            "17:15: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "AbstractClassOther",
+                pattern),
+            "20:15: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "AbstractClassName2",
+                pattern),
         };
 
-        verify(checkConfig, getPath("InputAbstractClassName.java"), expected);
+        verify(checkConfig, getPath("InputAbstractClassNameCustom.java"), expected);
     }
 
     @Test
@@ -84,11 +84,11 @@ public void testIllegalClassType() throws Exception {
         checkConfig.addAttribute("ignoreModifier", "false");
 
         final String[] expected = {
-            "18:1: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractClass"),
-            "22:5: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractInnerClass"),
+            "14:6: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractClass"),
+            "17:6: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractInnerClass"),
         };
 
-        verify(checkConfig, getPath("InputAbstractClassName.java"), expected);
+        verify(checkConfig, getPath("InputAbstractClassNameClassType.java"), expected);
     }
 
     @Test
@@ -100,25 +100,25 @@ public void testAllVariants() throws Exception {
         final String pattern = "^Abstract.+$";
 
         final String[] expected = {
-            "3:1: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "InputAbstractClassName",
+            "17:15: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "InputAbstractClassName",
                 pattern),
-            "6:1: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractClassName",
+            "20:15: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractClassName",
                 pattern),
-            "10:5: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractInnerClass",
+            "23:15: " + getCheckMessage(MSG_ILLEGAL_ABSTRACT_CLASS_NAME, "NonAbstractInnerClass",
                 pattern),
-            "18:1: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractClass"),
-            "22:5: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractInnerClass"),
+            "26:6: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractClass"),
+            "29:6: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractInnerClass"),
         };
 
-        verify(checkConfig, getPath("InputAbstractClassName.java"), expected);
+        verify(checkConfig, getPath("InputAbstractClassNameAllVariants.java"), expected);
     }
 
     @Test
     public void testFalsePositive() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(AbstractClassNameCheck.class);
 
         final String[] expected = {
-            "9:5: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractClass"),
+            "14:6: " + getCheckMessage(MSG_NO_ABSTRACT_CLASS_MODIFIER, "AbstractClass"),
         };
 
         verify(checkConfig, getPath("InputAbstractClassNameFormerFalsePositive.java"), expected);

diff --git a/...m/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassName.java b/...m/puppycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassName.java
@@ -0,0 +1,21 @@
+package com.puppycrawl.tools.checkstyle.checks.naming.abstractclassname;
+
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+
+import org.w3c.dom.Node;
+
+/* Config:
+ * pattern = "^Abstract.+$"
+ */
+abstract class AbstractClassName { // ok
+}
+
+abstract class InputAbstractClassName { // violation
+}
+
+abstract class NonAbstractClassName { // violation
+}
+
+abstract class NonAbstractInnerClass { // violation
+}
diff --git a/...l/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameAllVariants.java b/...l/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameAllVariants.java
@@ -0,0 +1,30 @@
+package com.puppycrawl.tools.checkstyle.checks.naming.abstractclassname;
+
+
+
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+
+import org.w3c.dom.Node;
+
+/* Config:
+ * pattern = "^Abstract.+$"
+ * modifier = abstract
+ */
+abstract class AbstractClassName { // ok
+}
+
+abstract class InputAbstractClassName { // violation
+}
+
+abstract class NonAbstractClassName { // violation
+}
+
+abstract class NonAbstractInnerClass { // violation
+}
+
+class AbstractClass { // violation
+}
+
+class AbstractInnerClass { // violation
+}
diff --git a/...awl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameClassType.java b/...awl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameClassType.java
@@ -0,0 +1,18 @@
+package com.puppycrawl.tools.checkstyle.checks.naming.abstractclassname;
+
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+
+import org.w3c.dom.Node;
+
+/* Config:
+ * modifier = abstract
+ */
+abstract class AbstractClassName { // ok
+}
+
+class AbstractClass { // violation
+}
+
+class AbstractInnerClass { // violation
+}
diff --git a/...ycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameCustom.java b/...ycrawl/tools/checkstyle/checks/naming/abstractclassname/InputAbstractClassNameCustom.java
@@ -0,0 +1,21 @@
+package com.puppycrawl.tools.checkstyle.checks.naming.abstractclassname;
+
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+
+import org.w3c.dom.Node;
+
+/* Config:
+ * pattern = "^NonAbstract.+$"
+ */
+abstract class NonAbstractClassName { // ok
+}
+
+abstract class InputAbstractClassName { // violation
+}
+
+abstract class AbstractClassOther { // violation
+}
+
+abstract class AbstractClassName2 { // violation
+}
diff --git a/...checkstyle/checks/naming/abstractclassname/InputAbstractClassNameFormerFalsePositive.java b/...checkstyle/checks/naming/abstractclassname/InputAbstractClassNameFormerFalsePositive.java
@@ -0,0 +1,16 @@
+package com.puppycrawl.tools.checkstyle.checks.naming.abstractclassname;
+
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+
+import org.w3c.dom.Node;
+
+/* Config:
+ * modifier = abstract
+ */
+abstract class AbstractClassName { // ok
+}
+
+class AbstractClass { // violation
+}
+