diff options
author | Roman Ivanov <ivanov-jr@mail.ru> | 2017-04-22 18:38:08 -0700 |
---|---|---|
committer | Roman Ivanov <ivanov-jr@mail.ru> | 2017-04-22 18:38:08 -0700 |
commit | be3cd4d7dbccd0fe69fb631d3939c020796458a8 (patch) | |
tree | 0af17f2efa611fb8e4b61ea513ba3c9efb7ec1db /src | |
parent | 0c382fd7b1fc9819f38bdd1c2cf9c50c76e0b725 (diff) | |
download | checkstyle-be3cd4d7dbccd0fe69fb631d3939c020796458a8.tar.gz |
Revert "Issue #4220: Modified EmptyBlockCheckTest.java and moved its input files to the emptyblock subdirectory"
This reverts commit 2036e7a4abceddad23311f4fa4bc61460072756a.
Diffstat (limited to 'src')
-rw-r--r-- | src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheckTest.java | 18 | ||||
-rw-r--r-- | src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCase.java (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockCase.java) | 4 | ||||
-rw-r--r-- | src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic.java (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockDefault.java) | 4 | ||||
-rw-r--r-- | src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic2.java (renamed from src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockAllowEmptyLoops.java) | 4 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheckTest.java index d58554f9b..2aeb83e7a 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheckTest.java @@ -40,7 +40,7 @@ public class EmptyBlockCheckTest @Override protected String getPath(String filename) throws IOException { return super.getPath("checks" + File.separator - + "blocks" + File.separator + "emptyblock" + File.separator + filename); + + "blocks" + File.separator + filename); } /* Additional test for jacoco, since valueOf() @@ -68,7 +68,7 @@ public class EmptyBlockCheckTest "73:41: " + getCheckMessage(MSG_KEY_BLOCK_NO_STMT), "84:12: " + getCheckMessage(MSG_KEY_BLOCK_NO_STMT), }; - verify(checkConfig, getPath("InputEmptyBlockDefault.java"), expected); + verify(checkConfig, getPath("InputSemantic.java"), expected); } @Test @@ -84,7 +84,7 @@ public class EmptyBlockCheckTest "71:29: " + getCheckMessage(MSG_KEY_BLOCK_EMPTY, "synchronized"), "84:12: " + getCheckMessage(MSG_KEY_BLOCK_EMPTY, "STATIC_INIT"), }; - verify(checkConfig, getPath("InputEmptyBlockDefault.java"), expected); + verify(checkConfig, getPath("InputSemantic.java"), expected); } @Test @@ -103,7 +103,7 @@ public class EmptyBlockCheckTest "73:41: " + getCheckMessage(MSG_KEY_BLOCK_NO_STMT), "84:12: " + getCheckMessage(MSG_KEY_BLOCK_NO_STMT), }; - verify(checkConfig, getPath("InputEmptyBlockDefault.java"), expected); + verify(checkConfig, getPath("InputSemantic.java"), expected); } @Test @@ -120,7 +120,7 @@ public class EmptyBlockCheckTest "22:29: " + getCheckMessage(MSG_KEY_BLOCK_NO_STMT), "23:28: " + getCheckMessage(MSG_KEY_BLOCK_NO_STMT), }; - verify(checkConfig, getPath("InputEmptyBlockAllowEmptyLoops.java"), expected); + verify(checkConfig, getPath("InputSemantic2.java"), expected); } @Test @@ -137,7 +137,7 @@ public class EmptyBlockCheckTest "22:29: " + getCheckMessage(MSG_KEY_BLOCK_EMPTY, "if"), "23:28: " + getCheckMessage(MSG_KEY_BLOCK_EMPTY, "switch"), }; - verify(checkConfig, getPath("InputEmptyBlockAllowEmptyLoops.java"), expected); + verify(checkConfig, getPath("InputSemantic2.java"), expected); } @Test @@ -148,7 +148,7 @@ public class EmptyBlockCheckTest try { final String[] expected = CommonUtils.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("InputEmptyBlockDefault.java"), expected); + verify(checkConfig, getPath("InputSemantic.java"), expected); fail("exception expected"); } catch (CheckstyleException ex) { @@ -170,7 +170,7 @@ public class EmptyBlockCheckTest "31:37: " + getCheckMessage(MSG_KEY_BLOCK_EMPTY, "case"), "32:29: " + getCheckMessage(MSG_KEY_BLOCK_EMPTY, "case"), }; - verify(checkConfig, getPath("InputEmptyBlockCase.java"), expected); + verify(checkConfig, getPath("InputEmptyCase.java"), expected); } @Test @@ -187,7 +187,7 @@ public class EmptyBlockCheckTest "32:29: " + getCheckMessage(MSG_KEY_BLOCK_NO_STMT, "case"), "32:40: " + getCheckMessage(MSG_KEY_BLOCK_NO_STMT, "case"), }; - verify(checkConfig, getPath("InputEmptyBlockCase.java"), expected); + verify(checkConfig, getPath("InputEmptyCase.java"), expected); } @Test diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockCase.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCase.java index bf75c7bd2..b8c1df3f6 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockCase.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCase.java @@ -2,9 +2,9 @@ // Input test file for testing empty LITERAL_CASE. // Created: 2017 //////////////////////////////////////////////////////////////////////////////// -package com.puppycrawl.tools.checkstyle.checks.blocks.emptyblock; +package com.puppycrawl.tools.checkstyle.checks.blocks; -class InputEmptyBlockCase +class InputEmptyCase { void method1(int a) { switch (a) {} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockDefault.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic.java index d387c10d1..94cda5d53 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockDefault.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic.java @@ -2,7 +2,7 @@ // Test case file for checkstyle. // Created: 2001 //////////////////////////////////////////////////////////////////////////////// -package com.puppycrawl.tools.checkstyle.checks.blocks.emptyblock; +package com.puppycrawl.tools.checkstyle.checks.blocks; import java.io.*; // star import for instantiation tests import java.awt.Dimension; // explicit import for instantiation tests @@ -12,7 +12,7 @@ import java.awt.Color; * Test case for detecting empty block statements. * @author Lars Kühne **/ -class InputEmptyBlockDefault +class InputSemantic { static { Boolean x = new Boolean(true); diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockAllowEmptyLoops.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic2.java index b1f994af7..01b93dfda 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockAllowEmptyLoops.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic2.java @@ -2,13 +2,13 @@ // Test case file for checkstyle. // Created: 2001 //////////////////////////////////////////////////////////////////////////////// -package com.puppycrawl.tools.checkstyle.checks.blocks.emptyblock; +package com.puppycrawl.tools.checkstyle.checks.blocks; import java.io.*; // star import for instantiation tests import java.awt.Dimension; // explicit import for instantiation tests import java.awt.Color; -class InputEmptyBlockAllowEmptyLoops +class UpdateClass { public void fooMethod() { |