From 911065320fb39299f442ea08f775cfe08ba2a2ed Mon Sep 17 00:00:00 2001 From: Oliver Burn Date: Sat, 26 Apr 2008 03:45:31 +0000 Subject: [PATCH] fixing things reported by FindBugs --- .../tools/checkstyle/CheckStyleTask.java | 2 +- .../tools/checkstyle/TreeWalker.java | 2 +- .../tools/checkstyle/api/AuditEvent.java | 2 +- .../tools/checkstyle/api/FileContents.java | 4 +- .../checkstyle/api/LocalizedMessage.java | 2 +- .../tools/checkstyle/api/Scope.java | 13 +++++ .../checkstyle/checks/TodoCommentCheck.java | 15 +++--- .../checks/coding/AbstractSuperCheck.java | 2 +- .../checks/coding/DeclarationOrderCheck.java | 2 +- .../imports/AvoidStaticImportCheck.java | 2 +- .../checks/imports/IllegalImportCheck.java | 2 +- .../checks/metrics/JavaNCSSCheck.java | 2 +- .../sizes/ExecutableStatementCountCheck.java | 2 +- .../checkstyle/doclets/CheckDocsDoclet.java | 10 ++-- .../tools/checkstyle/XMLLoggerTest.java | 2 +- .../checkstyle/api/AutomaticBeanTest.java | 2 +- .../checks/NewlineAtEndOfFileCheckTest.java | 11 +---- .../indentation/IndentationCheckTest.java | 10 ++-- .../checkstyle/filters/CSVFilterTest.java | 47 +++++++++---------- .../checkstyle/filters/FilterSetTest.java | 13 +++-- .../filters/IntMatchFilterTest.java | 7 ++- .../filters/IntRangeFilterTest.java | 27 +++++------ 22 files changed, 92 insertions(+), 89 deletions(-) diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/CheckStyleTask.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/CheckStyleTask.java index 5cecd0b05..0ceade825 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/CheckStyleTask.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/CheckStyleTask.java @@ -514,7 +514,7 @@ public class CheckStyleTask extends Task @Override public String[] getValues() { - return VALUES; + return VALUES.clone(); } } diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/TreeWalker.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/TreeWalker.java index 8d64ba88a..34287f92f 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/TreeWalker.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/TreeWalker.java @@ -296,7 +296,7 @@ public final class TreeWalker private void registerCheck(Check aCheck) throws CheckstyleException { - int[] tokens = new int[] {}; //safety initialization + final int[] tokens; final Set checkTokens = aCheck.getTokenNames(); if (!checkTokens.isEmpty()) { tokens = aCheck.getRequiredTokens(); diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/AuditEvent.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/AuditEvent.java index 6529b02ab..1d3a55f9c 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/AuditEvent.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/AuditEvent.java @@ -42,7 +42,7 @@ public final class AuditEvent /** filename event associated with **/ private final String mFileName; /** message associated with the event **/ - private final LocalizedMessage mMessage; + private final transient LocalizedMessage mMessage; /** * Creates a new instance. diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/FileContents.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/FileContents.java index 5ab7c289b..cc89f8e02 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/FileContents.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/FileContents.java @@ -73,7 +73,7 @@ public final class FileContents implements CommentListener public FileContents(String aFilename, String[] aLines) { mFilename = aFilename; - mLines = aLines; + mLines = aLines.clone(); } /** {@inheritDoc} */ @@ -208,7 +208,7 @@ public final class FileContents implements CommentListener /** @return the lines in the file */ public String[] getLines() { - return mLines; + return mLines.clone(); } /** @return the name of the file */ diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/LocalizedMessage.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/LocalizedMessage.java index 3886aca0a..5a2960362 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/LocalizedMessage.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/LocalizedMessage.java @@ -149,7 +149,7 @@ public final class LocalizedMessage mLineNo = aLineNo; mColNo = aColNo; mKey = aKey; - mArgs = aArgs; + mArgs = (null == aArgs) ? null : aArgs.clone(); mBundle = aBundle; mSeverityLevel = aSeverityLevel; mModuleId = aModuleId; diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Scope.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Scope.java index 74a9edfec..07f08cb1d 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Scope.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Scope.java @@ -122,6 +122,19 @@ public final class Scope implements Comparable, Serializable return this.mCode - aObject.mCode; } + @Override + public boolean equals(Object aOther) + { + // Since this is an Enum class, can do a simple implementation. + return (this == aOther); + } + + @Override + public int hashCode() + { + return mCode; + } + /** * Checks if this scope is a subscope of another scope. * Example: PUBLIC is a subscope of PRIVATE. diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java index a06f7850b..417f3d7d2 100755 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java @@ -81,10 +81,10 @@ public class TodoCommentCheck private void checkCppComments(FileContents aContents) { final Map comments = aContents.getCppComments(); - for (Integer key : comments.keySet()) { - final String cmt = (comments.get(key)).getText()[0]; + for (Map.Entry entry : comments.entrySet()) { + final String cmt = entry.getValue().getText()[0]; if (getRegexp().matcher(cmt).find()) { - log(key.intValue(), "todo.match", getFormat()); + log(entry.getKey().intValue(), "todo.match", getFormat()); } } } @@ -97,13 +97,14 @@ public class TodoCommentCheck { final Map> allComments = aContents .getCComments(); - for (Integer key : allComments.keySet()) { - final List lineComments = allComments.get(key); - for (TextBlock line : lineComments) { + for (Map.Entry> entry : allComments.entrySet()) + { + for (TextBlock line : entry.getValue()) { final String[] cmt = line.getText(); for (int i = 0; i < cmt.length; i++) { if (getRegexp().matcher(cmt[i]).find()) { - log(key.intValue() + i, "todo.match", getFormat()); + log(entry.getKey().intValue() + i, "todo.match", + getFormat()); } } } diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java index 564ce31da..ca565ff8f 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java @@ -42,7 +42,7 @@ public abstract class AbstractSuperCheck * whether the method has a call to the super method. * @author Rick Giles */ - private class MethodNode + private static class MethodNode { /** method definition */ private final DetailAST mMethod; diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java index 4af5eb457..93b64f783 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java @@ -77,7 +77,7 @@ public class DeclarationOrderCheck extends Check /** * private class to encapsulate the state */ - private class ScopeState + private static class ScopeState { /** The state the check is in */ private int mScopeState = STATE_STATIC_VARIABLE_DEF; diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java index e7dcce370..7100acc33 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java @@ -81,7 +81,7 @@ public class AvoidStaticImportCheck */ public void setExcludes(String[] aExcludes) { - mExcludes = aExcludes; + mExcludes = aExcludes.clone(); } @Override diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.java index 89909fe0d..a5f921125 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.java @@ -78,7 +78,7 @@ public class IllegalImportCheck */ public void setIllegalPkgs(String[] aFrom) { - mIllegalPkgs = aFrom; + mIllegalPkgs = aFrom.clone(); } @Override diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java index aa1be3093..1b894c198 100755 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java @@ -330,7 +330,7 @@ public class JavaNCSSCheck extends Check * * Class representing a counter, */ - private class Counter + private static class Counter { /** the counters internal integer */ private int mIvCount; diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java index 5020b9231..e0cfdfc30 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java @@ -185,7 +185,7 @@ public final class ExecutableStatementCountCheck * Class to encapsulate counting information about one member. * @author Simon Harris */ - private class Context + private static class Context { /** Member AST node. */ private final DetailAST mAST; diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/doclets/CheckDocsDoclet.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/doclets/CheckDocsDoclet.java index 6f974cfa4..4ac39419a 100644 --- a/src/checkstyle/com/puppycrawl/tools/checkstyle/doclets/CheckDocsDoclet.java +++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/doclets/CheckDocsDoclet.java @@ -19,14 +19,14 @@ package com.puppycrawl.tools.checkstyle.doclets; -import com.sun.javadoc.RootDoc; import com.sun.javadoc.ClassDoc; +import com.sun.javadoc.RootDoc; import com.sun.javadoc.Tag; - -import java.io.IOException; -import java.io.PrintWriter; import java.io.File; import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.Serializable; import java.util.Arrays; import java.util.Comparator; @@ -47,7 +47,7 @@ public final class CheckDocsDoclet * by their check name. */ private static class ClassDocByCheckNameComparator implements - Comparator + Comparator, Serializable { /** {@inheritDoc} */ public int compare(ClassDoc aObject1, ClassDoc aObject2) diff --git a/src/tests/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java b/src/tests/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java index fba38f5b2..de6e593d9 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java @@ -206,7 +206,7 @@ public class XMLLoggerTest assertEquals("last line.", "", lines[lines.length - 1]); } - private class TestThrowable extends Exception + private static class TestThrowable extends Exception { @Override public void printStackTrace(PrintWriter s) diff --git a/src/tests/com/puppycrawl/tools/checkstyle/api/AutomaticBeanTest.java b/src/tests/com/puppycrawl/tools/checkstyle/api/AutomaticBeanTest.java index d099d2268..d1b82bc2e 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/api/AutomaticBeanTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/api/AutomaticBeanTest.java @@ -5,7 +5,7 @@ import org.junit.Test; public class AutomaticBeanTest { - private class TestBean extends AutomaticBean + private static class TestBean extends AutomaticBean { public void setName(String aName) { diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckTest.java index 291da6227..a1fb7b861 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/NewlineAtEndOfFileCheckTest.java @@ -1,6 +1,5 @@ package com.puppycrawl.tools.checkstyle.checks; -import static org.junit.Assert.fail; import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport; import com.puppycrawl.tools.checkstyle.DefaultConfiguration; import com.puppycrawl.tools.checkstyle.api.CheckstyleException; @@ -49,20 +48,14 @@ public class NewlineAtEndOfFileCheckTest expected); } - @Test + @Test(expected=CheckstyleException.class) public void testSetLineSeparatorFailure() throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(NewlineAtEndOfFileCheck.class); checkConfig.addAttribute("lineSeparator", "ct"); - try { - createChecker(checkConfig); - } - catch (CheckstyleException ex) { - return; - } - fail("should throw conversion exception"); + createChecker(checkConfig); } @Test diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java index 4471cc987..8c2054156 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java @@ -647,8 +647,8 @@ public class IndentationCheckTest extends BaseCheckTestSupport throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(IndentationCheck.class); - checkConfig.addAttribute("basicOffset", new Integer(4).toString()); - checkConfig.addAttribute("tabWidth", new Integer(4).toString()); + checkConfig.addAttribute("basicOffset", Integer.valueOf(4).toString()); + checkConfig.addAttribute("tabWidth", Integer.valueOf(4).toString()); final String[] expected = { "25: ctor def child at indentation level 9 not at correct indentation, 8", }; @@ -660,7 +660,7 @@ public class IndentationCheckTest extends BaseCheckTestSupport throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(IndentationCheck.class); - checkConfig.addAttribute("basicOffset", new Integer(2).toString()); + checkConfig.addAttribute("basicOffset", Integer.valueOf(2).toString()); final String[] expected = { "25: ctor def child at indentation level 5 not at correct indentation, 4", }; @@ -672,7 +672,7 @@ public class IndentationCheckTest extends BaseCheckTestSupport throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(IndentationCheck.class); - checkConfig.addAttribute("caseIndent", new Integer(0).toString()); + checkConfig.addAttribute("caseIndent", Integer.valueOf(0).toString()); final String[] expected = { "23: case child at indentation level 10 not at correct indentation, 8", }; @@ -684,7 +684,7 @@ public class IndentationCheckTest extends BaseCheckTestSupport throws Exception { final DefaultConfiguration checkConfig = createCheckConfig(IndentationCheck.class); - checkConfig.addAttribute("braceAdjustment", new Integer(2).toString()); + checkConfig.addAttribute("braceAdjustment", Integer.valueOf(2).toString()); final String[] expected = { "24: if rcurly at indentation level 8 not at correct indentation, 10", }; diff --git a/src/tests/com/puppycrawl/tools/checkstyle/filters/CSVFilterTest.java b/src/tests/com/puppycrawl/tools/checkstyle/filters/CSVFilterTest.java index 1a112b7bd..273ac969e 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/filters/CSVFilterTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/filters/CSVFilterTest.java @@ -2,7 +2,6 @@ package com.puppycrawl.tools.checkstyle.filters; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import org.junit.Test; /** Tests CSVFilter */ @@ -12,52 +11,52 @@ public class CSVFilterTest public void testDecideSingle() { final IntFilter filter = new CSVFilter("0"); - assertFalse("less than", filter.accept(new Integer(-1))); - assertTrue("equal", filter.accept(new Integer(0))); - assertFalse("greater than", filter.accept(new Integer(1))); + assertFalse("less than", filter.accept(Integer.valueOf(-1))); + assertTrue("equal", filter.accept(Integer.valueOf(0))); + assertFalse("greater than", filter.accept(Integer.valueOf(1))); } @Test public void testDecidePair() { final IntFilter filter = new CSVFilter("0, 2"); - assertFalse("less than", filter.accept(new Integer(-1))); - assertTrue("equal 0", filter.accept(new Integer(0))); - assertFalse("greater than", filter.accept(new Integer(1))); - assertTrue("equal 2", filter.accept(new Integer(2))); + assertFalse("less than", filter.accept(Integer.valueOf(-1))); + assertTrue("equal 0", filter.accept(Integer.valueOf(0))); + assertFalse("greater than", filter.accept(Integer.valueOf(1))); + assertTrue("equal 2", filter.accept(Integer.valueOf(2))); } @Test public void testDecideRange() { final IntFilter filter = new CSVFilter("0-2"); - assertFalse("less than", filter.accept(new Integer(-1))); - assertTrue("equal 0", filter.accept(new Integer(0))); - assertTrue("equal 1", filter.accept(new Integer(1))); - assertTrue("equal 2", filter.accept(new Integer(2))); - assertFalse("greater than", filter.accept(new Integer(3))); + assertFalse("less than", filter.accept(Integer.valueOf(-1))); + assertTrue("equal 0", filter.accept(Integer.valueOf(0))); + assertTrue("equal 1", filter.accept(Integer.valueOf(1))); + assertTrue("equal 2", filter.accept(Integer.valueOf(2))); + assertFalse("greater than", filter.accept(Integer.valueOf(3))); } @Test public void testDecideEmptyRange() { final IntFilter filter = new CSVFilter("2-0"); - assertFalse("less than", filter.accept(new Integer(-1))); - assertFalse("equal 0", filter.accept(new Integer(0))); - assertFalse("equal 1", filter.accept(new Integer(1))); - assertFalse("equal 2", filter.accept(new Integer(2))); - assertFalse("greater than", filter.accept(new Integer(3))); + assertFalse("less than", filter.accept(Integer.valueOf(-1))); + assertFalse("equal 0", filter.accept(Integer.valueOf(0))); + assertFalse("equal 1", filter.accept(Integer.valueOf(1))); + assertFalse("equal 2", filter.accept(Integer.valueOf(2))); + assertFalse("greater than", filter.accept(Integer.valueOf(3))); } @Test public void testDecideRangePlusValue() { final IntFilter filter = new CSVFilter("0-2, 10"); - assertFalse("less than", filter.accept(new Integer(-1))); - assertTrue("equal 0", filter.accept(new Integer(0))); - assertTrue("equal 1", filter.accept(new Integer(1))); - assertTrue("equal 2", filter.accept(new Integer(2))); - assertFalse("greater than", filter.accept(new Integer(3))); - assertTrue("equal 10", filter.accept(new Integer(10))); + assertFalse("less than", filter.accept(Integer.valueOf(-1))); + assertTrue("equal 0", filter.accept(Integer.valueOf(0))); + assertTrue("equal 1", filter.accept(Integer.valueOf(1))); + assertTrue("equal 2", filter.accept(Integer.valueOf(2))); + assertFalse("greater than", filter.accept(Integer.valueOf(3))); + assertTrue("equal 10", filter.accept(Integer.valueOf(10))); } } diff --git a/src/tests/com/puppycrawl/tools/checkstyle/filters/FilterSetTest.java b/src/tests/com/puppycrawl/tools/checkstyle/filters/FilterSetTest.java index 6e1f1e929..8eb1a3065 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/filters/FilterSetTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/filters/FilterSetTest.java @@ -2,7 +2,6 @@ package com.puppycrawl.tools.checkstyle.filters; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import org.junit.Before; import org.junit.Test; @@ -21,15 +20,15 @@ public class FilterSetTest @Test public void testEmptyChain() { - assertFalse("0", filter.accept(new Integer(0))); + assertFalse("0", filter.accept(Integer.valueOf(0))); } @Test public void testOneFilter() { filter.addFilter(new IntMatchFilter(0)); - assertTrue("0", filter.accept(new Integer(0))); - assertFalse("1", filter.accept(new Integer(1))); + assertTrue("0", filter.accept(Integer.valueOf(0))); + assertFalse("1", filter.accept(Integer.valueOf(1))); } @Test @@ -37,9 +36,9 @@ public class FilterSetTest { filter.addFilter(new IntMatchFilter(0)); filter.addFilter(new IntRangeFilter(0, 2)); - assertTrue("0", filter.accept(new Integer(0))); - assertTrue("1", filter.accept(new Integer(1))); + assertTrue("0", filter.accept(Integer.valueOf(0))); + assertTrue("1", filter.accept(Integer.valueOf(1))); filter.addFilter(new IntRangeFilter(3, 4)); - assertTrue("0 is in [3,4]", filter.accept(new Integer(0))); + assertTrue("0 is in [3,4]", filter.accept(Integer.valueOf(0))); } } diff --git a/src/tests/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterTest.java b/src/tests/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterTest.java index d84ad38b3..dceefb762 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/filters/IntMatchFilterTest.java @@ -3,7 +3,6 @@ package com.puppycrawl.tools.checkstyle.filters; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import org.junit.Test; /** Tests IntMatchFilter */ @@ -13,9 +12,9 @@ public class IntMatchFilterTest public void testDecide() { final IntFilter filter = new IntMatchFilter(0); - assertFalse("less than", filter.accept(new Integer(-1))); - assertTrue("equal", filter.accept(new Integer(0))); - assertFalse("greater than", filter.accept(new Integer(1))); + assertFalse("less than", filter.accept(Integer.valueOf(-1))); + assertTrue("equal", filter.accept(Integer.valueOf(0))); + assertFalse("greater than", filter.accept(Integer.valueOf(1))); } @Test diff --git a/src/tests/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterTest.java b/src/tests/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterTest.java index 40d82d24f..9ba1f4a0f 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/filters/IntRangeFilterTest.java @@ -3,7 +3,6 @@ package com.puppycrawl.tools.checkstyle.filters; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import org.junit.Test; /** Tests IntRangeFilter */ @@ -13,31 +12,31 @@ public class IntRangeFilterTest public void testDecide() { final IntFilter filter = new IntRangeFilter(0, 10); - assertFalse("less than", filter.accept(new Integer(-1))); - assertTrue("in range", filter.accept(new Integer(0))); - assertTrue("in range", filter.accept(new Integer(5))); - assertTrue("in range", filter.accept(new Integer(10))); - assertFalse("greater than", filter.accept(new Integer(11))); + assertFalse("less than", filter.accept(Integer.valueOf(-1))); + assertTrue("in range", filter.accept(Integer.valueOf(0))); + assertTrue("in range", filter.accept(Integer.valueOf(5))); + assertTrue("in range", filter.accept(Integer.valueOf(10))); + assertFalse("greater than", filter.accept(Integer.valueOf(11))); } @Test public void testDecideSingle() { final IntFilter filter = new IntRangeFilter(0, 0); - assertFalse("less than", filter.accept(new Integer(-1))); - assertTrue("in range", filter.accept(new Integer(0))); - assertFalse("greater than", filter.accept(new Integer(1))); + assertFalse("less than", filter.accept(Integer.valueOf(-1))); + assertTrue("in range", filter.accept(Integer.valueOf(0))); + assertFalse("greater than", filter.accept(Integer.valueOf(1))); } @Test public void testDecideEmpty() { final IntFilter filter = new IntRangeFilter(10, 0); - assertFalse("out", filter.accept(new Integer(-1))); - assertFalse("out", filter.accept(new Integer(0))); - assertFalse("out", filter.accept(new Integer(5))); - assertFalse("out", filter.accept(new Integer(10))); - assertFalse("out", filter.accept(new Integer(11))); + assertFalse("out", filter.accept(Integer.valueOf(-1))); + assertFalse("out", filter.accept(Integer.valueOf(0))); + assertFalse("out", filter.accept(Integer.valueOf(5))); + assertFalse("out", filter.accept(Integer.valueOf(10))); + assertFalse("out", filter.accept(Integer.valueOf(11))); } @Test