Author: afester
Date: Thu May 4 12:56:47 2006
New Revision: 399843
URL: http://svn.apache.org/viewcvs?rev=399843&view=rev
Log:
LOGCXX-138: Use a different file name for the output of each test method
Modified:
logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp
Modified: logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp?rev=399843&r1=399842&r2=399843&view=diff
==============================================================================
--- logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp (original)
+++ logging/log4cxx/trunk/tests/src/xml/xmllayouttestcase.cpp Thu May 4
12:56:47 2006
@@ -83,8 +83,11 @@
void basic()
{
+ const LogString
tempFileName(LOG4CXX_STR("output/temp.xmlLayout.1"));
+ const File filteredFile("output/filtered.xmlLayout.1");
+
XMLLayoutPtr xmlLayout = new XMLLayout();
- AppenderPtr appender(new FileAppender(xmlLayout, TEMP, false));
+ AppenderPtr appender(new FileAppender(xmlLayout, tempFileName,
false));
root->addAppender(appender);
common();
@@ -97,7 +100,7 @@
try
{
- Transformer::transform(TEMP, FILTERED, filters);
+ Transformer::transform(tempFileName, filteredFile,
filters);
}
catch(UnexpectedFormatException& e)
{
@@ -105,14 +108,17 @@
throw;
}
- CPPUNIT_ASSERT(Compare::compare(FILTERED,
LOG4CXX_FILE("witness/xmlLayout.1")));
+ CPPUNIT_ASSERT(Compare::compare(filteredFile,
LOG4CXX_FILE("witness/xmlLayout.1")));
}
void locationInfo()
{
+ const LogString
tempFileName(LOG4CXX_STR("output/temp.xmlLayout.2"));
+ const File filteredFile("output/filtered.xmlLayout.2");
+
XMLLayoutPtr xmlLayout = new XMLLayout();
xmlLayout->setLocationInfo(true);
- root->addAppender(new FileAppender(xmlLayout, TEMP, false));
+ root->addAppender(new FileAppender(xmlLayout, tempFileName,
false));
common();
XMLTimestampFilter xmlTimestampFilter;
@@ -131,7 +137,7 @@
try
{
- Transformer::transform(TEMP, FILTERED, filters);
+ Transformer::transform(tempFileName, filteredFile,
filters);
}
catch(UnexpectedFormatException& e)
{
@@ -139,7 +145,7 @@
throw;
}
- CPPUNIT_ASSERT(Compare::compare(FILTERED,
LOG4CXX_FILE("witness/xmlLayout.2")));
+ CPPUNIT_ASSERT(Compare::compare(filteredFile,
LOG4CXX_FILE("witness/xmlLayout.2")));
}
#if _MSC_VER < 1300
@@ -149,9 +155,12 @@
void testCDATA()
{
+ const LogString
tempFileName(LOG4CXX_STR("output/temp.xmlLayout.3"));
+ const File filteredFile("output/filtered.xmlLayout.3");
+
XMLLayoutPtr xmlLayout = new XMLLayout();
xmlLayout->setLocationInfo(true);
- FileAppenderPtr appender(new FileAppender(xmlLayout, TEMP,
false));
+ FileAppenderPtr appender(new FileAppender(xmlLayout,
tempFileName, false));
root->addAppender(appender);
LOG4CXX_DEBUG(logger,
@@ -170,7 +179,7 @@
try
{
- Transformer::transform(TEMP, FILTERED, filters);
+ Transformer::transform(tempFileName, filteredFile,
filters);
}
catch(UnexpectedFormatException& e)
{
@@ -178,13 +187,16 @@
throw;
}
- CPPUNIT_ASSERT(Compare::compare(FILTERED,
LOG4CXX_FILE("witness/xmlLayout.3")));
+ CPPUNIT_ASSERT(Compare::compare(filteredFile,
LOG4CXX_FILE("witness/xmlLayout.3")));
}
void testNULL()
{
+ const LogString
tempFileName(LOG4CXX_STR("output/temp.xmlLayout.null"));
+ const File filteredFile("output/filtered.xmlLayout.null");
+
XMLLayoutPtr xmlLayout = new XMLLayout();
- FileAppenderPtr appender(new FileAppender(xmlLayout, TEMP,
false));
+ FileAppenderPtr appender(new FileAppender(xmlLayout,
tempFileName, false));
root->addAppender(appender);
LOG4CXX_DEBUG(logger, LOG4CXX_TEST_STR("hi"));
@@ -199,7 +211,7 @@
try
{
- Transformer::transform(TEMP, FILTERED, filters);
+ Transformer::transform(tempFileName, filteredFile,
filters);
}
catch(UnexpectedFormatException& e)
{
@@ -207,13 +219,16 @@
throw;
}
- CPPUNIT_ASSERT(Compare::compare(FILTERED,
LOG4CXX_FILE("witness/xmlLayout.null")));
+ CPPUNIT_ASSERT(Compare::compare(filteredFile,
LOG4CXX_FILE("witness/xmlLayout.null")));
}
void testMDC()
{
+ const LogString
tempFileName(LOG4CXX_STR("output/temp.xmlLayout.mdc.1"));
+ const File filteredFile("output/filtered.xmlLayout.mdc.1");
+
XMLLayoutPtr xmlLayout = new XMLLayout();
- FileAppenderPtr appender(new FileAppender(xmlLayout, TEMP,
false));
+ FileAppenderPtr appender(new FileAppender(xmlLayout,
tempFileName, false));
root->addAppender(appender);
MDC::clear();
@@ -233,7 +248,7 @@
try
{
- Transformer::transform(TEMP, FILTERED, filters);
+ Transformer::transform(tempFileName, filteredFile,
filters);
}
catch(UnexpectedFormatException& e)
{
@@ -241,14 +256,17 @@
throw;
}
- CPPUNIT_ASSERT(Compare::compare(FILTERED,
LOG4CXX_FILE("witness/xmlLayout.mdc.1")));
+ CPPUNIT_ASSERT(Compare::compare(filteredFile,
LOG4CXX_FILE("witness/xmlLayout.mdc.1")));
}
// not incuded in the tests for the moment !
void holdTestMDCEscaped()
{
+ const LogString
tempFileName(LOG4CXX_STR("output/temp.xmlLayout.mdc.2"));
+ const File filteredFile("output/filtered.xmlLayout.mdc.2");
+
XMLLayoutPtr xmlLayout = new XMLLayout();
- FileAppenderPtr appender(new FileAppender(xmlLayout, TEMP,
false));
+ FileAppenderPtr appender(new FileAppender(xmlLayout,
tempFileName, false));
root->addAppender(appender);
MDC::clear();
@@ -268,7 +286,7 @@
try
{
- Transformer::transform(TEMP, FILTERED, filters);
+ Transformer::transform(tempFileName, filteredFile,
filters);
}
catch(UnexpectedFormatException& e)
{
@@ -276,7 +294,7 @@
throw;
}
- CPPUNIT_ASSERT(Compare::compare(FILTERED,
LOG4CXX_FILE("witness/xmlLayout.mdc.2")));
+ CPPUNIT_ASSERT(Compare::compare(filteredFile,
LOG4CXX_FILE("witness/xmlLayout.mdc.2")));
}
@@ -308,12 +326,6 @@
LOG4CXX_FATAL(logger, msg + StringHelper::toString(++i, p));
LOG4CXX_FATAL(root, msg + StringHelper::toString(i, p));
}
- private:
- static const LogString TEMP;
- static const File FILTERED;
};
-
-const LogString XMLLayoutTestCase::TEMP(LOG4CXX_STR("output/temp"));
-const File XMLLayoutTestCase::FILTERED("output/filtered");
CPPUNIT_TEST_SUITE_REGISTRATION(XMLLayoutTestCase);
