tboudreaux/SERiF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(liblogging): changed SERiF to use liblogging

Browse Source
This commit is contained in:
Emily Boudreaux
2025-06-21 08:26:04 -04:00
parent a43f327672
commit c55185c1e3
20 changed files with 56 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/poly/polyTest.cpp
View File

@@ -24,7 +24,7 @@
#include "quill/LogMacros.h"
#include "mfem.hpp"
#include "polySolver.h"
#include "probe.h"
#include "logging.h"
#include "config.h"
std::string CONFIG_FILENAME = std::string(getenv("MESON_SOURCE_ROOT")) + "/tests/testsConfig.yaml";
@@ -37,7 +37,7 @@ TEST_F(polyTest, Solve) {
serif::config::Config& config = serif::config::Config::getInstance();
config.loadConfig(CONFIG_FILENAME);
serif::probe::LogManager& logManager = serif::probe::LogManager::getInstance();
fourdst::logging::LogManager& logManager = fourdst::logging::LogManager::getInstance();
quill::Logger* logger = logManager.getLogger("log");

71
tests/probe/probeTest.cpp
View File

@@ -13,38 +13,9 @@
std::string TEST_CONFIG = std::string(getenv("MESON_SOURCE_ROOT")) + "/tests/testsConfig.yaml";
std::string getLastLine(const std::string& filename) {
std::ifstream file(filename);
std::string line, lastLine;
if (!file.is_open()) {
throw std::runtime_error("Could not open file");
}
while (std::getline(file, line)) {
lastLine = line;
}
return lastLine; // Returns the last non-empty line
}
std::string stripTimestamps(const std::string& logLine) {
std::regex logPattern(R"(\d+:\d+:\d+\.\d+\s+\[\d+\]\s+probeTest\.cpp:\d+\s+LOG_INFO\s+[A-Za-z]*\s+(.*))");
std::smatch match;
if (std::regex_match(logLine, match, logPattern) && match.size() > 1) {
return match[1].str(); // Extract log message after timestamp
}
return logLine; // Return as-is if pattern doesn't match
}
class probeTest : public ::testing::Test {};
TEST_F(probeTest, DefaultConstructorTest) {
serif::config::Config::getInstance().loadConfig(TEST_CONFIG);
EXPECT_NO_THROW(serif::probe::LogManager::getInstance());
}
TEST_F(probeTest, waitTest) {
auto start = std::chrono::high_resolution_clock::now();
serif::probe::wait(1);
@@ -53,45 +24,3 @@ TEST_F(probeTest, waitTest) {
EXPECT_LE(elapsed.count(), 1.1);
}
TEST_F(probeTest, getLoggerTest) {
serif::config::Config::getInstance().loadConfig(TEST_CONFIG);
serif::probe::LogManager& logManager = serif::probe::LogManager::getInstance();
const std::string loggerName = "testLog";
const std::string filename = "test.log";
quill::Logger* logger = logManager.newFileLogger(filename, loggerName);
EXPECT_NE(logger, nullptr);
LOG_INFO(logger, "This is a test message");
// Wait for the log to be written by calling getLastLine until it is non empty
std::string lastLine;
while (lastLine.empty()) {
lastLine = getLastLine("test.log");
}
EXPECT_EQ(stripTimestamps(lastLine), "This is a test message");
}
TEST_F(probeTest, newFileLoggerTest) {
serif::config::Config::getInstance().loadConfig(TEST_CONFIG);
serif::probe::LogManager& logManager = serif::probe::LogManager::getInstance();
const std::string loggerName = "newLog";
const std::string filename = "newLog.log";
quill::Logger* logger = logManager.newFileLogger(filename, loggerName);
EXPECT_NE(logger, nullptr);
LOG_INFO(logger, "This is a new test message");
// Wait for the log to be written by calling getLastLine until it is non empty
std::string lastLine;
while (lastLine.empty()) {
lastLine = getLastLine(filename);
}
EXPECT_EQ(stripTimestamps(lastLine), "This is a new test message");
}
TEST_F(probeTest, getLoggerNames) {
serif::config::Config::getInstance().loadConfig(TEST_CONFIG);
serif::probe::LogManager& logManager = serif::probe::LogManager::getInstance();
std::vector<std::string> loggerNames = logManager.getLoggerNames();
EXPECT_EQ(loggerNames.size(), 4);
EXPECT_EQ(loggerNames.at(0), "log");
EXPECT_EQ(loggerNames.at(1), "newLog");
EXPECT_EQ(loggerNames.at(2), "stdout");
EXPECT_EQ(loggerNames.at(3), "testLog");
}