Author: rhys Date: Wed Feb 12 04:54:05 2014 New Revision: 1567525 URL: http://svn.apache.org/r1567525 Log: LOG4CXX-319: Sprinkle semis in examples, tests
r1566619 updated logger.h to make LOG4CXX_INFO and friends proper statements using the common do { stuff } while (0) idiom. There were many places within the 'make' and 'make check' targets that needed to be updated now that the macros behave like statements. Modified: incubator/log4cxx/trunk/src/examples/cpp/trivial.cpp incubator/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp incubator/log4cxx/trunk/src/test/cpp/customlogger/xloggertestcase.cpp incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase1.cpp incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase2.cpp incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase3.cpp incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase4.cpp incubator/log4cxx/trunk/src/test/cpp/loggertestcase.cpp incubator/log4cxx/trunk/src/test/cpp/minimumtestcase.cpp incubator/log4cxx/trunk/src/test/cpp/ndctestcase.cpp incubator/log4cxx/trunk/src/test/cpp/net/sockethubappendertestcase.cpp incubator/log4cxx/trunk/src/test/cpp/net/socketservertestcase.cpp incubator/log4cxx/trunk/src/test/cpp/net/telnetappendertestcase.cpp incubator/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp incubator/log4cxx/trunk/src/test/cpp/propertyconfiguratortest.cpp incubator/log4cxx/trunk/src/test/cpp/rolling/filterbasedrollingtest.cpp incubator/log4cxx/trunk/src/test/cpp/rolling/manualrollingtest.cpp incubator/log4cxx/trunk/src/test/cpp/rolling/obsoletedailyrollingfileappendertest.cpp incubator/log4cxx/trunk/src/test/cpp/rolling/obsoleterollingfileappendertest.cpp incubator/log4cxx/trunk/src/test/cpp/rolling/sizebasedrollingtest.cpp incubator/log4cxx/trunk/src/test/cpp/rolling/timebasedrollingtest.cpp incubator/log4cxx/trunk/src/test/cpp/streamtestcase.cpp incubator/log4cxx/trunk/src/test/cpp/xml/customleveltestcase.cpp incubator/log4cxx/trunk/src/test/cpp/xml/domtestcase.cpp incubator/log4cxx/trunk/src/test/cpp/xml/xmllayouttestcase.cpp Modified: incubator/log4cxx/trunk/src/examples/cpp/trivial.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/examples/cpp/trivial.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/examples/cpp/trivial.cpp (original) +++ incubator/log4cxx/trunk/src/examples/cpp/trivial.cpp Wed Feb 12 04:54:05 2014 @@ -36,11 +36,11 @@ int main() NDC::push("trivial context"); - LOG4CXX_DEBUG(rootLogger, "debug message") - LOG4CXX_INFO(rootLogger, "info message") - LOG4CXX_WARN(rootLogger, "warn message") - LOG4CXX_ERROR(rootLogger, "error message") - LOG4CXX_FATAL(rootLogger, "fatal message") + LOG4CXX_DEBUG(rootLogger, "debug message"); + LOG4CXX_INFO(rootLogger, "info message"); + LOG4CXX_WARN(rootLogger, "warn message"); + LOG4CXX_ERROR(rootLogger, "error message"); + LOG4CXX_FATAL(rootLogger, "fatal message"); NDC::pop(); } Modified: incubator/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp Wed Feb 12 04:54:05 2014 @@ -188,7 +188,7 @@ public: root->addAppender(asyncAppender); for (size_t i = 0; i < LEN; i++) { - LOG4CXX_DEBUG(root, "message" << i) + LOG4CXX_DEBUG(root, "message" << i); } asyncAppender->close(); @@ -211,10 +211,10 @@ public: asyncAppender->activateOptions(p); LoggerPtr root = Logger::getRootLogger(); root->addAppender(asyncAppender); - LOG4CXX_INFO(root, "Message") + LOG4CXX_INFO(root, "Message"); Thread::sleep(10); try { - LOG4CXX_INFO(root, "Message") + LOG4CXX_INFO(root, "Message"); LOGUNIT_FAIL("Should have thrown exception"); } catch(NullPointerException& ex) { } @@ -237,10 +237,10 @@ public: { synchronized sync(blockableAppender->getBlocker()); for (int i = 0; i < 100; i++) { - LOG4CXX_INFO(rootLogger, "Hello, World") + LOG4CXX_INFO(rootLogger, "Hello, World"); Thread::sleep(1); } - LOG4CXX_ERROR(rootLogger, "That's all folks.") + LOG4CXX_ERROR(rootLogger, "That's all folks."); } async->close(); const std::vector<spi::LoggingEventPtr>& events = blockableAppender->getVector(); @@ -272,7 +272,7 @@ public: size_t LEN = 20; for (size_t i = 0; i < LEN; i++) { - LOG4CXX_DEBUG(root, "message" << i) + LOG4CXX_DEBUG(root, "message" << i); } asyncAppender->close(); Modified: incubator/log4cxx/trunk/src/test/cpp/customlogger/xloggertestcase.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/customlogger/xloggertestcase.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/customlogger/xloggertestcase.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/customlogger/xloggertestcase.cpp Wed Feb 12 04:54:05 2014 @@ -69,15 +69,15 @@ public: LOG4CXX_LOG(logger, log4cxx::XLevel::getTrace(), "Message " << i); i++; - LOG4CXX_DEBUG(logger, "Message " << i) + LOG4CXX_DEBUG(logger, "Message " << i); i++; - LOG4CXX_WARN(logger, "Message " << i) + LOG4CXX_WARN(logger, "Message " << i); i++; - LOG4CXX_ERROR(logger, "Message " << i) + LOG4CXX_ERROR(logger, "Message " << i); i++; - LOG4CXX_FATAL(logger, "Message " << i) + LOG4CXX_FATAL(logger, "Message " << i); i++; - LOG4CXX_DEBUG(logger, "Message " << i) + LOG4CXX_DEBUG(logger, "Message " << i); const File OUTPUT("output/temp"); std::string witness("witness/customLogger."); Modified: incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase1.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase1.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase1.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase1.cpp Wed Feb 12 04:54:05 2014 @@ -41,7 +41,7 @@ public: void noneTest() { LoggerPtr root = Logger::getRootLogger(); - LOG4CXX_DEBUG(root, "Hello, world") + LOG4CXX_DEBUG(root, "Hello, world"); bool rootIsConfigured = !root->getAllAppenders().empty(); LOGUNIT_ASSERT(!rootIsConfigured); } Modified: incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase2.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase2.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase2.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase2.cpp Wed Feb 12 04:54:05 2014 @@ -45,7 +45,7 @@ public: void xmlTest() { LoggerPtr root = Logger::getRootLogger(); - LOG4CXX_DEBUG(root, "Hello, world") + LOG4CXX_DEBUG(root, "Hello, world"); bool rootIsConfigured = !root->getAllAppenders().empty(); LOGUNIT_ASSERT(rootIsConfigured); Modified: incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase3.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase3.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase3.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase3.cpp Wed Feb 12 04:54:05 2014 @@ -41,7 +41,7 @@ public: void testProperties() { LoggerPtr root = Logger::getRootLogger(); - LOG4CXX_DEBUG(root, "Hello, world") + LOG4CXX_DEBUG(root, "Hello, world"); bool rootIsConfigured = !root->getAllAppenders().empty(); LOGUNIT_ASSERT(rootIsConfigured); Modified: incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase4.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase4.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase4.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/defaultinit/testcase4.cpp Wed Feb 12 04:54:05 2014 @@ -45,7 +45,7 @@ public: void combinedTest() { LoggerPtr root = Logger::getRootLogger(); - LOG4CXX_DEBUG(root, "Hello, world") + LOG4CXX_DEBUG(root, "Hello, world"); bool rootIsConfigured = !root->getAllAppenders().empty(); LOGUNIT_ASSERT(rootIsConfigured); Modified: incubator/log4cxx/trunk/src/test/cpp/loggertestcase.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/loggertestcase.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/loggertestcase.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/loggertestcase.cpp Wed Feb 12 04:54:05 2014 @@ -425,9 +425,9 @@ public: LoggerPtr tracer = Logger::getLogger("com.example.Tracer"); tracer->setLevel(Level::getTrace()); - LOG4CXX_TRACE(tracer, "Message 1") - LOG4CXX_TRACE(root, "Discarded Message") - LOG4CXX_TRACE(root, "Discarded Message") + LOG4CXX_TRACE(tracer, "Message 1"); + LOG4CXX_TRACE(root, "Discarded Message"); + LOG4CXX_TRACE(root, "Discarded Message"); std::vector<LoggingEventPtr> msgs(appender->vector); LOGUNIT_ASSERT_EQUAL((size_t) 1, msgs.size()); Modified: incubator/log4cxx/trunk/src/test/cpp/minimumtestcase.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/minimumtestcase.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/minimumtestcase.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/minimumtestcase.cpp Wed Feb 12 04:54:05 2014 @@ -147,91 +147,91 @@ public: Pool pool; // These should all log.---------------------------- - LOG4CXX_FATAL(ERRlogger, createMessage(i, pool)) + LOG4CXX_FATAL(ERRlogger, createMessage(i, pool)); i++; //0 - LOG4CXX_ERROR(ERRlogger, createMessage(i, pool)) + LOG4CXX_ERROR(ERRlogger, createMessage(i, pool)); i++; - LOG4CXX_FATAL(INF, createMessage(i, pool)) + LOG4CXX_FATAL(INF, createMessage(i, pool)); i++; // 2 - LOG4CXX_ERROR(INF, createMessage(i, pool)) + LOG4CXX_ERROR(INF, createMessage(i, pool)); i++; - LOG4CXX_WARN(INF, createMessage(i, pool)) + LOG4CXX_WARN(INF, createMessage(i, pool)); i++; - LOG4CXX_INFO(INF, createMessage(i, pool)) + LOG4CXX_INFO(INF, createMessage(i, pool)); i++; - LOG4CXX_FATAL(INF_UNDEF, createMessage(i, pool)) + LOG4CXX_FATAL(INF_UNDEF, createMessage(i, pool)); i++; //6 - LOG4CXX_ERROR(INF_UNDEF, createMessage(i, pool)) + LOG4CXX_ERROR(INF_UNDEF, createMessage(i, pool)); i++; - LOG4CXX_WARN(INF_UNDEF, createMessage(i, pool)) + LOG4CXX_WARN(INF_UNDEF, createMessage(i, pool)); i++; - LOG4CXX_INFO(INF_UNDEF, createMessage(i, pool)) + LOG4CXX_INFO(INF_UNDEF, createMessage(i, pool)); i++; - LOG4CXX_FATAL(INF_ERR, createMessage(i, pool)) + LOG4CXX_FATAL(INF_ERR, createMessage(i, pool)); i++; // 10 - LOG4CXX_ERROR(INF_ERR, createMessage(i, pool)) + LOG4CXX_ERROR(INF_ERR, createMessage(i, pool)); i++; - LOG4CXX_FATAL(INF_ERR_UNDEF, createMessage(i, pool)) + LOG4CXX_FATAL(INF_ERR_UNDEF, createMessage(i, pool)); i++; - LOG4CXX_ERROR(INF_ERR_UNDEF, createMessage(i, pool)) + LOG4CXX_ERROR(INF_ERR_UNDEF, createMessage(i, pool)); i++; - LOG4CXX_FATAL(DEB, createMessage(i, pool)) + LOG4CXX_FATAL(DEB, createMessage(i, pool)); i++; //14 - LOG4CXX_ERROR(DEB, createMessage(i, pool)) + LOG4CXX_ERROR(DEB, createMessage(i, pool)); i++; - LOG4CXX_WARN(DEB, createMessage(i, pool)) + LOG4CXX_WARN(DEB, createMessage(i, pool)); i++; - LOG4CXX_INFO(DEB, createMessage(i, pool)) + LOG4CXX_INFO(DEB, createMessage(i, pool)); i++; - LOG4CXX_DEBUG(DEB, createMessage(i, pool)) + LOG4CXX_DEBUG(DEB, createMessage(i, pool)); i++; // defaultLevel=DEBUG - LOG4CXX_FATAL(UNDEF, createMessage(i, pool)) + LOG4CXX_FATAL(UNDEF, createMessage(i, pool)); i++; // 19 - LOG4CXX_ERROR(UNDEF, createMessage(i, pool)) + LOG4CXX_ERROR(UNDEF, createMessage(i, pool)); i++; - LOG4CXX_WARN(UNDEF, createMessage(i, pool)) + LOG4CXX_WARN(UNDEF, createMessage(i, pool)); i++; - LOG4CXX_INFO(UNDEF, createMessage(i, pool)) + LOG4CXX_INFO(UNDEF, createMessage(i, pool)); i++; - LOG4CXX_DEBUG(UNDEF, createMessage(i, pool)) + LOG4CXX_DEBUG(UNDEF, createMessage(i, pool)); i++; // ------------------------------------------------- // The following should not log - LOG4CXX_WARN(ERRlogger, createMessage(i, pool)) + LOG4CXX_WARN(ERRlogger, createMessage(i, pool)); i++; - LOG4CXX_INFO(ERRlogger, createMessage(i, pool)) + LOG4CXX_INFO(ERRlogger, createMessage(i, pool)); i++; - LOG4CXX_DEBUG(ERRlogger, createMessage(i, pool)) + LOG4CXX_DEBUG(ERRlogger, createMessage(i, pool)); i++; - LOG4CXX_DEBUG(INF, createMessage(i, pool)) + LOG4CXX_DEBUG(INF, createMessage(i, pool)); i++; - LOG4CXX_DEBUG(INF_UNDEF, createMessage(i, pool)) + LOG4CXX_DEBUG(INF_UNDEF, createMessage(i, pool)); i++; - LOG4CXX_WARN(INF_ERR, createMessage(i, pool)) + LOG4CXX_WARN(INF_ERR, createMessage(i, pool)); i++; - LOG4CXX_INFO(INF_ERR, createMessage(i, pool)) + LOG4CXX_INFO(INF_ERR, createMessage(i, pool)); i++; - LOG4CXX_DEBUG(INF_ERR, createMessage(i, pool)) + LOG4CXX_DEBUG(INF_ERR, createMessage(i, pool)); i++; - LOG4CXX_WARN(INF_ERR_UNDEF, createMessage(i, pool)) + LOG4CXX_WARN(INF_ERR_UNDEF, createMessage(i, pool)); i++; - LOG4CXX_INFO(INF_ERR_UNDEF, createMessage(i, pool)) + LOG4CXX_INFO(INF_ERR_UNDEF, createMessage(i, pool)); i++; - LOG4CXX_DEBUG(INF_ERR_UNDEF, createMessage(i, pool)) + LOG4CXX_DEBUG(INF_ERR_UNDEF, createMessage(i, pool)); i++; // ------------------------------------------------- - LOG4CXX_INFO(INF, LOG4CXX_TEST_STR("Messages should bear numbers 0 through 23.")) + LOG4CXX_INFO(INF, LOG4CXX_TEST_STR("Messages should bear numbers 0 through 23.")); } LoggerPtr root; Modified: incubator/log4cxx/trunk/src/test/cpp/ndctestcase.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/ndctestcase.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/ndctestcase.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/ndctestcase.cpp Wed Feb 12 04:54:05 2014 @@ -79,11 +79,11 @@ public: } static void commonLog() { - LOG4CXX_DEBUG(logger, "m1") - LOG4CXX_INFO(logger, "m2") - LOG4CXX_WARN(logger, "m3") - LOG4CXX_ERROR(logger, "m4") - LOG4CXX_FATAL(logger, "m5") + LOG4CXX_DEBUG(logger, "m1"); + LOG4CXX_INFO(logger, "m2"); + LOG4CXX_WARN(logger, "m3"); + LOG4CXX_ERROR(logger, "m4"); + LOG4CXX_FATAL(logger, "m5"); } void testInherit() { Modified: incubator/log4cxx/trunk/src/test/cpp/net/sockethubappendertestcase.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/net/sockethubappendertestcase.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/net/sockethubappendertestcase.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/net/sockethubappendertestcase.cpp Wed Feb 12 04:54:05 2014 @@ -71,7 +71,7 @@ public: LoggerPtr root(Logger::getRootLogger()); root->addAppender(hubAppender); for(int i = 0; i < 50; i++) { - LOG4CXX_INFO(root, "Hello, World " << i) + LOG4CXX_INFO(root, "Hello, World " << i); } hubAppender->close(); } Modified: incubator/log4cxx/trunk/src/test/cpp/net/socketservertestcase.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/net/socketservertestcase.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/net/socketservertestcase.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/net/socketservertestcase.cpp Wed Feb 12 04:54:05 2014 @@ -427,21 +427,21 @@ public: logger->setLevel(Level::getDebug()); root->setLevel(Level::getDebug()); - LOG4CXX_TRACE(logger, "Message " << i) + LOG4CXX_TRACE(logger, "Message " << i); i++; logger->setLevel(Level::getTrace()); root->setLevel(Level::getTrace()); - LOG4CXX_TRACE(logger, "Message " << ++i) - LOG4CXX_TRACE(root, "Message " << ++i) + LOG4CXX_TRACE(logger, "Message " << ++i); + LOG4CXX_TRACE(root, "Message " << ++i); - LOG4CXX_DEBUG(logger, "Message " << ++i) - LOG4CXX_DEBUG(root, "Message " << ++i) + LOG4CXX_DEBUG(logger, "Message " << ++i); + LOG4CXX_DEBUG(root, "Message " << ++i); - LOG4CXX_INFO(logger, "Message " << ++i) - LOG4CXX_WARN(logger, "Message " << ++i) - LOG4CXX_FATAL(logger, "Message " << ++i) //5 + LOG4CXX_INFO(logger, "Message " << ++i); + LOG4CXX_WARN(logger, "Message " << ++i); + LOG4CXX_FATAL(logger, "Message " << ++i); //5 std::string exceptionMsg("\njava.lang.Exception: Just testing\n" "\tat org.apache.log4j.net.SocketServerTestCase.common(SocketServerTestCase.java:XXX)\n" @@ -458,8 +458,8 @@ public: "\tat junit.framework.TestSuite.run(TestSuite.java:XXX)"); - LOG4CXX_DEBUG(logger, "Message " << ++i << exceptionMsg) - LOG4CXX_ERROR(root, "Message " << ++i << exceptionMsg) + LOG4CXX_DEBUG(logger, "Message " << ++i << exceptionMsg); + LOG4CXX_ERROR(root, "Message " << ++i << exceptionMsg); NDC::pop(); MDC::remove(key); Modified: incubator/log4cxx/trunk/src/test/cpp/net/telnetappendertestcase.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/net/telnetappendertestcase.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/net/telnetappendertestcase.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/net/telnetappendertestcase.cpp Wed Feb 12 04:54:05 2014 @@ -79,7 +79,7 @@ public: LoggerPtr root(Logger::getRootLogger()); root->addAppender(appender); for (int i = 0; i < 50; i++) { - LOG4CXX_INFO(root, "Hello, World " << i) + LOG4CXX_INFO(root, "Hello, World " << i); } appender->close(); } Modified: incubator/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp Wed Feb 12 04:54:05 2014 @@ -518,20 +518,20 @@ public: Pool pool; - LOG4CXX_DEBUG(logger, createMessage(pool, ++i)) - LOG4CXX_DEBUG(root, createMessage(pool, i)) + LOG4CXX_DEBUG(logger, createMessage(pool, ++i)); + LOG4CXX_DEBUG(root, createMessage(pool, i)); - LOG4CXX_INFO(logger, createMessage(pool, ++i)) - LOG4CXX_INFO(root, createMessage(pool, i)) + LOG4CXX_INFO(logger, createMessage(pool, ++i)); + LOG4CXX_INFO(root, createMessage(pool, i)); - LOG4CXX_WARN(logger, createMessage(pool, ++i)) - LOG4CXX_WARN(root, createMessage(pool, i)) + LOG4CXX_WARN(logger, createMessage(pool, ++i)); + LOG4CXX_WARN(root, createMessage(pool, i)); - LOG4CXX_ERROR(logger, createMessage(pool, ++i)) - LOG4CXX_ERROR(root, createMessage(pool, i)) + LOG4CXX_ERROR(logger, createMessage(pool, ++i)); + LOG4CXX_ERROR(root, createMessage(pool, i)); - LOG4CXX_FATAL(logger, createMessage(pool, ++i)) - LOG4CXX_FATAL(root, createMessage(pool, i)) + LOG4CXX_FATAL(logger, createMessage(pool, ++i)); + LOG4CXX_FATAL(root, createMessage(pool, i)); } private: Modified: incubator/log4cxx/trunk/src/test/cpp/propertyconfiguratortest.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/propertyconfiguratortest.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/propertyconfiguratortest.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/propertyconfiguratortest.cpp Wed Feb 12 04:54:05 2014 @@ -75,9 +75,9 @@ public: LoggerPtr root(Logger::getRootLogger()); VectorAppenderPtr appender(root->getAppender(LOG4CXX_STR("VECTOR1"))); LOGUNIT_ASSERT_EQUAL((int) Level::WARN_INT, appender->getThreshold()->toInt()); - LOG4CXX_INFO(root, "Info message") - LOG4CXX_WARN(root, "Warn message") - LOG4CXX_WARN(root, "Error message") + LOG4CXX_INFO(root, "Info message"); + LOG4CXX_WARN(root, "Warn message"); + LOG4CXX_WARN(root, "Error message"); LOGUNIT_ASSERT_EQUAL((size_t) 2, appender->vector.size()); LogManager::resetConfiguration(); } Modified: incubator/log4cxx/trunk/src/test/cpp/rolling/filterbasedrollingtest.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/rolling/filterbasedrollingtest.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/rolling/filterbasedrollingtest.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/rolling/filterbasedrollingtest.cpp Wed Feb 12 04:54:05 2014 @@ -116,14 +116,14 @@ private: #endif if (i < 10) { msg[8] = (char) ('0' + i); - LOG4CXX_DEBUG(logger, msg) + LOG4CXX_DEBUG(logger, msg); } else if (i < 100) { msg[7] = (char) ('0' + (i / 10)); msg[8] = (char) ('0' + (i % 10)); if ((i % 10) == 0) { - LOG4CXX_WARN(logger, msg) + LOG4CXX_WARN(logger, msg); } else { - LOG4CXX_DEBUG(logger, msg) + LOG4CXX_DEBUG(logger, msg); } } } Modified: incubator/log4cxx/trunk/src/test/cpp/rolling/manualrollingtest.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/rolling/manualrollingtest.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/rolling/manualrollingtest.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/rolling/manualrollingtest.cpp Wed Feb 12 04:54:05 2014 @@ -86,7 +86,7 @@ LOGUNIT_CLASS(ManualRollingTest) { msg[7] = '0' + i / 10; msg[8] = '0' + digit; } - LOG4CXX_DEBUG(logger1, msg) + LOG4CXX_DEBUG(logger1, msg); } } Modified: incubator/log4cxx/trunk/src/test/cpp/rolling/obsoletedailyrollingfileappendertest.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/rolling/obsoletedailyrollingfileappendertest.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/rolling/obsoletedailyrollingfileappendertest.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/rolling/obsoletedailyrollingfileappendertest.cpp Wed Feb 12 04:54:05 2014 @@ -75,7 +75,7 @@ public: apr_sleep(100000); msg[8] = (char) ('0' + (i / 10)); msg[9] = (char) ('0' + (i % 10)); - LOG4CXX_DEBUG(logger, msg) + LOG4CXX_DEBUG(logger, msg); } int postCount = getFileCount("output", LOG4CXX_STR("obsoleteDRFA-test1.log.")); @@ -108,7 +108,7 @@ public: apr_sleep(100000); msg[8] = (char) ('0' + i / 10); msg[9] = (char) ('0' + i % 10); - LOG4CXX_DEBUG(logger, msg) + LOG4CXX_DEBUG(logger, msg); } int postCount = getFileCount("output", LOG4CXX_STR("obsoleteDRFA-test2.log.")); Modified: incubator/log4cxx/trunk/src/test/cpp/rolling/obsoleterollingfileappendertest.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/rolling/obsoleterollingfileappendertest.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/rolling/obsoleterollingfileappendertest.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/rolling/obsoleterollingfileappendertest.cpp Wed Feb 12 04:54:05 2014 @@ -72,11 +72,11 @@ if (i < 10) { msg[8] = (char) ('0' + i); - LOG4CXX_DEBUG(logger, msg) + LOG4CXX_DEBUG(logger, msg); } else if (i < 100) { msg[7] = (char) ('0' + i / 10); msg[8] = (char) ('0' + i % 10); - LOG4CXX_DEBUG(logger, msg) + LOG4CXX_DEBUG(logger, msg); } } @@ -112,11 +112,11 @@ if (i < 10) { msg[8] = (char) ('0' + i); - LOG4CXX_DEBUG(logger, msg) + LOG4CXX_DEBUG(logger, msg); } else if (i < 100) { msg[7] = (char) ('0' + i / 10); msg[8] = (char) ('0' + i % 10); - LOG4CXX_DEBUG(logger, msg) + LOG4CXX_DEBUG(logger, msg); } } Modified: incubator/log4cxx/trunk/src/test/cpp/rolling/sizebasedrollingtest.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/rolling/sizebasedrollingtest.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/rolling/sizebasedrollingtest.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/rolling/sizebasedrollingtest.cpp Wed Feb 12 04:54:05 2014 @@ -85,7 +85,7 @@ LOGUNIT_CLASS(SizeBasedRollingTest) { msg[7] = '0' + i / 10; msg[8] = '0' + i % 10; } - LOG4CXX_DEBUG(logger1, msg) + LOG4CXX_DEBUG(logger1, msg); } } Modified: incubator/log4cxx/trunk/src/test/cpp/rolling/timebasedrollingtest.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/rolling/timebasedrollingtest.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/rolling/timebasedrollingtest.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/rolling/timebasedrollingtest.cpp Wed Feb 12 04:54:05 2014 @@ -123,7 +123,7 @@ public: { for (int i = 0; i < 5; i++) { std::string message("Hello---"); message.append(pool.itoa(i)); - LOG4CXX_DEBUG(logger, message) + LOG4CXX_DEBUG(logger, message); apr_sleep(APR_USEC_PER_SEC/2); } } @@ -167,7 +167,7 @@ public: { for (int i = 0; i <= 2; i++) { std::string message("Hello---"); message.append(pool.itoa(i)); - LOG4CXX_DEBUG(logger, message) + LOG4CXX_DEBUG(logger, message); apr_sleep(APR_USEC_PER_SEC/2); } } @@ -189,7 +189,7 @@ public: { for (int i = 3; i <= 4; i++) { std::string message("Hello---"); message.append(pool.itoa(i)); - LOG4CXX_DEBUG(logger, message) + LOG4CXX_DEBUG(logger, message); apr_sleep(APR_USEC_PER_SEC/2); } } @@ -237,7 +237,7 @@ public: { for (int i = 0; i < 5; i++) { std::string message("Hello---"); message.append(p.itoa(i)); - LOG4CXX_DEBUG(logger, message) + LOG4CXX_DEBUG(logger, message); apr_sleep(APR_USEC_PER_SEC/2); } } @@ -286,7 +286,7 @@ public: { for (int i = 0; i <= 2; i++) { std::string message("Hello---"); message.append(pool.itoa(i)); - LOG4CXX_DEBUG(logger, message) + LOG4CXX_DEBUG(logger, message); apr_sleep(APR_USEC_PER_SEC/2); } } @@ -308,7 +308,7 @@ public: { for (int i = 3; i <= 4; i++) { std::string message("Hello---"); message.append(pool.itoa(i)); - LOG4CXX_DEBUG(logger, message) + LOG4CXX_DEBUG(logger, message); apr_sleep(APR_USEC_PER_SEC/2); } } @@ -357,7 +357,7 @@ public: { for (int i = 0; i < 5; i++) { std::string message("Hello---"); message.append(pool.itoa(i)); - LOG4CXX_DEBUG(logger, message) + LOG4CXX_DEBUG(logger, message); apr_sleep(APR_USEC_PER_SEC/2); } } @@ -406,7 +406,7 @@ public: { for (int i = 0; i < 5; i++) { std::string message("Hello---"); message.append(p.itoa(i)); - LOG4CXX_DEBUG(logger, message) + LOG4CXX_DEBUG(logger, message); apr_sleep(APR_USEC_PER_SEC/2); } } Modified: incubator/log4cxx/trunk/src/test/cpp/streamtestcase.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/streamtestcase.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/streamtestcase.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/streamtestcase.cpp Wed Feb 12 04:54:05 2014 @@ -134,13 +134,13 @@ public: void testSimple() { LoggerPtr root(Logger::getRootLogger()); - LOG4CXX_INFO(root, "This is a test") + LOG4CXX_INFO(root, "This is a test"); LOGUNIT_ASSERT_EQUAL((size_t) 1, vectorAppender->getVector().size()); } void testMultiple() { LoggerPtr root(Logger::getRootLogger()); - LOG4CXX_INFO(root, "This is a test" << ": Details to follow") + LOG4CXX_INFO(root, "This is a test" << ": Details to follow"); LOGUNIT_ASSERT_EQUAL((size_t) 1, vectorAppender->getVector().size()); } @@ -148,19 +148,19 @@ public: LoggerPtr logger(Logger::getLogger("StreamTestCase.shortCircuit")); logger->setLevel(Level::getInfo()); ExceptionOnInsert someObj; - LOG4CXX_DEBUG(logger, someObj) + LOG4CXX_DEBUG(logger, someObj); LOGUNIT_ASSERT_EQUAL((size_t) 0, vectorAppender->getVector().size()); } void testInsertException() { LoggerPtr logger(Logger::getLogger("StreamTestCase.insertException")); ExceptionOnInsert someObj; - LOG4CXX_INFO(logger, someObj) + LOG4CXX_INFO(logger, someObj); } void testScientific() { LoggerPtr root(Logger::getRootLogger()); - LOG4CXX_INFO(root, std::scientific << 0.000001115) + LOG4CXX_INFO(root, std::scientific << 0.000001115); spi::LoggingEventPtr event(vectorAppender->getVector()[0]); LogString msg(event->getMessage()); LOGUNIT_ASSERT(msg.find(LOG4CXX_STR("e-")) != LogString::npos || @@ -169,7 +169,7 @@ public: void testPrecision() { LoggerPtr root(Logger::getRootLogger()); - LOG4CXX_INFO(root, std::setprecision(4) << 1.000001) + LOG4CXX_INFO(root, std::setprecision(4) << 1.000001); spi::LoggingEventPtr event(vectorAppender->getVector()[0]); LogString msg(event->getMessage()); LOGUNIT_ASSERT(msg.find(LOG4CXX_STR("1.00000")) == LogString::npos); @@ -178,7 +178,7 @@ public: void testWidth() { LoggerPtr root(Logger::getRootLogger()); - LOG4CXX_INFO(root, '[' << std::fixed << std::setprecision(2) << std::setw(7) << std::right << std::setfill('_') << 10.0 << ']') + LOG4CXX_INFO(root, '[' << std::fixed << std::setprecision(2) << std::setw(7) << std::right << std::setfill('_') << 10.0 << ']'); spi::LoggingEventPtr event(vectorAppender->getVector()[0]); LogString msg(event->getMessage()); LOGUNIT_ASSERT_EQUAL(LogString(LOG4CXX_STR("[__10.00]")), msg); @@ -315,19 +315,19 @@ public: #if LOG4CXX_WCHAR_T_API void testWide() { LoggerPtr root(Logger::getRootLogger()); - LOG4CXX_INFO(root, L"This is a test") + LOG4CXX_INFO(root, L"This is a test"); LOGUNIT_ASSERT_EQUAL((size_t) 1, vectorAppender->getVector().size()); } void testWideAppend() { LoggerPtr root(Logger::getRootLogger()); - LOG4CXX_INFO(root, L"This is a test" << L": Details to follow") + LOG4CXX_INFO(root, L"This is a test" << L": Details to follow"); LOGUNIT_ASSERT_EQUAL((size_t) 1, vectorAppender->getVector().size()); } void testWideWidth() { LoggerPtr root(Logger::getRootLogger()); - LOG4CXX_INFO(root, L'[' << std::fixed << std::setprecision(2) << std::setw(7) << std::right << std::setfill(L'_') << 10.0 << L"]") + LOG4CXX_INFO(root, L'[' << std::fixed << std::setprecision(2) << std::setw(7) << std::right << std::setfill(L'_') << 10.0 << L"]"); spi::LoggingEventPtr event(vectorAppender->getVector()[0]); LogString msg(event->getMessage()); LOGUNIT_ASSERT_EQUAL(LogString(LOG4CXX_STR("[__10.00]")), msg); Modified: incubator/log4cxx/trunk/src/test/cpp/xml/customleveltestcase.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/xml/customleveltestcase.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/xml/customleveltestcase.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/xml/customleveltestcase.cpp Wed Feb 12 04:54:05 2014 @@ -104,16 +104,16 @@ public: int i = 0; std::ostringstream os; os << "Message " << ++i; - LOG4CXX_DEBUG(logger, os.str()) + LOG4CXX_DEBUG(logger, os.str()); os.str(""); os << "Message " << ++i; - LOG4CXX_INFO(logger, os.str()) + LOG4CXX_INFO(logger, os.str()); os.str(""); os << "Message " << ++i; - LOG4CXX_WARN(logger, os.str()) + LOG4CXX_WARN(logger, os.str()); os.str(""); os << "Message " << ++i; - LOG4CXX_ERROR(logger, os.str()) + LOG4CXX_ERROR(logger, os.str()); os.str(""); os << "Message " << ++i; LOG4CXX_LOG(logger, XLevel::getTrace(), os.str()); Modified: incubator/log4cxx/trunk/src/test/cpp/xml/domtestcase.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/xml/domtestcase.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/xml/domtestcase.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/xml/domtestcase.cpp Wed Feb 12 04:54:05 2014 @@ -161,24 +161,24 @@ public: { int i = 0; - LOG4CXX_DEBUG(logger, "Message " << i) - LOG4CXX_DEBUG(root, "Message " << i) + LOG4CXX_DEBUG(logger, "Message " << i); + LOG4CXX_DEBUG(root, "Message " << i); i++; - LOG4CXX_INFO(logger, "Message " << i) - LOG4CXX_INFO(root, "Message " << i) + LOG4CXX_INFO(logger, "Message " << i); + LOG4CXX_INFO(root, "Message " << i); i++; - LOG4CXX_WARN(logger, "Message " << i) - LOG4CXX_WARN(root, "Message " << i) + LOG4CXX_WARN(logger, "Message " << i); + LOG4CXX_WARN(root, "Message " << i); i++; - LOG4CXX_ERROR(logger, "Message " << i) - LOG4CXX_ERROR(root, "Message " << i) + LOG4CXX_ERROR(logger, "Message " << i); + LOG4CXX_ERROR(root, "Message " << i); i++; - LOG4CXX_FATAL(logger, "Message " << i) - LOG4CXX_FATAL(root, "Message " << i) + LOG4CXX_FATAL(logger, "Message " << i); + LOG4CXX_FATAL(root, "Message " << i); } @@ -188,7 +188,7 @@ public: */ void test3() { DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml")); - LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3") + LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3"); #if LOG4CXX_LOGCHAR_IS_UTF8 const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 }; #else @@ -207,7 +207,7 @@ public: */ void test4() { DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml")); - LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4") + LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4"); #if LOG4CXX_LOGCHAR_IS_UTF8 const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 }; #else Modified: incubator/log4cxx/trunk/src/test/cpp/xml/xmllayouttestcase.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/xml/xmllayouttestcase.cpp?rev=1567525&r1=1567524&r2=1567525&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/test/cpp/xml/xmllayouttestcase.cpp (original) +++ incubator/log4cxx/trunk/src/test/cpp/xml/xmllayouttestcase.cpp Wed Feb 12 04:54:05 2014 @@ -52,7 +52,7 @@ public: { LoggerPtr logger = Logger::getLogger(LOG4CXX_TEST_STR("org.apache.log4j.xml.XMLLayoutTestCase$X")); - LOG4CXX_INFO(logger, LOG4CXX_TEST_STR("in X() constructor")) + LOG4CXX_INFO(logger, LOG4CXX_TEST_STR("in X() constructor")); } }; @@ -206,9 +206,9 @@ public: FileAppenderPtr appender(new FileAppender(xmlLayout, tempFileName, false)); root->addAppender(appender); - LOG4CXX_DEBUG(logger, LOG4CXX_TEST_STR("hi")) - LOG4CXX_DEBUG(logger, (char*) 0) - LOG4CXX_DEBUG(logger, "hi") + LOG4CXX_DEBUG(logger, LOG4CXX_TEST_STR("hi")); + LOG4CXX_DEBUG(logger, (char*) 0); + LOG4CXX_DEBUG(logger, "hi"); XMLTimestampFilter xmlTimestampFilter; XMLThreadFilter xmlThreadFilter; @@ -244,7 +244,7 @@ public: MDC::put(LOG4CXX_TEST_STR("key1"), LOG4CXX_TEST_STR("val1")); MDC::put(LOG4CXX_TEST_STR("key2"), LOG4CXX_TEST_STR("val2")); - LOG4CXX_DEBUG(logger, LOG4CXX_TEST_STR("Hello")) + LOG4CXX_DEBUG(logger, LOG4CXX_TEST_STR("Hello")); MDC::clear(); @@ -283,7 +283,7 @@ public: MDC::put(LOG4CXX_TEST_STR("blahAttribute"), LOG4CXX_TEST_STR("<blah value='blah'>")); MDC::put(LOG4CXX_TEST_STR("<blahKey value='blah'/>"), LOG4CXX_TEST_STR("blahValue")); - LOG4CXX_DEBUG(logger, LOG4CXX_TEST_STR("Hello")) + LOG4CXX_DEBUG(logger, LOG4CXX_TEST_STR("Hello")); MDC::clear(); @@ -321,36 +321,36 @@ public: std::string msg("Message "); - LOG4CXX_TRACE(logger, msg << i) - LOG4CXX_TRACE(root, msg << i) + LOG4CXX_TRACE(logger, msg << i); + LOG4CXX_TRACE(root, msg << i); i++; - LOG4CXX_DEBUG(logger, msg << i) - LOG4CXX_DEBUG(root, msg << i) + LOG4CXX_DEBUG(logger, msg << i); + LOG4CXX_DEBUG(root, msg << i); i++; - LOG4CXX_INFO(logger, msg << i) - LOG4CXX_INFO(root, msg << i) + LOG4CXX_INFO(logger, msg << i); + LOG4CXX_INFO(root, msg << i); i++; - LOG4CXX_WARN(logger, msg << i) - LOG4CXX_WARN(root, msg << i) + LOG4CXX_WARN(logger, msg << i); + LOG4CXX_WARN(root, msg << i); i++; - LOG4CXX_ERROR(logger, msg << i) - LOG4CXX_ERROR(root, msg << i) + LOG4CXX_ERROR(logger, msg << i); + LOG4CXX_ERROR(root, msg << i); i++; - LOG4CXX_FATAL(logger, msg << i) - LOG4CXX_FATAL(root, msg << i) + LOG4CXX_FATAL(logger, msg << i); + LOG4CXX_FATAL(root, msg << i); i++; - LOG4CXX_DEBUG(logger, "Message " << i) - LOG4CXX_DEBUG(root, "Message " << i) + LOG4CXX_DEBUG(logger, "Message " << i); + LOG4CXX_DEBUG(root, "Message " << i); i++; - LOG4CXX_ERROR(logger, "Message " << i) - LOG4CXX_ERROR(root, "Message " << i) + LOG4CXX_ERROR(logger, "Message " << i); + LOG4CXX_ERROR(root, "Message " << i); } };