Issue #2640: Change abbreviationAsWordInName error message to contains name that violates a format

1 files changed, 13 insertions, 10 deletions

diff --git a/src/it/java/com/google/checkstyle/test/chapter5naming/rule53camelcase/AbbreviationAsWordInNameTest.java b/src/it/java/com/google/checkstyle/test/chapter5naming/rule53camelcase/AbbreviationAsWordInNameTest.java
index fe7317fdb..9c6528715 100644
--- a/src/it/java/com/google/checkstyle/test/chapter5naming/rule53camelcase/AbbreviationAsWordInNameTest.java
+++ b/src/it/java/com/google/checkstyle/test/chapter5naming/rule53camelcase/AbbreviationAsWordInNameTest.java
@@ -43,18 +43,17 @@ public class AbbreviationAsWordInNameTest extends BaseCheckTestSupport {
     public void abbreviationAsWordInNameTest() throws Exception {
 
         final int maxCapitalCount = 1;
-        final String msg = getCheckMessage(clazz, MSG_KEY, maxCapitalCount);
 
         final String[] expected = {
-            "50: " + msg,
-            "52: " + msg,
-            "54: " + msg,
-            "58: " + msg,
-            "60: " + msg,
-            "62: " + msg,
-            "67: " + msg,
-            "69: " + msg,
-            "71: " + msg,
+            "50: " + getWarningMessage("newCustomerID", maxCapitalCount),
+            "52: " + getWarningMessage("supportsIPv6OnIOS", maxCapitalCount),
+            "54: " + getWarningMessage("XMLHTTPRequest", maxCapitalCount),
+            "58: " + getWarningMessage("newCustomerID", maxCapitalCount),
+            "60: " + getWarningMessage("supportsIPv6OnIOS", maxCapitalCount),
+            "62: " + getWarningMessage("XMLHTTPRequest", maxCapitalCount),
+            "67: " + getWarningMessage("newCustomerID", maxCapitalCount),
+            "69: " + getWarningMessage("supportsIPv6OnIOS", maxCapitalCount),
+            "71: " + getWarningMessage("XMLHTTPRequest", maxCapitalCount),
         };
 
         final String filePath = getPath("InputAbbreviationAsWordInTypeNameCheck.java");
@@ -63,4 +62,8 @@ public class AbbreviationAsWordInNameTest extends BaseCheckTestSupport {
         final Integer[] warnList = getLinesWithWarn(filePath);
         verify(checkConfig, filePath, expected, warnList);
     }
+
+    private String getWarningMessage(String typeName, int expectedCapitalCount) {
+        return getCheckMessage(clazz, MSG_KEY, typeName, expectedCapitalCount);
+    }
 }