fix all broken tests due to new highlight code errors

42School · Jul 1, 2024 · d2c2d71 · d2c2d71
1 parent 4d4375c
commit d2c2d71
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 19 deletions.
diff --git a/tests/rules/samples/check_preprocessor_indent.out b/tests/rules/samples/check_preprocessor_indent.out
@@ -151,6 +151,7 @@ Error: TOO_MANY_WS          (line:   7, col:   1):	Extra whitespaces for indent
 Error: TAB_REPLACE_SPACE    (line:   7, col:   2):	Found tab when expecting space
 Error: TOO_MANY_WS          (line:   9, col:   1):	Extra whitespaces for indent level
 Error: MACRO_NAME_CAPITAL   (line:   9, col:  10):	Macro name must be capitalized
+Error: SPC_BEFORE_NL        (line:  26, col:   2):	Space before newline
 Error: PREPROC_START_LINE   (line:  29, col:  17):	Preprocessor statement not at the beginning of the line
 Error: PREPROC_START_LINE   (line:  30, col:   5):	Preprocessor statement not at the beginning of the line
 Error: PREPROC_START_LINE   (line:  31, col:   5):	Preprocessor statement not at the beginning of the line
@@ -164,6 +165,7 @@ Error: TAB_REPLACE_SPACE    (line:  37, col:  11):	Found tab when expecting spac
 Error: CONSECUTIVE_WS       (line:  38, col:   9):	Two or more consecutives white spaces
 Error: TAB_REPLACE_SPACE    (line:  38, col:  10):	Found tab when expecting space
 Error: PREPROC_NO_SPACE     (line:  39, col:   9):	Missing space after preprocessor directive
+Error: SPC_BEFORE_NL        (line:  45, col:  34):	Space before newline
 Error: TAB_REPLACE_SPACE    (line:  50, col:   8):	Found tab when expecting space
 Error: PREPOC_ONLY_GLOBAL   (line:  61, col:   1):	Preprocessor statements are only allowed in the global scope
 Error: NL_AFTER_PREPROC     (line:  62, col:   1):	Preprocessor statement must be followed by a newline

diff --git a/tests/rules/samples/check_utype_declaration_1.out b/tests/rules/samples/check_utype_declaration_1.out
@@ -79,3 +79,4 @@ Error: TYPE_NOT_GLOBAL      (line:  23, col:   5):	Enums, structs and unions nee
 Error: WRONG_SCOPE_COMMENT  (line:  27, col:  18):	Comment is invalid in this scope
 Error: WRONG_SCOPE_COMMENT  (line:  27, col:  18):	Comment is invalid in this scope
 Error: WRONG_SCOPE_COMMENT  (line:  28, col:   1):	Comment is invalid in this scope
+Error: SPC_BEFORE_NL        (line:  28, col:  34):	Space before newline
diff --git a/tests/rules/samples/integer_constants.out b/tests/rules/samples/integer_constants.out
@@ -123,7 +123,7 @@ Error: TOO_MANY_VARS_FUNC   (line:  25, col:   1):	Too many variables declaratio
 Error: DECL_ASSIGN_LINE     (line:  25, col:  33):	Declaration and assignation on a single line
 Error: TOO_MANY_VARS_FUNC   (line:  26, col:   1):	Too many variables declarations in a function
 Error: DECL_ASSIGN_LINE     (line:  26, col:  34):	Declaration and assignation on a single line
-Error: LINE_TOO_LONG        (line:  29, col:  82):	line too long
+Error: LINE_TOO_LONG        (line:  29, col:  81):	line too long
 Error: TOO_MANY_ARGS        (line:  29, col: 115):	Function has more than 4 arguments
 Error: TOO_MANY_VARS_FUNC   (line:  36, col:   1):	Too many variables declarations in a function
 Error: TOO_MANY_VARS_FUNC   (line:  37, col:   1):	Too many variables declarations in a function

diff --git a/tests/rules/samples/ko_white_space_end_include.out b/tests/rules/samples/ko_white_space_end_include.out
@@ -18,5 +18,7 @@
 		<RBRACE> <SPACE> <NEWLINE>
 ko_white_space_end_include.c: Error!
 Error: INVALID_HEADER       (line:   1, col:   1):	Missing or invalid 42 header
