You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2008/01/28 20:01:46 UTC
svn commit: r616001 - in /logging/log4cxx/trunk/src/test/cpp:
fileappendertestcase.h helpers/charsetencodertestcase.cpp
helpers/inetaddresstestcase.cpp rolling/filenamepatterntestcase.cpp
xml/customleveltestcase.cpp
Author: carnold
Date: Mon Jan 28 11:01:44 2008
New Revision: 616001
URL: http://svn.apache.org/viewvc?rev=616001&view=rev
Log:
LOGCXX-225: Stray CPPUNIT references
Modified:
logging/log4cxx/trunk/src/test/cpp/fileappendertestcase.h
logging/log4cxx/trunk/src/test/cpp/helpers/charsetencodertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/helpers/inetaddresstestcase.cpp
logging/log4cxx/trunk/src/test/cpp/rolling/filenamepatterntestcase.cpp
logging/log4cxx/trunk/src/test/cpp/xml/customleveltestcase.cpp
Modified: logging/log4cxx/trunk/src/test/cpp/fileappendertestcase.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/fileappendertestcase.h?rev=616001&r1=616000&r2=616001&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/fileappendertestcase.h (original)
+++ logging/log4cxx/trunk/src/test/cpp/fileappendertestcase.h Mon Jan 28 11:01:44 2008
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-#include <cppunit/TestFixture.h>
#include <log4cxx/fileappender.h>
#include "writerappendertestcase.h"
Modified: logging/log4cxx/trunk/src/test/cpp/helpers/charsetencodertestcase.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/helpers/charsetencodertestcase.cpp?rev=616001&r1=616000&r2=616001&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/helpers/charsetencodertestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/helpers/charsetencodertestcase.cpp Mon Jan 28 11:01:44 2008
@@ -31,7 +31,7 @@
using namespace log4cxx::helpers;
-class CharsetEncoderTestCase : public CppUnit::TestFixture
+LOGUNIT_CLASS(CharsetEncoderTestCase)
{
LOGUNIT_TEST_SUITE(CharsetEncoderTestCase);
#if APR_HAS_THREADS
Modified: logging/log4cxx/trunk/src/test/cpp/helpers/inetaddresstestcase.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/helpers/inetaddresstestcase.cpp?rev=616001&r1=616000&r2=616001&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/helpers/inetaddresstestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/helpers/inetaddresstestcase.cpp Mon Jan 28 11:01:44 2008
@@ -22,7 +22,7 @@
using namespace log4cxx::helpers;
-class InetAddressTestCase : public CppUnit::TestFixture
+LOGUNIT_CLASS(InetAddressTestCase)
{
LOGUNIT_TEST_SUITE(InetAddressTestCase);
LOGUNIT_TEST(testGetLocalHost);
Modified: logging/log4cxx/trunk/src/test/cpp/rolling/filenamepatterntestcase.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/rolling/filenamepatterntestcase.cpp?rev=616001&r1=616000&r2=616001&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/rolling/filenamepatterntestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/rolling/filenamepatterntestcase.cpp Mon Jan 28 11:01:44 2008
@@ -39,7 +39,7 @@
* @author Curt Arnold
*
*/
-class FileNamePatternTestCase : public CppUnit::TestFixture {
+LOGUNIT_CLASS(FileNamePatternTestCase) {
LOGUNIT_TEST_SUITE(FileNamePatternTestCase);
LOGUNIT_TEST(testFormatInteger1);
LOGUNIT_TEST(testFormatInteger2);
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=616001&r1=616000&r2=616001&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/xml/customleveltestcase.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/xml/customleveltestcase.cpp Mon Jan 28 11:01:44 2008
@@ -39,12 +39,12 @@
LOGUNIT_CLASS(CustomLevelTestCase)
{
- CPPUNIT_TEST_SUITE(CustomLevelTestCase);
- CPPUNIT_TEST(test1);
- CPPUNIT_TEST(test2);
- CPPUNIT_TEST(test3);
- CPPUNIT_TEST(test4);
- CPPUNIT_TEST_SUITE_END();
+ LOGUNIT_TEST_SUITE(CustomLevelTestCase);
+ LOGUNIT_TEST(test1);
+ LOGUNIT_TEST(test2);
+ LOGUNIT_TEST(test3);
+ LOGUNIT_TEST(test4);
+ LOGUNIT_TEST_SUITE_END();
LoggerPtr root;
LoggerPtr logger;
@@ -72,7 +72,7 @@
DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/customLevel1.xml"));
common();
const File witness("witness/customLevel.1");
- CPPUNIT_ASSERT(Compare::compare(TEMP, witness));
+ LOGUNIT_ASSERT(Compare::compare(TEMP, witness));
}
void test2()
@@ -80,7 +80,7 @@
DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/customLevel2.xml"));
common();
const File witness("witness/customLevel.2");
- CPPUNIT_ASSERT(Compare::compare(TEMP, witness));
+ LOGUNIT_ASSERT(Compare::compare(TEMP, witness));
}
void test3()
@@ -88,7 +88,7 @@
DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/customLevel3.xml"));
common();
const File witness("witness/customLevel.3");
- CPPUNIT_ASSERT(Compare::compare(TEMP, witness));
+ LOGUNIT_ASSERT(Compare::compare(TEMP, witness));
}
void test4()
@@ -96,7 +96,7 @@
DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/customLevel4.xml"));
common();
const File witness("witness/customLevel.4");
- CPPUNIT_ASSERT(Compare::compare(TEMP, witness));
+ LOGUNIT_ASSERT(Compare::compare(TEMP, witness));
}
void common()
@@ -120,7 +120,7 @@
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION(CustomLevelTestCase);
+LOGUNIT_TEST_SUITE_REGISTRATION(CustomLevelTestCase);
const File CustomLevelTestCase::TEMP("output/temp");