You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rm...@apache.org on 2022/01/15 19:23:17 UTC
[logging-log4cxx] branch next_stable updated (60a9812 -> f169b32)
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a change to branch next_stable
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git.
from 60a9812 Merge branch 'master' into next_stable
add 94f57db Fix NPE when attempting to cast a null pointer (#101)
add 64a106b always upload compatibility report
add 8988e3e LOGCXX-102 Parse rolling file appender options from properties file (#100)
new f169b32 Merge branch 'master' into next_stable
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/abi-compatibility.yml | 4 +-
src/main/cpp/propertyconfigurator.cpp | 37 +++++++++-
src/main/include/log4cxx/helpers/object.h | 7 +-
.../include/log4cxx/rolling/rollingfileappender.h | 2 +-
src/test/cpp/helpers/casttestcase.cpp | 10 +++
src/test/cpp/rolling/CMakeLists.txt | 1 +
.../rolling/rollingfileappenderpropertiestest.cpp | 85 ++++++++++++++++++++++
...> rollingFileAppenderFromProperties.properties} | 18 +++--
8 files changed, 150 insertions(+), 14 deletions(-)
create mode 100644 src/test/cpp/rolling/rollingfileappenderpropertiestest.cpp
copy src/test/resources/input/rolling/{obsoleteERFA1.properties => rollingFileAppenderFromProperties.properties} (64%)
[logging-log4cxx] 01/01: Merge branch 'master' into next_stable
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch next_stable
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit f169b32f8d83a0f96e5d7ea1b6dad3bf6bb12eb3
Merge: 60a9812 8988e3e
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Sat Jan 15 14:21:23 2022 -0500
Merge branch 'master' into next_stable
.github/workflows/abi-compatibility.yml | 4 +-
src/main/cpp/propertyconfigurator.cpp | 37 +++++++++-
src/main/include/log4cxx/helpers/object.h | 7 +-
.../include/log4cxx/rolling/rollingfileappender.h | 2 +-
src/test/cpp/helpers/casttestcase.cpp | 10 +++
src/test/cpp/rolling/CMakeLists.txt | 1 +
.../rolling/rollingfileappenderpropertiestest.cpp | 85 ++++++++++++++++++++++
.../rollingFileAppenderFromProperties.properties | 30 ++++++++
8 files changed, 170 insertions(+), 6 deletions(-)
diff --cc src/test/cpp/helpers/casttestcase.cpp
index 7cd1874,4d2e5ab..53e6de5
--- a/src/test/cpp/helpers/casttestcase.cpp
+++ b/src/test/cpp/helpers/casttestcase.cpp
@@@ -34,7 -33,7 +34,8 @@@ LOGUNIT_CLASS(CastTestCase
LOGUNIT_TEST_SUITE( CastTestCase );
LOGUNIT_TEST(testGoodCast);
LOGUNIT_TEST(testBadCast);
+ LOGUNIT_TEST(testNullParameter);
+ LOGUNIT_TEST(testRollingFileAppender);
LOGUNIT_TEST_SUITE_END();
public:
@@@ -60,15 -59,15 +61,24 @@@
LOGUNIT_ASSERT(!fos);
}
+ void testNullParameter()
+ {
+ OutputStreamPtr out = nullptr;
+
+ FileOutputStreamPtr fos = log4cxx::cast<FileOutputStream>(out);
+
+ LOGUNIT_ASSERT(!fos);
+ }
+
+ void testRollingFileAppender()
+ {
+ rolling::RollingFileAppenderPtr rolling = rolling::RollingFileAppenderPtr(new rolling::RollingFileAppender());
+
+ AppenderPtr appender = log4cxx::cast<Appender>(rolling);
+
+ LOGUNIT_ASSERT(appender);
+ }
+
};
LOGUNIT_TEST_SUITE_REGISTRATION(CastTestCase);
diff --cc src/test/cpp/rolling/CMakeLists.txt
index e8ea189,81242fd..f892b8b
--- a/src/test/cpp/rolling/CMakeLists.txt
+++ b/src/test/cpp/rolling/CMakeLists.txt
@@@ -20,8 -20,11 +20,9 @@@ set(ROLLING_TEST
filenamepatterntestcase
filterbasedrollingtest
manualrollingtest
- obsoletedailyrollingfileappendertest
- obsoleterollingfileappendertest
sizebasedrollingtest
timebasedrollingtest
+ rollingfileappenderpropertiestest
)
foreach(fileName IN LISTS ROLLING_TESTS)
add_executable(${fileName} "${fileName}.cpp")