Author: afester
Date: Mon Jun 5 05:08:15 2006
New Revision: 411761
URL: http://svn.apache.org/viewvc?rev=411761&view=rev
Log:
LOGCXX-14: first part for fix of "declaration of ‘local’ shadows a member of
'this'" when compiling with g++ -Wshadow
Modified:
logging/log4cxx/trunk/tests/src/customlogger/xlogger.h
logging/log4cxx/trunk/tests/src/helpers/optionconvertertestcase.cpp
logging/log4cxx/trunk/tests/src/loggertestcase.cpp
logging/log4cxx/trunk/tests/src/net/socketservertestcase.cpp
logging/log4cxx/trunk/tests/src/rolling/manualrollingtest.cpp
logging/log4cxx/trunk/tests/src/rolling/sizebasedrollingtest.cpp
logging/log4cxx/trunk/tests/src/shortsocketserver.cpp
logging/log4cxx/trunk/tests/src/xml/customleveltestcase.cpp
logging/log4cxx/trunk/tests/src/xml/xlevel.cpp
Modified: logging/log4cxx/trunk/tests/src/customlogger/xlogger.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/customlogger/xlogger.h?rev=411761&r1=411760&r2=411761&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/customlogger/xlogger.h (original)
+++ logging/log4cxx/trunk/tests/src/customlogger/xlogger.h Mon Jun 5 05:08:15
2006
@@ -67,7 +67,7 @@
/**
Just calls the parent constuctor.
*/
- XLogger(const LogString& name) : Logger(name) {}
+ XLogger(const LogString& name1) : Logger(name1) {}
/**
Nothing to activate.
@@ -92,8 +92,8 @@
LogString getSuffix() const
{ return suffix; }
- void setSuffix(const LogString& suffix)
- { this->suffix = suffix; }
+ void setSuffix(const LogString& suffix1)
+ { this->suffix = suffix1; }
/**
We introduce a new printing method that takes the
TRACE level.
Modified: logging/log4cxx/trunk/tests/src/helpers/optionconvertertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/helpers/optionconvertertestcase.cpp?rev=411761&r1=411760&r2=411761&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/helpers/optionconvertertestcase.cpp
(original)
+++ logging/log4cxx/trunk/tests/src/helpers/optionconvertertestcase.cpp Mon Jun
5 05:08:15 2006
@@ -127,10 +127,10 @@
void varSubstTest5()
{
- Properties props;
- props.setProperty(LOG4CXX_STR("p1"), LOG4CXX_STR("x1"));
- props.setProperty(LOG4CXX_STR("p2"), LOG4CXX_STR("${p1}"));
- LogString res = OptionConverter::substVars(LOG4CXX_STR("${p2}"), props);
+ Properties props1;
+ props1.setProperty(LOG4CXX_STR("p1"), LOG4CXX_STR("x1"));
+ props1.setProperty(LOG4CXX_STR("p2"), LOG4CXX_STR("${p1}"));
+ LogString res = OptionConverter::substVars(LOG4CXX_STR("${p2}"), props1);
CPPUNIT_ASSERT_EQUAL((LogString) LOG4CXX_STR("x1"), res);
}
Modified: logging/log4cxx/trunk/tests/src/loggertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/loggertestcase.cpp?rev=411761&r1=411760&r2=411761&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/loggertestcase.cpp (original)
+++ logging/log4cxx/trunk/tests/src/loggertestcase.cpp Mon Jun 5 05:08:15 2006
@@ -392,8 +392,8 @@
CPPUNIT_ASSERT(a0->getLevel() == 0);
CPPUNIT_ASSERT(Level::ERROR == a0->getEffectiveLevel());
- LoggerPtr a1 = h->getLogger(LOG4CXX_STR("a"));
- CPPUNIT_ASSERT_EQUAL(a0, a1);
+ LoggerPtr a11 = h->getLogger(LOG4CXX_STR("a"));
+ CPPUNIT_ASSERT_EQUAL(a0, a11);
}
protected:
Modified: logging/log4cxx/trunk/tests/src/net/socketservertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/net/socketservertestcase.cpp?rev=411761&r1=411760&r2=411761&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/net/socketservertestcase.cpp (original)
+++ logging/log4cxx/trunk/tests/src/net/socketservertestcase.cpp Mon Jun 5
05:08:15 2006
@@ -176,9 +176,9 @@
*/
void test1()
{
- SocketAppenderPtr socketAppender =
+ SocketAppenderPtr socketAppender1 =
new SocketAppender(LOG4CXX_STR("localhost"), PORT);
- root->addAppender(socketAppender);
+ root->addAppender(socketAppender1);
common(LOG4CXX_STR("T1"), LOG4CXX_STR("key1"),
LOG4CXX_STR("MDC-TEST1"));
delay(1);
@@ -206,9 +206,9 @@
void test2()
{
- SocketAppenderPtr socketAppender =
+ SocketAppenderPtr socketAppender1 =
new SocketAppender(LOG4CXX_STR("localhost"), PORT);
- root->addAppender(socketAppender);
+ root->addAppender(socketAppender1);
common(LOG4CXX_STR("T2"), LOG4CXX_STR("key2"),
LOG4CXX_STR("MDC-TEST2"));
delay(1);
@@ -241,9 +241,9 @@
void test3()
{
- SocketAppenderPtr socketAppender =
+ SocketAppenderPtr socketAppender1 =
new SocketAppender(LOG4CXX_STR("localhost"), PORT);
- root->addAppender(socketAppender);
+ root->addAppender(socketAppender1);
common(LOG4CXX_STR("T3"), LOG4CXX_STR("key3"),
LOG4CXX_STR("MDC-TEST3"));
delay(1);
@@ -276,9 +276,9 @@
void test4()
{
- SocketAppenderPtr socketAppender =
+ SocketAppenderPtr socketAppender1 =
new SocketAppender(LOG4CXX_STR("localhost"), PORT);
- root->addAppender(socketAppender);
+ root->addAppender(socketAppender1);
NDC::push(LOG4CXX_TEST_STR("some"));
common(LOG4CXX_STR("T4"), LOG4CXX_STR("key4"),
LOG4CXX_STR("MDC-TEST4"));
NDC::pop();
@@ -308,11 +308,11 @@
void test5()
{
- SocketAppenderPtr socketAppender =
+ SocketAppenderPtr socketAppender1 =
new SocketAppender(LOG4CXX_STR("localhost"), PORT);
AsyncAppenderPtr asyncAppender = new AsyncAppender();
- root->addAppender(socketAppender);
+ root->addAppender(socketAppender1);
root->addAppender(asyncAppender);
NDC::push(LOG4CXX_TEST_STR("some5"));
@@ -344,11 +344,11 @@
void test6()
{
- SocketAppenderPtr socketAppender =
+ SocketAppenderPtr socketAppender1 =
new SocketAppender(LOG4CXX_STR("localhost"), PORT);
AsyncAppenderPtr asyncAppender = new AsyncAppender();
- root->addAppender(socketAppender);
+ root->addAppender(socketAppender1);
root->addAppender(asyncAppender);
NDC::push(LOG4CXX_TEST_STR("some6"));
@@ -382,11 +382,11 @@
void test7()
{
- SocketAppenderPtr socketAppender =
+ SocketAppenderPtr socketAppender1 =
new SocketAppender(LOG4CXX_STR("localhost"), PORT);
AsyncAppenderPtr asyncAppender = new AsyncAppender();
- root->addAppender(socketAppender);
+ root->addAppender(socketAppender1);
root->addAppender(asyncAppender);
NDC::push(LOG4CXX_TEST_STR("some7"));
@@ -420,10 +420,10 @@
void test8()
{
- SocketAppenderPtr socketAppender =
+ SocketAppenderPtr socketAppender1 =
new SocketAppender(LOG4CXX_STR("localhost"), PORT);
- root->addAppender(socketAppender);
+ root->addAppender(socketAppender1);
NDC::push(LOG4CXX_TEST_STR("some8"));
common(LOG4CXX_STR("T8"), LOG4CXX_STR("key8"),
LOG4CXX_STR("MDC-TEST8"));
Modified: logging/log4cxx/trunk/tests/src/rolling/manualrollingtest.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/rolling/manualrollingtest.cpp?rev=411761&r1=411760&r2=411761&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/rolling/manualrollingtest.cpp (original)
+++ logging/log4cxx/trunk/tests/src/rolling/manualrollingtest.cpp Mon Jun 5
05:08:15 2006
@@ -35,11 +35,11 @@
#include <log4cxx/helpers/fileoutputstream.h>
- using namespace log4cxx;
- using namespace log4cxx::xml;
- using namespace log4cxx::filter;
- using namespace log4cxx::helpers;
- using namespace log4cxx::rolling;
+using namespace log4cxx;
+using namespace log4cxx::xml;
+using namespace log4cxx::filter;
+using namespace log4cxx::helpers;
+using namespace log4cxx::rolling;
/**
* Tests of explicit manual rolling of RollingFileAppenders.
@@ -70,32 +70,34 @@
LogManager::shutdown();
}
-void common(RollingFileAppenderPtr& rfa,
- Pool& pool,
- LoggerPtr& logger) {
- char msg[] = { 'H', 'e', 'l', 'l', 'o', '-', '-', '-', 'N', 0 };
-
-// Write exactly 10 bytes with each log
-for (int i = 0; i < 25; i++) {
- if (i < 10) {
- msg[8] = '0' + i;
- } else if (i < 100) {
- int digit = i % 10;
- if (digit == 0) {
- rfa->rollover(pool);
+ void common(RollingFileAppenderPtr& rfa,
+ Pool& pool,
+ LoggerPtr& logger1) {
+ char msg[] = { 'H', 'e', 'l', 'l', 'o', '-', '-', '-', 'N', 0 };
+
+ // Write exactly 10 bytes with each log
+ for (int i = 0; i < 25; i++) {
+ if (i < 10) {
+ msg[8] = '0' + i;
+ } else if (i < 100) {
+ int digit = i % 10;
+ if (digit == 0) {
+ rfa->rollover(pool);
+ }
+ msg[7] = '0' + i / 10;
+ msg[8] = '0' + digit;
+ }
+ LOG4CXX_DEBUG(logger1, msg);
}
- msg[7] = '0' + i / 10;
- msg[8] = '0' + digit;
}
- LOG4CXX_DEBUG(logger, msg);
-}
-}
-/**
- * Tests that the lack of an explicit active file will use the
- * low index as the active file.
- *
- */
-void test1() {
+
+
+ /**
+ * Tests that the lack of an explicit active file will use the
+ * low index as the active file.
+ *
+ */
+ void test1() {
PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
RollingFileAppenderPtr rfa = new RollingFileAppender();
rfa->setName(LOG4CXX_STR("ROLLING"));
@@ -125,170 +127,169 @@
File("witness/rolling/sbr-test2.0")));
CPPUNIT_ASSERT_EQUAL(true, Compare::compare(File("output/manual-test1.2"),
File("witness/rolling/sbr-test2.1")));
-}
+ }
-/**
- * Test basic rolling functionality with explicit setting of FileAppender.file.
- */
-void test2() {
-PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
-RollingFileAppenderPtr rfa = new RollingFileAppender();
-rfa->setName(LOG4CXX_STR("ROLLING"));
-rfa->setAppend(false);
-rfa->setLayout(layout);
-rfa->setFile(LOG4CXX_STR("output/manual-test2.log"));
-
-Pool p;
-rfa->activateOptions(p);
-root->addAppender(rfa);
-
-common(rfa, p, logger);
-
-CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test2.log").exists(p));
-CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test2.log.1").exists(p));
-CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test2.log.2").exists(p));
-
-CPPUNIT_ASSERT_EQUAL(true, Compare::compare(File("output/manual-test2.log"),
- File("witness/rolling/sbr-test2.log")));
-CPPUNIT_ASSERT_EQUAL(true, Compare::compare(File("output/manual-test2.log.1"),
- File("witness/rolling/sbr-test2.0")));
-CPPUNIT_ASSERT_EQUAL(true, Compare::compare(File("output/manual-test2.log.2"),
- File("witness/rolling/sbr-test2.1")));
-}
+ /**
+ * Test basic rolling functionality with explicit setting of
FileAppender.file.
+ */
+ void test2() {
+ PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
+ RollingFileAppenderPtr rfa = new RollingFileAppender();
+ rfa->setName(LOG4CXX_STR("ROLLING"));
+ rfa->setAppend(false);
+ rfa->setLayout(layout);
+ rfa->setFile(LOG4CXX_STR("output/manual-test2.log"));
-/**
- * Same as testBasic but also with GZ compression.
- */
-void test3() {
- PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
- RollingFileAppenderPtr rfa = new RollingFileAppender();
- rfa->setAppend(false);
- rfa->setLayout(layout);
-
- FixedWindowRollingPolicyPtr fwrp = new FixedWindowRollingPolicy();
-
- fwrp->setMinIndex(0);
- rfa->setFile(LOG4CXX_STR("output/manual-test3.log"));
- fwrp->setFileNamePattern(LOG4CXX_STR("output/sbr-test3.%i.gz"));
- Pool p;
- fwrp->activateOptions(p);
- rfa->setRollingPolicy(fwrp);
- rfa->activateOptions(p);
- root->addAppender(rfa);
-
- common(rfa, p, logger);
-
-CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test3.log").exists(p));
-CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test3.0.gz").exists(p));
-CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test3.1.gz").exists(p));
-
-CPPUNIT_ASSERT_EQUAL(true, Compare::compare(File("output/manual-test3.log"),
File("witness/rolling/sbr-test3.log")));
-CPPUNIT_ASSERT_EQUAL(true,
Compare::gzCompare(File("output/manual-test3.0.gz"),
File("witness/rolling/sbr-test3.0.gz")));
-CPPUNIT_ASSERT_EQUAL(true,
Compare::gzCompare(File("output/manual-test3.1.gz"),
File("witness/rolling/sbr-test3.1.gz")));
-}
+ Pool p;
+ rfa->activateOptions(p);
+ root->addAppender(rfa);
-/**
- * Test basic rolling functionality with bogus path in file name pattern.
- */
-void test4() {
-PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
-RollingFileAppenderPtr rfa = new RollingFileAppender();
-rfa->setName(LOG4CXX_STR("ROLLING"));
-rfa->setAppend(false);
-rfa->setLayout(layout);
-rfa->setFile(LOG4CXX_STR("output/manual-test4.log"));
-
-FixedWindowRollingPolicyPtr swrp = new FixedWindowRollingPolicy();
-
-swrp->setMinIndex(0);
-
-//
-// test4 directory should not exists. Should cause all rollover attempts to
fail.
-//
-swrp->setFileNamePattern(LOG4CXX_STR("output/test4/manual-test4.%i"));
-Pool p;
-swrp->activateOptions(p);
-
-rfa->setRollingPolicy(swrp);
-rfa->activateOptions(p);
-root->addAppender(rfa);
-
-common(rfa, p, logger);
-
-CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test4.log").exists(p));
-
-CPPUNIT_ASSERT_EQUAL(true, Compare::compare(File("output/manual-test4.log"),
- File("witness/rolling/sbr-test4.log")));
-}
+ common(rfa, p, logger);
-/**
- * Checking handling of rename failures due to other access
- * to the indexed files.
- */
-void test5() {
-PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
-RollingFileAppenderPtr rfa = new RollingFileAppender();
-rfa->setName(LOG4CXX_STR("ROLLING"));
-rfa->setAppend(false);
-rfa->setLayout(layout);
-rfa->setFile(LOG4CXX_STR("output/manual-test5.log"));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test2.log").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test2.log.1").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test2.log.2").exists(p));
-FixedWindowRollingPolicyPtr swrp = new FixedWindowRollingPolicy();
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/manual-test2.log"),
+ File("witness/rolling/sbr-test2.log")));
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/manual-test2.log.1"),
+ File("witness/rolling/sbr-test2.0")));
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/manual-test2.log.2"),
+ File("witness/rolling/sbr-test2.1")));
+ }
-swrp->setMinIndex(0);
+ /**
+ * Same as testBasic but also with GZ compression.
+ */
+ void test3() {
+ PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
+ RollingFileAppenderPtr rfa = new RollingFileAppender();
+ rfa->setAppend(false);
+ rfa->setLayout(layout);
-swrp->setFileNamePattern(LOG4CXX_STR("output/manual-test5.%i"));
-Pool p;
-swrp->activateOptions(p);
+ FixedWindowRollingPolicyPtr fwrp = new FixedWindowRollingPolicy();
-rfa->setRollingPolicy(swrp);
-rfa->activateOptions(p);
-root->addAppender(rfa);
+ fwrp->setMinIndex(0);
+ rfa->setFile(LOG4CXX_STR("output/manual-test3.log"));
+ fwrp->setFileNamePattern(LOG4CXX_STR("output/sbr-test3.%i.gz"));
+ Pool p;
+ fwrp->activateOptions(p);
+ rfa->setRollingPolicy(fwrp);
+ rfa->activateOptions(p);
+ root->addAppender(rfa);
-//
-// put stray file about locked file
-FileOutputStream os1(LOG4CXX_STR("output/manual-test5.1"), false);
-os1.close(p);
+ common(rfa, p, logger);
+ CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test3.log").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test3.0.gz").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test3.1.gz").exists(p));
+
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/manual-test3.log"),
File("witness/rolling/sbr-test3.log")));
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::gzCompare(File("output/manual-test3.0.gz"),
File("witness/rolling/sbr-test3.0.gz")));
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::gzCompare(File("output/manual-test3.1.gz"),
File("witness/rolling/sbr-test3.1.gz")));
+ }
-FileOutputStream os0(LOG4CXX_STR("output/manual-test5.0"), false);
+ /**
+ * Test basic rolling functionality with bogus path in file name pattern.
+ */
+ void test4() {
+ PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
+ RollingFileAppenderPtr rfa = new RollingFileAppender();
+ rfa->setName(LOG4CXX_STR("ROLLING"));
+ rfa->setAppend(false);
+ rfa->setLayout(layout);
+ rfa->setFile(LOG4CXX_STR("output/manual-test4.log"));
-common(rfa, p, logger);
+ FixedWindowRollingPolicyPtr swrp = new FixedWindowRollingPolicy();
-os0.close(p);
+ swrp->setMinIndex(0);
-if (File("output/manual-test5.3").exists(p)) {
//
- // looks like platform where open files can be renamed
+ // test4 directory should not exists. Should cause all rollover
attempts to fail.
//
- CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test5.log").exists(p));
- CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test5.0").exists(p));
- CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test5.1").exists(p));
- CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test5.2").exists(p));
- CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test5.3").exists(p));
+ swrp->setFileNamePattern(LOG4CXX_STR("output/test4/manual-test4.%i"));
+ Pool p;
+ swrp->activateOptions(p);
- CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/manual-test5.log"),
- File("witness/rolling/sbr-test2.log")));
- CPPUNIT_ASSERT_EQUAL(true, Compare::compare(File("output/manual-test5.0"),
- File("witness/rolling/sbr-test2.0")));
- CPPUNIT_ASSERT_EQUAL(true, Compare::compare(File("output/manual-test5.1"),
- File("witness/rolling/sbr-test2.1")));
+ rfa->setRollingPolicy(swrp);
+ rfa->activateOptions(p);
+ root->addAppender(rfa);
+
+ common(rfa, p, logger);
+
+ CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test4.log").exists(p));
+
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/manual-test4.log"),
+ File("witness/rolling/sbr-test4.log")));
+ }
+
+ /**
+ * Checking handling of rename failures due to other access
+ * to the indexed files.
+ */
+ void test5() {
+ PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
+ RollingFileAppenderPtr rfa = new RollingFileAppender();
+ rfa->setName(LOG4CXX_STR("ROLLING"));
+ rfa->setAppend(false);
+ rfa->setLayout(layout);
+ rfa->setFile(LOG4CXX_STR("output/manual-test5.log"));
+
+ FixedWindowRollingPolicyPtr swrp = new FixedWindowRollingPolicy();
+
+ swrp->setMinIndex(0);
+
+ swrp->setFileNamePattern(LOG4CXX_STR("output/manual-test5.%i"));
+ Pool p;
+ swrp->activateOptions(p);
+
+ rfa->setRollingPolicy(swrp);
+ rfa->activateOptions(p);
+ root->addAppender(rfa);
-} else {
//
- // rollover attempts should all fail
- // so initial log file should have all log content
- // open file should be unaffected
- // stray file should have only been moved one slot.
- CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test5.log").exists(p));
- CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test5.0").exists(p));
- CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test5.2").exists(p));
-
- CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/manual-test5.log"),
- File("witness/rolling/sbr-test4.log")));
-}
-}
+ // put stray file about locked file
+ FileOutputStream os1(LOG4CXX_STR("output/manual-test5.1"), false);
+ os1.close(p);
+
+
+ FileOutputStream os0(LOG4CXX_STR("output/manual-test5.0"), false);
+
+ common(rfa, p, logger);
+
+ os0.close(p);
+
+ if (File("output/manual-test5.3").exists(p)) {
+ //
+ // looks like platform where open files can be renamed
+ //
+ CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test5.log").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test5.0").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test5.1").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test5.2").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test5.3").exists(p));
+
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/manual-test5.log"),
+ File("witness/rolling/sbr-test2.log")));
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/manual-test5.0"),
+ File("witness/rolling/sbr-test2.0")));
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/manual-test5.1"),
+ File("witness/rolling/sbr-test2.1")));
+
+ } else {
+ //
+ // rollover attempts should all fail
+ // so initial log file should have all log content
+ // open file should be unaffected
+ // stray file should have only been moved one slot.
+ CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test5.log").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test5.0").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/manual-test5.2").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/manual-test5.log"),
+ File("witness/rolling/sbr-test4.log")));
+ }
+ }
};
Modified: logging/log4cxx/trunk/tests/src/rolling/sizebasedrollingtest.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/rolling/sizebasedrollingtest.cpp?rev=411761&r1=411760&r2=411761&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/rolling/sizebasedrollingtest.cpp (original)
+++ logging/log4cxx/trunk/tests/src/rolling/sizebasedrollingtest.cpp Mon Jun 5
05:08:15 2006
@@ -35,11 +35,11 @@
#include <log4cxx/helpers/fileoutputstream.h>
- using namespace log4cxx;
- using namespace log4cxx::xml;
- using namespace log4cxx::filter;
- using namespace log4cxx::helpers;
- using namespace log4cxx::rolling;
+using namespace log4cxx;
+using namespace log4cxx::xml;
+using namespace log4cxx::filter;
+using namespace log4cxx::helpers;
+using namespace log4cxx::rolling;
/**
*
@@ -75,26 +75,28 @@
LogManager::shutdown();
}
-void common(LoggerPtr& logger, int sleep) {
- char msg[] = { 'H', 'e', 'l', 'l', 'o', '-', '-', '-', 'N', 0 };
+ void common(LoggerPtr& logger1, int sleep) {
+ char msg[] = { 'H', 'e', 'l', 'l', 'o', '-', '-', '-', 'N', 0 };
-// Write exactly 10 bytes with each log
-for (int i = 0; i < 25; i++) {
- if (i < 10) {
- msg[8] = '0' + i;
- } else if (i < 100) {
- msg[7] = '0' + i / 10;
- msg[8] = '0' + i % 10;
+ // Write exactly 10 bytes with each log
+ for (int i = 0; i < 25; i++) {
+ if (i < 10) {
+ msg[8] = '0' + i;
+ } else if (i < 100) {
+ msg[7] = '0' + i / 10;
+ msg[8] = '0' + i % 10;
+ }
+ LOG4CXX_DEBUG(logger1, msg);
+ }
}
- LOG4CXX_DEBUG(logger, msg);
-}
-}
-/**
- * Tests that the lack of an explicit active file will use the
- * low index as the active file.
- *
- */
-void test1() {
+
+
+ /**
+ * Tests that the lack of an explicit active file will use the
+ * low index as the active file.
+ *
+ */
+ void test1() {
PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
RollingFileAppenderPtr rfa = new RollingFileAppender();
rfa->setName(LOG4CXX_STR("ROLLING"));
@@ -128,191 +130,189 @@
File("witness/rolling/sbr-test2.0")));
CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/sizeBased-test1.2"),
File("witness/rolling/sbr-test2.1")));
-}
+ }
-/**
- * Test basic rolling functionality with explicit setting of FileAppender.file.
- */
-void test2() {
-PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
-RollingFileAppenderPtr rfa = new RollingFileAppender();
-rfa->setName(LOG4CXX_STR("ROLLING"));
-rfa->setAppend(false);
-rfa->setLayout(layout);
-rfa->setFile(LOG4CXX_STR("output/sizeBased-test2.log"));
-
-FixedWindowRollingPolicyPtr swrp = new FixedWindowRollingPolicy();
-SizeBasedTriggeringPolicyPtr sbtp = new SizeBasedTriggeringPolicy();
-
-sbtp->setMaxFileSize(100);
-swrp->setMinIndex(0);
-
-swrp->setFileNamePattern(LOG4CXX_STR("output/sizeBased-test2.%i"));
-Pool p;
-swrp->activateOptions(p);
-
-rfa->setRollingPolicy(swrp);
-rfa->setTriggeringPolicy(sbtp);
-rfa->activateOptions(p);
-root->addAppender(rfa);
-
-common(logger, 0);
-
-CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test2.log").exists(p));
-CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test2.0").exists(p));
-CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test2.1").exists(p));
-
-CPPUNIT_ASSERT_EQUAL(true, Compare::compare(File("output/sizeBased-test2.log"),
- File("witness/rolling/sbr-test2.log")));
-CPPUNIT_ASSERT_EQUAL(true, Compare::compare(File("output/sizeBased-test2.0"),
- File("witness/rolling/sbr-test2.0")));
-CPPUNIT_ASSERT_EQUAL(true, Compare::compare(File("output/sizeBased-test2.1"),
- File("witness/rolling/sbr-test2.1")));
-}
+ /**
+ * Test basic rolling functionality with explicit setting of
FileAppender.file.
+ */
+ void test2() {
+ PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
+ RollingFileAppenderPtr rfa = new RollingFileAppender();
+ rfa->setName(LOG4CXX_STR("ROLLING"));
+ rfa->setAppend(false);
+ rfa->setLayout(layout);
+ rfa->setFile(LOG4CXX_STR("output/sizeBased-test2.log"));
-/**
- * Same as testBasic but also with GZ compression.
- */
-void test3() {
- PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
- RollingFileAppenderPtr rfa = new RollingFileAppender();
- rfa->setAppend(false);
- rfa->setLayout(layout);
-
- FixedWindowRollingPolicyPtr fwrp = new FixedWindowRollingPolicy();
- SizeBasedTriggeringPolicyPtr sbtp = new SizeBasedTriggeringPolicy();
-
- sbtp->setMaxFileSize(100);
- fwrp->setMinIndex(0);
- rfa->setFile(LOG4CXX_STR("output/sbr-test3.log"));
- fwrp->setFileNamePattern(LOG4CXX_STR("output/sbr-test3.%i.gz"));
- Pool p;
- fwrp->activateOptions(p);
- rfa->setRollingPolicy(fwrp);
- rfa->setTriggeringPolicy(sbtp);
- rfa->activateOptions(p);
- root->addAppender(rfa);
-
- common(logger, 100);
-
-CPPUNIT_ASSERT_EQUAL(true, File("output/sbr-test3.log").exists(p));
-CPPUNIT_ASSERT_EQUAL(true, File("output/sbr-test3.0.gz").exists(p));
-CPPUNIT_ASSERT_EQUAL(true, File("output/sbr-test3.1.gz").exists(p));
-
-CPPUNIT_ASSERT_EQUAL(true, Compare::compare(File("output/sbr-test3.log"),
File("witness/rolling/sbr-test3.log")));
-CPPUNIT_ASSERT_EQUAL(true, Compare::gzCompare(File("output/sbr-test3.0.gz"),
File("witness/rolling/sbr-test3.0.gz")));
-CPPUNIT_ASSERT_EQUAL(true, Compare::gzCompare(File("output/sbr-test3.1.gz"),
File("witness/rolling/sbr-test3.1.gz")));
-}
+ FixedWindowRollingPolicyPtr swrp = new FixedWindowRollingPolicy();
+ SizeBasedTriggeringPolicyPtr sbtp = new SizeBasedTriggeringPolicy();
-/**
- * Test basic rolling functionality with bogus path in file name pattern.
- */
-void test4() {
-PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
-RollingFileAppenderPtr rfa = new RollingFileAppender();
-rfa->setName(LOG4CXX_STR("ROLLING"));
-rfa->setAppend(false);
-rfa->setLayout(layout);
-rfa->setFile(LOG4CXX_STR("output/sizeBased-test4.log"));
-
-FixedWindowRollingPolicyPtr swrp = new FixedWindowRollingPolicy();
-SizeBasedTriggeringPolicyPtr sbtp = new SizeBasedTriggeringPolicy();
-
-sbtp->setMaxFileSize(100);
-swrp->setMinIndex(0);
-
-//
-// test4 directory should not exists. Should cause all rollover attempts to
fail.
-//
-swrp->setFileNamePattern(LOG4CXX_STR("output/test4/sizeBased-test4.%i"));
-Pool p;
-swrp->activateOptions(p);
-
-rfa->setRollingPolicy(swrp);
-rfa->setTriggeringPolicy(sbtp);
-rfa->activateOptions(p);
-root->addAppender(rfa);
-
-common(logger, 0);
-
-CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test4.log").exists(p));
-
-CPPUNIT_ASSERT_EQUAL(true, Compare::compare(File("output/sizeBased-test4.log"),
- File("witness/rolling/sbr-test4.log")));
-}
+ sbtp->setMaxFileSize(100);
+ swrp->setMinIndex(0);
-/**
- * Checking handling of rename failures due to other access
- * to the indexed files.
- */
-void test5() {
-PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
-RollingFileAppenderPtr rfa = new RollingFileAppender();
-rfa->setName(LOG4CXX_STR("ROLLING"));
-rfa->setAppend(false);
-rfa->setLayout(layout);
-rfa->setFile(LOG4CXX_STR("output/sizeBased-test5.log"));
+ swrp->setFileNamePattern(LOG4CXX_STR("output/sizeBased-test2.%i"));
+ Pool p;
+ swrp->activateOptions(p);
+
+ rfa->setRollingPolicy(swrp);
+ rfa->setTriggeringPolicy(sbtp);
+ rfa->activateOptions(p);
+ root->addAppender(rfa);
-FixedWindowRollingPolicyPtr swrp = new FixedWindowRollingPolicy();
-SizeBasedTriggeringPolicyPtr sbtp = new SizeBasedTriggeringPolicy();
+ common(logger, 0);
+
+ CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test2.log").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test2.0").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test2.1").exists(p));
+
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/sizeBased-test2.log"),
+ File("witness/rolling/sbr-test2.log")));
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/sizeBased-test2.0"),
+ File("witness/rolling/sbr-test2.0")));
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/sizeBased-test2.1"),
+ File("witness/rolling/sbr-test2.1")));
+ }
-sbtp->setMaxFileSize(100);
-swrp->setMinIndex(0);
+ /**
+ * Same as testBasic but also with GZ compression.
+ */
+ void test3() {
+ PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
+ RollingFileAppenderPtr rfa = new RollingFileAppender();
+ rfa->setAppend(false);
+ rfa->setLayout(layout);
-swrp->setFileNamePattern(LOG4CXX_STR("output/sizeBased-test5.%i"));
-Pool p;
-swrp->activateOptions(p);
+ FixedWindowRollingPolicyPtr fwrp = new FixedWindowRollingPolicy();
+ SizeBasedTriggeringPolicyPtr sbtp = new SizeBasedTriggeringPolicy();
-rfa->setRollingPolicy(swrp);
-rfa->setTriggeringPolicy(sbtp);
-rfa->activateOptions(p);
-root->addAppender(rfa);
+ sbtp->setMaxFileSize(100);
+ fwrp->setMinIndex(0);
+ rfa->setFile(LOG4CXX_STR("output/sbr-test3.log"));
+ fwrp->setFileNamePattern(LOG4CXX_STR("output/sbr-test3.%i.gz"));
+ Pool p;
+ fwrp->activateOptions(p);
+ rfa->setRollingPolicy(fwrp);
+ rfa->setTriggeringPolicy(sbtp);
+ rfa->activateOptions(p);
+ root->addAppender(rfa);
-//
-// put stray file about locked file
-FileOutputStream os1(LOG4CXX_STR("output/sizeBased-test5.1"), false);
-os1.close(p);
+ common(logger, 100);
+ CPPUNIT_ASSERT_EQUAL(true, File("output/sbr-test3.log").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/sbr-test3.0.gz").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/sbr-test3.1.gz").exists(p));
+
+ CPPUNIT_ASSERT_EQUAL(true, Compare::compare(File("output/sbr-test3.log"),
File("witness/rolling/sbr-test3.log")));
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::gzCompare(File("output/sbr-test3.0.gz"),
File("witness/rolling/sbr-test3.0.gz")));
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::gzCompare(File("output/sbr-test3.1.gz"),
File("witness/rolling/sbr-test3.1.gz")));
+ }
-FileOutputStream os0(LOG4CXX_STR("output/sizeBased-test5.0"), false);
+ /**
+ * Test basic rolling functionality with bogus path in file name pattern.
+ */
+ void test4() {
+ PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
+ RollingFileAppenderPtr rfa = new RollingFileAppender();
+ rfa->setName(LOG4CXX_STR("ROLLING"));
+ rfa->setAppend(false);
+ rfa->setLayout(layout);
+ rfa->setFile(LOG4CXX_STR("output/sizeBased-test4.log"));
-common(logger, 0);
+ FixedWindowRollingPolicyPtr swrp = new FixedWindowRollingPolicy();
+ SizeBasedTriggeringPolicyPtr sbtp = new SizeBasedTriggeringPolicy();
-os0.close(p);
+ sbtp->setMaxFileSize(100);
+ swrp->setMinIndex(0);
-if (File("output/sizeBased-test5.3").exists(p)) {
//
- // looks like platform where open files can be renamed
+ // test4 directory should not exists. Should cause all rollover
attempts to fail.
//
- CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test5.log").exists(p));
- CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test5.0").exists(p));
- CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test5.1").exists(p));
- CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test5.2").exists(p));
- CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test5.3").exists(p));
+ swrp->setFileNamePattern(LOG4CXX_STR("output/test4/sizeBased-test4.%i"));
+ Pool p;
+ swrp->activateOptions(p);
- CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/sizeBased-test5.log"),
- File("witness/rolling/sbr-test2.log")));
- CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/sizeBased-test5.0"),
- File("witness/rolling/sbr-test2.0")));
- CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/sizeBased-test5.1"),
- File("witness/rolling/sbr-test2.1")));
+ rfa->setRollingPolicy(swrp);
+ rfa->setTriggeringPolicy(sbtp);
+ rfa->activateOptions(p);
+ root->addAppender(rfa);
+
+ common(logger, 0);
+
+ CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test4.log").exists(p));
+
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/sizeBased-test4.log"),
+ File("witness/rolling/sbr-test4.log")));
+ }
+
+ /**
+ * Checking handling of rename failures due to other access
+ * to the indexed files.
+ */
+ void test5() {
+ PatternLayoutPtr layout = new PatternLayout(LOG4CXX_STR("%m\n"));
+ RollingFileAppenderPtr rfa = new RollingFileAppender();
+ rfa->setName(LOG4CXX_STR("ROLLING"));
+ rfa->setAppend(false);
+ rfa->setLayout(layout);
+ rfa->setFile(LOG4CXX_STR("output/sizeBased-test5.log"));
+
+ FixedWindowRollingPolicyPtr swrp = new FixedWindowRollingPolicy();
+ SizeBasedTriggeringPolicyPtr sbtp = new SizeBasedTriggeringPolicy();
+
+ sbtp->setMaxFileSize(100);
+ swrp->setMinIndex(0);
+
+ swrp->setFileNamePattern(LOG4CXX_STR("output/sizeBased-test5.%i"));
+ Pool p;
+ swrp->activateOptions(p);
+
+ rfa->setRollingPolicy(swrp);
+ rfa->setTriggeringPolicy(sbtp);
+ rfa->activateOptions(p);
+ root->addAppender(rfa);
-} else {
//
- // rollover attempts should all fail
- // so initial log file should have all log content
- // open file should be unaffected
- // stray file should have only been moved one slot.
- CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test5.log").exists(p));
- CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test5.0").exists(p));
- CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test5.2").exists(p));
-
- CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/sizeBased-test5.log"),
- File("witness/rolling/sbr-test4.log")));
-}
-}
+ // put stray file about locked file
+ FileOutputStream os1(LOG4CXX_STR("output/sizeBased-test5.1"), false);
+ os1.close(p);
+
+
+ FileOutputStream os0(LOG4CXX_STR("output/sizeBased-test5.0"), false);
+ common(logger, 0);
+
+ os0.close(p);
+ if (File("output/sizeBased-test5.3").exists(p)) {
+ //
+ // looks like platform where open files can be renamed
+ //
+ CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test5.log").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test5.0").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test5.1").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test5.2").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test5.3").exists(p));
+
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/sizeBased-test5.log"),
+ File("witness/rolling/sbr-test2.log")));
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/sizeBased-test5.0"),
+ File("witness/rolling/sbr-test2.0")));
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/sizeBased-test5.1"),
+ File("witness/rolling/sbr-test2.1")));
+
+ } else {
+ //
+ // rollover attempts should all fail
+ // so initial log file should have all log content
+ // open file should be unaffected
+ // stray file should have only been moved one slot.
+ CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test5.log").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test5.0").exists(p));
+ CPPUNIT_ASSERT_EQUAL(true, File("output/sizeBased-test5.2").exists(p));
+
+ CPPUNIT_ASSERT_EQUAL(true,
Compare::compare(File("output/sizeBased-test5.log"),
+ File("witness/rolling/sbr-test4.log")));
+ }
+ }
};
Modified: logging/log4cxx/trunk/tests/src/shortsocketserver.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/shortsocketserver.cpp?rev=411761&r1=411760&r2=411761&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/shortsocketserver.cpp (original)
+++ logging/log4cxx/trunk/tests/src/shortsocketserver.cpp Mon Jun 5 05:08:15
2006
@@ -61,10 +61,10 @@
//
// using the stream interface since it knows
// numeric and encoding conversion
- LoggerPtr logger(Logger::getLogger("shortsocketserver"));
+ LoggerPtr log(Logger::getLogger("shortsocketserver"));
std::ostringstream os("Listening on port ");
os << PORT;
- LOG4CXX_INFO(logger, os.str());
+ LOG4CXX_INFO(log, os.str());
ServerSocket serverSocket(PORT);
@@ -75,12 +75,12 @@
std::ostringstream sbuf(prefix);
sbuf << i << ".properties";
PropertyConfigurator::configure(sbuf.str());
- LOG4CXX_INFO(logger, "Waiting to accept a new client.");
+ LOG4CXX_INFO(log, "Waiting to accept a new client.");
SocketPtr socket = serverSocket.accept();
LogString msg(socket->getInetAddress()->toString());
msg.insert(0, LOG4CXX_STR("Connected to client at "));
- LOG4CXX_INFO(logger, msg);
- LOG4CXX_INFO(logger, "Starting new socket node.");
+ LOG4CXX_INFO(log, msg);
+ LOG4CXX_INFO(log, "Starting new socket node.");
SocketNode sn(socket, LogManager::getLoggerRepository());
sn.run();
}
Modified: logging/log4cxx/trunk/tests/src/xml/customleveltestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/xml/customleveltestcase.cpp?rev=411761&r1=411760&r2=411761&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/xml/customleveltestcase.cpp (original)
+++ logging/log4cxx/trunk/tests/src/xml/customleveltestcase.cpp Mon Jun 5
05:08:15 2006
@@ -61,9 +61,9 @@
{
root->getLoggerRepository()->resetConfiguration();
- LoggerPtr logger = Logger::getLogger(LOG4CXX_TEST_STR("LOG4J"));
- logger->setAdditivity(false);
- logger->addAppender(
+ LoggerPtr logger1 = Logger::getLogger(LOG4CXX_TEST_STR("LOG4J"));
+ logger1->setAdditivity(false);
+ logger1->addAppender(
new ConsoleAppender(new PatternLayout(LOG4CXX_STR("log4j: %-22c{2} -
%m%n"))));
}
Modified: logging/log4cxx/trunk/tests/src/xml/xlevel.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/xml/xlevel.cpp?rev=411761&r1=411760&r2=411761&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/xml/xlevel.cpp (original)
+++ logging/log4cxx/trunk/tests/src/xml/xlevel.cpp Mon Jun 5 05:08:15 2006
@@ -26,8 +26,8 @@
const LevelPtr XLevel::LETHAL(XLevel::getLethal());
-XLevel::XLevel(int level, const logchar* name, int syslogEquivalent)
-: Level(level, name, syslogEquivalent)
+XLevel::XLevel(int level1, const logchar* name1, int syslogEquivalent1)
+: Level(level1, name1, syslogEquivalent1)
{
}
