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 2005/06/02 05:46:24 UTC
cvs commit: logging-log4cxx/tests/src/varia levelmatchfiltertestcase.cpp
carnold 2005/06/01 20:46:24
Modified: include/log4cxx/helpers date.h thread.h
src date.cpp loglog.cpp patternparser.cpp
simpledateformat.cpp thread.cpp
tests/input/rolling filter1.xml
tests/src vectorappender.cpp
tests/src/helpers charsetdecodertestcase.cpp
charsetencodertestcase.cpp
iso8601dateformattestcase.cpp
relativetimedateformattestcase.cpp
timezonetestcase.cpp
tests/src/net smtpappendertestcase.cpp
tests/src/nt nteventlogappendertestcase.cpp
tests/src/rolling filterbasedrollingtest.cpp
tests/src/varia levelmatchfiltertestcase.cpp
Log:
LOGCXX-52: Rolling Appender port, misc fixes
Revision Changes Path
1.3 +10 -1 logging-log4cxx/include/log4cxx/helpers/date.h
Index: date.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/date.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- date.h 1 Jun 2005 20:40:25 -0000 1.2
+++ date.h 2 Jun 2005 03:46:23 -0000 1.3
@@ -44,7 +44,16 @@
inline log4cxx_time_t getTime() const {
return time;
- }
+ }
+
+ /**
+ * Get start of next second
+ */
+ log4cxx_time_t getNextSecond() const;
+
+
+ static log4cxx_time_t getMicrosecondsPerDay();
+ static log4cxx_time_t getMicrosecondsPerSecond();
};
1.29 +3 -1 logging-log4cxx/include/log4cxx/helpers/thread.h
Index: thread.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/thread.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- thread.h 4 May 2005 16:13:40 -0000 1.28
+++ thread.h 2 Jun 2005 03:46:23 -0000 1.29
@@ -51,7 +51,9 @@
// immediate exit from the start method
void ending();
- inline bool isActive() { return thread != 0; }
+ inline bool isActive() { return thread != 0; }
+
+ static void sleep(log4cxx_time_t duration);
private:
log4cxx_thread_t* thread;
1.3 +16 -3 logging-log4cxx/src/date.cpp
Index: date.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/date.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- date.cpp 1 Jun 2005 20:40:26 -0000 1.2
+++ date.cpp 2 Jun 2005 03:46:23 -0000 1.3
@@ -15,18 +15,31 @@
*/
#include <log4cxx/helpers/date.h>
-
+#include <apr_time.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
IMPLEMENT_LOG4CXX_OBJECT(Date)
-Date::Date() : time(0) {
+Date::Date() : time(apr_time_now()) {
}
Date::Date(log4cxx_time_t t) : time(t) {
}
Date::~Date() {
-}
+}
+
+log4cxx_time_t Date::getMicrosecondsPerDay() {
+ return APR_INT64_C(86400000000);
+}
+
+log4cxx_time_t Date::getMicrosecondsPerSecond() {
+ return APR_USEC_PER_SEC;
+}
+
+
+log4cxx_time_t Date::getNextSecond() const {
+ return ((time / APR_USEC_PER_SEC) + 1) * APR_USEC_PER_SEC;
+}
\ No newline at end of file
1.16 +1 -1 logging-log4cxx/src/loglog.cpp
Index: loglog.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/loglog.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- loglog.cpp 7 May 2005 15:12:15 -0000 1.15
+++ loglog.cpp 2 Jun 2005 03:46:23 -0000 1.16
@@ -85,7 +85,7 @@
#if LOG4CXX_HAS_WCHAR_T
void LogLog::emit(const std::wstring& msg) {
#if LOG4CXX_HAS_STD_WCOUT
- std::wcerr << "log4cxx: " << msg << std::endl;
+ std::wcerr << L"log4cxx: " << msg << std::endl;
#else
LOG4CXX_ENCODE_CHAR(encoded, msg);
std::cerr << "log4cxx: " << encoded << std::endl;
1.37 +57 -49 logging-log4cxx/src/patternparser.cpp
Index: patternparser.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/patternparser.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- patternparser.cpp 1 Jun 2005 20:40:26 -0000 1.36
+++ patternparser.cpp 2 Jun 2005 03:46:23 -0000 1.37
@@ -55,8 +55,10 @@
int PatternParser::extractConverter(
logchar lastChar, const LogString& pattern,
int i, LogString& convBuf,
- LogString& currentLiteral) {
- convBuf.erase(convBuf.begin(), convBuf.end());
+ LogString& currentLiteral) {
+ if (!convBuf.empty()) {
+ convBuf.erase(convBuf.begin(), convBuf.end());
+ }
// When this method is called, lastChar points to the first character of the
// conversion word. For example:
@@ -138,13 +140,13 @@
default:
- if (currentLiteral.length() != 0) {
+ if (!currentLiteral.empty()) {
patternConverters.push_back(
LiteralPatternConverter::newInstance(currentLiteral));
- formattingInfos.push_back(FormattingInfo::getDefault());
+ formattingInfos.push_back(FormattingInfo::getDefault());
+ currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
}
-
- currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
+
currentLiteral.append(1, c); // append %
state = CONVERTER_STATE;
formattingInfo = FormattingInfo::getDefault();
@@ -187,8 +189,10 @@
// Next pattern is assumed to be a literal.
state = LITERAL_STATE;
- formattingInfo = FormattingInfo::getDefault();
- currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
+ formattingInfo = FormattingInfo::getDefault();
+ if (!currentLiteral.empty()) {
+ currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
+ }
}
} // switch
@@ -210,8 +214,10 @@
c, pattern, i, currentLiteral, formattingInfo,
rules, patternConverters, formattingInfos);
state = LITERAL_STATE;
- formattingInfo = FormattingInfo::getDefault();
- currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
+ formattingInfo = FormattingInfo::getDefault();
+ if (!currentLiteral.empty()) {
+ currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
+ }
}
break;
@@ -246,8 +252,10 @@
c, pattern, i, currentLiteral, formattingInfo,
rules, patternConverters, formattingInfos);
state = LITERAL_STATE;
- formattingInfo = FormattingInfo::getDefault();
- currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
+ formattingInfo = FormattingInfo::getDefault();
+ if (!currentLiteral.empty()) {
+ currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
+ }
}
break;
@@ -294,45 +302,45 @@
std::vector<PatternConverterPtr>& patternConverters,
std::vector<FormattingInfoPtr>& formattingInfos) {
LogString convBuf;
- i = extractConverter(c, pattern, i, convBuf, currentLiteral);
-
- LogString converterId(convBuf);
-
- std::vector<LogString> options;
- i = extractOptions(pattern, i, options);
-
- PatternConverterPtr pc(
- createConverter(
- converterId, currentLiteral, rules, options));
-
- if (pc == NULL) {
- LogString msg;
-
- if (converterId.length() == 0) {
- msg = LOG4CXX_STR("Empty conversion specifier starting at position ");
- } else {
- msg = LOG4CXX_STR("Unrecognized conversion specifier [");
- msg.append(converterId);
- msg.append(LOG4CXX_STR("] in conversion pattern."));
- }
+ i = extractConverter(c, pattern, i, convBuf, currentLiteral);
+ if (convBuf.empty()) {
+ LogLog::error(LOG4CXX_STR("Empty conversion specifier"));
+ patternConverters.push_back(
+ LiteralPatternConverter::newInstance(currentLiteral));
+ formattingInfos.push_back(FormattingInfo::getDefault());
+ } else {
+ LogString converterId(convBuf);
+
+ std::vector<LogString> options;
+ i = extractOptions(pattern, i, options);
+
+ PatternConverterPtr pc(
+ createConverter(
+ converterId, currentLiteral, rules, options));
+
+ if (pc == NULL) {
+ LogString msg(LOG4CXX_STR("Unrecognized conversion specifier ["));
+ msg.append(converterId);
+ msg.append(LOG4CXX_STR("] in conversion pattern."));
+ LogLog::error(msg);
+ patternConverters.push_back(
+ LiteralPatternConverter::newInstance(currentLiteral));
+ formattingInfos.push_back(FormattingInfo::getDefault());
+ } else {
+ patternConverters.push_back(pc);
+ formattingInfos.push_back(formattingInfo);
- LogLog::error(msg);
-
- patternConverters.push_back(
- LiteralPatternConverter::newInstance(currentLiteral));
- formattingInfos.push_back(FormattingInfo::getDefault());
- } else {
- patternConverters.push_back(pc);
- formattingInfos.push_back(formattingInfo);
-
- if (currentLiteral.length() > 0) {
- patternConverters.push_back(
- LiteralPatternConverter::newInstance(currentLiteral));
- formattingInfos.push_back(FormattingInfo::getDefault());
- }
+ if (currentLiteral.length() > 0) {
+ patternConverters.push_back(
+ LiteralPatternConverter::newInstance(currentLiteral));
+ formattingInfos.push_back(FormattingInfo::getDefault());
+ }
+ }
+ }
+
+ if (!currentLiteral.empty()) {
+ currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
}
-
- currentLiteral.erase(currentLiteral.begin(), currentLiteral.end());
return i;
}
1.20 +1 -1 logging-log4cxx/src/simpledateformat.cpp
Index: simpledateformat.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/simpledateformat.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- simpledateformat.cpp 1 Jun 2005 21:29:18 -0000 1.19
+++ simpledateformat.cpp 2 Jun 2005 03:46:23 -0000 1.20
@@ -200,7 +200,7 @@
if ( locale != NULL )
{
tm time;
- memset( & time, sizeof( time ), 0 );
+ memset( & time, 0, sizeof( time ));
std::basic_ostringstream < localechar > buffer;
size_t start = 0;
for ( int imon = 0; imon < 12; imon++ )
1.28 +5 -0 logging-log4cxx/src/thread.cpp
Index: thread.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/thread.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- thread.cpp 11 Apr 2005 04:36:35 -0000 1.27
+++ thread.cpp 2 Jun 2005 03:46:23 -0000 1.28
@@ -77,3 +77,8 @@
void Thread::ending() {
finished = true;
}
+
+
+void Thread::sleep(log4cxx_time_t duration) {
+ apr_sleep(duration);
+}
\ No newline at end of file
1.2 +0 -1 logging-log4cxx/tests/input/rolling/filter1.xml
Index: filter1.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/input/rolling/filter1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filter1.xml 1 Jun 2005 18:40:27 -0000 1.1
+++ filter1.xml 2 Jun 2005 03:46:23 -0000 1.2
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration>
<log4j:configuration xmlns:log4j='http://logging.apache.org/' debug="true">
1.8 +2 -2 logging-log4cxx/tests/src/vectorappender.cpp
Index: vectorappender.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/vectorappender.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vectorappender.cpp 15 Feb 2005 23:56:03 -0000 1.7
+++ vectorappender.cpp 2 Jun 2005 03:46:23 -0000 1.8
@@ -15,7 +15,7 @@
*/
#include "vectorappender.h"
-#include <apr_time.h>
+#include <log4cxx/helpers/thread.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
@@ -26,7 +26,7 @@
{
try
{
- apr_sleep(5000);
+ Thread::sleep(5000);
}
catch (Exception&)
{
1.3 +5 -2 logging-log4cxx/tests/src/helpers/charsetdecodertestcase.cpp
Index: charsetdecodertestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/helpers/charsetdecodertestcase.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- charsetdecodertestcase.cpp 22 Apr 2005 05:27:22 -0000 1.2
+++ charsetdecodertestcase.cpp 2 Jun 2005 03:46:23 -0000 1.3
@@ -20,10 +20,13 @@
#include <log4cxx/helpers/charsetdecoder.h>
#include "../insertwide.h"
#include <log4cxx/helpers/bytebuffer.h>
-#include <apr_xlate.h>
using namespace log4cxx;
-using namespace log4cxx::helpers;
+using namespace log4cxx::helpers;
+
+
+#define APR_SUCCESS ((log4cxx_status_t) 0)
+
class CharsetDecoderTestCase : public CppUnit::TestFixture
1.3 +3 -2 logging-log4cxx/tests/src/helpers/charsetencodertestcase.cpp
Index: charsetencodertestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/helpers/charsetencodertestcase.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- charsetencodertestcase.cpp 22 Apr 2005 05:27:22 -0000 1.2
+++ charsetencodertestcase.cpp 2 Jun 2005 03:46:23 -0000 1.3
@@ -20,10 +20,11 @@
#include <log4cxx/helpers/charsetencoder.h>
#include "../insertwide.h"
#include <log4cxx/helpers/bytebuffer.h>
-#include <apr_xlate.h>
using namespace log4cxx;
-using namespace log4cxx::helpers;
+using namespace log4cxx::helpers;
+
+#define APR_SUCCESS ((log4cxx_status_t) 0)
class CharsetEncoderTestCase : public CppUnit::TestFixture
1.6 +9 -14 logging-log4cxx/tests/src/helpers/iso8601dateformattestcase.cpp
Index: iso8601dateformattestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/helpers/iso8601dateformattestcase.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iso8601dateformattestcase.cpp 11 Dec 2004 04:53:29 -0000 1.5
+++ iso8601dateformattestcase.cpp 2 Jun 2005 03:46:23 -0000 1.6
@@ -16,15 +16,11 @@
#include <log4cxx/helpers/iso8601dateformat.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <apr_time.h>
#include <locale>
#include "../insertwide.h"
-#include <log4cxx/helpers/pool.h>
+#include <log4cxx/helpers/pool.h>
+#include <log4cxx/helpers/date.h>
-//Define INT64_C for compilers that don't have it
-#if (!defined(INT64_C))
-#define INT64_C(value) value ## LL
-#endif
using namespace log4cxx;
@@ -54,7 +50,7 @@
* @param timeZone TimeZone timezone for conversion
* @param expected String expected string
*/
- void assertFormattedTime(apr_time_t date,
+ void assertFormattedTime(log4cxx_time_t date,
const TimeZonePtr& timeZone,
const LogString& expected) {
ISO8601DateFormat formatter;
@@ -65,14 +61,13 @@
CPPUNIT_ASSERT_EQUAL(expected, actual);
}
-#define MICROSECONDS_PER_DAY APR_INT64_C(86400000000)
public:
/**
* Convert 02 Jan 2004 00:00:00 GMT for GMT.
*/
void test1() {
- apr_time_t jan2 = MICROSECONDS_PER_DAY * 12419;
+ log4cxx_time_t jan2 = Date::getMicrosecondsPerDay() * 12419;
assertFormattedTime(jan2, TimeZone::getGMT(),
LOG4CXX_STR("2004-01-02 00:00:00,000"));
}
@@ -85,7 +80,7 @@
// 03 Jan 2004 00:00 GMT
// (asking for the same time at a different timezone
// will ignore the change of timezone)
- apr_time_t jan3 = MICROSECONDS_PER_DAY * 12420;
+ log4cxx_time_t jan3 = Date::getMicrosecondsPerDay() * 12420;
assertFormattedTime(jan3, TimeZone::getTimeZone(LOG4CXX_STR("GMT-6")),
LOG4CXX_STR("2004-01-02 18:00:00,000"));
}
@@ -95,7 +90,7 @@
* Convert 30 Jun 2004 00:00:00 GMT for GMT.
*/
void test3() {
- apr_time_t jun30 = MICROSECONDS_PER_DAY * 12599;
+ log4cxx_time_t jun30 = Date::getMicrosecondsPerDay() * 12599;
assertFormattedTime(jun30, TimeZone::getGMT(),
LOG4CXX_STR("2004-06-30 00:00:00,000"));
}
@@ -104,7 +99,7 @@
* Convert 1 Jul 2004 00:00:00 GMT for Chicago, daylight savings in effect.
*/
void test4() {
- apr_time_t jul1 = MICROSECONDS_PER_DAY * 12600;
+ log4cxx_time_t jul1 = Date::getMicrosecondsPerDay() * 12600;
assertFormattedTime(jul1, TimeZone::getTimeZone(LOG4CXX_STR("GMT-5")),
LOG4CXX_STR("2004-06-30 19:00:00,000"));
}
@@ -116,7 +111,7 @@
// subsequent calls within one minute
// are optimized to reuse previous formatted value
// make a couple of nearly spaced calls
- apr_time_t ticks = MICROSECONDS_PER_DAY * 12601;
+ log4cxx_time_t ticks = Date::getMicrosecondsPerDay() * 12601;
assertFormattedTime(ticks, TimeZone::getGMT(),
LOG4CXX_STR("2004-07-02 00:00:00,000"));
assertFormattedTime(ticks + 8000, TimeZone::getGMT(),
@@ -134,7 +129,7 @@
* This test would fail for revision 1.4 of DateTimeDateFormat.java.
*/
void test6() {
- apr_time_t jul3 = MICROSECONDS_PER_DAY * 12602;
+ log4cxx_time_t jul3 = Date::getMicrosecondsPerDay() * 12602;
assertFormattedTime(jul3, TimeZone::getGMT(),
LOG4CXX_STR("2004-07-03 00:00:00,000"));
assertFormattedTime(jul3, TimeZone::getTimeZone(LOG4CXX_STR("GMT-5")),
1.9 +5 -11 logging-log4cxx/tests/src/helpers/relativetimedateformattestcase.cpp
Index: relativetimedateformattestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/helpers/relativetimedateformattestcase.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- relativetimedateformattestcase.cpp 15 Feb 2005 23:56:04 -0000 1.8
+++ relativetimedateformattestcase.cpp 2 Jun 2005 03:46:23 -0000 1.9
@@ -19,15 +19,10 @@
#include <log4cxx/spi/loggingevent.h>
#include <cppunit/extensions/HelperMacros.h>
#include <log4cxx/helpers/pool.h>
-#include <apr_strings.h>
#include <log4cxx/helpers/stringhelper.h>
-#include "../insertwide.h"
-#include <apr_time.h>
+#include "../insertwide.h"
+#include <log4cxx/helpers/date.h>
-//Define INT64_C for compilers that don't have it
-#if (!defined(INT64_C))
-#define INT64_C(value) value ## LL
-#endif
using namespace log4cxx;
@@ -46,7 +41,6 @@
CPPUNIT_TEST(test3);
CPPUNIT_TEST_SUITE_END();
-#define MICROSECONDS_PER_DAY APR_INT64_C(86400000000)
public:
@@ -54,8 +48,8 @@
* Convert 2 Jan 2004
*/
void test1() {
- apr_time_t jan2 = MICROSECONDS_PER_DAY * 12419;
- apr_time_t preStartTime = LoggingEvent::getStartTime();
+ log4cxx_time_t jan2 = Date::getMicrosecondsPerDay() * 12419;
+ log4cxx_time_t preStartTime = LoggingEvent::getStartTime();
RelativeTimeDateFormat formatter;
@@ -65,7 +59,7 @@
formatter.format(actual, jan2, p);
- apr_time_t elapsed = log4cxx::helpers::StringHelper::toInt64(actual);
+ log4cxx_time_t elapsed = log4cxx::helpers::StringHelper::toInt64(actual);
CPPUNIT_ASSERT(preStartTime + elapsed*1000 > jan2 - 2000);
1.9 +1 -2 logging-log4cxx/tests/src/helpers/timezonetestcase.cpp
Index: timezonetestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/helpers/timezonetestcase.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- timezonetestcase.cpp 1 Mar 2005 23:30:45 -0000 1.8
+++ timezonetestcase.cpp 2 Jun 2005 03:46:23 -0000 1.9
@@ -16,9 +16,8 @@
#include <log4cxx/helpers/timezone.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <apr_pools.h>
-#include <apr_time.h>
#include "../insertwide.h"
+#include <apr_time.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
1.5 +1 -1 logging-log4cxx/tests/src/net/smtpappendertestcase.cpp
Index: smtpappendertestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/net/smtpappendertestcase.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- smtpappendertestcase.cpp 7 May 2005 15:12:16 -0000 1.4
+++ smtpappendertestcase.cpp 2 Jun 2005 03:46:23 -0000 1.5
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#if LOG4CXX_HAVE_SMTP
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
@@ -23,7 +24,6 @@
#define LOG4CXX_TEST 1
#include <log4cxx/private/log4cxx_private.h>
-#if LOG4CXX_HAVE_SMTP
using namespace log4cxx;
using namespace log4cxx::helpers;
1.7 +5 -4 logging-log4cxx/tests/src/nt/nteventlogappendertestcase.cpp
Index: nteventlogappendertestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/nt/nteventlogappendertestcase.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nteventlogappendertestcase.cpp 11 Apr 2005 04:36:35 -0000 1.6
+++ nteventlogappendertestcase.cpp 2 Jun 2005 03:46:23 -0000 1.7
@@ -19,12 +19,12 @@
#include <cppunit/extensions/HelperMacros.h>
#include <log4cxx/nt/nteventlogappender.h>
#include "../appenderskeletontestcase.h"
-#include <apr_time.h>
#include "windows.h"
#include <log4cxx/logger.h>
#include <log4cxx/spi/loggingevent.h>
#include <log4cxx/patternlayout.h>
-#include "../insertwide.h"
+#include "../insertwide.h"
+#include <log4cxx/helpers/date.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
@@ -66,8 +66,9 @@
}
- Pool p;
- DWORD expectedTime = apr_time_sec(apr_time_now());
+ Pool p;
+ Date now;
+ DWORD expectedTime = now.getTime() / Date::getMicrosecondsPerSecond();
{
NTEventLogAppenderPtr appender(new NTEventLogAppender());
appender->setSource(LOG4CXX_STR("log4cxx_test"));
1.2 +0 -2 logging-log4cxx/tests/src/rolling/filterbasedrollingtest.cpp
Index: filterbasedrollingtest.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/rolling/filterbasedrollingtest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filterbasedrollingtest.cpp 1 Jun 2005 18:40:27 -0000 1.1
+++ filterbasedrollingtest.cpp 2 Jun 2005 03:46:23 -0000 1.2
@@ -19,7 +19,6 @@
#include "../util/compare.h"
#include "../insertwide.h"
-#include <apr_time.h>
#include <log4cxx/logmanager.h>
#include <log4cxx/xml/domconfigurator.h>
#include <log4cxx/patternlayout.h>
@@ -110,7 +109,6 @@
// Write exactly 10 bytes with each log
for (int i = 0; i < 25; i++) {
-// Thread.sleep(100);
char msg[10];
strcpy(msg, "Hello---?");
1.12 +0 -1 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- levelmatchfiltertestcase.cpp 1 Jun 2005 18:40:28 -0000 1.11
+++ levelmatchfiltertestcase.cpp 2 Jun 2005 03:46:24 -0000 1.12
@@ -24,7 +24,6 @@
#include <log4cxx/filter/levelmatchfilter.h>
#include <log4cxx/filter/denyallfilter.h>
#include <log4cxx/helpers/pool.h>
-#include <apr_strings.h>
#include <log4cxx/helpers/transcoder.h>
#include <log4cxx/helpers/stringhelper.h>
#include <log4cxx/spi/loggerrepository.h>