+Error: SPC_BEFORE_NL        (line:   1, col:  19):	Space before newline
+Error: SPC_BEFORE_NL        (line:   2, col:  19):	Space before newline
 Error: SPC_BEFORE_NL        (line:   5, col:   2):	Space before newline
 Error: SPC_BEFORE_NL        (line:   9, col:   2):	Space before newline
diff --git a/tests/rules/samples/test_comments.out b/tests/rules/samples/test_comments.out
@@ -57,7 +57,6 @@ Error: USER_DEFINED_TYPEDEF (line:   6, col:  26):	User defined typedef must sta
 Error: FORBIDDEN_ENUM       (line:   8, col:   1):	Enum declaration are not allowed in .c files
 Error: ENUM_TYPE_NAMING     (line:   8, col:   6):	Enum name must start with e_
 Error: BRACE_NEWLINE        (line:   8, col:  11):	Expected newline before brace
-Error: SPACE_EMPTY_LINE     (line:   9, col:   5):	Space on empty line
 Error: TOO_FEW_TAB          (line:  10, col:   1):	Missing tabs for indent level
 Error: SPACE_REPLACE_TAB    (line:  10, col:   5):	Found space when expecting tab
 Error: CONSECUTIVE_SPC      (line:  10, col:  11):	Two or more consecutives spaces
@@ -66,13 +65,8 @@ Error: TOO_FEW_TAB          (line:  11, col:  16):	Missing tabs for indent level
 Error: SPACE_BEFORE_FUNC    (line:  14, col:   5):	space before function name
 Error: COMMENT_ON_INSTR     (line:  14, col:  12):	Comment must be on its own line or at end of a line
 Error: MISSING_IDENTIFIER   (line:  14, col:  25):	missing type qualifier or identifier in function arguments
-Error: SPACE_EMPTY_LINE     (line:  16, col:   4):	Space on empty line
 Error: WRONG_SCOPE_COMMENT  (line:  16, col:   4):	Comment is invalid in this scope
 Error: TOO_FEW_TAB          (line:  17, col:   1):	Missing tabs for indent level
-Error: SPACE_EMPTY_LINE     (line:  17, col:   4):	Space on empty line
-Error: SPACE_EMPTY_LINE     (line:  18, col:   7):	Space on empty line
 Error: WRONG_SCOPE_COMMENT  (line:  18, col:   7):	Comment is invalid in this scope
-Error: SPACE_EMPTY_LINE     (line:  19, col:   7):	Space on empty line
 Error: WRONG_SCOPE_COMMENT  (line:  19, col:   7):	Comment is invalid in this scope
 Error: TOO_FEW_TAB          (line:  20, col:   1):	Missing tabs for indent level
-Error: SPACE_EMPTY_LINE     (line:  20, col:   4):	Space on empty line
diff --git a/tests/rules/samples/test_file_0907_3.out b/tests/rules/samples/test_file_0907_3.out
@@ -505,7 +505,7 @@ Error: SPC_AFTER_OPERATOR   (line:  65, col:  61):	missing space after operator
 Error: SPC_BFR_OPERATOR     (line:  65, col:  61):	missing space before operator
 Error: SPC_AFTER_OPERATOR   (line:  65, col:  80):	missing space after operator
 Error: SPC_BFR_OPERATOR     (line:  65, col:  80):	missing space before operator
-Error: LINE_TOO_LONG        (line:  65, col:  87):	line too long
+Error: LINE_TOO_LONG        (line:  65, col:  81):	line too long
 Error: SPC_AFTER_OPERATOR   (line:  65, col:  87):	missing space after operator
 Error: SPC_BFR_OPERATOR     (line:  65, col:  87):	missing space before operator
 Error: ASSIGN_IN_CONTROL    (line:  66, col:  19):	Assignment in control structure
@@ -542,10 +542,10 @@ Error: SPACE_AFTER_KW       (line: 155, col:  13):	Missing space after keyword
 Error: NO_SPC_AFR_PAR       (line: 156, col:  50):	Extra space after parenthesis (brace/bracket)
 Error: TOO_FEW_TAB          (line: 156, col:  52):	Missing tabs for indent level
 Error: SPACE_AFTER_KW       (line: 159, col:  17):	Missing space after keyword
-Error: LINE_TOO_LONG        (line: 162, col:  86):	line too long
+Error: LINE_TOO_LONG        (line: 162, col:  81):	line too long
 Error: NO_SPC_AFR_PAR       (line: 168, col:  23):	Extra space after parenthesis (brace/bracket)
 Error: TOO_FEW_TAB          (line: 168, col:  25):	Missing tabs for indent level
