From b97f3760e4957322b014ad83c2e1df8588fdbd24 Mon Sep 17 00:00:00 2001 From: anudeepti2004 Date: Sun, 12 Mar 2017 14:28:22 -0400 Subject: [PATCH] Issue: #3985 Moved all input files to new folder 1. Updated EmptyLineSeparatorCheckTest.java with updated paths. 2. Moved InputEmptyLineSeparator[*].java to new folder emptylinesperator 3. Copied InputPrePreviousLineEmptiness and files under package-info to the new folder. --- .../checks/whitespace/EmptyLineSeparatorCheckTest.java | 3 ++- .../{ => emptylineseparator}/InputEmptyLineSeparator.java | 0 .../InputEmptyLineSeparatorFormerException.java | 0 .../InputEmptyLineSeparatorHeader.java | 0 .../InputEmptyLineSeparatorMultipleEmptyLines.java | 0 .../InputEmptyLineSeparatorMultipleEmptyLinesInside.java | 0 .../InputEmptyLineSeparatorMultipleFieldsInClass.java | 0 .../InputEmptyLineSeparatorMultipleImportEmptyClass.java | 0 .../emptylineseparator/InputPrePreviousLineEmptiness.java | 6 ++++++ .../package-info/test1/package-info.java | 5 +++++ .../package-info/test2/package-info.java | 6 ++++++ .../package-info/test3/package-info.java | 7 +++++++ .../package-info/test4/package-info.java | 7 +++++++ 13 files changed, 33 insertions(+), 1 deletion(-) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/{ => emptylineseparator}/InputEmptyLineSeparator.java (100%) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/{ => emptylineseparator}/InputEmptyLineSeparatorFormerException.java (100%) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/{ => emptylineseparator}/InputEmptyLineSeparatorHeader.java (100%) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/{ => emptylineseparator}/InputEmptyLineSeparatorMultipleEmptyLines.java (100%) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/{ => emptylineseparator}/InputEmptyLineSeparatorMultipleEmptyLinesInside.java (100%) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/{ => emptylineseparator}/InputEmptyLineSeparatorMultipleFieldsInClass.java (100%) rename src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/{ => emptylineseparator}/InputEmptyLineSeparatorMultipleImportEmptyClass.java (100%) create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputPrePreviousLineEmptiness.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/package-info/test1/package-info.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/package-info/test2/package-info.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/package-info/test3/package-info.java create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/package-info/test4/package-info.java diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java index 853b881c0d52..457c6cb97f00 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java @@ -40,7 +40,8 @@ public class EmptyLineSeparatorCheckTest @Override protected String getPath(String filename) throws IOException { return super.getPath("checks" + File.separator - + "whitespace" + File.separator + filename); + + "whitespace" + File.separator + + "emptylineseparator" + File.separator + filename); } @Test diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparator.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparator.java similarity index 100% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparator.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparator.java diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorFormerException.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorFormerException.java similarity index 100% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorFormerException.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorFormerException.java diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorHeader.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorHeader.java similarity index 100% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorHeader.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorHeader.java diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorMultipleEmptyLines.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorMultipleEmptyLines.java similarity index 100% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorMultipleEmptyLines.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorMultipleEmptyLines.java diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorMultipleEmptyLinesInside.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorMultipleEmptyLinesInside.java similarity index 100% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorMultipleEmptyLinesInside.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorMultipleEmptyLinesInside.java diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorMultipleFieldsInClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorMultipleFieldsInClass.java similarity index 100% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorMultipleFieldsInClass.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorMultipleFieldsInClass.java diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorMultipleImportEmptyClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorMultipleImportEmptyClass.java similarity index 100% rename from src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputEmptyLineSeparatorMultipleImportEmptyClass.java rename to src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputEmptyLineSeparatorMultipleImportEmptyClass.java diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputPrePreviousLineEmptiness.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputPrePreviousLineEmptiness.java new file mode 100644 index 000000000000..1a1aef1eb1a0 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/InputPrePreviousLineEmptiness.java @@ -0,0 +1,6 @@ + +package com.puppycrawl.tools.checkstyle.checks.whitespace; + +public class InputPrePreviousLineEmptiness { + +} diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/package-info/test1/package-info.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/package-info/test1/package-info.java new file mode 100644 index 000000000000..717e51a8214c --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/package-info/test1/package-info.java @@ -0,0 +1,5 @@ +/*OK: for test allowing to place annotation before PACKAGE_DEF.*/ +@Deprecated +package com.puppycrawl.tools.checkstyle.checks.whitespace.packageinfo.test1; + +import java.lang.Deprecated; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/package-info/test2/package-info.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/package-info/test2/package-info.java new file mode 100644 index 000000000000..bb11990ea46a --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/package-info/test2/package-info.java @@ -0,0 +1,6 @@ +/**OK: for test allowing to place javadoc before PACKAGE_DEF.*/ +package com.puppycrawl.tools.checkstyle.checks.whitespace.packageinfo.test2; + +//that import is for doing check of PACKAGE_DEF, +//because EmptyLineSeparatorCheck doesn't check last token +import java.lang.System; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/package-info/test3/package-info.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/package-info/test3/package-info.java new file mode 100644 index 000000000000..9551c295f414 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/package-info/test3/package-info.java @@ -0,0 +1,7 @@ +/*violation: for test that there's warning when block comment isn't + separated from PACKAGE_DEF by line.*/ +package com.puppycrawl.tools.checkstyle.checks.whitespace.packageinfo.test3; + +//that import is for doing check of PACKAGE_DEF, +//because EmptyLineSeparatorCheck doesn't check last token +import java.lang.System; diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/package-info/test4/package-info.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/package-info/test4/package-info.java new file mode 100644 index 000000000000..0f4d20f385e8 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/emptylineseparator/package-info/test4/package-info.java @@ -0,0 +1,7 @@ +//for test there's warning when single line comment isn't separated from PACKAGE_DEF by line +//violation is expected after this line +package com.puppycrawl.tools.checkstyle.checks.whitespace.packageinfo.test4; + +//that import is for doing check of PACKAGE_DEF, +//because EmptyLineSeparatorCheck doesn't check last token +import java.lang.System;