diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/InputMagicNumber.java b/src/testinputs/com/puppycrawl/tools/checkstyle/InputMagicNumber.java index aa9f872a1..03d8de237 100644 --- a/src/testinputs/com/puppycrawl/tools/checkstyle/InputMagicNumber.java +++ b/src/testinputs/com/puppycrawl/tools/checkstyle/InputMagicNumber.java @@ -123,22 +123,22 @@ class Cast class ComplexAndFlagged { - public static final java.util.List MYLIST = new java.util.ArrayList() - { - public int size() - { - // should be flagged although technically inside const definition - return 378; - } - }; + public static final java.util.List MYLIST = new java.util.ArrayList() + { + public int size() + { + // should be flagged although technically inside const definition + return 378; + } + }; } class ComplexButNotFlagged { - // according to user feedback this is typical code that should not be flagged - // (at least in the default configuration of MagicNumberCheck) - public static final Integer DEFAULT_INT = new Integer(27); - public static final int SECS_PER_DAY = 24 * 60 * 60; - public static final javax.swing.Border STD_BORDER = - javax.swing.BorderFactory.createEmptyBorder(3, 3, 3, 3); + // according to user feedback this is typical code that should not be flagged + // (at least in the default configuration of MagicNumberCheck) + public static final Integer DEFAULT_INT = new Integer(27); + public static final int SECS_PER_DAY = 24 * 60 * 60; + public static final javax.swing.Border STD_BORDER = + javax.swing.BorderFactory.createEmptyBorder(3, 3, 3, 3); } diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheckTest.java index cc2e7e072..e55681770 100644 --- a/src/tests/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheckTest.java +++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheckTest.java @@ -42,7 +42,7 @@ public class MagicNumberCheckTest "112:36: '0x8000000000000000L' is a magic number.", "115:37: '020000000000' is a magic number.", "116:38: '01000000000000000000000L' is a magic number.", - "131:32: '378' is a magic number.", + "131:20: '378' is a magic number.", }; verify(checkConfig, getPath("InputMagicNumber.java"), expected); } @@ -81,7 +81,7 @@ public class MagicNumberCheckTest "114:38: '01777777777777777777777L' is a magic number.", "115:37: '020000000000' is a magic number.", "116:38: '01000000000000000000000L' is a magic number.", - "131:32: '378' is a magic number.", + "131:20: '378' is a magic number.", }; verify(checkConfig, getPath("InputMagicNumber.java"), expected); } @@ -148,7 +148,7 @@ public class MagicNumberCheckTest "114:38: '01777777777777777777777L' is a magic number.", "115:37: '020000000000' is a magic number.", "116:38: '01000000000000000000000L' is a magic number.", - "131:32: '378' is a magic number.", + "131:20: '378' is a magic number.", }; verify(checkConfig, getPath("InputMagicNumber.java"), expected); } @@ -186,7 +186,7 @@ public class MagicNumberCheckTest "112:36: '0x8000000000000000L' is a magic number.", "115:37: '020000000000' is a magic number.", "116:38: '01000000000000000000000L' is a magic number.", - "131:32: '378' is a magic number.", + "131:20: '378' is a magic number.", }; verify(checkConfig, getPath("InputMagicNumber.java"), expected); } @@ -221,7 +221,7 @@ public class MagicNumberCheckTest "92:14: '0xffffffffL' is a magic number.", "100:30: '+3' is a magic number.", "101:29: '-2' is a magic number.", - "131:32: '378' is a magic number.", + "131:20: '378' is a magic number.", }; verify(checkConfig, getPath("InputMagicNumber.java"), expected); }