-Error: LINE_TOO_LONG        (line: 172, col:  86):	line too long
+Error: LINE_TOO_LONG        (line: 172, col:  81):	line too long
 Error: SPACE_AFTER_KW       (line: 182, col:  17):	Missing space after keyword
 Error: BRACE_SHOULD_EOL     (line: 201, col:   1):	Expected newline after brace
 Error: TOO_MANY_LINES       (line: 201, col:   1):	Function has more than 25 lines
diff --git a/tests/rules/samples/test_file_1019.out b/tests/rules/samples/test_file_1019.out
@@ -180,8 +180,8 @@ Error: TOO_MANY_FUNCS       (line:  66, col:   1):	Too many functions in file
 Error: COMMENT_ON_INSTR     (line:  70, col:  14):	Comment must be on its own line or at end of a line
 Error: WRONG_SCOPE_COMMENT  (line:  70, col:  14):	Comment is invalid in this scope
 Error: TOO_MANY_FUNCS       (line:  73, col:   1):	Too many functions in file
-Error: SPC_BEFORE_NL        (line:  73, col:  17):	Space before newline
+Error: SPC_BEFORE_NL        (line:  73, col:  15):	Space before newline
 Error: TOO_MANY_FUNCS       (line:  78, col:   1):	Too many functions in file
-Error: SPC_BEFORE_NL        (line:  78, col:  17):	Space before newline
+Error: SPC_BEFORE_NL        (line:  78, col:  15):	Space before newline
 Error: SPC_BEFORE_NL        (line:  79, col:   2):	Space before newline
 Error: SPC_BEFORE_NL        (line:  81, col:   2):	Space before newline
diff --git a/tests/rules/samples/test_file_2007.out b/tests/rules/samples/test_file_2007.out
@@ -33,7 +33,7 @@
 test_file_2007.c: Error!
 Error: INVALID_HEADER       (line:   1, col:   1):	Missing or invalid 42 header
 Error: SPACE_REPLACE_TAB    (line:   3, col:   9):	Found space when expecting tab
-Error: LINE_TOO_LONG        (line:   7, col:  82):	line too long
-Error: LINE_TOO_LONG        (line:   8, col:  82):	line too long
-Error: LINE_TOO_LONG        (line:  10, col: 117):	line too long
-Error: LINE_TOO_LONG        (line:  11, col:  82):	line too long
+Error: LINE_TOO_LONG        (line:   7, col:  81):	line too long
+Error: LINE_TOO_LONG        (line:   8, col:  81):	line too long
+Error: LINE_TOO_LONG        (line:  10, col:  81):	line too long
+Error: LINE_TOO_LONG        (line:  11, col:  81):	line too long
diff --git a/tests/rules/samples/test_file_210923.out b/tests/rules/samples/test_file_210923.out
@@ -228,12 +228,12 @@ Error: TOO_MANY_INSTR       (line:  23, col:  24):	Too many instructions on a si
 Error: TOO_FEW_TAB          (line:  31, col:  12):	Missing tabs for indent level
 Error: TOO_MANY_INSTR       (line:  31, col:  12):	Too many instructions on a single line
 Error: TOO_MANY_FUNCS       (line:  47, col:   1):	Too many functions in file
-Error: LINE_TOO_LONG        (line:  52, col:  88):	line too long
+Error: LINE_TOO_LONG        (line:  52, col:  81):	line too long
 Error: TOO_MANY_FUNCS       (line:  54, col:   1):	Too many functions in file
 Error: TOO_MANY_FUNCS       (line:  59, col:   1):	Too many functions in file
-Error: LINE_TOO_LONG        (line:  63, col:  84):	line too long
+Error: LINE_TOO_LONG        (line:  63, col:  81):	line too long
 Error: TOO_MANY_FUNCS       (line:  66, col:   1):	Too many functions in file
-Error: LINE_TOO_LONG        (line:  70, col:  84):	line too long
+Error: LINE_TOO_LONG        (line:  70, col:  81):	line too long
 Error: TOO_MANY_FUNCS       (line:  73, col:   1):	Too many functions in file
 Error: SPACE_REPLACE_TAB    (line:  75, col:  10):	Found space when expecting tab
 Error: SPC_AFTER_POINTER    (line:  75, col:  11):	space after pointer