From ce92f66aa9452cca6e7dc96c8ca531e61dc6d793 Mon Sep 17 00:00:00 2001 From: Mateusz Nojek Date: Mon, 1 Mar 2021 14:35:53 +0100 Subject: [PATCH] Fix missing trailing blank line and add tests (#270) --- robocop/checkers/spacing.py | 2 +- robocop/version.py | 2 +- .../expected_output.txt | 2 +- .../rules/missing-trailing-blank-line/test.robot | 15 +-------------- .../rules/missing-trailing-blank-line/test2.robot | 7 +++++++ .../rules/missing-trailing-blank-line/test3.robot | 8 ++++++++ .../rules/missing-trailing-blank-line/test4.robot | 8 ++++++++ 7 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 tests/atest/rules/missing-trailing-blank-line/test2.robot create mode 100644 tests/atest/rules/missing-trailing-blank-line/test3.robot create mode 100644 tests/atest/rules/missing-trailing-blank-line/test4.robot diff --git a/robocop/checkers/spacing.py b/robocop/checkers/spacing.py index 401137f1e..c2724d149 100644 --- a/robocop/checkers/spacing.py +++ b/robocop/checkers/spacing.py @@ -57,7 +57,7 @@ def parse_file(self): if empty_lines > 1: self.report("too-many-trailing-blank-lines", lineno=len(self.lines), col=0) return - if not empty_lines: + if not empty_lines and not last_line.endswith('\n'): self.report("missing-trailing-blank-line", lineno=len(self.lines), col=0) def check_line(self, line, lineno): diff --git a/robocop/version.py b/robocop/version.py index 96e3ce8d9..8e3c933cd 100644 --- a/robocop/version.py +++ b/robocop/version.py @@ -1 +1 @@ -__version__ = '1.4.0' +__version__ = '1.4.1' diff --git a/tests/atest/rules/missing-trailing-blank-line/expected_output.txt b/tests/atest/rules/missing-trailing-blank-line/expected_output.txt index e04ab4604..277cfc862 100644 --- a/tests/atest/rules/missing-trailing-blank-line/expected_output.txt +++ b/tests/atest/rules/missing-trailing-blank-line/expected_output.txt @@ -1 +1 @@ -${rules_dir}${\}test.robot:20:0 [W] 1002 Missing trailing blank line at the end of file \ No newline at end of file +${rules_dir}${\}test.robot:7:0 [W] 1002 Missing trailing blank line at the end of file \ No newline at end of file diff --git a/tests/atest/rules/missing-trailing-blank-line/test.robot b/tests/atest/rules/missing-trailing-blank-line/test.robot index ba1c440a1..9827a91c4 100644 --- a/tests/atest/rules/missing-trailing-blank-line/test.robot +++ b/tests/atest/rules/missing-trailing-blank-line/test.robot @@ -1,20 +1,7 @@ -*** Settings *** -Documentation doc - - *** Test Cases *** Test [Documentation] doc [Tags] sometag Pass Keyword - One More - - -*** Keywords *** -Keyword - [Documentation] this is doc - No Operation - Pass - No Operation - Fail \ No newline at end of file + One More \ No newline at end of file diff --git a/tests/atest/rules/missing-trailing-blank-line/test2.robot b/tests/atest/rules/missing-trailing-blank-line/test2.robot new file mode 100644 index 000000000..0d9092fbc --- /dev/null +++ b/tests/atest/rules/missing-trailing-blank-line/test2.robot @@ -0,0 +1,7 @@ +*** Test Cases *** +Test + [Documentation] doc + [Tags] sometag + Pass + Keyword + One More diff --git a/tests/atest/rules/missing-trailing-blank-line/test3.robot b/tests/atest/rules/missing-trailing-blank-line/test3.robot new file mode 100644 index 000000000..3ce6a6605 --- /dev/null +++ b/tests/atest/rules/missing-trailing-blank-line/test3.robot @@ -0,0 +1,8 @@ +*** Test Cases *** +Test + [Documentation] doc + [Tags] sometag + Pass + Keyword + One More + diff --git a/tests/atest/rules/missing-trailing-blank-line/test4.robot b/tests/atest/rules/missing-trailing-blank-line/test4.robot new file mode 100644 index 000000000..362f4deb9 --- /dev/null +++ b/tests/atest/rules/missing-trailing-blank-line/test4.robot @@ -0,0 +1,8 @@ +*** Test Cases *** +Test + [Documentation] doc + [Tags] sometag + Pass + Keyword + One More + \ No newline at end of file