From e14ef6a2a3f6af131c84ab0dde76cb4a790d528d Mon Sep 17 00:00:00 2001 From: Subbu Dantu Date: Tue, 18 Apr 2017 19:22:14 +0530 Subject: [PATCH] Issue #4220: Modified EmptyBlockCheckTest.java and moved its input files to the emptyblock subdirectory --- .../checks/blocks/EmptyBlockCheckTest.java | 18 +++++++++--------- .../InputEmptyBlockAllowEmptyLoops.java} | 2 +- .../InputEmptyBlockCase.java} | 4 ++-- .../InputEmptyBlockDefault.java} | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/{InputSemantic2.java => emptyblock/InputEmptyBlockAllowEmptyLoops.java} (93%) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/{InputEmptyCase.java => emptyblock/InputEmptyBlockCase.java} (91%) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/{InputSemantic.java => emptyblock/InputEmptyBlockDefault.java} (94%) 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 e9616d4e7585..dfe9913a27bc 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 + filename); + + "blocks" + File.separator + "emptyblock" + File.separator + filename); } /* Additional test for jacoco, since valueOf() @@ -68,7 +68,7 @@ public void testDefault() "73:41: " + getCheckMessage(MSG_KEY_BLOCK_NO_STMT), "84:12: " + getCheckMessage(MSG_KEY_BLOCK_NO_STMT), }; - verify(checkConfig, getPath("InputSemantic.java"), expected); + verify(checkConfig, getPath("InputEmptyBlockDefault.java"), expected); } @Test @@ -84,7 +84,7 @@ public void testText() "71:29: " + getCheckMessage(MSG_KEY_BLOCK_EMPTY, "synchronized"), "84:12: " + getCheckMessage(MSG_KEY_BLOCK_EMPTY, "STATIC_INIT"), }; - verify(checkConfig, getPath("InputSemantic.java"), expected); + verify(checkConfig, getPath("InputEmptyBlockDefault.java"), expected); } @Test @@ -103,7 +103,7 @@ public void testStatement() "73:41: " + getCheckMessage(MSG_KEY_BLOCK_NO_STMT), "84:12: " + getCheckMessage(MSG_KEY_BLOCK_NO_STMT), }; - verify(checkConfig, getPath("InputSemantic.java"), expected); + verify(checkConfig, getPath("InputEmptyBlockDefault.java"), expected); } @Test @@ -120,7 +120,7 @@ public void allowEmptyLoops() throws Exception { "22:29: " + getCheckMessage(MSG_KEY_BLOCK_NO_STMT), "23:28: " + getCheckMessage(MSG_KEY_BLOCK_NO_STMT), }; - verify(checkConfig, getPath("InputSemantic2.java"), expected); + verify(checkConfig, getPath("InputEmptyBlockAllowEmptyLoops.java"), expected); } @Test @@ -137,7 +137,7 @@ public void allowEmptyLoopsText() throws Exception { "22:29: " + getCheckMessage(MSG_KEY_BLOCK_EMPTY, "if"), "23:28: " + getCheckMessage(MSG_KEY_BLOCK_EMPTY, "switch"), }; - verify(checkConfig, getPath("InputSemantic2.java"), expected); + verify(checkConfig, getPath("InputEmptyBlockAllowEmptyLoops.java"), expected); } @Test @@ -148,7 +148,7 @@ public void testInvalidOption() throws Exception { try { final String[] expected = CommonUtils.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("InputSemantic.java"), expected); + verify(checkConfig, getPath("InputEmptyBlockDefault.java"), expected); fail("exception expected"); } catch (CheckstyleException ex) { @@ -170,7 +170,7 @@ public void testAllowEmptyCaseWithText() throws Exception { "31:37: " + getCheckMessage(MSG_KEY_BLOCK_EMPTY, "case"), "32:29: " + getCheckMessage(MSG_KEY_BLOCK_EMPTY, "case"), }; - verify(checkConfig, getPath("InputEmptyCase.java"), expected); + verify(checkConfig, getPath("InputEmptyBlockCase.java"), expected); } @Test @@ -187,6 +187,6 @@ public void testForbidCaseWithoutStmt() throws Exception { "32:29: " + getCheckMessage(MSG_KEY_BLOCK_NO_STMT, "case"), "32:40: " + getCheckMessage(MSG_KEY_BLOCK_NO_STMT, "case"), }; - verify(checkConfig, getPath("InputEmptyCase.java"), expected); + verify(checkConfig, getPath("InputEmptyBlockCase.java"), expected); } } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockAllowEmptyLoops.java similarity index 93% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic2.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockAllowEmptyLoops.java index 01b93dfdaa0a..3247ebd378b4 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic2.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockAllowEmptyLoops.java @@ -2,7 +2,7 @@ // Test case file for checkstyle. // Created: 2001 //////////////////////////////////////////////////////////////////////////////// -package com.puppycrawl.tools.checkstyle.checks.blocks; +package com.puppycrawl.tools.checkstyle.checks.blocks.emptyblock; import java.io.*; // star import for instantiation tests import java.awt.Dimension; // explicit import for instantiation tests diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCase.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockCase.java similarity index 91% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCase.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockCase.java index b8c1df3f665d..bf75c7bd264f 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputEmptyCase.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockCase.java @@ -2,9 +2,9 @@ // Input test file for testing empty LITERAL_CASE. // Created: 2017 //////////////////////////////////////////////////////////////////////////////// -package com.puppycrawl.tools.checkstyle.checks.blocks; +package com.puppycrawl.tools.checkstyle.checks.blocks.emptyblock; -class InputEmptyCase +class InputEmptyBlockCase { void method1(int a) { switch (a) {} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockDefault.java similarity index 94% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockDefault.java index 94cda5d53dc2..d387c10d1081 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputSemantic.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/emptyblock/InputEmptyBlockDefault.java @@ -2,7 +2,7 @@ // Test case file for checkstyle. // Created: 2001 //////////////////////////////////////////////////////////////////////////////// -package com.puppycrawl.tools.checkstyle.checks.blocks; +package com.puppycrawl.tools.checkstyle.checks.blocks.emptyblock; import java.io.*; // star import for instantiation tests import java.awt.Dimension; // explicit import for instantiation tests @@ -12,7 +12,7 @@ * Test case for detecting empty block statements. * @author Lars Kühne **/ -class InputSemantic +class InputEmptyBlockDefault { static { Boolean x = new Boolean(true);