Commit 75adf9e7 authored by gabime's avatar gabime

Improved test_sink in unit tests

parent 0fa09f6a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "spdlog/details/null_mutex.h" #include "spdlog/details/null_mutex.h"
#include "spdlog/sinks/base_sink.h" #include "spdlog/sinks/base_sink.h"
#include "spdlog/fmt/fmt.h"
#include <chrono> #include <chrono>
#include <mutex> #include <mutex>
#include <thread> #include <thread>
...@@ -36,9 +36,20 @@ public: ...@@ -36,9 +36,20 @@ public:
delay_ = delay; delay_ = delay;
} }
// return last output without the eol
std::string last_output()
{
std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
auto eol_len = strlen(spdlog::details::os::default_eol);
return std::string(last_output_.begin(), last_output_.end() - eol_len);
}
protected: protected:
void sink_it_(const details::log_msg &) override void sink_it_(const details::log_msg &msg) override
{ {
fmt::memory_buffer formatted;
base_sink<Mutex>::formatter_->format(msg, formatted);
last_output_.assign(formatted.begin(), formatted.end());
msg_counter_++; msg_counter_++;
std::this_thread::sleep_for(delay_); std::this_thread::sleep_for(delay_);
} }
...@@ -47,9 +58,11 @@ protected: ...@@ -47,9 +58,11 @@ protected:
{ {
flush_counter_++; flush_counter_++;
} }
size_t msg_counter_{0}; size_t msg_counter_{0};
size_t flush_counter_{0}; size_t flush_counter_{0};
std::chrono::milliseconds delay_{std::chrono::milliseconds::zero()}; std::chrono::milliseconds delay_{std::chrono::milliseconds::zero()};
std::string last_output_;
}; };
using test_sink_mt = test_sink<std::mutex>; using test_sink_mt = test_sink<std::mutex>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment