From cb475adb81d2c3242b38ea5cf44fc7c9b9fa09e3 Mon Sep 17 00:00:00 2001 From: Rick Giles Date: Sat, 16 Nov 2002 20:27:48 +0000 Subject: [PATCH] corrected syntax errors in test inputs --- .../tools/checkstyle/InputBraces.java | 5 +- .../tools/checkstyle/InputHiddenField.java | 2 + .../checkstyle/InputSimplifyBoolean.java | 4 +- .../checkstyle/HiddenFieldCheckTest.java | 54 +++++++++---------- .../checkstyle/WhitespaceAfterCheckTest.java | 2 +- 5 files changed, 35 insertions(+), 32 deletions(-) diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/InputBraces.java b/src/testinputs/com/puppycrawl/tools/checkstyle/InputBraces.java index 32139e5d0..14956cfbb 100644 --- a/src/testinputs/com/puppycrawl/tools/checkstyle/InputBraces.java +++ b/src/testinputs/com/puppycrawl/tools/checkstyle/InputBraces.java @@ -103,10 +103,11 @@ class InputBraces void whitespaceAfterSemi() { + //reject + int i = 1;int j = 2; + //accept for (;;) { } - //reject - int i = 1;int j = 2; } } diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/InputHiddenField.java b/src/testinputs/com/puppycrawl/tools/checkstyle/InputHiddenField.java index 60d28bf13..8de89f9a1 100644 --- a/src/testinputs/com/puppycrawl/tools/checkstyle/InputHiddenField.java +++ b/src/testinputs/com/puppycrawl/tools/checkstyle/InputHiddenField.java @@ -1,3 +1,5 @@ +package com.puppycrawl.tools.checkstyle; + //////////////////////////////////////////////////////////////////////////////// // Test case file for checkstyle. // Created: 2002 diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/InputSimplifyBoolean.java b/src/testinputs/com/puppycrawl/tools/checkstyle/InputSimplifyBoolean.java index 9795a9b67..026e61e6c 100644 --- a/src/testinputs/com/puppycrawl/tools/checkstyle/InputSimplifyBoolean.java +++ b/src/testinputs/com/puppycrawl/tools/checkstyle/InputSimplifyBoolean.java @@ -14,7 +14,7 @@ public class InputSimplifyBoolean public static boolean isOddMillis() { - boolean even = System.currentMillis() % 2 == 0; + boolean even = System.currentTimeMillis() % 2 == 0; // can be simplified to "if (even)" if (even == true) { @@ -28,7 +28,7 @@ public class InputSimplifyBoolean public static boolean isOddMillis2() { - boolean even = System.currentMillis() % 2 == 0; + boolean even = System.currentTimeMillis() % 2 == 0; // can be simplified to "return !even" if (!even) return true; diff --git a/src/tests/com/puppycrawl/tools/checkstyle/HiddenFieldCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/HiddenFieldCheckTest.java index 3433a2080..7dd89d2ac 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/HiddenFieldCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/HiddenFieldCheckTest.java @@ -14,17 +14,17 @@ public class HiddenFieldCheckTest final Checker c = createChecker(checkConfig); final String fname = getPath("InputHiddenField.java"); final String[] expected = { - "16:13: 'hidden' hides a field.", - "25:13: 'hidden' hides a field.", - "30:18: 'hidden' hides a field.", - "44:17: 'innerHidden' hides a field.", - "53:17: 'innerHidden' hides a field.", - "54:17: 'hidden' hides a field.", - "59:22: 'innerHidden' hides a field.", - "62:22: 'hidden' hides a field.", - "74:17: 'innerHidden' hides a field.", - "75:17: 'hidden' hides a field.", - "80:13: 'hidden' hides a field.", + "18:13: 'hidden' hides a field.", + "27:13: 'hidden' hides a field.", + "32:18: 'hidden' hides a field.", + "46:17: 'innerHidden' hides a field.", + "55:17: 'innerHidden' hides a field.", + "56:17: 'hidden' hides a field.", + "61:22: 'innerHidden' hides a field.", + "64:22: 'hidden' hides a field.", + "76:17: 'innerHidden' hides a field.", + "77:17: 'hidden' hides a field.", + "82:13: 'hidden' hides a field.", }; verify(c, fname, expected); } @@ -37,22 +37,22 @@ public class HiddenFieldCheckTest final Checker c = createChecker(checkConfig); final String fname = getPath("InputHiddenField.java"); final String[] expected = { - "16:13: 'hidden' hides a field.", - "19:33: 'hidden' hides a field.", - "25:13: 'hidden' hides a field.", - "30:18: 'hidden' hides a field.", - "34:33: 'hidden' hides a field.", - "44:17: 'innerHidden' hides a field.", - "47:26: 'innerHidden' hides a field.", - "53:17: 'innerHidden' hides a field.", - "54:17: 'hidden' hides a field.", - "59:22: 'innerHidden' hides a field.", - "62:22: 'hidden' hides a field.", - "67:17: 'innerHidden' hides a field.", - "68:17: 'hidden' hides a field.", - "74:17: 'innerHidden' hides a field.", - "75:17: 'hidden' hides a field.", - "80:13: 'hidden' hides a field.", + "18:13: 'hidden' hides a field.", + "21:33: 'hidden' hides a field.", + "27:13: 'hidden' hides a field.", + "32:18: 'hidden' hides a field.", + "36:33: 'hidden' hides a field.", + "46:17: 'innerHidden' hides a field.", + "49:26: 'innerHidden' hides a field.", + "55:17: 'innerHidden' hides a field.", + "56:17: 'hidden' hides a field.", + "61:22: 'innerHidden' hides a field.", + "64:22: 'hidden' hides a field.", + "69:17: 'innerHidden' hides a field.", + "70:17: 'hidden' hides a field.", + "76:17: 'innerHidden' hides a field.", + "77:17: 'hidden' hides a field.", + "82:13: 'hidden' hides a field.", }; verify(c, fname, expected); } diff --git a/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAfterCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAfterCheckTest.java index 9026f5d33..87ac75209 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAfterCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAfterCheckTest.java @@ -41,7 +41,7 @@ public class WhitespaceAfterCheckTest final String[] expected = { "58:23: ';' is not followed by whitespace.", "58:29: ';' is not followed by whitespace.", - "110:19: ';' is not followed by whitespace.", + "107:19: ';' is not followed by whitespace.", }; verify(c, fname, expected); }