diff --git a/lib/junit.jar b/lib/junit.jar index 914a5cfa9..674d71e89 100644 Binary files a/lib/junit.jar and b/lib/junit.jar differ diff --git a/src/tests/com/puppycrawl/tools/checkstyle/AvoidStarImportTest.java b/src/tests/com/puppycrawl/tools/checkstyle/AvoidStarImportTest.java index 4744be843..9758b591b 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/AvoidStarImportTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/AvoidStarImportTest.java @@ -3,13 +3,8 @@ package com.puppycrawl.tools.checkstyle; import com.puppycrawl.tools.checkstyle.checks.AvoidStarImport; public class AvoidStarImportTest -extends BaseCheckTestCase + extends BaseCheckTestCase { - public AvoidStarImportTest(String aName) - { - super(aName); - } - public void testWithChecker() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/BaseCheckTestCase.java b/src/tests/com/puppycrawl/tools/checkstyle/BaseCheckTestCase.java index e98d7f444..6a41c8bbd 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/BaseCheckTestCase.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/BaseCheckTestCase.java @@ -32,11 +32,6 @@ public abstract class BaseCheckTestCase private final PrintStream mStream = new PrintStream(mBAOS); protected final Properties mProps = new Properties(); - public BaseCheckTestCase(String aName) - { - super(aName); - } - protected Checker createChecker(CheckConfiguration aCheckConfig) throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/ConstantNameCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/ConstantNameCheckTest.java index 929571755..81a44a208 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/ConstantNameCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/ConstantNameCheckTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.ConstantNameCheck; public class ConstantNameCheckTest extends BaseCheckTestCase { - public ConstantNameCheckTest(String aName) - { - super(aName); - } - public void testDefault() throws Exception { @@ -23,7 +18,7 @@ public class ConstantNameCheckTest }; verify(c, fname, expected); } - + public void testInterface() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/EmptyBlockCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/EmptyBlockCheckTest.java index d938cfec7..a0e8bebc8 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/EmptyBlockCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/EmptyBlockCheckTest.java @@ -6,11 +6,6 @@ import com.puppycrawl.tools.checkstyle.checks.BlockOption; public class EmptyBlockCheckTest extends BaseCheckTestCase { - public EmptyBlockCheckTest(String aName) - { - super(aName); - } - public void testDefault() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/EqualsHashCodeCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/EqualsHashCodeCheckTest.java index 72bf1bb83..5291f3e35 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/EqualsHashCodeCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/EqualsHashCodeCheckTest.java @@ -3,13 +3,8 @@ package com.puppycrawl.tools.checkstyle; import com.puppycrawl.tools.checkstyle.checks.EqualsHashCodeCheck; public class EqualsHashCodeCheckTest - extends BaseCheckTestCase + extends BaseCheckTestCase { - public EqualsHashCodeCheckTest(String aName) - { - super(aName); - } - public void testIt() throws Exception { final CheckConfiguration checkConfig = new CheckConfiguration(); diff --git a/src/tests/com/puppycrawl/tools/checkstyle/FileLengthCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/FileLengthCheckTest.java index b04d321fb..f7f38648f 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/FileLengthCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/FileLengthCheckTest.java @@ -4,13 +4,8 @@ import com.puppycrawl.tools.checkstyle.checks.FileLengthCheck; import org.apache.commons.beanutils.ConversionException; public class FileLengthCheckTest - extends BaseCheckTestCase + extends BaseCheckTestCase { - public FileLengthCheckTest(String aName) - { - super(aName); - } - private void runIt(String aMax, String[] aExpected) throws Exception { final CheckConfiguration checkConfig = new CheckConfiguration(); diff --git a/src/tests/com/puppycrawl/tools/checkstyle/GenericIllegalRegexpCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/GenericIllegalRegexpCheckTest.java index 2c4e1519a..0a9b48da9 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/GenericIllegalRegexpCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/GenericIllegalRegexpCheckTest.java @@ -3,13 +3,8 @@ package com.puppycrawl.tools.checkstyle; import com.puppycrawl.tools.checkstyle.checks.GenericIllegalRegexpCheck; public class GenericIllegalRegexpCheckTest - extends BaseCheckTestCase + extends BaseCheckTestCase { - public GenericIllegalRegexpCheckTest(String aName) - { - super(aName); - } - public void testIt() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/GlobalPropertiesSerializationTest.java b/src/tests/com/puppycrawl/tools/checkstyle/GlobalPropertiesSerializationTest.java index 2644c3912..0b44ab593 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/GlobalPropertiesSerializationTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/GlobalPropertiesSerializationTest.java @@ -13,11 +13,6 @@ import org.apache.regexp.RE; public class GlobalPropertiesSerializationTest extends TestCase { - public GlobalPropertiesSerializationTest(String name) - { - super(name); - } - /** * Copy mConfig using in-memory serialization * @param aConfig the original diff --git a/src/tests/com/puppycrawl/tools/checkstyle/GlobalPropertiesTest.java b/src/tests/com/puppycrawl/tools/checkstyle/GlobalPropertiesTest.java index 63dcea639..496671c7f 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/GlobalPropertiesTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/GlobalPropertiesTest.java @@ -7,11 +7,6 @@ import java.util.Properties; public class GlobalPropertiesTest extends TestCase { - public GlobalPropertiesTest(String name) - { - super(name); - } - public void test1() throws Exception { final Properties p = new Properties(); diff --git a/src/tests/com/puppycrawl/tools/checkstyle/HeaderCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/HeaderCheckTest.java index 88f064d0f..990a56945 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/HeaderCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/HeaderCheckTest.java @@ -6,11 +6,6 @@ import com.puppycrawl.tools.checkstyle.CheckstyleException; public class HeaderCheckTest extends BaseCheckTestCase { - public HeaderCheckTest(String aName) - { - super(aName); - } - public void testStaticHeader() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/HiddenFieldCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/HiddenFieldCheckTest.java index 37e4da525..3433a2080 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/HiddenFieldCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/HiddenFieldCheckTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.HiddenFieldCheck; public class HiddenFieldCheckTest extends BaseCheckTestCase { - public HiddenFieldCheckTest(String aName) - { - super(aName); - } - public void testNoParameters() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/IllegalImportCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/IllegalImportCheckTest.java index 1b849b180..ed536ae07 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/IllegalImportCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/IllegalImportCheckTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.IllegalImportCheck; public class IllegalImportCheckTest extends BaseCheckTestCase { - public IllegalImportCheckTest(String aName) - { - super(aName); - } - public void testWithSupplied() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/IllegalInstantiationCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/IllegalInstantiationCheckTest.java index bce414011..578bbd079 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/IllegalInstantiationCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/IllegalInstantiationCheckTest.java @@ -3,13 +3,8 @@ package com.puppycrawl.tools.checkstyle; import com.puppycrawl.tools.checkstyle.checks.IllegalInstantiationCheck; public class IllegalInstantiationCheckTest - extends BaseCheckTestCase + extends BaseCheckTestCase { - public IllegalInstantiationCheckTest(String aName) - { - super(aName); - } - public void testIt() throws Exception { final CheckConfiguration checkConfig = new CheckConfiguration(); diff --git a/src/tests/com/puppycrawl/tools/checkstyle/InnerAssignmentCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/InnerAssignmentCheckTest.java index cbc8bcc75..3f169d196 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/InnerAssignmentCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/InnerAssignmentCheckTest.java @@ -3,13 +3,8 @@ package com.puppycrawl.tools.checkstyle; import com.puppycrawl.tools.checkstyle.checks.InnerAssignmentCheck; public class InnerAssignmentCheckTest - extends BaseCheckTestCase + extends BaseCheckTestCase { - public InnerAssignmentCheckTest(String aName) - { - super(aName); - } - public void testIt() throws Exception { final CheckConfiguration checkConfig = new CheckConfiguration(); diff --git a/src/tests/com/puppycrawl/tools/checkstyle/JavadocMethodCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/JavadocMethodCheckTest.java index 4b7754350..fc8575be4 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/JavadocMethodCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/JavadocMethodCheckTest.java @@ -7,11 +7,6 @@ import com.puppycrawl.tools.checkstyle.checks.JavadocMethodCheck; public class JavadocMethodCheckTest extends BaseCheckTestCase { - public JavadocMethodCheckTest(String aName) - { - super(aName); - } - public void testTags() throws Exception { @@ -49,7 +44,7 @@ public class JavadocMethodCheckTest public void testTagsWithResolver() throws Exception - { + { final CheckConfiguration checkConfig = new CheckConfiguration(); checkConfig.setClassname(JavadocMethodCheck.class.getName()); checkConfig.addProperty("checkUnusedThrows", "true"); @@ -123,7 +118,7 @@ public class JavadocMethodCheckTest public void testRelaxedJavadoc() throws Exception { - + final CheckConfiguration checkConfig = new CheckConfiguration(); checkConfig.setClassname(JavadocMethodCheck.class.getName()); checkConfig.addProperty("scope", Scope.PROTECTED.getName()); @@ -182,7 +177,7 @@ public class JavadocMethodCheckTest }; verify(c, fname, expected); } - + public void testScopeAnonInnerWithResolver() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/JavadocTypeCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/JavadocTypeCheckTest.java index cfbb92d31..2d4312350 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/JavadocTypeCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/JavadocTypeCheckTest.java @@ -13,11 +13,6 @@ import com.puppycrawl.tools.checkstyle.checks.JavadocTypeCheck; */ public class JavadocTypeCheckTest extends BaseCheckTestCase { - public JavadocTypeCheckTest(String arg0) - { - super(arg0); - } - public void testTags() throws Exception { final CheckConfiguration checkConfig = new CheckConfiguration(); diff --git a/src/tests/com/puppycrawl/tools/checkstyle/JavadocVariableCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/JavadocVariableCheckTest.java index 50b9396ad..dd9f8b64f 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/JavadocVariableCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/JavadocVariableCheckTest.java @@ -7,11 +7,6 @@ import com.puppycrawl.tools.checkstyle.checks.JavadocVariableCheck; public class JavadocVariableCheckTest extends BaseCheckTestCase { - public JavadocVariableCheckTest(String aName) - { - super(aName); - } - public void testDefault() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/LineLengthCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/LineLengthCheckTest.java index 49138cebc..a930ea54e 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/LineLengthCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/LineLengthCheckTest.java @@ -4,12 +4,6 @@ import com.puppycrawl.tools.checkstyle.checks.LineLengthCheck; public class LineLengthCheckTest extends BaseCheckTestCase { - public LineLengthCheckTest(String aName) - { - super(aName); - } - - public void testSimple() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/LocalFinalVariableNameCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/LocalFinalVariableNameCheckTest.java index 9b0edea81..f6b598aae 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/LocalFinalVariableNameCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/LocalFinalVariableNameCheckTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.LocalFinalVariableNameCheck; public class LocalFinalVariableNameCheckTest extends BaseCheckTestCase { - public LocalFinalVariableNameCheckTest(String aName) - { - super(aName); - } - public void testDefault() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/LocalVariableNameCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/LocalVariableNameCheckTest.java index f72780b3b..e1f7ab0de 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/LocalVariableNameCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/LocalVariableNameCheckTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.LocalVariableNameCheck; public class LocalVariableNameCheckTest extends BaseCheckTestCase { - public LocalVariableNameCheckTest(String aName) - { - super(aName); - } - public void testDefault() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/LocalizedMessageTest.java b/src/tests/com/puppycrawl/tools/checkstyle/LocalizedMessageTest.java index db09a6347..46493bd2d 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/LocalizedMessageTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/LocalizedMessageTest.java @@ -9,11 +9,6 @@ import com.puppycrawl.tools.checkstyle.api.LocalizedMessage; public class LocalizedMessageTest extends TestCase { - public LocalizedMessageTest(String name) - { - super(name); - } - protected void setUp() throws Exception { LocalizedMessage.setLocale(Locale.ENGLISH); diff --git a/src/tests/com/puppycrawl/tools/checkstyle/MemberNameCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/MemberNameCheckTest.java index 5f8ec7e15..69ed823bf 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/MemberNameCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/MemberNameCheckTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.MemberNameCheck; public class MemberNameCheckTest extends BaseCheckTestCase { - public MemberNameCheckTest(String aName) - { - super(aName); - } - public void testSpecified() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/MethodLeftCurlyCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/MethodLeftCurlyCheckTest.java index a31dde84a..6d376732a 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/MethodLeftCurlyCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/MethodLeftCurlyCheckTest.java @@ -6,11 +6,6 @@ import com.puppycrawl.tools.checkstyle.checks.LeftCurlyOption; public class MethodLeftCurlyCheckTest extends BaseCheckTestCase { - public MethodLeftCurlyCheckTest(String aName) - { - super(aName); - } - public void testDefault() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/MethodLengthCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/MethodLengthCheckTest.java index 5c48104a6..ff4a2c23c 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/MethodLengthCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/MethodLengthCheckTest.java @@ -22,11 +22,6 @@ import com.puppycrawl.tools.checkstyle.checks.MethodLengthCheck; public class MethodLengthCheckTest extends BaseCheckTestCase { - public MethodLengthCheckTest(String aName) - { - super(aName); - } - public void testIt() throws Exception { final CheckConfiguration checkConfig = new CheckConfiguration(); @@ -50,4 +45,4 @@ public class MethodLengthCheckTest extends BaseCheckTestCase }; verify(c, fname, expected); } -} \ No newline at end of file +} diff --git a/src/tests/com/puppycrawl/tools/checkstyle/MethodNameCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/MethodNameCheckTest.java index cc19dc6b9..d612ec3dd 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/MethodNameCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/MethodNameCheckTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.MethodNameCheck; public class MethodNameCheckTest extends BaseCheckTestCase { - public MethodNameCheckTest(String aName) - { - super(aName); - } - public void testDefault() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/ModifierCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/ModifierCheckTest.java index 6cecc5df8..175a727a4 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/ModifierCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/ModifierCheckTest.java @@ -3,13 +3,8 @@ package com.puppycrawl.tools.checkstyle; import com.puppycrawl.tools.checkstyle.checks.ModifierCheck; public class ModifierCheckTest - extends BaseCheckTestCase + extends BaseCheckTestCase { - public ModifierCheckTest(String aName) - { - super(aName); - } - public void testIt() throws Exception { final CheckConfiguration checkConfig = new CheckConfiguration(); diff --git a/src/tests/com/puppycrawl/tools/checkstyle/NeedBracesCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/NeedBracesCheckTest.java index 611e63446..64327acf5 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/NeedBracesCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/NeedBracesCheckTest.java @@ -16,18 +16,12 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //////////////////////////////////////////////////////////////////////////////// - package com.puppycrawl.tools.checkstyle; import com.puppycrawl.tools.checkstyle.checks.NeedBracesCheck; public class NeedBracesCheckTest extends BaseCheckTestCase { - public NeedBracesCheckTest(String aName) - { - super(aName); - } - public void testIt() throws Exception { final CheckConfiguration checkConfig = new CheckConfiguration(); @@ -55,4 +49,4 @@ public class NeedBracesCheckTest extends BaseCheckTestCase }; verify(c, fname, expected); } -} \ No newline at end of file +} diff --git a/src/tests/com/puppycrawl/tools/checkstyle/NoWhitespaceAfterCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/NoWhitespaceAfterCheckTest.java index e952c87a2..9d7963022 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/NoWhitespaceAfterCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/NoWhitespaceAfterCheckTest.java @@ -6,17 +6,12 @@ public class NoWhitespaceAfterCheckTest extends BaseCheckTestCase { private CheckConfiguration checkConfig; - - public NoWhitespaceAfterCheckTest(String aName) - { - super(aName); - } - + public void setUp() { checkConfig = new CheckConfiguration(); checkConfig.setClassname(NoWhitespaceAfterCheck.class.getName()); } - + public void testDefault() throws Exception { final Checker c = createChecker(checkConfig); @@ -31,7 +26,7 @@ public class NoWhitespaceAfterCheckTest }; verify(c, fname, expected); } - + public void testDot() throws Exception { checkConfig.addTokens("DOT"); @@ -47,7 +42,7 @@ public class NoWhitespaceAfterCheckTest verify(c, fname, expected); } - + public void testDotAllowLineBreaks() throws Exception { checkConfig.addTokens("DOT"); @@ -61,5 +56,5 @@ public class NoWhitespaceAfterCheckTest }; verify(c, fname, expected); } - + } diff --git a/src/tests/com/puppycrawl/tools/checkstyle/NoWhitespaceBeforeCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/NoWhitespaceBeforeCheckTest.java index 5aee0edfb..a675e17b7 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/NoWhitespaceBeforeCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/NoWhitespaceBeforeCheckTest.java @@ -6,17 +6,12 @@ public class NoWhitespaceBeforeCheckTest extends BaseCheckTestCase { private CheckConfiguration checkConfig; - - public NoWhitespaceBeforeCheckTest(String aName) - { - super(aName); - } - + public void setUp() { checkConfig = new CheckConfiguration(); checkConfig.setClassname(NoWhitespaceBeforeCheck.class.getName()); } - + public void testDefault() throws Exception { final Checker c = createChecker(checkConfig); @@ -27,7 +22,7 @@ public class NoWhitespaceBeforeCheckTest }; verify(c, fname, expected); } - + public void testDot() throws Exception { checkConfig.addTokens("DOT"); @@ -43,7 +38,7 @@ public class NoWhitespaceBeforeCheckTest verify(c, fname, expected); } - + public void testDotAllowLineBreaks() throws Exception { checkConfig.addTokens("DOT"); @@ -57,5 +52,5 @@ public class NoWhitespaceBeforeCheckTest }; verify(c, fname, expected); } - + } diff --git a/src/tests/com/puppycrawl/tools/checkstyle/OperatorWrapCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/OperatorWrapCheckTest.java index 108296ffc..3afad38ec 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/OperatorWrapCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/OperatorWrapCheckTest.java @@ -7,12 +7,7 @@ public class OperatorWrapCheckTest extends BaseCheckTestCase { private CheckConfiguration checkConfig; - - public OperatorWrapCheckTest(String aName) - { - super(aName); - } - + public void setUp() { checkConfig = new CheckConfiguration(); checkConfig.setClassname(OperatorWrapCheck.class.getName()); @@ -45,7 +40,7 @@ public class OperatorWrapCheckTest }; verify(c, fname, expected); } - + public void testAssignEOL() throws Exception { @@ -57,5 +52,5 @@ public class OperatorWrapCheckTest "33:13: '=' should be on the previous line.", }; verify(c, fname, expected); - } + } } diff --git a/src/tests/com/puppycrawl/tools/checkstyle/OptionTest.java b/src/tests/com/puppycrawl/tools/checkstyle/OptionTest.java index e4860b71d..627d30d61 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/OptionTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/OptionTest.java @@ -14,14 +14,6 @@ import junit.framework.TestCase; */ public class OptionTest extends TestCase { - /** - * Constructor for OptionTest. - * @param arg0 - */ - public OptionTest(String arg0) { - super(arg0); - } - public void testBlockOption() { BlockOption stmtOpt = BlockOption.STMT; diff --git a/src/tests/com/puppycrawl/tools/checkstyle/OtherLeftCurlyCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/OtherLeftCurlyCheckTest.java index 21ac8d497..8853ad336 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/OtherLeftCurlyCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/OtherLeftCurlyCheckTest.java @@ -6,11 +6,6 @@ import com.puppycrawl.tools.checkstyle.checks.LeftCurlyOption; public class OtherLeftCurlyCheckTest extends BaseCheckTestCase { - public OtherLeftCurlyCheckTest(String aName) - { - super(aName); - } - public void testDefault() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/PackageHtmlCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/PackageHtmlCheckTest.java index 5f35c6f14..ed688a571 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/PackageHtmlCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/PackageHtmlCheckTest.java @@ -4,12 +4,8 @@ import com.puppycrawl.tools.checkstyle.api.FileSetCheck; import com.puppycrawl.tools.checkstyle.checks.PackageHtmlCheck; public class PackageHtmlCheckTest - extends BaseCheckTestCase + extends BaseCheckTestCase { - public PackageHtmlCheckTest(String s) { - super(s); - } - public void testPackageHtml() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/PackageNameCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/PackageNameCheckTest.java index 6922a4cff..3112dae0d 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/PackageNameCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/PackageNameCheckTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.PackageNameCheck; public class PackageNameCheckTest extends BaseCheckTestCase { - public PackageNameCheckTest(String aName) - { - super(aName); - } - public void testSpecified() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/ParameterNameCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/ParameterNameCheckTest.java index 93c87c50a..a2fb08c50 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/ParameterNameCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/ParameterNameCheckTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.ParameterNameCheck; public class ParameterNameCheckTest extends BaseCheckTestCase { - public ParameterNameCheckTest(String aName) - { - super(aName); - } - public void testSpecified() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/ParameterNumberCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/ParameterNumberCheckTest.java index a30e08dd0..a93cf13b6 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/ParameterNumberCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/ParameterNumberCheckTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.ParameterNumberCheck; public class ParameterNumberCheckTest extends BaseCheckTestCase { - public ParameterNumberCheckTest(String aName) - { - super(aName); - } - public void testDefault() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/ParenPadCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/ParenPadCheckTest.java index f221f42cb..d86b9b01b 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/ParenPadCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/ParenPadCheckTest.java @@ -6,11 +6,6 @@ import com.puppycrawl.tools.checkstyle.checks.PadOption; public class ParenPadCheckTest extends BaseCheckTestCase { - public ParenPadCheckTest(String aName) - { - super(aName); - } - public void testDefault() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/PublicMemberNameCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/PublicMemberNameCheckTest.java index e33462f3f..da6d9b267 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/PublicMemberNameCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/PublicMemberNameCheckTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.PublicMemberNameCheck; public class PublicMemberNameCheckTest extends BaseCheckTestCase { - public PublicMemberNameCheckTest(String aName) - { - super(aName); - } - public void testDefault() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/RedundantImportCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/RedundantImportCheckTest.java index e7ae6ead3..99156e0cd 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/RedundantImportCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/RedundantImportCheckTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.RedundantImportCheck; public class RedundantImportCheckTest extends BaseCheckTestCase { - public RedundantImportCheckTest(String aName) - { - super(aName); - } - public void testWithChecker() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/RedundantModifierTest.java b/src/tests/com/puppycrawl/tools/checkstyle/RedundantModifierTest.java index 32c4431bd..420e9f213 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/RedundantModifierTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/RedundantModifierTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.RedundantModifierCheck; public class RedundantModifierTest extends BaseCheckTestCase { - public RedundantModifierTest(String aName) - { - super(aName); - } - public void testIt() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/RightCurlyCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/RightCurlyCheckTest.java index 8aa508881..b21ff77df 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/RightCurlyCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/RightCurlyCheckTest.java @@ -6,11 +6,6 @@ import com.puppycrawl.tools.checkstyle.checks.RightCurlyOption; public class RightCurlyCheckTest extends BaseCheckTestCase { - public RightCurlyCheckTest(String aName) - { - super(aName); - } - public void testDefault() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/SimplifyBooleanExpressionCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/SimplifyBooleanExpressionCheckTest.java index e06c99146..a13eb5b82 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/SimplifyBooleanExpressionCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/SimplifyBooleanExpressionCheckTest.java @@ -3,13 +3,8 @@ package com.puppycrawl.tools.checkstyle; import com.puppycrawl.tools.checkstyle.checks.SimplifyBooleanExpressionCheck; public class SimplifyBooleanExpressionCheckTest -extends BaseCheckTestCase + extends BaseCheckTestCase { - public SimplifyBooleanExpressionCheckTest(String aName) - { - super(aName); - } - public void testIt() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/SimplifyBooleanReturnCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/SimplifyBooleanReturnCheckTest.java index 00384747b..d09a6fbcb 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/SimplifyBooleanReturnCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/SimplifyBooleanReturnCheckTest.java @@ -12,11 +12,6 @@ import com.puppycrawl.tools.checkstyle.checks.SimplifyBooleanReturnCheck; public class SimplifyBooleanReturnCheckTest extends BaseCheckTestCase { - public SimplifyBooleanReturnCheckTest(String aName) - { - super(aName); - } - public void testIt() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/StaticVariableNameCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/StaticVariableNameCheckTest.java index 184f65805..58980e9b2 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/StaticVariableNameCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/StaticVariableNameCheckTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.StaticVariableNameCheck; public class StaticVariableNameCheckTest extends BaseCheckTestCase { - public StaticVariableNameCheckTest(String aName) - { - super(aName); - } - public void testSpecified() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/StringArrayReaderTest.java b/src/tests/com/puppycrawl/tools/checkstyle/StringArrayReaderTest.java index 596747d68..277db3466 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/StringArrayReaderTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/StringArrayReaderTest.java @@ -7,11 +7,6 @@ import java.io.IOException; public class StringArrayReaderTest extends TestCase { - public StringArrayReaderTest(String name) - { - super(name); - } - public void testClose() { final StringArrayReader o = new StringArrayReader(new String[] {""}); diff --git a/src/tests/com/puppycrawl/tools/checkstyle/TabCharacterCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/TabCharacterCheckTest.java index 7c9471695..d8b20cec0 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/TabCharacterCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/TabCharacterCheckTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.TabCharacterCheck; public class TabCharacterCheckTest extends BaseCheckTestCase { - public TabCharacterCheckTest(String aName) - { - super(aName); - } - public void testIt() throws Exception { final CheckConfiguration checkConfig = new CheckConfiguration(); diff --git a/src/tests/com/puppycrawl/tools/checkstyle/TodoCommentCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/TodoCommentCheckTest.java index adf969041..347ac5745 100755 --- a/src/tests/com/puppycrawl/tools/checkstyle/TodoCommentCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/TodoCommentCheckTest.java @@ -3,13 +3,8 @@ package com.puppycrawl.tools.checkstyle; import com.puppycrawl.tools.checkstyle.checks.TodoCommentCheck; public class TodoCommentCheckTest - extends BaseCheckTestCase + extends BaseCheckTestCase { - public TodoCommentCheckTest(String aName) - { - super(aName); - } - public void testIt() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java b/src/tests/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java index 244e8b5c5..9a86d9505 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/TreeWalkerTest.java @@ -14,11 +14,6 @@ import com.puppycrawl.tools.checkstyle.api.LocalizedMessages; public class TreeWalkerTest extends TestCase { - public TreeWalkerTest(String s) - { - super(s); - } - public void testCreate() { new TreeWalker(new LocalizedMessages(), 8); diff --git a/src/tests/com/puppycrawl/tools/checkstyle/TypeLeftCurlyCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/TypeLeftCurlyCheckTest.java index fbea829ad..d68f6bdd8 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/TypeLeftCurlyCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/TypeLeftCurlyCheckTest.java @@ -6,11 +6,6 @@ import com.puppycrawl.tools.checkstyle.checks.LeftCurlyOption; public class TypeLeftCurlyCheckTest extends BaseCheckTestCase { - public TypeLeftCurlyCheckTest(String aName) - { - super(aName); - } - public void testDefault() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/TypeNameCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/TypeNameCheckTest.java index 6d7bfb2e2..6abb6ee48 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/TypeNameCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/TypeNameCheckTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.TypeNameCheck; public class TypeNameCheckTest extends BaseCheckTestCase { - public TypeNameCheckTest(String aName) - { - super(aName); - } - public void testSpecified() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/UnusedImportsCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/UnusedImportsCheckTest.java index ebd8e1d87..52daf3981 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/UnusedImportsCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/UnusedImportsCheckTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.UnusedImportsCheck; public class UnusedImportsCheckTest extends BaseCheckTestCase { - public UnusedImportsCheckTest(String aName) - { - super(aName); - } - public void testDefault() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/UpperEllCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/UpperEllCheckTest.java index ad60563a5..64419e0c7 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/UpperEllCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/UpperEllCheckTest.java @@ -3,13 +3,8 @@ package com.puppycrawl.tools.checkstyle; import com.puppycrawl.tools.checkstyle.checks.UpperEllCheck; public class UpperEllCheckTest -extends BaseCheckTestCase + extends BaseCheckTestCase { - public UpperEllCheckTest(String aName) - { - super(aName); - } - public void testWithChecker() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/UtilsTest.java b/src/tests/com/puppycrawl/tools/checkstyle/UtilsTest.java index ab866d460..a198ca1a7 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/UtilsTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/UtilsTest.java @@ -7,11 +7,6 @@ import com.puppycrawl.tools.checkstyle.api.Utils; public class UtilsTest extends TestCase { - public UtilsTest(String name) - { - super(name); - } - /** * Test Utils.countCharInString. */ diff --git a/src/tests/com/puppycrawl/tools/checkstyle/VisibilityModifierCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/VisibilityModifierCheckTest.java index b96cc9515..37772ba79 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/VisibilityModifierCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/VisibilityModifierCheckTest.java @@ -3,13 +3,8 @@ package com.puppycrawl.tools.checkstyle; import com.puppycrawl.tools.checkstyle.checks.VisibilityModifierCheck; public class VisibilityModifierCheckTest - extends BaseCheckTestCase + extends BaseCheckTestCase { - public VisibilityModifierCheckTest(String aName) - { - super(aName); - } - private Checker getChecker() throws Exception { final CheckConfiguration checkConfig = new CheckConfiguration(); diff --git a/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAfterCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAfterCheckTest.java index cd8becfbe..9026f5d33 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAfterCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAfterCheckTest.java @@ -6,17 +6,12 @@ public class WhitespaceAfterCheckTest extends BaseCheckTestCase { private CheckConfiguration mCheckConfig; - - public WhitespaceAfterCheckTest(String aName) - { - super(aName); - } - + public void setUp() { mCheckConfig = new CheckConfiguration(); mCheckConfig.setClassname(WhitespaceAfterCheck.class.getName()); } - + public void testDefault() throws Exception { final Checker c = createChecker(mCheckConfig); @@ -27,7 +22,7 @@ public class WhitespaceAfterCheckTest }; verify(c, fname, expected); } - + public void testCast() throws Exception { mCheckConfig.addTokens("TYPECAST"); @@ -38,7 +33,7 @@ public class WhitespaceAfterCheckTest }; verify(c, fname, expected); } - + public void testSemi() throws Exception {; final Checker c = createChecker(mCheckConfig); diff --git a/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAroundTest.java b/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAroundTest.java index 9e56174b9..67f9456f9 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAroundTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/WhitespaceAroundTest.java @@ -5,11 +5,6 @@ import com.puppycrawl.tools.checkstyle.checks.WhitespaceAroundCheck; public class WhitespaceAroundTest extends BaseCheckTestCase { - public WhitespaceAroundTest(String aName) - { - super(aName); - } - public void testIt() throws Exception { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/api/ScopeTest.java b/src/tests/com/puppycrawl/tools/checkstyle/api/ScopeTest.java index 8bb859c75..ee664b665 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/api/ScopeTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/api/ScopeTest.java @@ -5,11 +5,6 @@ import junit.framework.TestCase; public class ScopeTest extends TestCase { - public ScopeTest(String name) - { - super(name); - } - public void testMisc() { final Scope o = Scope.getInstance("public"); diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/ClassResolverTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/ClassResolverTest.java index 88eaaf834..a8c1b178a 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/checks/ClassResolverTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/ClassResolverTest.java @@ -8,11 +8,6 @@ import java.util.HashSet; public class ClassResolverTest extends TestCase { - public ClassResolverTest(String name) - { - super(name); - } - public void testMisc() throws ClassNotFoundException { final Set imps = new HashSet();