highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-24 23:41:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: add ReadDebugLogLines helper function

Browse Source 
Deduplicates repeated usage of the same functionality.
This commit is contained in:
stickies-v
2025-07-23 22:29:01 +01:00
committed by Eugene Siegel
parent 3d630c2544
commit 05d7c22479
1 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/test/logging_tests.cpp
View File

@@ -37,6 +37,16 @@ static void ResetLogger()
LogInstance().SetCategoryLogLevel({}); LogInstance().SetCategoryLogLevel({});
} }
static std::vector<std::string> ReadDebugLogLines()
{
std::vector<std::string> lines;
std::ifstream ifs{LogInstance().m_file_path};
for (std::string line; std::getline(ifs, line);) {
lines.push_back(std::move(line));
}
return lines;
}
struct LogSetup : public BasicTestingSetup { struct LogSetup : public BasicTestingSetup {
fs::path prev_log_path; fs::path prev_log_path;
fs::path tmp_log_path; fs::path tmp_log_path;
@@ -120,11 +130,7 @@ BOOST_FIXTURE_TEST_CASE(logging_LogPrintStr, LogSetup)
expected.push_back(tfm::format("[%s:%s] [%s] %s%s", util::RemovePrefix(loc.file_name(), "./"), loc.line(), loc.function_name(), prefix, msg)); expected.push_back(tfm::format("[%s:%s] [%s] %s%s", util::RemovePrefix(loc.file_name(), "./"), loc.line(), loc.function_name(), prefix, msg));
LogInstance().LogPrintStr(msg, std::move(loc), category, level, /*should_ratelimit=*/false); LogInstance().LogPrintStr(msg, std::move(loc), category, level, /*should_ratelimit=*/false);
} }
std::ifstream file{tmp_log_path}; std::vector<std::string> log_lines{ReadDebugLogLines()};
std::vector<std::string> log_lines;
for (std::string log; std::getline(file, log);) {
log_lines.push_back(log);
}
BOOST_CHECK_EQUAL_COLLECTIONS(log_lines.begin(), log_lines.end(), expected.begin(), expected.end()); BOOST_CHECK_EQUAL_COLLECTIONS(log_lines.begin(), log_lines.end(), expected.begin(), expected.end());
} }
@@ -136,11 +142,7 @@ BOOST_FIXTURE_TEST_CASE(logging_LogPrintMacrosDeprecated, LogSetup)
LogPrintLevel(BCLog::NET, BCLog::Level::Info, "foo8: %s\n", "bar8"); LogPrintLevel(BCLog::NET, BCLog::Level::Info, "foo8: %s\n", "bar8");
LogPrintLevel(BCLog::NET, BCLog::Level::Warning, "foo9: %s\n", "bar9"); LogPrintLevel(BCLog::NET, BCLog::Level::Warning, "foo9: %s\n", "bar9");
LogPrintLevel(BCLog::NET, BCLog::Level::Error, "foo10: %s\n", "bar10"); LogPrintLevel(BCLog::NET, BCLog::Level::Error, "foo10: %s\n", "bar10");
std::ifstream file{tmp_log_path}; std::vector<std::string> log_lines{ReadDebugLogLines()};
std::vector<std::string> log_lines;
for (std::string log; std::getline(file, log);) {
log_lines.push_back(log);
}
std::vector<std::string> expected = { std::vector<std::string> expected = {
"foo5: bar5", "foo5: bar5",
"[net] foo7: bar7", "[net] foo7: bar7",
@@ -158,11 +160,7 @@ BOOST_FIXTURE_TEST_CASE(logging_LogPrintMacros, LogSetup)
LogInfo("foo8: %s", "bar8"); LogInfo("foo8: %s", "bar8");
LogWarning("foo9: %s", "bar9"); LogWarning("foo9: %s", "bar9");
LogError("foo10: %s", "bar10"); LogError("foo10: %s", "bar10");
std::ifstream file{tmp_log_path}; std::vector<std::string> log_lines{ReadDebugLogLines()};
std::vector<std::string> log_lines;
for (std::string log; std::getline(file, log);) {
log_lines.push_back(log);
}
std::vector<std::string> expected = { std::vector<std::string> expected = {
"[net] foo7: bar7", "[net] foo7: bar7",
"foo8: bar8", "foo8: bar8",
@@ -194,11 +192,7 @@ BOOST_FIXTURE_TEST_CASE(logging_LogPrintMacros_CategoryName, LogSetup)
expected.push_back(expected_log); expected.push_back(expected_log);
} }
std::ifstream file{tmp_log_path}; std::vector<std::string> log_lines{ReadDebugLogLines()};
std::vector<std::string> log_lines;
for (std::string log; std::getline(file, log);) {
log_lines.push_back(log);
}
BOOST_CHECK_EQUAL_COLLECTIONS(log_lines.begin(), log_lines.end(), expected.begin(), expected.end()); BOOST_CHECK_EQUAL_COLLECTIONS(log_lines.begin(), log_lines.end(), expected.begin(), expected.end());
} }
@@ -227,11 +221,7 @@ BOOST_FIXTURE_TEST_CASE(logging_SeverityLevels, LogSetup)
"[net:warning] foo5: bar5", "[net:warning] foo5: bar5",
"[net:error] foo7: bar7", "[net:error] foo7: bar7",
}; };
std::ifstream file{tmp_log_path}; std::vector<std::string> log_lines{ReadDebugLogLines()};
std::vector<std::string> log_lines;
for (std::string log; std::getline(file, log);) {
log_lines.push_back(log);
}
BOOST_CHECK_EQUAL_COLLECTIONS(log_lines.begin(), log_lines.end(), expected.begin(), expected.end()); BOOST_CHECK_EQUAL_COLLECTIONS(log_lines.begin(), log_lines.end(), expected.begin(), expected.end());
} }