carnold 2004/12/15 22:41:24
Modified: . build.xml
src logmanager.cpp socketinputstream.cpp
tests/src asyncappendertestcase.cpp
hierarchythresholdtestcase.cpp l7dtestcase.cpp
loggertestcase.cpp minimumtestcase.cpp
patternlayouttest.cpp
tests/src/defaultinit testcase3.cpp
tests/src/helpers cyclicbuffertestcase.cpp
optionconvertertestcase.cpp
tests/src/net socketservertestcase.cpp
tests/src/pattern patternparsertestcase.cpp
tests/src/varia levelmatchfiltertestcase.cpp
levelrangefiltertestcase.cpp
tests/src/xml xmllayouttestcase.cpp
Log:
LOGCXX-10: tchar.h/unicode: Mac iteration
Revision Changes Path
1.11 +22 -8 logging-log4cxx/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 15 Dec 2004 00:15:19 -0000 1.10
+++ build.xml 16 Dec 2004 06:41:15 -0000 1.11
@@ -36,6 +36,7 @@
<property name="version" value="0.9.7"/>
<taskdef resource="cpptasks.tasks"/>
<typedef resource="cpptasks.types"/>
+<property name="boost_regex.lib.name" value="boost_regex-gcc"/>
<target name="usage">
<echo>
@@ -128,10 +129,9 @@
<property name="lib-suffix" value="-${version}"/>
- <property name="cppunit.dir" location="${user.home}/cppunit-1.10.2"/>
- <property name="cppunit.include.dir" location="${cppunit.dir}/include"/>
- <property name="cppunit.lib.dir" location="${cppunit.dir}/build"/>
- <property name="cppunit.bin.dir" location="${cppunit.dir}/build"/>
+ <property name="cppunit.include.dir"
location="/usr/local/include/cppunit"/>
+ <property name="cppunit.lib.dir" location="/usr/local/lib"/>
+ <property name="cppunit.bin.dir" location="/usr/local/lib"/>
<property name="cppunit.lib.name" value="cppunit"/>
</target>
@@ -398,7 +398,7 @@
<libset libs="${apriconv.lib.name}"
unless="apriconv.lib.dir"/>
<libset libs="stdc++" if="is-gcc"/>
- <libset libs="boost_regex-gcc" if="is-gcc"/>
+ <!-- libset libs="boost_regex-gcc" if="is-gcc"/ -->
<libset libs="${cppunit.lib.name}" dir="${cppunit.lib.dir}"/>
<project outfile="cbx/shortsocketserver" type="cbuilderx"
if="gen-cbx"/>
<project outfile="msvc/shortsocketserver" type="msvc6" if="gen-dsw"/>
@@ -427,7 +427,7 @@
<includepath path="${apr.include.dir}"/>
<defineset define="APR_DECLARE_STATIC"/>
<defineset define="WIN32" if="is-windows"/>
- <includepath path="${boost.include.dir}"
if="boost.include.dir"/>
+ <includepath path="${boost.include.dir}" if="boost.include.dir"/>
<libset libs="log4cxx${lib-suffix}" dir="${build.dir}"/>
<libset libs="${apr.lib.name} ${aprutil.lib.name}"
dir="${apr.lib.dir}" if="apr.lib.dir"/>
@@ -438,7 +438,8 @@
<libset libs="${apriconv.lib.name}"
unless="apriconv.lib.dir"/>
<libset libs="stdc++" if="is-gcc"/>
- <libset libs="boost_regex-gcc" if="is-gcc"/>
+ <libset libs="${boost_regex.lib.name}" if="is-gcc"
unless="boost.lib.dir"/>
+ <libset libs="${boost_regex.lib.name}" dir="${boost.lib.dir}"
if="boost.lib.dir"/>
<libset libs="${cppunit.lib.name}" dir="${cppunit.lib.dir}"/>
<syslibset libs="Ws2_32 ws2 advapi32" if="is-windows"/>
<project outfile="cbx/log4cxx-test" type="cbuilderx" if="gen-cbx"/>
@@ -476,7 +477,8 @@
<libset libs="${apriconv.lib.name}"
unless="apriconv.lib.dir"/>
<libset libs="stdc++" if="is-gcc"/>
- <libset libs="boost_regex-gcc" if="is-gcc"/>
+ <libset libs="${boost_regex.lib.name}" if="is-gcc"
unless="boost.lib.dir"/>
+ <libset libs="${boost_regex.lib.name}" dir="${boost.lib.dir}"
if="boost.lib.dir"/>
<libset libs="${cppunit.lib.name}" dir="${cppunit.lib.dir}"/>
<syslibset libs="Ws2_32 ws2 advapi32" if="is-windows"/>
<project outfile="cbx/log4cxx-testcase3" type="cbuilderx"
if="gen-cbx"/>
@@ -546,6 +548,8 @@
failonerror="true">
<env key="LD_LIBRARY_PATH"
value="${build.dir}:${cppunit.bin.dir}:${apr.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ <env key="DYLD_LIBRARY_PATH"
+
value="${build.dir}:${cppunit.bin.dir}:${apr.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="Path"
value="${build.dir};${env.Path}"/>
</exec>
@@ -557,6 +561,8 @@
failonerror="true">
<env key="LD_LIBRARY_PATH"
value="${build.dir}:${cppunit.bin.dir}:${apr.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ <env key="DYLD_LIBRARY_PATH"
+
value="${build.dir}:${cppunit.bin.dir}:${apr.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="log4j.configuration"
value="${defaultInit3.properties}"/>
</exec>
@@ -566,6 +572,8 @@
failonerror="true">
<env key="LD_LIBRARY_PATH"
value="${build.dir}:${cppunit.bin.dir}:${apr.lib.dir}:${env.LD_LIBRARY_PATH}"/>
+ <env key="DYLD_LIBRARY_PATH"
+
value="${build.dir}:${cppunit.bin.dir}:${apr.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="LOG4CXX_CONFIGURATION"
value="${defaultInit3.properties}"/>
</exec>
@@ -578,6 +586,8 @@
file="${defaultInit3.properties}" overwrite="true"/>
<exec executable="${log4cxx-testcase3.exe}" dir="${build.dir}"
failonerror="true">
+ <env key="DYLD_LIBRARY_PATH"
+
value="${build.dir}:${cppunit.bin.dir}:${apr.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="LD_LIBRARY_PATH"
value="${build.dir}:${cppunit.bin.dir}:${apr.lib.dir}:${env.LD_LIBRARY_PATH}"/>
</exec>
@@ -588,6 +598,8 @@
file="${defaultInit3.properties}"/>
<exec executable="${log4cxx-testcase3.exe}" dir="${build.dir}"
failonerror="true">
+ <env key="DYLD_LIBRARY_PATH"
+
value="${build.dir}:${cppunit.bin.dir}:${apr.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="LD_LIBRARY_PATH"
value="${build.dir}:${cppunit.bin.dir}:${apr.lib.dir}:${env.LD_LIBRARY_PATH}"/>
</exec>
@@ -600,6 +612,8 @@
<mkdir dir="${tests.dir}/output"/>
<exec executable="${log4cxx-standalone-test.exe}" dir="${tests.dir}"
failonerror="true">
+ <env key="DYLD_LIBRARY_PATH"
+
value="${build.dir}:${cppunit.bin.dir}:${apr.lib.dir}:${env.DYLD_LIBRARY_PATH}"/>
<env key="LD_LIBRARY_PATH"
value="${build.dir}:${cppunit.bin.dir}:${apr.lib.dir}:${env.LD_LIBRARY_PATH}"/>
<env key="Path"
1.18 +10 -2 logging-log4cxx/src/logmanager.cpp
Index: logmanager.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/logmanager.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- logmanager.cpp 15 Dec 2004 08:10:39 -0000 1.17
+++ logmanager.cpp 16 Dec 2004 06:41:15 -0000 1.18
@@ -31,6 +31,7 @@
#include <log4cxx/spi/loggingevent.h>
#include <log4cxx/file.h>
+#include <log4cxx/helpers/transcoder.h>
using namespace log4cxx;
using namespace log4cxx::spi;
@@ -173,9 +174,16 @@
return getLoggerRepository()->getLogger(name, factory);
}
-LoggerPtr LogManager::exists(const LogString& name)
+LoggerPtr LogManager::exists(const std::string& name)
{
- return getLoggerRepository()->exists(name);
+ LOG4CXX_DECODE_CHAR(n, name);
+ return getLoggerRepository()->exists(n);
+}
+
+LoggerPtr LogManager::exists(const std::wstring& name)
+{
+ LOG4CXX_DECODE_WCHAR(n, name);
+ return getLoggerRepository()->exists(n);
}
LoggerList LogManager::getCurrentLoggers()
1.11 +1 -1 logging-log4cxx/src/socketinputstream.cpp
Index: socketinputstream.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/socketinputstream.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- socketinputstream.cpp 13 Dec 2004 05:05:13 -0000 1.10
+++ socketinputstream.cpp 16 Dec 2004 06:41:16 -0000 1.11
@@ -17,7 +17,7 @@
#include <log4cxx/helpers/socketinputstream.h>
#include <log4cxx/helpers/socket.h>
#include <log4cxx/helpers/loglog.h>
-#include <malloc.h>
+//#include <malloc.h>
using namespace log4cxx;
using namespace log4cxx::helpers ;
1.10 +6 -7 logging-log4cxx/tests/src/asyncappendertestcase.cpp
Index: asyncappendertestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/asyncappendertestcase.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- asyncappendertestcase.cpp 11 Dec 2004 04:53:27 -0000 1.9
+++ asyncappendertestcase.cpp 16 Dec 2004 06:41:16 -0000 1.10
@@ -25,12 +25,11 @@
#include "appenderskeletontestcase.h"
#include <apr_pools.h>
#include <apr_strings.h>
+#include "testchar.h"
using namespace log4cxx;
using namespace log4cxx::helpers;
-#define _T(str) L ## str
-
/**
A superficial but general test of log4j.
*/
@@ -78,9 +77,9 @@
asyncAppender->addAppender(vectorAppender);
root->addAppender(asyncAppender);
- root->debug(_T("m1"));
+ root->debug(LOG4CXX_TEST_STR("m1"));
asyncAppender->close();
- root->debug(_T("m2"));
+ root->debug(LOG4CXX_TEST_STR("m2"));
const std::vector<spi::LoggingEventPtr>& v =
vectorAppender->getVector();
CPPUNIT_ASSERT(v.size() == 1);
@@ -98,9 +97,9 @@
asyncAppender->addAppender(vectorAppender);
root->addAppender(asyncAppender);
- root->debug(_T("m1"));
+ root->debug(LOG4CXX_TEST_STR("m1"));
asyncAppender->close();
- root->debug(_T("m2"));
+ root->debug(LOG4CXX_TEST_STR("m2"));
const std::vector<spi::LoggingEventPtr>& v =
vectorAppender->getVector();
CPPUNIT_ASSERT(v.size() == 1);
@@ -132,7 +131,7 @@
}
asyncAppender->close();
- root->debug(_T("m2"));
+ root->debug(LOG4CXX_TEST_STR("m2"));
apr_pool_destroy(pool);
1.5 +8 -9 logging-log4cxx/tests/src/hierarchythresholdtestcase.cpp
Index: hierarchythresholdtestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/hierarchythresholdtestcase.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hierarchythresholdtestcase.cpp 11 Dec 2004 04:53:27 -0000 1.4
+++ hierarchythresholdtestcase.cpp 16 Dec 2004 06:41:16 -0000 1.5
@@ -21,11 +21,10 @@
#include <log4cxx/propertyconfigurator.h>
#include "util/compare.h"
#include "xml/xlevel.h"
+#include "testchar.h"
using namespace log4cxx;
-#define _T(str) L ## str
-
/**
Test the configuration of the hierarchy-wide threshold.
*/
@@ -111,12 +110,12 @@
static void common()
{
- logger->log(XLevel::getTrace(), _T("m0"));
- logger->debug(_T("m1"));
- logger->info(_T("m2"));
- logger->warn(_T("m3"));
- logger->error(_T("m4"));
- logger->fatal(_T("m5"));
+ logger->log(XLevel::getTrace(), LOG4CXX_TEST_STR("m0"));
+ logger->debug(LOG4CXX_TEST_STR("m1"));
+ logger->info(LOG4CXX_TEST_STR("m2"));
+ logger->warn(LOG4CXX_TEST_STR("m3"));
+ logger->error(LOG4CXX_TEST_STR("m4"));
+ logger->fatal(LOG4CXX_TEST_STR("m5"));
}
private:
@@ -127,6 +126,6 @@
File HierarchyThresholdTestCase::TEMP(LOG4CXX_FILE("output/temp"));
LoggerPtr HierarchyThresholdTestCase::logger =
- Logger::getLogger(_T("HierarchyThresholdTestCase"));
+ Logger::getLogger(LOG4CXX_TEST_STR("HierarchyThresholdTestCase"));
CPPUNIT_TEST_SUITE_REGISTRATION(HierarchyThresholdTestCase);
1.6 +13 -12 logging-log4cxx/tests/src/l7dtestcase.cpp
Index: l7dtestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/l7dtestcase.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- l7dtestcase.cpp 14 Dec 2004 20:26:14 -0000 1.5
+++ l7dtestcase.cpp 16 Dec 2004 06:41:16 -0000 1.6
@@ -26,8 +26,9 @@
#include <vector>
#include <sstream>
-#define _T(str) L ## str
-typedef std::basic_ostringstream<wchar_t> StringBuffer;
+#include "testchar.h"
+
+typedef std::basic_ostringstream<testchar> StringBuffer;
using namespace log4cxx;
using namespace log4cxx::helpers;
@@ -74,20 +75,20 @@
{
root->setResourceBundle(bundles[i]);
- LOG4CXX_L7DLOG(root, Level::DEBUG, _T("bogus1"));
- LOG4CXX_L7DLOG(root, Level::INFO, _T("test"));
- LOG4CXX_L7DLOG(root, Level::WARN, _T("hello_world"));
+ LOG4CXX_L7DLOG(root, Level::DEBUG,
LOG4CXX_TEST_STR("bogus1"));
+ LOG4CXX_L7DLOG(root, Level::INFO,
LOG4CXX_TEST_STR("test"));
+ LOG4CXX_L7DLOG(root, Level::WARN,
LOG4CXX_TEST_STR("hello_world"));
StringBuffer os;
os << i + 1;
- LOG4CXX_L7DLOG2(root, Level::DEBUG, _T("msg1"),
os.str().c_str(),
- _T("log4j"));
- LOG4CXX_L7DLOG2(root, Level::getError(),
_T("bogusMsg"), os.str().c_str(),
- _T("log4j"));
- LOG4CXX_L7DLOG2(root, Level::getError(), _T("msg1"),
os.str().c_str(),
- _T("log4j"));
- LOG4CXX_L7DLOG(root, Level::INFO, _T("bogus2"));
+ LOG4CXX_L7DLOG2(root, Level::DEBUG,
LOG4CXX_TEST_STR("msg1"), os.str().c_str(),
+ LOG4CXX_TEST_STR("log4j"));
+ LOG4CXX_L7DLOG2(root, Level::getError(),
LOG4CXX_TEST_STR("bogusMsg"), os.str().c_str(),
+ LOG4CXX_TEST_STR("log4j"));
+ LOG4CXX_L7DLOG2(root, Level::getError(),
LOG4CXX_TEST_STR("msg1"), os.str().c_str(),
+ LOG4CXX_TEST_STR("log4j"));
+ LOG4CXX_L7DLOG(root, Level::INFO,
LOG4CXX_TEST_STR("bogus2"));
}
CPPUNIT_ASSERT(Compare::compare(LOG4CXX_FILE("output/temp"),
1.7 +29 -30 logging-log4cxx/tests/src/loggertestcase.cpp
Index: loggertestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/loggertestcase.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- loggertestcase.cpp 11 Dec 2004 04:53:27 -0000 1.6
+++ loggertestcase.cpp 16 Dec 2004 06:41:16 -0000 1.7
@@ -28,8 +28,7 @@
#include <log4cxx/spi/rootcategory.h>
#include <log4cxx/helpers/propertyresourcebundle.h>
#include "insertwide.h"
-
-#define _T(str) L ## str
+#include "testchar.h"
using namespace log4cxx;
using namespace log4cxx::spi;
@@ -100,7 +99,7 @@
*/
void testAppender1()
{
- logger = Logger::getLogger(_T("test"));
+ logger = Logger::getLogger(LOG4CXX_TEST_STR("test"));
a1 = new FileAppender();
a1->setName(LOG4CXX_STR("testAppender1"));
logger->addAppender(a1);
@@ -121,7 +120,7 @@
a2 = new FileAppender();
a2->setName(LOG4CXX_STR("testAppender2.2"));
- logger = Logger::getLogger(_T("test"));
+ logger = Logger::getLogger(LOG4CXX_TEST_STR("test"));
logger->addAppender(a1);
logger->addAppender(a2);
logger->removeAppender((LogString)
LOG4CXX_STR("testAppender2.1"));
@@ -137,8 +136,8 @@
*/
void testAdditivity1()
{
- LoggerPtr a = Logger::getLogger(_T("a"));
- LoggerPtr ab = Logger::getLogger(_T("a.b"));
+ LoggerPtr a = Logger::getLogger(LOG4CXX_TEST_STR("a"));
+ LoggerPtr ab = Logger::getLogger(LOG4CXX_TEST_STR("a.b"));
CountingAppenderPtr ca = new CountingAppender();
a->addAppender(ca);
@@ -158,10 +157,10 @@
*/
void testAdditivity2()
{
- LoggerPtr a = Logger::getLogger(_T("a"));
- LoggerPtr ab = Logger::getLogger(_T("a.b"));
- LoggerPtr abc = Logger::getLogger(_T("a.b.c"));
- LoggerPtr x = Logger::getLogger(_T("x"));
+ LoggerPtr a = Logger::getLogger(LOG4CXX_TEST_STR("a"));
+ LoggerPtr ab = Logger::getLogger(LOG4CXX_TEST_STR("a.b"));
+ LoggerPtr abc = Logger::getLogger(LOG4CXX_TEST_STR("a.b.c"));
+ LoggerPtr x = Logger::getLogger(LOG4CXX_TEST_STR("x"));
CountingAppenderPtr ca1 = new CountingAppender();
CountingAppenderPtr ca2 = new CountingAppender();
@@ -191,10 +190,10 @@
void testAdditivity3()
{
LoggerPtr root = Logger::getRootLogger();
- LoggerPtr a = Logger::getLogger(_T("a"));
- LoggerPtr ab = Logger::getLogger(_T("a.b"));
- LoggerPtr abc = Logger::getLogger(_T("a.b.c"));
- LoggerPtr x = Logger::getLogger(_T("x"));
+ LoggerPtr a = Logger::getLogger(LOG4CXX_TEST_STR("a"));
+ LoggerPtr ab = Logger::getLogger(LOG4CXX_TEST_STR("a.b"));
+ LoggerPtr abc = Logger::getLogger(LOG4CXX_TEST_STR("a.b.c"));
+ LoggerPtr x = Logger::getLogger(LOG4CXX_TEST_STR("x"));
CountingAppenderPtr caRoot = new CountingAppender();
CountingAppenderPtr caA = new CountingAppender();
@@ -299,9 +298,9 @@
ResourceBundlePtr t = root->getResourceBundle();
CPPUNIT_ASSERT(t == rbUS);
- LoggerPtr x = Logger::getLogger(_T("x"));
- LoggerPtr x_y = Logger::getLogger(_T("x.y"));
- LoggerPtr x_y_z = Logger::getLogger(_T("x.y.z"));
+ LoggerPtr x = Logger::getLogger(LOG4CXX_TEST_STR("x"));
+ LoggerPtr x_y = Logger::getLogger(LOG4CXX_TEST_STR("x.y"));
+ LoggerPtr x_y_z = Logger::getLogger(LOG4CXX_TEST_STR("x.y.z"));
t = x->getResourceBundle();
CPPUNIT_ASSERT(t == rbUS);
@@ -319,9 +318,9 @@
ResourceBundlePtr t = root->getResourceBundle();
CPPUNIT_ASSERT(t == rbUS);
- LoggerPtr x = Logger::getLogger(_T("x"));
- LoggerPtr x_y = Logger::getLogger(_T("x.y"));
- LoggerPtr x_y_z = Logger::getLogger(_T("x.y.z"));
+ LoggerPtr x = Logger::getLogger(LOG4CXX_TEST_STR("x"));
+ LoggerPtr x_y = Logger::getLogger(LOG4CXX_TEST_STR("x.y"));
+ LoggerPtr x_y_z = Logger::getLogger(LOG4CXX_TEST_STR("x.y.z"));
x_y->setResourceBundle(rbFR);
t = x->getResourceBundle();
@@ -340,9 +339,9 @@
ResourceBundlePtr t = root->getResourceBundle();
CPPUNIT_ASSERT(t == rbUS);
- LoggerPtr x = Logger::getLogger(_T("x"));
- LoggerPtr x_y = Logger::getLogger(_T("x.y"));
- LoggerPtr x_y_z = Logger::getLogger(_T("x.y.z"));
+ LoggerPtr x = Logger::getLogger(LOG4CXX_TEST_STR("x"));
+ LoggerPtr x_y = Logger::getLogger(LOG4CXX_TEST_STR("x.y"));
+ LoggerPtr x_y_z = Logger::getLogger(LOG4CXX_TEST_STR("x.y.z"));
x_y->setResourceBundle(rbFR);
x_y_z->setResourceBundle(rbCH);
@@ -356,18 +355,18 @@
void testExists()
{
- LoggerPtr a = Logger::getLogger(_T("a"));
- LoggerPtr a_b = Logger::getLogger(_T("a.b"));
- LoggerPtr a_b_c = Logger::getLogger(_T("a.b.c"));
+ LoggerPtr a = Logger::getLogger(LOG4CXX_TEST_STR("a"));
+ LoggerPtr a_b = Logger::getLogger(LOG4CXX_TEST_STR("a.b"));
+ LoggerPtr a_b_c = Logger::getLogger(LOG4CXX_TEST_STR("a.b.c"));
LoggerPtr t;
- t = LogManager::exists(_T("xx"));
+ t = LogManager::exists(LOG4CXX_TEST_STR("xx"));
CPPUNIT_ASSERT(t == 0);
- t = LogManager::exists(_T("a"));
+ t = LogManager::exists(LOG4CXX_TEST_STR("a"));
CPPUNIT_ASSERT_EQUAL(a, t);
- t = LogManager::exists(_T("a.b"));
+ t = LogManager::exists(LOG4CXX_TEST_STR("a.b"));
CPPUNIT_ASSERT_EQUAL(a_b, t);
- t = LogManager::exists(_T("a.b.c"));
+ t = LogManager::exists(LOG4CXX_TEST_STR("a.b.c"));
CPPUNIT_ASSERT_EQUAL(a_b_c, t);
}
1.9 +9 -10 logging-log4cxx/tests/src/minimumtestcase.cpp
Index: minimumtestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/minimumtestcase.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- minimumtestcase.cpp 11 Dec 2004 05:42:27 -0000 1.8
+++ minimumtestcase.cpp 16 Dec 2004 06:41:16 -0000 1.9
@@ -33,6 +33,7 @@
#include <iostream>
#include <apr_pools.h>
#include <apr_strings.h>
+#include "testchar.h"
using namespace log4cxx;
using namespace log4cxx::helpers;
@@ -49,8 +50,6 @@
LOG4CXX_STR("Messages should bear numbers 0 through 23\\.")
-#define _T(str) L ## str
-
class MinimumTestCase : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(MinimumTestCase);
@@ -124,22 +123,22 @@
// In the lines below, the category names are chosen as an aid
in
// remembering their level values. In general, the category
names
// have no bearing to level values.
- LoggerPtr ERR = Logger::getLogger(_T("ERR"));
+ LoggerPtr ERR = Logger::getLogger(LOG4CXX_TEST_STR("ERR"));
ERR->setLevel(Level::getError());
- LoggerPtr INF = Logger::getLogger(_T("INF"));
+ LoggerPtr INF = Logger::getLogger(LOG4CXX_TEST_STR("INF"));
INF->setLevel(Level::INFO);
- LoggerPtr INF_ERR = Logger::getLogger(_T("INF.ERR"));
+ LoggerPtr INF_ERR =
Logger::getLogger(LOG4CXX_TEST_STR("INF.ERR"));
INF_ERR->setLevel(Level::getError());
- LoggerPtr DEB = Logger::getLogger(_T("DEB"));
+ LoggerPtr DEB = Logger::getLogger(LOG4CXX_TEST_STR("DEB"));
DEB->setLevel(Level::DEBUG);
// Note: categories with undefined level
- LoggerPtr INF_UNDEF = Logger::getLogger(_T("INF.UNDEF"));
- LoggerPtr INF_ERR_UNDEF =
Logger::getLogger(_T("INF.ERR.UNDEF"));
- LoggerPtr UNDEF = Logger::getLogger(_T("UNDEF"));
+ LoggerPtr INF_UNDEF =
Logger::getLogger(LOG4CXX_TEST_STR("INF.UNDEF"));
+ LoggerPtr INF_ERR_UNDEF =
Logger::getLogger(LOG4CXX_TEST_STR("INF.ERR.UNDEF"));
+ LoggerPtr UNDEF = Logger::getLogger(LOG4CXX_TEST_STR("UNDEF"));
apr_pool_t* pool;
apr_status_t rv = apr_pool_create(&pool, NULL);
@@ -231,7 +230,7 @@
i++;
// -------------------------------------------------
- LOG4CXX_INFO(INF, _T("Messages should bear numbers 0 through
23."));
+ LOG4CXX_INFO(INF, LOG4CXX_TEST_STR("Messages should bear
numbers 0 through 23."));
apr_pool_destroy(pool);
}
1.8 +21 -22 logging-log4cxx/tests/src/patternlayouttest.cpp
Index: patternlayouttest.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/patternlayouttest.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- patternlayouttest.cpp 11 Dec 2004 04:53:27 -0000 1.7
+++ patternlayouttest.cpp 16 Dec 2004 06:41:16 -0000 1.8
@@ -38,8 +38,7 @@
#include <apr_pools.h>
#include <apr_strings.h>
#include <log4cxx/helpers/pool.h>
-
-#define _T(str) L ## str
+#include "testchar.h"
#define FILTERED LOG4CXX_FILE("output/filtered")
#define TEMP LOG4CXX_FILE("output/temp")
@@ -85,7 +84,7 @@
void setUp()
{
root = Logger::getRootLogger();
- logger =
Logger::getLogger(_T("java.org.apache.log4j.PatternLayoutTest"));
+ logger =
Logger::getLogger(LOG4CXX_TEST_STR("java.org.apache.log4j.PatternLayoutTest"));
}
void tearDown()
@@ -417,9 +416,9 @@
void testMDC1()
{
PropertyConfigurator::configure(LOG4CXX_FILE("input/patternLayout.mdc.1.properties"));
- MDC::put(_T("key1"), _T("va11"));
- MDC::put(_T("key2"), _T("va12"));
- logger->debug(_T("Hello World"));
+ MDC::put(LOG4CXX_TEST_STR("key1"), LOG4CXX_TEST_STR("va11"));
+ MDC::put(LOG4CXX_TEST_STR("key2"), LOG4CXX_TEST_STR("va12"));
+ logger->debug(LOG4CXX_TEST_STR("Hello World"));
MDC::clear();
CPPUNIT_ASSERT(Compare::compare(TEMP,
LOG4CXX_FILE("witness/patternLayout.mdc.1")));
@@ -445,58 +444,58 @@
root->setLevel(Level::DEBUG);
// output starting message
- root->debug(_T("starting mdc pattern test"));
+ root->debug(LOG4CXX_TEST_STR("starting mdc pattern test"));
layout->setConversionPattern(mdcMsgPattern1);
log4cxx::helpers::Pool pool;
layout->activateOptions(pool);
- root->debug(_T("empty mdc, no key specified in pattern"));
+ root->debug(LOG4CXX_TEST_STR("empty mdc, no key specified in
pattern"));
layout->setConversionPattern(mdcMsgPattern2);
layout->activateOptions(pool);
- root->debug(_T("empty mdc, key1 in pattern"));
+ root->debug(LOG4CXX_TEST_STR("empty mdc, key1 in pattern"));
layout->setConversionPattern(mdcMsgPattern3);
layout->activateOptions(pool);
- root->debug(_T("empty mdc, key2 in pattern"));
+ root->debug(LOG4CXX_TEST_STR("empty mdc, key2 in pattern"));
layout->setConversionPattern(mdcMsgPattern4);
layout->activateOptions(pool);
- root->debug(_T("empty mdc, key3 in pattern"));
+ root->debug(LOG4CXX_TEST_STR("empty mdc, key3 in pattern"));
layout->setConversionPattern(mdcMsgPattern5);
layout->activateOptions(pool);
- root->debug(_T("empty mdc, key1, key2, and key3 in pattern"));
+ root->debug(LOG4CXX_TEST_STR("empty mdc, key1, key2, and key3
in pattern"));
- MDC::put(_T("key1"), _T("value1"));
- MDC::put(_T("key2"), _T("value2"));
+ MDC::put(LOG4CXX_TEST_STR("key1"), LOG4CXX_TEST_STR("value1"));
+ MDC::put(LOG4CXX_TEST_STR("key2"), LOG4CXX_TEST_STR("value2"));
layout->setConversionPattern(mdcMsgPattern1);
layout->activateOptions(pool);
- root->debug(_T("filled mdc, no key specified in pattern"));
+ root->debug(LOG4CXX_TEST_STR("filled mdc, no key specified in
pattern"));
layout->setConversionPattern(mdcMsgPattern2);
layout->activateOptions(pool);
- root->debug(_T("filled mdc, key1 in pattern"));
+ root->debug(LOG4CXX_TEST_STR("filled mdc, key1 in pattern"));
layout->setConversionPattern(mdcMsgPattern3);
layout->activateOptions(pool);
- root->debug(_T("filled mdc, key2 in pattern"));
+ root->debug(LOG4CXX_TEST_STR("filled mdc, key2 in pattern"));
layout->setConversionPattern(mdcMsgPattern4);
layout->activateOptions(pool);
- root->debug(_T("filled mdc, key3 in pattern"));
+ root->debug(LOG4CXX_TEST_STR("filled mdc, key3 in pattern"));
layout->setConversionPattern(mdcMsgPattern5);
layout->activateOptions(pool);
- root->debug(_T("filled mdc, key1, key2, and key3 in pattern"));
+ root->debug(LOG4CXX_TEST_STR("filled mdc, key1, key2, and key3
in pattern"));
- MDC::remove(_T("key1"));
- MDC::remove(_T("key2"));
+ MDC::remove(LOG4CXX_TEST_STR("key1"));
+ MDC::remove(LOG4CXX_TEST_STR("key2"));
layout->setConversionPattern(LOG4CXX_STR("%m%n"));
layout->activateOptions(pool);
- root->debug(_T("finished mdc pattern test"));
+ root->debug(LOG4CXX_TEST_STR("finished mdc pattern test"));
CPPUNIT_ASSERT(Compare::compare(OUTPUT_FILE, WITNESS_FILE));
}
1.6 +2 -3 logging-log4cxx/tests/src/defaultinit/testcase3.cpp
Index: testcase3.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/defaultinit/testcase3.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testcase3.cpp 11 Dec 2004 04:53:29 -0000 1.5
+++ testcase3.cpp 16 Dec 2004 06:41:18 -0000 1.6
@@ -19,8 +19,7 @@
#include <log4cxx/logmanager.h>
#include <log4cxx/logger.h>
-
-#define _T(str) L ## str
+#include "../insertwide.h"
using namespace log4cxx;
@@ -48,7 +47,7 @@
AppenderList list = root->getAllAppenders();
AppenderPtr appender = list.front();
- CPPUNIT_ASSERT(appender->getName() == _T("D3"));
+ CPPUNIT_ASSERT_EQUAL((LogString) LOG4CXX_STR("D3"),
appender->getName());
}
};
1.5 +2 -3
logging-log4cxx/tests/src/helpers/cyclicbuffertestcase.cpp
Index: cyclicbuffertestcase.cpp
===================================================================
RCS file:
/home/cvs/logging-log4cxx/tests/src/helpers/cyclicbuffertestcase.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cyclicbuffertestcase.cpp 11 Dec 2004 04:53:29 -0000 1.4
+++ cyclicbuffertestcase.cpp 16 Dec 2004 06:41:19 -0000 1.5
@@ -22,13 +22,12 @@
#include <log4cxx/helpers/cyclicbuffer.h>
#include <log4cxx/spi/loggingevent.h>
#include <log4cxx/spi/location/locationinfo.h>
+#include "../testchar.h"
using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace log4cxx::spi;
-#define _T(str) L ## str
-
#define MAX 1000
class CyclicBufferTestCase : public CppUnit::TestFixture
@@ -45,7 +44,7 @@
public:
void setUp()
{
- logger = Logger::getLogger(_T("x"));
+ logger = Logger::getLogger(LOG4CXX_TEST_STR("x"));
e.reserve(1000);
for (int i = 0; i < MAX; i++)
{
1.6 +18 -22
logging-log4cxx/tests/src/helpers/optionconvertertestcase.cpp
Index: optionconvertertestcase.cpp
===================================================================
RCS file:
/home/cvs/logging-log4cxx/tests/src/helpers/optionconvertertestcase.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- optionconvertertestcase.cpp 11 Dec 2004 04:53:29 -0000 1.5
+++ optionconvertertestcase.cpp 16 Dec 2004 06:41:19 -0000 1.6
@@ -21,14 +21,14 @@
#include <log4cxx/helpers/properties.h>
#include <log4cxx/helpers/system.h>
#include <log4cxx/helpers/transcoder.h>
+#include "../testchar.h"
+#include "../insertwide.h"
using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace log4cxx::spi;
-#define _T(str) LOG4CXX_STR(str)
-
#define MAX 1000
class OptionConverterTestCase : public CppUnit::TestFixture
@@ -58,39 +58,35 @@
void varSubstTest1()
{
- LogString r(OptionConverter::substVars(_T("hello world."),
nullProperties));
- CPPUNIT_ASSERT(r == _T("hello world."));
+ LogString r(OptionConverter::substVars(LOG4CXX_STR("hello
world."), nullProperties));
+ CPPUNIT_ASSERT_EQUAL((LogString) LOG4CXX_STR("hello world."),
r);
- r = OptionConverter::substVars(_T("hello ${TOTO} world."),
nullProperties);
+ r = OptionConverter::substVars(LOG4CXX_STR("hello ${TOTO}
world."), nullProperties);
- CPPUNIT_ASSERT(r == _T("hello wonderful world."));
+ CPPUNIT_ASSERT_EQUAL((LogString) LOG4CXX_STR("hello wonderful
world."), r);
}
void varSubstTest2()
{
- LogString r;
-
- r = OptionConverter::substVars(_T("Test2 ${key1} mid ${key2}
end."),
- nullProperties);
- CPPUNIT_ASSERT(r == _T("Test2 value1 mid value2 end."));
+ LogString r(OptionConverter::substVars(LOG4CXX_STR("Test2
${key1} mid ${key2} end."),
+ nullProperties));
+ CPPUNIT_ASSERT_EQUAL((LogString) LOG4CXX_STR("Test2 value1 mid
value2 end."), r);
}
void varSubstTest3()
{
- LogString r;
-
- r = OptionConverter::substVars(
- _T("Test3 ${unset} mid ${key1} end."), nullProperties);
- CPPUNIT_ASSERT(r == _T("Test3 mid value1 end."));
+ LogString r(OptionConverter::substVars(
+ LOG4CXX_STR("Test3 ${unset} mid ${key1} end."),
nullProperties));
+ CPPUNIT_ASSERT_EQUAL((LogString) LOG4CXX_STR("Test3 mid value1
end."), r);
}
void varSubstTest4()
{
LogString res;
- LogString val = _T("Test4 ${incomplete ");
+ LogString val(LOG4CXX_STR("Test4 ${incomplete "));
try
{
res = OptionConverter::substVars(val, nullProperties);
@@ -98,7 +94,7 @@
catch(IllegalArgumentException& e)
{
std::string witness("\"Test4 ${incomplete \" has no
closing brace. Opening brace at position 6.");
- CPPUNIT_ASSERT(witness == e.what());
+ CPPUNIT_ASSERT_EQUAL(witness, (std::string) e.what());
}
}
@@ -106,10 +102,10 @@
void varSubstTest5()
{
Properties props;
- props.setProperty(_T("p1"), _T("x1"));
- props.setProperty(_T("p2"), _T("${p1}"));
- LogString res = OptionConverter::substVars(_T("${p2}"), props);
- CPPUNIT_ASSERT(res == _T("x1"));
+ props.setProperty(LOG4CXX_STR("p1"), LOG4CXX_STR("x1"));
+ props.setProperty(LOG4CXX_STR("p2"), LOG4CXX_STR("${p1}"));
+ LogString res =
OptionConverter::substVars(LOG4CXX_STR("${p2}"), props);
+ CPPUNIT_ASSERT_EQUAL((LogString) LOG4CXX_STR("x1"), res);
}
private:
1.12 +10 -11 logging-log4cxx/tests/src/net/socketservertestcase.cpp
Index: socketservertestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/net/socketservertestcase.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- socketservertestcase.cpp 11 Dec 2004 05:42:27 -0000 1.11
+++ socketservertestcase.cpp 16 Dec 2004 06:41:20 -0000 1.12
@@ -38,6 +38,7 @@
#include <iostream>
#include <log4cxx/helpers/transcoder.h>
#include <log4cxx/helpers/stringhelper.h>
+#include "../testchar.h"
//Define INT64_C for compilers that don't have it
#if (!defined(INT64_C))
@@ -52,8 +53,6 @@
using namespace log4cxx::helpers;
using namespace log4cxx::net;
-#define _T(str) L ## str
-
#define TEMP LOG4CXX_FILE("output/temp")
#define FILTERED LOG4CXX_FILE("output/filtered")
@@ -280,7 +279,7 @@
SocketAppenderPtr socketAppender =
new SocketAppender(LOG4CXX_STR("localhost"), PORT);
root->addAppender(socketAppender);
- NDC::push(_T("some"));
+ NDC::push(LOG4CXX_TEST_STR("some"));
common(LOG4CXX_STR("T4"), LOG4CXX_STR("key4"),
LOG4CXX_STR("MDC-TEST4"));
NDC::pop();
delay(1);
@@ -316,7 +315,7 @@
root->addAppender(socketAppender);
root->addAppender(asyncAppender);
- NDC::push(_T("some5"));
+ NDC::push(LOG4CXX_TEST_STR("some5"));
common(LOG4CXX_STR("T5"), LOG4CXX_STR("key5"),
LOG4CXX_STR("MDC-TEST5"));
NDC::pop();
delay(2);
@@ -352,11 +351,11 @@
root->addAppender(socketAppender);
root->addAppender(asyncAppender);
- NDC::push(_T("some6"));
- MDC::put(_T("hostID"), _T("client-test6"));
+ NDC::push(LOG4CXX_TEST_STR("some6"));
+ MDC::put(LOG4CXX_TEST_STR("hostID"), LOG4CXX_TEST_STR("client-test6"));
common(LOG4CXX_STR("T6"), LOG4CXX_STR("key6"),
LOG4CXX_STR("MDC-TEST6"));
NDC::pop();
- MDC::remove(_T("hostID"));
+ MDC::remove(LOG4CXX_TEST_STR("hostID"));
delay(2);
ControlFilter cf;
@@ -390,11 +389,11 @@
root->addAppender(socketAppender);
root->addAppender(asyncAppender);
- NDC::push(_T("some7"));
- MDC::put(_T("hostID"), _T("client-test7"));
+ NDC::push(LOG4CXX_TEST_STR("some7"));
+ MDC::put(LOG4CXX_TEST_STR("hostID"), LOG4CXX_TEST_STR("client-test7"));
common(LOG4CXX_STR("T7"), LOG4CXX_STR("key7"),
LOG4CXX_STR("MDC-TEST7"));
NDC::pop();
- MDC::remove(_T("hostID"));
+ MDC::remove(LOG4CXX_TEST_STR("hostID"));
delay(2);
ControlFilter cf;
@@ -426,7 +425,7 @@
root->addAppender(socketAppender);
- NDC::push(_T("some8"));
+ NDC::push(LOG4CXX_TEST_STR("some8"));
common(LOG4CXX_STR("T8"), LOG4CXX_STR("key8"),
LOG4CXX_STR("MDC-TEST8"));
NDC::pop();
delay(2);
1.5 +2 -3
logging-log4cxx/tests/src/pattern/patternparsertestcase.cpp
Index: patternparsertestcase.cpp
===================================================================
RCS file:
/home/cvs/logging-log4cxx/tests/src/pattern/patternparsertestcase.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- patternparsertestcase.cpp 11 Dec 2004 04:53:29 -0000 1.4
+++ patternparsertestcase.cpp 16 Dec 2004 06:41:21 -0000 1.5
@@ -23,13 +23,12 @@
#include <log4cxx/level.h>
#include "num343patternconverter.h"
+#include "../testchar.h"
using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace log4cxx::spi;
-#define _T(str) L ## str
-
class PatternParserTestCase : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(PatternParserTestCase);
@@ -41,7 +40,7 @@
public:
void setUp()
{
- logger = Logger::getLogger(_T("org.foobar"));
+ logger = Logger::getLogger(LOG4CXX_TEST_STR("org.foobar"));
event = new LoggingEvent(
logger, Level::INFO, LOG4CXX_STR("msg 1"),
LOG4CXX_LOCATION);
1.5 +3 -3
logging-log4cxx/tests/src/varia/levelmatchfiltertestcase.cpp
Index: levelmatchfiltertestcase.cpp
===================================================================
RCS file:
/home/cvs/logging-log4cxx/tests/src/varia/levelmatchfiltertestcase.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- levelmatchfiltertestcase.cpp 11 Dec 2004 05:42:27 -0000 1.4
+++ levelmatchfiltertestcase.cpp 16 Dec 2004 06:41:22 -0000 1.5
@@ -29,13 +29,13 @@
#include <log4cxx/helpers/stringhelper.h>
#include "../util/compare.h"
+#include "../testchar.h"
+
using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace log4cxx::varia;
-#define _T(str) L ## str
-
#define ACCEPT_FILE LOG4CXX_FILE("output/LevelMatchFilter_accept")
#define ACCEPT_WITNESS LOG4CXX_FILE("witness/LevelMatchFilter_accept")
#define DENY_FILE LOG4CXX_FILE("output/LevelMatchFilter_deny")
@@ -56,7 +56,7 @@
{
root = Logger::getRootLogger();
root->removeAllAppenders();
- logger = Logger::getLogger(_T("test"));
+ logger = Logger::getLogger(LOG4CXX_TEST_STR("test"));
}
void tearDown()
1.4 +2 -2
logging-log4cxx/tests/src/varia/levelrangefiltertestcase.cpp
Index: levelrangefiltertestcase.cpp
===================================================================
RCS file:
/home/cvs/logging-log4cxx/tests/src/varia/levelrangefiltertestcase.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- levelrangefiltertestcase.cpp 11 Dec 2004 04:53:30 -0000 1.3
+++ levelrangefiltertestcase.cpp 16 Dec 2004 06:41:23 -0000 1.4
@@ -28,12 +28,12 @@
#include <log4cxx/helpers/pool.h>
#include <log4cxx/helpers/stringhelper.h>
#include <log4cxx/helpers/transcoder.h>
+#include "../testchar.h"
using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace log4cxx::varia;
-#define _T(str) L ## str
#define ACCEPT_FILE LOG4CXX_FILE("output/LevelRangeFilter_accept")
#define ACCEPT_WITNESS LOG4CXX_FILE("witness/LevelRangeFilter_accept")
@@ -55,7 +55,7 @@
{
root = Logger::getRootLogger();
root->removeAllAppenders();
- logger = Logger::getLogger(_T("test"));
+ logger = Logger::getLogger(LOG4CXX_TEST_STR("test"));
}
void tearDown()
1.5 +13 -14 logging-log4cxx/tests/src/xml/xmllayouttestcase.cpp
Index: xmllayouttestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/xml/xmllayouttestcase.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmllayouttestcase.cpp 11 Dec 2004 04:53:30 -0000 1.4
+++ xmllayouttestcase.cpp 16 Dec 2004 06:41:24 -0000 1.5
@@ -30,13 +30,12 @@
#include "../util/xmlfilenamefilter.h"
#include <iostream>
#include <log4cxx/helpers/stringhelper.h>
+#include "../testchar.h"
using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace log4cxx::xml;
-#define _T(str) L ## str
-
#define FILTERED LOG4CXX_FILE("output/filtered")
#define TEMP LOG4CXX_FILE("output/temp")
@@ -46,8 +45,8 @@
X()
{
LoggerPtr logger =
-
Logger::getLogger(_T("org.apache.log4j.xml.XMLLayoutTestCase$X"));
- LOG4CXX_INFO(logger, _T("in X() constructor"));
+
Logger::getLogger(LOG4CXX_TEST_STR("org.apache.log4j.xml.XMLLayoutTestCase$X"));
+ LOG4CXX_INFO(logger, LOG4CXX_TEST_STR("in X() constructor"));
}
};
@@ -68,7 +67,7 @@
void setUp()
{
root = Logger::getRootLogger();
- logger =
Logger::getLogger(_T("org.apache.log4j.xml.XMLLayoutTestCase"));
+ logger =
Logger::getLogger(LOG4CXX_TEST_STR("org.apache.log4j.xml.XMLLayoutTestCase"));
}
void tearDown()
@@ -141,7 +140,7 @@
root->addAppender(new FileAppender(xmlLayout, TEMP, false));
LOG4CXX_DEBUG(logger,
- _T("Message with embedded
<![CDATA[<hello>hi</hello>]]>."));
+ LOG4CXX_TEST_STR("Message with embedded
<![CDATA[<hello>hi</hello>]]>."));
XMLTimestampFilter xmlTimestampFilter;
XMLLineAttributeFilter xmlLineAttributeFilter;
@@ -173,8 +172,8 @@
XMLLayoutPtr xmlLayout = new XMLLayout();
root->addAppender(new FileAppender(xmlLayout, TEMP, false));
- LOG4CXX_DEBUG(logger, _T("hi"));
- LOG4CXX_DEBUG(logger, _T(""));
+ LOG4CXX_DEBUG(logger, LOG4CXX_TEST_STR("hi"));
+ LOG4CXX_DEBUG(logger, LOG4CXX_TEST_STR(""));
XMLTimestampFilter xmlTimestampFilter;
XMLThreadFilter xmlThreadFilter;
@@ -202,10 +201,10 @@
root->addAppender(new FileAppender(xmlLayout, TEMP, false));
MDC::clear();
- MDC::put(_T("key1"), _T("val1"));
- MDC::put(_T("key2"), _T("val2"));
+ MDC::put(LOG4CXX_TEST_STR("key1"), LOG4CXX_TEST_STR("val1"));
+ MDC::put(LOG4CXX_TEST_STR("key2"), LOG4CXX_TEST_STR("val2"));
- LOG4CXX_DEBUG(logger, _T("Hello"));
+ LOG4CXX_DEBUG(logger, LOG4CXX_TEST_STR("Hello"));
MDC::clear();
@@ -236,10 +235,10 @@
root->addAppender(new FileAppender(xmlLayout, TEMP, false));
MDC::clear();
- MDC::put(_T("blahAttribute"), _T("<blah value=\"blah\">"));
- MDC::put(_T("<blahKey value=\"blah\"/>"), _T("blahValue"));
+ 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, _T("Hello"));
+ LOG4CXX_DEBUG(logger, LOG4CXX_TEST_STR("Hello"));
MDC::clear();
