Fix missing trailing blank line and add tests (#270)

MarketSquare · Mar 1, 2021 · ce92f66 · ce92f66
1 parent 30f3217
commit ce92f66
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 17 deletions.
diff --git 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
@@ -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
@@ -1 +1 @@
-${rules_dir}${\}test.robot:20:0 [W] 1002 Missing trailing blank line at the end of file
+${rules_dir}${\}test.robot:7:0 [W] 1002 Missing trailing blank line at the 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
@@ -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
+    One More
diff --git a/tests/atest/rules/missing-trailing-blank-line/test2.robot 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
@@ -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
@@ -0,0 +1,8 @@
+*** Test Cases ***
+Test
+    [Documentation]  doc
+    [Tags]  sometag
+    Pass
+    Keyword
+    One More
+
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		${rules_dir}${\}test.robot:20:0 [W] 1002 Missing trailing blank line at the end of file
		${rules_dir}${\}test.robot:7:0 [W] 1002 Missing trailing blank line at the end of file