Author: carnold
Date: Tue Jun 17 14:02:17 2008
New Revision: 668828
URL: http://svn.apache.org/viewvc?rev=668828&view=rev
Log:
LOGCXX-288: Unnecessary trailing semi-colons after LOG4CXX_INFO et al in docs,
examples and tests
Modified:
logging/log4cxx/trunk/src/changes/changes.xml
logging/log4cxx/trunk/src/examples/cpp/trivial.cpp
logging/log4cxx/trunk/src/site/xdoc/index.xml
logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/customlogger/xloggertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase1.cpp
logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase2.cpp
logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase3.cpp
logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase4.cpp
logging/log4cxx/trunk/src/test/cpp/loggertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/minimumtestcase.cpp
logging/log4cxx/trunk/src/test/cpp/ndctestcase.cpp
logging/log4cxx/trunk/src/test/cpp/net/smtpappendertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/net/sockethubappendertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/net/socketservertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/net/telnetappendertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp
logging/log4cxx/trunk/src/test/cpp/propertyconfiguratortest.cpp
logging/log4cxx/trunk/src/test/cpp/rolling/filterbasedrollingtest.cpp
logging/log4cxx/trunk/src/test/cpp/rolling/manualrollingtest.cpp
logging/log4cxx/trunk/src/test/cpp/rolling/obsoletedailyrollingfileappendertest.cpp
logging/log4cxx/trunk/src/test/cpp/rolling/obsoleterollingfileappendertest.cpp
logging/log4cxx/trunk/src/test/cpp/rolling/sizebasedrollingtest.cpp
logging/log4cxx/trunk/src/test/cpp/rolling/timebasedrollingtest.cpp
logging/log4cxx/trunk/src/test/cpp/streamtestcase.cpp
logging/log4cxx/trunk/src/test/cpp/varia/errorhandlertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/xml/customleveltestcase.cpp
logging/log4cxx/trunk/src/test/cpp/xml/domtestcase.cpp
logging/log4cxx/trunk/src/test/cpp/xml/xmllayouttestcase.cpp
Modified: logging/log4cxx/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/changes/changes.xml?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/changes/changes.xml (original)
+++ logging/log4cxx/trunk/src/changes/changes.xml Tue Jun 17 14:02:17 2008
@@ -40,6 +40,7 @@
<action issue="LOGCXX-284">Unit tests fail to compile with xlc_r on
AIX</action>
<action issue="LOGCXX-285">LevelRangeFilter has default value for
acceptOnMatch that is different from log4j</action>
<action issue="LOGCXX-286">gcc 4.3 requires #include <cstring> when
using memcpy and related.</action>
+<action issue="LOGCXX-288">Unnecessary trailing semi-colons after LOG4CXX_INFO
et al in docs, examples and tests.<action>
</release>
<release version="0.10.0" date="2008-04-03" description="First Apache release">
<action issue="LOGCXX-2">logger.h includes config.h</action>
Modified: logging/log4cxx/trunk/src/examples/cpp/trivial.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/examples/cpp/trivial.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/examples/cpp/trivial.cpp (original)
+++ logging/log4cxx/trunk/src/examples/cpp/trivial.cpp Tue Jun 17 14:02:17 2008
@@ -36,11 +36,11 @@
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: logging/log4cxx/trunk/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/xdoc/index.xml?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/site/xdoc/index.xml (original)
+++ logging/log4cxx/trunk/src/site/xdoc/index.xml Tue Jun 17 14:02:17 2008
@@ -252,14 +252,14 @@
<p><table bgcolor="CCCCCC"><tr><td><pre>
log4cxx::LoggerPtr
logger(log4cxx::Logger::getLogger(<strong>"com.foo"</strong>));
const char* region = "World";
- LOG4CXX_INFO(logger, "Simple message text.");
- LOG4CXX_INFO(logger, "Hello, " << region);
- LOG4CXX_DEBUG(logger, L"Iteration " << i);
- LOG4CXX_DEBUG(logger, "e^10 = " << std::scientific <<
exp(10.0));
+ LOG4CXX_INFO(logger, "Simple message text.")
+ LOG4CXX_INFO(logger, "Hello, " << region)
+ LOG4CXX_DEBUG(logger, L"Iteration " << i)
+ LOG4CXX_DEBUG(logger, "e^10 = " << std::scientific << exp(10.0))
//
// Use a wchar_t first operand to force use of wchar_t based stream.
//
- LOG4CXX_WARN(logger, L"" << i << L" is the number of the
iteration.");
+ LOG4CXX_WARN(logger, L"" << i << L" is the number of the
iteration.")
</pre></td></tr></table></p>
<p>A logging request is said to be <em>enabled</em> if its level is
@@ -304,19 +304,19 @@
log4cxx::LoggerPtr
barlogger(log4cxx::Logger::getLogger(<strong>"com.foo.Bar"</strong>);
// This request is enabled, because <font
color="00AA00"><strong>WARN</strong></font> >= <font
color="0000AA"><strong>INFO</strong></font>.
- LOG4CXX_WARN(logger, "Low fuel level.");
+ LOG4CXX_WARN(logger, "Low fuel level.")
// This request is disabled, because <font
color="00AA00"><strong>DEBUG</strong></font> < <font
color="0000AA"><strong>INFO</strong></font>.
- LOG4CXX_DEBUG(logger, "Starting search for nearest gas station.");
+ LOG4CXX_DEBUG(logger, "Starting search for nearest gas station.")
// The logger instance barlogger, named "com.foo.Bar",
// will inherit its level from the logger named
// "com.foo" Thus, the following request is enabled
// because <font color="00AA00"><strong>INFO</strong></font> >= <font
color="0000AA"><strong>INFO</strong></font>.
- LOG4CXX_INFO(barlogger. "Located nearest gas station.");
+ LOG4CXX_INFO(barlogger. "Located nearest gas station.")
// This request is disabled, because <font
color="00AA00"><strong>DEBUG</strong></font> < <font
color="0000AA"><strong>INFO</strong></font>.
- LOG4CXX_DEBUG(barlogger, "Exiting gas station search");
+ LOG4CXX_DEBUG(barlogger, "Exiting gas station search")
</pre>
</td></tr>
</table></p>
@@ -523,10 +523,10 @@
// Set up a simple configuration that logs on the console.
BasicConfigurator::configure();
- LOG4CXX_INFO(logger, "Entering application.");
+ LOG4CXX_INFO(logger, "Entering application.")
Bar bar;
bar.doIt();
- LOG4CXX_INFO(logger, "Exiting application.");
+ LOG4CXX_INFO(logger, "Exiting application.")
}
catch(Exception&)
{
@@ -574,7 +574,7 @@
LoggerPtr Bar::logger(Logger::getLogger("com.foo.bar"));
void Bar::doIt() {
- LOG4CXX_DEBUG(logger, "Did it again!");
+ LOG4CXX_DEBUG(logger, "Did it again!")
}
</pre>
</td></tr>
@@ -638,10 +638,10 @@
BasicConfigurator::configure();
}
- LOG4CXX_INFO(logger, "Entering application.");
+ LOG4CXX_INFO(logger, "Entering application.")
Bar bar
bar.doIt();
- LOG4CXX_INFO(logger, "Exiting application.");
+ LOG4CXX_INFO(logger, "Exiting application.")
}
catch(Exception&)
{
Modified: logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp Tue Jun 17
14:02:17 2008
@@ -188,7 +188,7 @@
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 @@
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 @@
{
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 @@
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: logging/log4cxx/trunk/src/test/cpp/customlogger/xloggertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/customlogger/xloggertestcase.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/customlogger/xloggertestcase.cpp
(original)
+++ logging/log4cxx/trunk/src/test/cpp/customlogger/xloggertestcase.cpp Tue Jun
17 14:02:17 2008
@@ -69,15 +69,15 @@
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: logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase1.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase1.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase1.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase1.cpp Tue Jun 17
14:02:17 2008
@@ -41,7 +41,7 @@
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: logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase2.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase2.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase2.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase2.cpp Tue Jun 17
14:02:17 2008
@@ -45,7 +45,7 @@
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: logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase3.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase3.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase3.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase3.cpp Tue Jun 17
14:02:17 2008
@@ -41,7 +41,7 @@
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: logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase4.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase4.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase4.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/defaultinit/testcase4.cpp Tue Jun 17
14:02:17 2008
@@ -45,7 +45,7 @@
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: logging/log4cxx/trunk/src/test/cpp/loggertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/loggertestcase.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/loggertestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/loggertestcase.cpp Tue Jun 17 14:02:17
2008
@@ -425,9 +425,9 @@
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: logging/log4cxx/trunk/src/test/cpp/minimumtestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/minimumtestcase.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/minimumtestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/minimumtestcase.cpp Tue Jun 17 14:02:17
2008
@@ -147,91 +147,91 @@
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: logging/log4cxx/trunk/src/test/cpp/ndctestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/ndctestcase.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/ndctestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/ndctestcase.cpp Tue Jun 17 14:02:17 2008
@@ -79,11 +79,11 @@
}
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: logging/log4cxx/trunk/src/test/cpp/net/smtpappendertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/net/smtpappendertestcase.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/net/smtpappendertestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/net/smtpappendertestcase.cpp Tue Jun 17
14:02:17 2008
@@ -111,8 +111,8 @@
appender->activateOptions(p);
LoggerPtr root(Logger::getRootLogger());
root->addAppender(appender);
- LOG4CXX_INFO(root, "Hello, World.");
- LOG4CXX_ERROR(root, "Sending Message");
+ LOG4CXX_INFO(root, "Hello, World.")
+ LOG4CXX_ERROR(root, "Sending Message")
}
};
Modified: logging/log4cxx/trunk/src/test/cpp/net/sockethubappendertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/net/sockethubappendertestcase.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/net/sockethubappendertestcase.cpp
(original)
+++ logging/log4cxx/trunk/src/test/cpp/net/sockethubappendertestcase.cpp Tue
Jun 17 14:02:17 2008
@@ -71,7 +71,7 @@
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: logging/log4cxx/trunk/src/test/cpp/net/socketservertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/net/socketservertestcase.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/net/socketservertestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/net/socketservertestcase.cpp Tue Jun 17
14:02:17 2008
@@ -427,21 +427,21 @@
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 @@
"\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: logging/log4cxx/trunk/src/test/cpp/net/telnetappendertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/net/telnetappendertestcase.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/net/telnetappendertestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/net/telnetappendertestcase.cpp Tue Jun
17 14:02:17 2008
@@ -79,7 +79,7 @@
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: logging/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/patternlayouttest.cpp Tue Jun 17
14:02:17 2008
@@ -518,20 +518,20 @@
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: logging/log4cxx/trunk/src/test/cpp/propertyconfiguratortest.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/propertyconfiguratortest.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/propertyconfiguratortest.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/propertyconfiguratortest.cpp Tue Jun 17
14:02:17 2008
@@ -75,9 +75,9 @@
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: logging/log4cxx/trunk/src/test/cpp/rolling/filterbasedrollingtest.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/rolling/filterbasedrollingtest.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/rolling/filterbasedrollingtest.cpp
(original)
+++ logging/log4cxx/trunk/src/test/cpp/rolling/filterbasedrollingtest.cpp Tue
Jun 17 14:02:17 2008
@@ -116,14 +116,14 @@
#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: logging/log4cxx/trunk/src/test/cpp/rolling/manualrollingtest.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/rolling/manualrollingtest.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/rolling/manualrollingtest.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/rolling/manualrollingtest.cpp Tue Jun 17
14:02:17 2008
@@ -86,7 +86,7 @@
msg[7] = '0' + i / 10;
msg[8] = '0' + digit;
}
- LOG4CXX_DEBUG(logger1, msg);
+ LOG4CXX_DEBUG(logger1, msg)
}
}
Modified:
logging/log4cxx/trunk/src/test/cpp/rolling/obsoletedailyrollingfileappendertest.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/rolling/obsoletedailyrollingfileappendertest.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
---
logging/log4cxx/trunk/src/test/cpp/rolling/obsoletedailyrollingfileappendertest.cpp
(original)
+++
logging/log4cxx/trunk/src/test/cpp/rolling/obsoletedailyrollingfileappendertest.cpp
Tue Jun 17 14:02:17 2008
@@ -75,7 +75,7 @@
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 @@
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:
logging/log4cxx/trunk/src/test/cpp/rolling/obsoleterollingfileappendertest.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/rolling/obsoleterollingfileappendertest.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
---
logging/log4cxx/trunk/src/test/cpp/rolling/obsoleterollingfileappendertest.cpp
(original)
+++
logging/log4cxx/trunk/src/test/cpp/rolling/obsoleterollingfileappendertest.cpp
Tue Jun 17 14:02:17 2008
@@ -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: logging/log4cxx/trunk/src/test/cpp/rolling/sizebasedrollingtest.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/rolling/sizebasedrollingtest.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/rolling/sizebasedrollingtest.cpp
(original)
+++ logging/log4cxx/trunk/src/test/cpp/rolling/sizebasedrollingtest.cpp Tue Jun
17 14:02:17 2008
@@ -85,7 +85,7 @@
msg[7] = '0' + i / 10;
msg[8] = '0' + i % 10;
}
- LOG4CXX_DEBUG(logger1, msg);
+ LOG4CXX_DEBUG(logger1, msg)
}
}
Modified: logging/log4cxx/trunk/src/test/cpp/rolling/timebasedrollingtest.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/rolling/timebasedrollingtest.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/rolling/timebasedrollingtest.cpp
(original)
+++ logging/log4cxx/trunk/src/test/cpp/rolling/timebasedrollingtest.cpp Tue Jun
17 14:02:17 2008
@@ -123,7 +123,7 @@
{ 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 @@
{ 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 @@
{ 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 @@
{ 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 @@
{ 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 @@
{ 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 @@
{ 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 @@
{ 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: logging/log4cxx/trunk/src/test/cpp/streamtestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/streamtestcase.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/streamtestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/streamtestcase.cpp Tue Jun 17 14:02:17
2008
@@ -134,13 +134,13 @@
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 @@
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 @@
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 @@
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 @@
#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);
@@ -427,7 +427,7 @@
void testUniChar() {
LoggerPtr root(Logger::getRootLogger());
const log4cxx::UniChar msg[] = { 'T', 'h', 'i', 's', ' ', 'i',
's', ' ', 'a', ' ', 't', 'e', 's', 't', 0 };
- LOG4CXX_INFO(root, msg);
+ LOG4CXX_INFO(root, msg)
LOGUNIT_ASSERT_EQUAL((size_t) 1,
vectorAppender->getVector().size());
}
@@ -435,7 +435,7 @@
LoggerPtr root(Logger::getRootLogger());
const log4cxx::UniChar msg1[] = { 'T', 'h', 'i', 's', ' ', 'i',
's', ' ', 'a', ' ', 't', 'e', 's', 't', 0 };
const log4cxx::UniChar msg2[] = { ':', ' ', 'D', 'e', 't', 'a',
'i', 'l', 's', ' ', 't', 'o', ' ', 'f', 'o', 'l', 'l', 'o', 'w', 0 };
- LOG4CXX_INFO(root, msg1 << msg2);
+ LOG4CXX_INFO(root, msg1 << msg2)
LOGUNIT_ASSERT_EQUAL((size_t) 1,
vectorAppender->getVector().size());
}
@@ -443,7 +443,7 @@
LoggerPtr root(Logger::getRootLogger());
const log4cxx::UniChar openBracket[] = { '[', 0 };
const log4cxx::UniChar closeBracket[] = { ']', 0 };
- LOG4CXX_INFO(root, openBracket << std::fixed << std::setprecision(2)
<< std::setw(7) << std::right << std::setfill((log4cxx::UniChar) '_') << 10.0
<< closeBracket);
+ LOG4CXX_INFO(root, openBracket << std::fixed << std::setprecision(2)
<< std::setw(7) << std::right << std::setfill((log4cxx::UniChar) '_') << 10.0
<< closeBracket)
spi::LoggingEventPtr event(vectorAppender->getVector()[0]);
LogString msg(event->getMessage());
LOGUNIT_ASSERT_EQUAL(LogString(LOG4CXX_STR("[__10.00]")), msg);
@@ -555,13 +555,13 @@
#if LOG4CXX_CFSTRING_API
void testCFString() {
LoggerPtr root(Logger::getRootLogger());
- LOG4CXX_INFO(root, CFSTR("This is a test"));
+ LOG4CXX_INFO(root, CFSTR("This is a test"))
LOGUNIT_ASSERT_EQUAL((size_t) 1,
vectorAppender->getVector().size());
}
void testCFStringAppend() {
LoggerPtr root(Logger::getRootLogger());
- LOG4CXX_INFO(root, CFSTR("This is a test") << CFSTR(": Details to
follow"));
+ LOG4CXX_INFO(root, CFSTR("This is a test") << CFSTR(": Details to
follow"))
LOGUNIT_ASSERT_EQUAL((size_t) 1,
vectorAppender->getVector().size());
}
Modified: logging/log4cxx/trunk/src/test/cpp/varia/errorhandlertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/varia/errorhandlertestcase.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/varia/errorhandlertestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/varia/errorhandlertestcase.cpp Tue Jun
17 14:02:17 2008
@@ -102,28 +102,28 @@
std::ostringstream os;
os << "Message " << ++ i;
- LOG4CXX_DEBUG(logger, os.str());
- LOG4CXX_DEBUG(root, os.str());
+ LOG4CXX_DEBUG(logger, os.str())
+ LOG4CXX_DEBUG(root, os.str())
os.str("");
os << "Message " << ++i;
- LOG4CXX_INFO(logger, os.str());
- LOG4CXX_INFO(root, os.str());
+ LOG4CXX_INFO(logger, os.str())
+ LOG4CXX_INFO(root, os.str())
os.str("");
os << "Message " << ++i;
- LOG4CXX_WARN(logger, os.str());
- LOG4CXX_WARN(root, os.str());
+ LOG4CXX_WARN(logger, os.str())
+ LOG4CXX_WARN(root, os.str())
os.str("");
os << "Message " << ++i;
- LOG4CXX_ERROR(logger, os.str());
- LOG4CXX_ERROR(root, os.str());
+ LOG4CXX_ERROR(logger, os.str())
+ LOG4CXX_ERROR(root, os.str())
os.str("");
os << "Message " << ++i;
- LOG4CXX_FATAL(logger, os.str());
- LOG4CXX_FATAL(root, os.str());
+ LOG4CXX_FATAL(logger, os.str())
+ LOG4CXX_FATAL(root, os.str())
}
};
Modified: logging/log4cxx/trunk/src/test/cpp/xml/customleveltestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/xml/customleveltestcase.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/xml/customleveltestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/xml/customleveltestcase.cpp Tue Jun 17
14:02:17 2008
@@ -104,16 +104,16 @@
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: logging/log4cxx/trunk/src/test/cpp/xml/domtestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/xml/domtestcase.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/xml/domtestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/xml/domtestcase.cpp Tue Jun 17 14:02:17
2008
@@ -161,24 +161,24 @@
{
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 @@
*/
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 @@
*/
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: logging/log4cxx/trunk/src/test/cpp/xml/xmllayouttestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/xml/xmllayouttestcase.cpp?rev=668828&r1=668827&r2=668828&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/xml/xmllayouttestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/xml/xmllayouttestcase.cpp Tue Jun 17
14:02:17 2008
@@ -52,7 +52,7 @@
{
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 @@
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 @@
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 @@
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 @@
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)
}
};
