Browse Source

Test: Framework improve logging

depend on pEpLog, but add logging macros that are for testing and are not controlled by pEpLog::set_enabled(), so you can disable library logging.
LIB-11
heck 1 year ago
parent
commit
cf7c5feea1
2 changed files with 60 additions and 40 deletions
  1. +0
    -34
      test/framework/utils.cc
  2. +60
    -6
      test/framework/utils.hh

+ 0
- 34
test/framework/utils.cc View File

@ -17,40 +17,6 @@ using namespace pEp;
namespace pEp {
namespace Test {
namespace Log {
void log(const string &msg)
{
lograw(msg + "\n");
}
void logH1(const string &msg)
{
stringstream tmp;
char decoration{ '=' };
tmp << endl
<< endl
<< std::string(30, decoration) << ' ' << msg << ' '
<< std::string(30, decoration) << endl;
lograw(tmp.str());
}
void logH2(const string &msg)
{
stringstream tmp;
char decoration{ '-' };
tmp << endl
<< std::string(10, decoration) << ' ' << msg << ' '
<< std::string(10, decoration) << endl;
lograw(tmp.str());
}
void lograw(const string &msg)
{
cerr << msg;
}
} // namespace Log
namespace Utils {
string to_string(const ::pEp_identity *const ident, bool full, int indent)


+ 60
- 6
test/framework/utils.hh View File

@ -4,20 +4,74 @@
#ifndef LIBPEPADAPTER_UTILS_HH
#define LIBPEPADAPTER_UTILS_HH
#include "../../src/pEpLog.hh"
#include <string>
#include <pEp/message.h>
#include <pEp/identity_list.h>
#include <pEp/group.h>
#include <exception>
// ------------------------------------------------------------------------------------------------
#ifndef ASSERT_EXCEPT
#define ASSERT_EXCEPT(func) \
do { \
try { \
(func); \
assert(false); \
} catch (const exception &e) { \
pEp::Adapter::pEpLog::log(nested_exception_to_string(e)); \
} \
} while (0)
#endif
// ------------------------------------------------------------------------------------------------
// Logging macros for testing
// ------------------------------------------------------------------------------------------------
// Use the macros if you need the message to be prefixed with "thread - __FILE__::__FUNTION__"
// OTHERWISE, just use the logging functions from pEp::Adapter::pEpLog
// TESTLOG - logformat "thread - __FILE__::__FUNTION__ - <message>"
// To be used in a non-class/object context
#ifndef TESTLOG
#define TESTLOG(msg) \
do { \
std::stringstream msg_; \
msg_ << std::this_thread::get_id(); \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << msg; \
pEp::Adapter::pEpLog::log(msg_.str()); \
} while (0)
#endif // TESTLOG
// TESTLOGH1 - logformat "Thread - __FILE__::__FUNTION__ - <=============== message ==============>"
#ifndef TESTLOGH1
#define TESTLOGH1(msg) \
do { \
std::stringstream msg_; \
msg_ << std::this_thread::get_id(); \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << pEp::Adapter::pEpLog::decorateH1(msg); \
pEp::Adapter::pEpLog::log(msg_.str()); \
} while (0)
#endif // TESTLOGH1
// TESTLOGH2 - logformat "Thread - __FILE__::__FUNTION__ - <--------------- message -------------->"
#ifndef TESTLOGH2
#define TESTLOGH2(msg) \
do { \
std::stringstream msg_; \
msg_ << std::this_thread::get_id(); \
msg_ << " - " << __FILE__ << "::" << __FUNCTION__; \
msg_ << " - " << pEp::Adapter::pEpLog::decorateH2(msg); \
pEp::Adapter::pEpLog::log(msg_.str()); \
} while (0)
#endif // TESTLOGH2
// ------------------------------------------------------------------------------------------------
namespace pEp {
namespace Test {
namespace Log {
void log(const std::string &msg);
void logH1(const std::string &msg);
void logH2(const std::string &msg);
void lograw(const std::string &msg);
} // namespace Log
namespace Utils {
// pEpEngine datatypes to string
std::string to_string(const ::pEp_identity *const ident, bool full = true, int indent = 0);


Loading…
Cancel
Save