From 5efa04e1bbcb5e90f72296f68534f2e626850ceb Mon Sep 17 00:00:00 2001 From: Oleg Sukhodolsky Date: Mon, 15 Dec 2003 11:38:17 +0000 Subject: [PATCH] Fixes for tests failures cause by last putback. --- .../usage/UnusedLocalVariableCheckTest.java | 14 +++++++------- .../usage/UnusedPrivateFieldCheckTest.java | 18 +++++++++--------- .../usage/UnusedPrivateMethodCheckTest.java | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/usage/UnusedLocalVariableCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/usage/UnusedLocalVariableCheckTest.java index 30dded5bc..ec10e0a14 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/checks/usage/UnusedLocalVariableCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/usage/UnusedLocalVariableCheckTest.java @@ -11,10 +11,10 @@ public class UnusedLocalVariableCheckTest final DefaultConfiguration checkConfig = createCheckConfig(UnusedLocalVariableCheck.class); final String[] expected = { - "13:13: Unread local variable 'mUnreadPrimitive'.", - "24:16: Unread local variable 'unreadObject'.", - "36:15: Unread local variable 'unreadArray'.", - "45:13: Unread local variable 'java'.", + "13:13: Unused local variable 'mUnreadPrimitive'.", + "24:16: Unused local variable 'unreadObject'.", + "36:15: Unused local variable 'unreadArray'.", + "45:13: Unused local variable 'java'.", }; verify(checkConfig, getPath("usage/InputUnusedLocal.java"), expected); } @@ -25,9 +25,9 @@ public class UnusedLocalVariableCheckTest createCheckConfig(UnusedLocalVariableCheck.class); checkConfig.addAttribute("ignoreFormat", "Array$"); final String[] expected = { - "13:13: Unread local variable 'mUnreadPrimitive'.", - "24:16: Unread local variable 'unreadObject'.", - "45:13: Unread local variable 'java'.", + "13:13: Unused local variable 'mUnreadPrimitive'.", + "24:16: Unused local variable 'unreadObject'.", + "45:13: Unused local variable 'java'.", }; verify(checkConfig, getPath("usage/InputUnusedLocal.java"), expected); } diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/usage/UnusedPrivateFieldCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/usage/UnusedPrivateFieldCheckTest.java index af876d19a..a996a7926 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/checks/usage/UnusedPrivateFieldCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/usage/UnusedPrivateFieldCheckTest.java @@ -11,11 +11,11 @@ public class UnusedPrivateFieldCheckTest final DefaultConfiguration checkConfig = createCheckConfig(UnusedPrivateFieldCheck.class); final String[] expected = { - "10:17: Unused field 'mUnreadPrimitive'.", - "16:19: Unused field 'mUnreadArray'.", - "20:17: Unused field 'mUnused2'.", - "22:30: Unused field 'SUNUSED'.", - "64:17: Unused field 'mUnused'.", + "10:17: Unused private field 'mUnreadPrimitive'.", + "16:19: Unused private field 'mUnreadArray'.", + "20:17: Unused private field 'mUnused2'.", + "22:30: Unused private field 'SUNUSED'.", + "64:17: Unused private field 'mUnused'.", }; verify(checkConfig, getPath("usage/InputUnusedField.java"), expected); } @@ -26,10 +26,10 @@ public class UnusedPrivateFieldCheckTest createCheckConfig(UnusedPrivateFieldCheck.class); checkConfig.addAttribute("ignoreFormat", "Array$"); final String[] expected = { - "10:17: Unused field 'mUnreadPrimitive'.", - "20:17: Unused field 'mUnused2'.", - "22:30: Unused field 'SUNUSED'.", - "64:17: Unused field 'mUnused'.", + "10:17: Unused private field 'mUnreadPrimitive'.", + "20:17: Unused private field 'mUnused2'.", + "22:30: Unused private field 'SUNUSED'.", + "64:17: Unused private field 'mUnused'.", }; verify(checkConfig, getPath("usage/InputUnusedField.java"), expected); } diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/usage/UnusedPrivateMethodCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/usage/UnusedPrivateMethodCheckTest.java index 44ec75e37..84ed31baa 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/checks/usage/UnusedPrivateMethodCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/usage/UnusedPrivateMethodCheckTest.java @@ -11,7 +11,7 @@ public class UnusedPrivateMethodCheckTest final DefaultConfiguration checkConfig = createCheckConfig(UnusedPrivateMethodCheck.class); final String[] expected = { - "7:18: Unused method 'methodUnused0'.", + "7:18: Unused private method 'methodUnused0'.", }; verify(checkConfig, getPath("usage/InputUnusedMethod.java"), expected); }