summaryrefslogtreecommitdiff
path: root/icetray/unittests/testIceTrayLogger.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'icetray/unittests/testIceTrayLogger.cpp')
-rw-r--r--icetray/unittests/testIceTrayLogger.cpp155
1 files changed, 74 insertions, 81 deletions
diff --git a/icetray/unittests/testIceTrayLogger.cpp b/icetray/unittests/testIceTrayLogger.cpp
index 73142a4..f667ede 100644
--- a/icetray/unittests/testIceTrayLogger.cpp
+++ b/icetray/unittests/testIceTrayLogger.cpp
@@ -1,17 +1,17 @@
#define BOOST_TEST_MODULE TestIceTrayLogger
#include <boost/test/unit_test.hpp>
-#include <logger.h>
-#include <icetrayService.h>
-#include <Ice/Initialize.h>
+#include "testService.h"
#include <Ice/Communicator.h>
+#include <Ice/Initialize.h>
#include <Ice/ObjectAdapter.h>
-#include <compileTimeFormatter.h>
#include <boost/format.hpp>
-#include <slicer/common.h>
+#include <compileTimeFormatter.h>
+#include <icetrayService.h>
#include <logWriterConsole.h>
+#include <logger.h>
+#include <slicer/common.h>
#include <slicer/modelPartsTypes.h>
-#include "testService.h"
using namespace IceTray::Logging;
@@ -22,45 +22,41 @@ struct LogEntry {
};
class TestLogWriter : public AbstractLogWriter {
- public:
- template <typename ... T>
- explicit TestLogWriter(const T & ... t) :
- AbstractLogWriter(t...)
- {
- }
+public:
+ template<typename... T> explicit TestLogWriter(const T &... t) : AbstractLogWriter(t...) { }
- explicit TestLogWriter(const Ice::PropertiesPtr & p) :
- AbstractLogWriter("TestLogWriter", p)
- {
- }
+ explicit TestLogWriter(const Ice::PropertiesPtr & p) : AbstractLogWriter("TestLogWriter", p) { }
- void message(LogLevel priority, Domain domain, const std::string_view message, const Ice::Current &) override
- {
- msgs.push_back({priority, domain, std::string(message)});
- }
+ void
+ message(LogLevel priority, Domain domain, const std::string_view message, const Ice::Current &) override
+ {
+ msgs.push_back({priority, domain, std::string(message)});
+ }
- std::vector<LogEntry> msgs;
+ std::vector<LogEntry> msgs;
};
FACTORY(TestLogWriter, LogWriterFactory);
namespace std {
ostream &
- operator<<(ostream & s, const Domain & domain) {
+ operator<<(ostream & s, const Domain & domain)
+ {
for (const auto & d : domain) {
s << "::" << d;
}
return s;
}
ostream &
- operator<<(ostream & s, const LogLevel & ll) {
+ operator<<(ostream & s, const LogLevel & ll)
+ {
s << Slicer::ModelPartForEnum<LogLevel>::lookup(ll);
return s;
}
}
class StaticLogTest {
- public:
- static IceTray::Logging::LoggerPtr staticLog;
+public:
+ static IceTray::Logging::LoggerPtr staticLog;
};
IceTray::Logging::LoggerPtr staticLog = LOGMANAGER()->getLogger<IceTray::Service>();
@@ -69,7 +65,7 @@ Domain test = {"test"};
Domain testDomain = {"test", "domain"};
Domain testDebug = {"test", "debug"};
-BOOST_AUTO_TEST_CASE( staticLogInit )
+BOOST_AUTO_TEST_CASE(staticLogInit)
{
BOOST_REQUIRE(staticLog);
Domain expected = {"IceTray", "Service"};
@@ -78,50 +74,52 @@ BOOST_AUTO_TEST_CASE( staticLogInit )
// NOLINTNEXTLINE(hicpp-special-member-functions)
class TestLogImpl {
- public:
- TestLogImpl() :
- ic(Ice::initialize()),
- adp(ic->createObjectAdapterWithEndpoints("test", "default"))
- {
- adp->activate();
- log = manager.getLogger("test.domain");
- }
+public:
+ TestLogImpl() : ic(Ice::initialize()), adp(ic->createObjectAdapterWithEndpoints("test", "default"))
+ {
+ adp->activate();
+ log = manager.getLogger("test.domain");
+ }
- ~TestLogImpl()
- {
- adp->deactivate();
- adp->destroy();
- ic->destroy();
- }
+ ~TestLogImpl()
+ {
+ adp->deactivate();
+ adp->destroy();
+ ic->destroy();
+ }
- LogWriterPrxPtr add(const LogWriterPtr & w)
- {
- return Ice::uncheckedCast<LogWriterPrx>(adp->addWithUUID(w));
- }
+ LogWriterPrxPtr
+ add(const LogWriterPtr & w)
+ {
+ return Ice::uncheckedCast<LogWriterPrx>(adp->addWithUUID(w));
+ }
- protected:
- LoggerPtr log;
- LogManager manager;
- Ice::CommunicatorPtr ic;
+protected:
+ LoggerPtr log;
+ LogManager manager;
+ Ice::CommunicatorPtr ic;
- private:
- Ice::ObjectAdapterPtr adp;
+private:
+ Ice::ObjectAdapterPtr adp;
};
BOOST_FIXTURE_TEST_SUITE(li, TestLogImpl);
-BOOST_AUTO_TEST_CASE(no_writers) {
+BOOST_AUTO_TEST_CASE(no_writers)
+{
log->message(LogLevel::EMERG, "");
log->message(LogLevel::DEBUG, "");
}
-BOOST_AUTO_TEST_CASE(ostreamDomain) {
+BOOST_AUTO_TEST_CASE(ostreamDomain)
+{
std::stringstream str;
str << testDomain;
BOOST_REQUIRE_EQUAL("::test::domain", str.str());
}
-BOOST_AUTO_TEST_CASE(priority_filtering) {
+BOOST_AUTO_TEST_CASE(priority_filtering)
+{
auto w = std::make_shared<TestLogWriter>(LogLevel::WARNING);
auto e = std::make_shared<TestLogWriter>(LogLevel::ERR);
auto wp = add(w);
@@ -169,7 +167,7 @@ BOOST_AUTO_TEST_CASE(priority_filtering) {
BOOST_REQUIRE_EQUAL(5, e->msgs.size());
}
-BOOST_AUTO_TEST_CASE( no_domains )
+BOOST_AUTO_TEST_CASE(no_domains)
{
auto d = std::make_shared<TestLogWriter>();
manager.addWriter(add(d));
@@ -219,7 +217,7 @@ BOOST_AUTO_TEST_CASE(formatter_adhoc_compiletime)
BOOST_REQUIRE_EQUAL(testDomain, d->msgs.front().domain);
}
-BOOST_AUTO_TEST_CASE( domains_none )
+BOOST_AUTO_TEST_CASE(domains_none)
{
// No domains
auto l = add(std::make_shared<TestLogWriter>());
@@ -228,7 +226,7 @@ BOOST_AUTO_TEST_CASE( domains_none )
BOOST_REQUIRE(!l->lowestLevel());
}
-BOOST_AUTO_TEST_CASE( domains_single )
+BOOST_AUTO_TEST_CASE(domains_single)
{
// A single catch-all domain at the given level
auto l = add(std::make_shared<TestLogWriter>(LogLevel::ERR));
@@ -238,7 +236,7 @@ BOOST_AUTO_TEST_CASE( domains_single )
BOOST_REQUIRE_EQUAL(LogLevel::ERR, *l->lowestLevel());
}
-BOOST_AUTO_TEST_CASE( domains_fromNullProperties )
+BOOST_AUTO_TEST_CASE(domains_fromNullProperties)
{
// A single catch-all domain at the default level (WARNING)
auto l = add(std::make_shared<TestLogWriter>("", Ice::PropertiesPtr()));
@@ -248,7 +246,7 @@ BOOST_AUTO_TEST_CASE( domains_fromNullProperties )
BOOST_REQUIRE_EQUAL(LogLevel::WARNING, *l->lowestLevel());
}
-BOOST_AUTO_TEST_CASE( domains_fromProperties )
+BOOST_AUTO_TEST_CASE(domains_fromProperties)
{
// Domains configured according to properties
Ice::PropertiesPtr p = ic->getProperties();
@@ -265,7 +263,7 @@ BOOST_AUTO_TEST_CASE( domains_fromProperties )
BOOST_REQUIRE_EQUAL(LogLevel::DEBUG, *l->lowestLevel());
}
-BOOST_AUTO_TEST_CASE( domains_fromProperties_noDefault )
+BOOST_AUTO_TEST_CASE(domains_fromProperties_noDefault)
{
// Domains configured according to properties
Ice::PropertiesPtr p = ic->getProperties();
@@ -278,7 +276,7 @@ BOOST_AUTO_TEST_CASE( domains_fromProperties_noDefault )
BOOST_REQUIRE_EQUAL(LogLevel::DEBUG, *l->lowestLevel());
}
-BOOST_AUTO_TEST_CASE( domains_fromProperties_onlyDefault )
+BOOST_AUTO_TEST_CASE(domains_fromProperties_onlyDefault)
{
// Domains configured according to properties
Ice::PropertiesPtr p = ic->getProperties();
@@ -292,20 +290,18 @@ BOOST_AUTO_TEST_CASE( domains_fromProperties_onlyDefault )
BOOST_REQUIRE_EQUAL(LogLevel::INFO, *l->lowestLevel());
}
-BOOST_AUTO_TEST_CASE( domains_fromProperties_badLevel )
+BOOST_AUTO_TEST_CASE(domains_fromProperties_badLevel)
{
Ice::PropertiesPtr p = ic->getProperties();
p->setProperty("TestLogWriter.domains.test.domain", "BAD");
- BOOST_REQUIRE_THROW({
- TestLogWriter tlw("TestLogWriter", p);
- }, Slicer::InvalidEnumerationSymbol);
+ BOOST_REQUIRE_THROW({ TestLogWriter tlw("TestLogWriter", p); }, Slicer::InvalidEnumerationSymbol);
}
BOOST_AUTO_TEST_SUITE_END();
-BOOST_FIXTURE_TEST_SUITE( ts, TestService );
+BOOST_FIXTURE_TEST_SUITE(ts, TestService);
-BOOST_AUTO_TEST_CASE( getLogger )
+BOOST_AUTO_TEST_CASE(getLogger)
{
auto ic = Ice::initialize();
ic->getProperties()->setProperty("test.Endpoints", "default");
@@ -318,7 +314,7 @@ BOOST_AUTO_TEST_CASE( getLogger )
ic->destroy();
}
-BOOST_AUTO_TEST_CASE( getLoggerForType )
+BOOST_AUTO_TEST_CASE(getLoggerForType)
{
auto logger = LOGMANAGER()->getLogger<IceTray::Service>();
BOOST_REQUIRE(logger);
@@ -328,66 +324,63 @@ BOOST_AUTO_TEST_CASE( getLoggerForType )
BOOST_AUTO_TEST_SUITE_END();
-BOOST_AUTO_TEST_CASE( syslog )
+BOOST_AUTO_TEST_CASE(syslog)
{
- IceTray::Logging::LogWriterPtr lwp =
- IceTray::Logging::LogWriterFactory::createNew("SyslogLogWriter", nullptr);
+ IceTray::Logging::LogWriterPtr lwp = IceTray::Logging::LogWriterFactory::createNew("SyslogLogWriter", nullptr);
lwp->message(LogLevel::DEBUG, testDomain, "some message", {});
}
-BOOST_AUTO_TEST_CASE( console )
+BOOST_AUTO_TEST_CASE(console)
{
- IceTray::Logging::LogWriterPtr lwp =
- IceTray::Logging::LogWriterFactory::createNew("ConsoleLogWriter", nullptr);
+ IceTray::Logging::LogWriterPtr lwp = IceTray::Logging::LogWriterFactory::createNew("ConsoleLogWriter", nullptr);
lwp->message(LogLevel::DEBUG, testDomain, "some message", {});
}
-BOOST_AUTO_TEST_CASE( consoleNoWidth )
+BOOST_AUTO_TEST_CASE(consoleNoWidth)
{
std::stringstream str;
ConsoleLogWriter::writeStream(str, -1, LogLevel::DEBUG, testDomain, "message");
BOOST_REQUIRE_EQUAL("DEBUG: test.domain: message\n", str.str());
}
-BOOST_AUTO_TEST_CASE( consoleWidthJustRight )
+BOOST_AUTO_TEST_CASE(consoleWidthJustRight)
{
std::stringstream str;
ConsoleLogWriter::writeStream(str, 11, LogLevel::DEBUG, testDomain, "message");
BOOST_REQUIRE_EQUAL("DEBUG: test.domain: message\n", str.str());
}
-BOOST_AUTO_TEST_CASE( consoleWidthSmall )
+BOOST_AUTO_TEST_CASE(consoleWidthSmall)
{
std::stringstream str;
ConsoleLogWriter::writeStream(str, 10, LogLevel::DEBUG, testDomain, "message");
BOOST_REQUIRE_EQUAL("DEBUG: t.domain: message\n", str.str());
}
-BOOST_AUTO_TEST_CASE( consoleWidthTiny )
+BOOST_AUTO_TEST_CASE(consoleWidthTiny)
{
std::stringstream str;
ConsoleLogWriter::writeStream(str, 8, LogLevel::DEBUG, testDomain, "message");
BOOST_REQUIRE_EQUAL("DEBUG: t.domain: message\n", str.str());
}
-BOOST_AUTO_TEST_CASE( consoleWidthTooTiny )
+BOOST_AUTO_TEST_CASE(consoleWidthTooTiny)
{
std::stringstream str;
ConsoleLogWriter::writeStream(str, 7, LogLevel::DEBUG, testDomain, "message");
BOOST_REQUIRE_EQUAL("DEBUG: t.d: message\n", str.str());
}
-BOOST_AUTO_TEST_CASE( consoleWidthOverflow )
+BOOST_AUTO_TEST_CASE(consoleWidthOverflow)
{
std::stringstream str;
ConsoleLogWriter::writeStream(str, 1, LogLevel::DEBUG, testDomain, "message");
BOOST_REQUIRE_EQUAL("DEBUG: t.d: message\n", str.str());
}
-BOOST_AUTO_TEST_CASE( consoleNoDomain )
+BOOST_AUTO_TEST_CASE(consoleNoDomain)
{
std::stringstream str;
ConsoleLogWriter::writeStream(str, 0, LogLevel::DEBUG, {}, "message");
BOOST_REQUIRE_EQUAL("DEBUG: : message\n", str.str());
}
-
generated by cgit v1.2.3 (git 2.46.0) at 2025-04-22 01:03:14 +0000