danny
/
spdlog
mirror of https://github.com/gabime/spdlog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed: tests project was not working

Browse Source
pull/288/head
vwbij 9 years ago
parent b6805fd826
commit 8f0715ea8a
4 changed files with 63 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape Escape View File

@ -54,6 +54,8 @@ spdloglb/DebugWL/*
spdloglb/ReleaseAL/*
spdloglb/ReleaseWL/*
spdloglb/.vs/*
spdloglb/*.db
spdlogLbTest/*.db
spdlogLbTest/Debug/*
spdlogLbTest/Release/*
spdlogLbTest/ipch/*

16
tests/errors.cpp
Unescape Escape View File

@ -9,9 +9,13 @@
TEST_CASE("default_error_handler", "[errors]]")
{
prepare_logdir();
spdlog::filename_t filename = _SFT("logs/simple_log.txt");
#ifdef SPDLOG_WCHAR_FILENAMES
spdlog::filename_t filename = L"logs/simple_log.txt";
#else
spdlog::filename_t filename = "logs/simple_log.txt";
#endif
auto logger = spdlog::create<spdlog::sinks::simple_file_sink_mt>("logger", filename, true);
auto logger = spdlog::create<spdlog::sinks::simple_file_sink_mt>("logger", filename, true);
logger->set_pattern(_SLT("%v"));
logger->info(_SLT("Test message {} {}"), 1);
logger->info(_SLT("Test message {}"), 2);
@ -21,7 +25,8 @@ TEST_CASE("default_error_handler", "[errors]]")
#if defined(SPDLOG_WCHAR_LOGGING)
REQUIRE(wfile_contents(filename) == spdlog::log_string_t(_SLT("Test message 2\r\n")));
#else
REQUIRE(file_contents(filename) == std::string("Test message 2\r\n"));
// \r is removed by the file_contents routine !!!!
REQUIRE(file_contents(filename) == std::string("Test message 2\n"));
#endif
#else
REQUIRE(file_contents(filename) == std::string("Test message 2\n"));
@ -85,6 +90,11 @@ TEST_CASE("async_error_handler", "[errors]]")
#if defined(_WIN32) && defined(SPDLOG_WCHAR_LOGGING)
REQUIRE(wfile_contents(_SFT("logs/custom_err.txt")) == err_msg);
#else
#ifdef SPDLOG_WCHAR_FILENAMES
REQUIRE(file_contents(L"logs/custom_err.txt") == err_msg);
#else
REQUIRE(file_contents("logs/custom_err.txt") == err_msg);
#endif
#endif
}

4
tests/file_helper.cpp
Unescape Escape View File

@ -5,7 +5,11 @@
using namespace spdlog::details;
#ifdef SPDLOG_WCHAR_FILENAMES
static const std::wstring target_filename = L"logs/file_helper_test.txt";
#else
static const std::string target_filename = "logs/file_helper_test.txt";
#endif
static unsigned long calculate_file_size(unsigned long nChars)
{

55
tests/file_log.cpp
Unescape Escape View File

@ -26,7 +26,8 @@ TEST_CASE("simple_file_logger", "[simple_logger]]")
REQUIRE(wfile_contents(filename) == /*spdlog::log_string_t*/(L"Test message 1\r\nTest message 2\r\n"));
REQUIRE(wcount_lines(filename) == 2);
#else // SPDLOG_WCHAR_LOGGING
REQUIRE(file_contents(filename) == /*spdlog::log_string_t*/("Test message 1\r\nTest message 2\r\n"));
// \r is removed by the file_contents routine !!!!
REQUIRE(file_contents(filename) == /*spdlog::log_string_t*/("Test message 1\nTest message 2\n"));
REQUIRE(count_lines(filename) == 2);
#endif // SPDLOG_WCHAR_LOGGING
#else // WIN32
@ -80,8 +81,14 @@ TEST_CASE("daily_logger", "[daily_logger]]")
//calculate filename (time based)
spdlog::filename_t basename = _SFT("logs/daily_log");
std::tm tm = spdlog::details::os::localtime();
spdlog::fmt_memory_writer_t w;
w.write(_SLT("{}_{:04d}-{:02d}-{:02d}_{:02d}-{:02d}.txt"), basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min);
#ifdef SPDLOG_WCHAR_FILENAMES
fmt::WMemoryWriter w;
w.write(L"{}_{:04d}-{:02d}-{:02d}_{:02d}-{:02d}.txt", basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min);
#else
fmt::MemoryWriter w;
w.write("{}_{:04d}-{:02d}-{:02d}_{:02d}-{:02d}.txt", basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min);
#endif
auto logger = spdlog::daily_logger_mt("logger", basename, 0, 0);
logger->flush_on(spdlog::level::info);
@ -103,13 +110,24 @@ TEST_CASE("daily_logger with dateonly calculator", "[daily_logger_dateonly]]")
//calculate filename (time based)
spdlog::filename_t basename = _SFT("logs/daily_dateonly");
std::tm tm = spdlog::details::os::localtime();
spdlog::fmt_memory_writer_t w;
w.write(_SLT("{}_{:04d}-{:02d}-{:02d}.txt"), basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
auto logger = spdlog::create<sink_type>("logger", basename, _SFT("txt"), 0, 0, true);
#ifdef SPDLOG_WCHAR_FILENAMES
fmt::WMemoryWriter w;
w.write(L"{}_{:04d}-{:02d}-{:02d}.txt", basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
auto logger = spdlog::create<sink_type>("logger", basename, L"txt", 0, 0);
#else
fmt::MemoryWriter w;
w.write("{}_{:04d}-{:02d}-{:02d}.txt", basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
auto logger = spdlog::create<sink_type>("logger", basename, "txt", 0, 0);
#endif
for (int i = 0; i < 10; ++i)
logger->info(_SLT("Test message {}"), i);
logger->flush();
auto filename = w.str();
REQUIRE(count_lines_t(filename) == 10);
}
@ -119,8 +137,14 @@ struct custom_daily_file_name_calculator
static spdlog::filename_t calc_filename(const spdlog::filename_t& basename, const spdlog::filename_t& extension)
{
std::tm tm = spdlog::details::os::localtime();
spdlog::fmt_memory_writer_t w;
w.write(_SLT("{}{:04d}{:02d}{:02d}.{}"), basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, extension);
#ifdef SPDLOG_WCHAR_FILENAMES
fmt::WMemoryWriter w;
w.write(L"{}{:04d}{:02d}{:02d}.{}", basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, extension);
#else
fmt::MemoryWriter w;
w.write("{}{:04d}{:02d}{:02d}.{}", basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, extension);
#endif
return w.str();
}
};
@ -135,13 +159,22 @@ TEST_CASE("daily_logger with custom calculator", "[daily_logger_custom]]")
//calculate filename (time based)
spdlog::filename_t basename = _SFT("logs/daily_dateonly");
std::tm tm = spdlog::details::os::localtime();
spdlog::fmt_memory_writer_t w;
w.write(_SLT("{}{:04d}{:02d}{:02d}.txt"), basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
auto logger = spdlog::create<sink_type>("logger", basename, _SFT("txt"), 0, 0, true);
#ifdef SPDLOG_WCHAR_FILENAMES
fmt::WMemoryWriter w;
w.write(L"{}{:04d}{:02d}{:02d}.txt", basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
auto logger = spdlog::create<sink_type>("logger", basename, L"txt", 0, 0);
#else
fmt::MemoryWriter w;
w.write("{}{:04d}{:02d}{:02d}.txt", basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
auto logger = spdlog::create<sink_type>("logger", basename, "txt", 0, 0);
#endif
for (int i = 0; i < 10; ++i)
logger->info(_SLT("Test message {}"), i);
logger->flush();
auto filename = w.str();
REQUIRE(count_lines_t(filename) == 10);
}

Write Preview
Loading…
Cancel
Save