From 2bf2138d04ebbb969c6c26d27f01ef0a572a64c8 Mon Sep 17 00:00:00 2001 From: Andrei Selkin Date: Sat, 23 Jul 2016 08:49:20 +0400 Subject: [PATCH] minor: fix hardcoded messages in UTs and spelling mistakes in FinalLocalVariable (#3361) --- .../coding/FinalLocalVariableCheck.java | 2 +- .../coding/FinalLocalVariableCheckTest.java | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java index 3ec540e35..4bf09d799 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java @@ -485,7 +485,7 @@ public class FinalLocalVariableCheck extends AbstractCheck { } /** - * Checks whether a variable which is declared ouside loop is used inside loop. + * Checks whether a variable which is declared outside loop is used inside loop. * For example: *

* {@code diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java index 019247d25..8d184982f 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java @@ -135,8 +135,8 @@ public class FinalLocalVariableCheckTest checkConfig.addAttribute("tokens", "VARIABLE_DEF, PARAMETER_DEF"); checkConfig.addAttribute("validateEnhancedForLoopVariable", "true"); final String[] expected = { - "8:20: " + "Variable 'a' should be declared final.", - "15:13: " + "Variable 'x' should be declared final.", + "8:20: " + getCheckMessage(MSG_KEY, "a"), + "15:13: " + getCheckMessage(MSG_KEY, "x"), }; verify(checkConfig, getPath("InputFinalLocalVariableEnhancedForLoopVariable.java"), expected); @@ -148,7 +148,7 @@ public class FinalLocalVariableCheckTest createCheckConfig(FinalLocalVariableCheck.class); checkConfig.addAttribute("tokens", "VARIABLE_DEF, PARAMETER_DEF"); final String[] expected = { - "15:13: " + "Variable 'x' should be declared final.", + "15:13: " + getCheckMessage(MSG_KEY, "x"), }; verify(checkConfig, getPath("InputFinalLocalVariableEnhancedForLoopVariable.java"), expected); @@ -161,7 +161,7 @@ public class FinalLocalVariableCheckTest createCheckConfig(FinalLocalVariableCheck.class); checkConfig.addAttribute("tokens", "PARAMETER_DEF,VARIABLE_DEF"); final String[] expected = { - "32:16: " + "Variable 'result' should be declared final.", + "32:16: " + getCheckMessage(MSG_KEY, "result"), }; verify(checkConfig, getPath("InputFinalLocalVariableNameLambda.java"), expected); @@ -175,8 +175,8 @@ public class FinalLocalVariableCheckTest checkConfig.addAttribute("tokens", "PARAMETER_DEF,VARIABLE_DEF"); final String[] expected = { - "4:28: " + "Variable 'text' should be declared final.", - "17:13: " + "Variable 'x' should be declared final.", + "4:28: " + getCheckMessage(MSG_KEY, "text"), + "17:13: " + getCheckMessage(MSG_KEY, "x"), }; verify(checkConfig, getPath("InputFinalLocalVariableNameShadowing.java"), expected); } @@ -198,16 +198,16 @@ public class FinalLocalVariableCheckTest } @Test - public void testVariavleWhichIsAssignedMultipleTimes() throws Exception { + public void testVariableWhichIsAssignedMultipleTimes() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(FinalLocalVariableCheck.class); final String[] expected = { - "49:13: " + "Variable 'i' should be declared final.", - "122:16: " + "Variable 'path' should be declared final.", - "126:20: " + "Variable 'relativePath' should be declared final.", - "202:17: " + "Variable 'kind' should be declared final.", - "207:24: " + "Variable 'm' should be declared final.", - "409:17: " + "Variable 'increment' should be declared final.", + "49:13: " + getCheckMessage(MSG_KEY, "i"), + "122:16: " + getCheckMessage(MSG_KEY, "path"), + "126:20: " + getCheckMessage(MSG_KEY, "relativePath"), + "202:17: " + getCheckMessage(MSG_KEY, "kind"), + "207:24: " + getCheckMessage(MSG_KEY, "m"), + "409:17: " + getCheckMessage(MSG_KEY, "increment"), }; verify(checkConfig, getPath("InputFinalLocalVariableAssignedMultipleTimes.java"), expected); }