From 781dd1a35de94dc192d3f59eb591bd06948133c2 Mon Sep 17 00:00:00 2001
From: Arin Modi <arinmodi2306@gmail.com>
Date: Thu, 1 Dec 2022 13:09:38 +0530
Subject: [PATCH] Issue #12409: Inconsistent allowedAbbreviations

---
 .../checks/naming/AbbreviationAsWordInNameCheck.java |  4 ++--
 .../naming/AbbreviationAsWordInNameCheckTest.java    |  8 ++++----
 .../InputAbbreviationAsWordInNameType7.java          | 12 ++++++++----
 src/xdocs/config_naming.xml                          |  4 ++--
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java
index 257a8c81e87..0a185590b4b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java
@@ -299,7 +299,7 @@
  * <p>
  * To configure to check variables, enforce
  * no abbreviations (essentially camel case) except for
- * words like 'ORDERS', 'OBSERVATION', 'UNDERSCORE', 'TEST'.
+ * words like 'ORDERS', 'TEST'.
  * </p>
  * <p>Configuration:</p>
  * <pre>
@@ -310,7 +310,7 @@
  * <p>Example:</p>
  * <pre>
  * public class Test {
- *    void getORDER_OBSERVATION() {} // violation, at most 4 consecutive capital letters allowed
+ *    void getORDER_TEST() {} // OK, ignored
  * }
  * </pre>
  * <p>
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java
index 2e8f5a147ff..5b1f8cf1cce 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheckTest.java
@@ -470,10 +470,10 @@ public void testReceiver() throws Exception {
     @Test
     public void testInputAbbreviationAsWordInNameTypeWithUnderScore() throws Exception {
         final String[] expected = {
-            "12:17: " + getWarningMessage("HBCK_LOCK_PATH", 4),
-            "14:15: " + getWarningMessage("BOOL_VALS", 4),
-            "21:10: " + getWarningMessage("getNONE_Test", 4),
-            "38:13: " + getWarningMessage("LINE_SEP", 4),
+            "13:17: " + getWarningMessage("HBCK_LOCK_PATH", 4),
+            "16:15: " + getWarningMessage("BOOL_VALS", 4),
+            "24:10: " + getWarningMessage("getNONE_Test", 4),
+            "42:13: " + getWarningMessage("LINE_SEP", 4),
         };
 
         verifyWithInlineConfigParser(
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameType7.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameType7.java
index 6cc5bbb4774..9367554f68d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameType7.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/naming/abbreviationaswordinname/InputAbbreviationAsWordInNameType7.java
@@ -9,16 +9,19 @@
 package com.puppycrawl.tools.checkstyle.checks.naming.abbreviationaswordinname;
 
 public class InputAbbreviationAsWordInNameType7 {
-    private int HBCK_LOCK_PATH; // violation
+    // violation below 'Abb.* in name '.*' must contain no more than '4' consecutive cap.* let.*.'
+    private int HBCK_LOCK_PATH;
 
-    Boolean[] BOOL_VALS = { false, true }; // violation
+    // violation below 'Abb.* in name '.*' must contain no more than '4' consecutive cap.* let.*.'
+    Boolean[] BOOL_VALS = { false, true };
 
     void getTEST() {
     } // ok
 
     void getORDER_OBSERVATION() {} // ok
 
-    void getNONE_Test() {} // violation
+    // violation below 'Abb.* in name '.*' must contain no more than '4' consecutive cap.* let.*.'
+    void getNONE_Test() {}
 
     void getCLR_Test() {} // ok
 
@@ -35,7 +38,8 @@ void getOBSERVATION() {} // ok
     void getORDER_UNDERSCORE() {} // ok
 
     int getCLRTest() { // ok
-        int LINE_SEP = 1; // violation
+        // violation below 'Abb.* in name '.*' must contain no more than '4' conse.* cap.* let.*.'
+        int LINE_SEP = 1;
         return LINE_SEP;
     }
 }
diff --git a/src/xdocs/config_naming.xml b/src/xdocs/config_naming.xml
index 491189d1504..6c2e4a46f23 100644
--- a/src/xdocs/config_naming.xml
+++ b/src/xdocs/config_naming.xml
@@ -349,7 +349,7 @@ public class MyClass {
         <p>
           To configure to check variables, enforce
           no abbreviations (essentially camel case) except for
-          words like 'ORDERS', 'OBSERVATION', 'UNDERSCORE', 'TEST'.
+          words like 'ORDERS', 'TEST'.
         </p>
         <p>Configuration:</p>
         <source>
@@ -360,7 +360,7 @@ public class MyClass {
         <p>Example:</p>
         <source>
 public class Test {
-    void getORDER_OBSERVATION() {} // violation, at most 4 consecutive capital letters allowed
+    void getORDER_TEST() {} // OK, ignored
 }
         </source>
       </subsection>