ckeck error messages in unit tests, fix some typos in error messges

Author: matyalatte

include/cpplint_state.h

@@ -124,6 +124,9 @@ class CppLintState {
     // Flush buffers for cout and cerr
     void FlushThreadStream();
 
+    // Get error buffer as string
+    std::string GetErrorStreamAsStr();
+
     // Print a summary of errors by category, and the total.
     void PrintErrorCounts();
     void PrintInfo(const std::string& message);

src/cpplint_state.cpp

@@ -60,7 +60,7 @@ thread_local std::ostringstream cout_buffer;
 thread_local std::ostringstream cerr_buffer;
 
 // Flush streams when the buffer size is larger than this value
-static const std::streampos FLUSH_THRESHOLD = 512;
+static const std::streampos FLUSH_THRESHOLD = 1024;
 
 void CppLintState::PrintInfo(const std::string& message) {
     // _quiet does not represent --quiet flag.
@@ -161,3 +161,7 @@ void CppLintState::FlushThreadStream() {
     }
 }
 
+std::string CppLintState::GetErrorStreamAsStr() {
+    std::lock_guard<std::mutex> lock(m_mtx);
+    return cerr_buffer.str();
+}

src/file_linter.cpp

@@ -171,8 +171,8 @@ void FileLinter::ParseNolintSuppressions(const std::string& raw_line,
         } else if (no_lint_type == "BEGIN") {
             if (m_error_suppressions.HasOpenBlock()) {
                 Error(linenum, "readability/nolint", 5,
-                      "NONLINT block already defined on line " +
-                      m_error_suppressions.GetOpenBlockStart());
+                      "NOLINT block already defined on line " +
+                      std::to_string(m_error_suppressions.GetOpenBlockStart()));
             }
             ProcessCategory = ProcessCategoryBegin;
         } else if (no_lint_type == "END") {
@@ -1415,7 +1415,7 @@ void FileLinter::CheckOperatorSpacing(const CleansedLines& clean_lines,
             !(GetMatchStrView(m_re_result, line, 1) == "operator" &&
               StrIsChar(GetMatchStrView(m_re_result, line, 2), ';'))) {
         Error(linenum, "whitespace/operators", 3,
-                              "Missing spaces around <<");
+              "Missing spaces around <<");
     }
 
     // We allow no-spaces around >> for almost anything.  This is because
@@ -1773,8 +1773,7 @@ void FileLinter::CheckSpacingForFunctionCallBase(const std::string& line,
         RegexCompile(R"(\w\s*\(\s(?!\s*\\$))");
     static const regex_code RE_PATTERN_PARENS =
         RegexCompile(R"(\(\s+(?!(\s*\\)|\())");
-    if (GetLastNonSpace(fncall) == '\\' &&  // This can avoid the next RegexSearch()
-            RegexSearch(RE_PATTERN_FUNC_PARENS, fncall)) {
+    if (RegexSearch(RE_PATTERN_FUNC_PARENS, fncall)) {
         // a ( used for a fn call
         Error(linenum, "whitespace/parens", 4,
               "Extra space after ( in function call");
@@ -3660,8 +3659,8 @@ void FileLinter::CheckRedundantOverrideOrFinal(const CleansedLines& clean_lines,
     // Check that at most one of "override" or "final" is present, not both
     if (has_error) {
         Error(linenum, "readability/inheritance", 4,
-                              "\"override\" is redundant since function is "
-                              "already declared as \"final\"");
+              "\"override\" is redundant since function is "
+              "already declared as \"final\"");
     }
 }
 
@@ -4021,7 +4020,7 @@ void FileLinter::ProcessFileData(std::vector<std::string>& lines) {
         }
         if (m_error_suppressions.HasOpenBlock()) {
             Error(m_error_suppressions.GetOpenBlockStart(), "readability/nolint", 5,
-                  "NONLINT block never ended");
+                  "NOLINT block never ended");
         }
     }
 

tests/file_test.cpp

@@ -40,28 +40,53 @@ class FileLinterTest : public ::testing::Test {
         fs::path file = filename;
         linter = FileLinter(file, &cpplint_state, options);
     }
+
+    void ExpectErrorStr(const char* expected, const char* file, int linenum) {
+        std::string error_str = cpplint_state.GetErrorStreamAsStr();
+        EXPECT_STREQ(expected, error_str.c_str()) << "  line: " << file << "(" << linenum << ")";
+    }
 };
 
+#define EXPECT_ERROR_STR(expected) ExpectErrorStr(expected, __FILE__, __LINE__)
+
 TEST_F(FileLinterTest, NullBytes) {
     filename = "./tests/test_files/nullbytes.c";
     ProcessFile();
-    // Line contains NUL byte.
     EXPECT_EQ(2, cpplint_state.ErrorCount());
     EXPECT_EQ(2, cpplint_state.ErrorCount("readability/nul"));
+    const char* expected =
+        "./tests/test_files/nullbytes.c:1:  "
+        "Line contains NUL byte."
+        "  [readability/nul] [5]\n"
+        "./tests/test_files/nullbytes.c:2:  "
+        "Line contains NUL byte."
+        "  [readability/nul] [5]\n";
+    EXPECT_ERROR_STR(expected);
 }
 
 TEST_F(FileLinterTest, InvalidUTF) {
     filename = "./tests/test_files/invalid_utf.c";
     ProcessFile();
-    // Line contains invalid UTF-8
     EXPECT_EQ(2, cpplint_state.ErrorCount());
     EXPECT_EQ(2, cpplint_state.ErrorCount("readability/utf8"));
+    const char* expected =
+        "./tests/test_files/invalid_utf.c:1:  "
+        "Line contains invalid UTF-8 (or Unicode replacement character)."
+        "  [readability/utf8] [5]\n"
+        "./tests/test_files/invalid_utf.c:2:  "
+        "Line contains invalid UTF-8 (or Unicode replacement character)."
+        "  [readability/utf8] [5]\n";
+    EXPECT_ERROR_STR(expected);
 }
 
 TEST_F(FileLinterTest, Crlf) {
     filename = "./tests/test_files/crlf.c";
     ProcessFile();
-    // Unexpected \r (^M) found
     EXPECT_EQ(1, cpplint_state.ErrorCount());
     EXPECT_EQ(1, cpplint_state.ErrorCount("whitespace/newline"));
+    const char* expected =
+        "./tests/test_files/crlf.c:1:  "
+        "Unexpected \\r (^M) found; better to use only \\n"
+        "  [whitespace/newline] [1]\n";
+    EXPECT_ERROR_STR(expected);
 }