Restore CFString code

apache · Aug 4, 2023 · 0101dba · 0101dba
1 parent aaf0ca6
commit 0101dba
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/src/main/include/log4cxx/logger.h b/src/main/include/log4cxx/logger.h
@@ -1608,7 +1608,7 @@ class LOG4CXX_EXPORT Logger :
 		void log(const LevelPtr& level, const CFStringRef& message,
 			const log4cxx::spi::LocationInfo& location) const;
 		/**
-		Add a new logging event containing \c message and \c location to the appenders attached to this logger if this logger is enabled for \c level events.
+		Add a new logging event containing \c message to the appenders attached to this logger if this logger is enabled for \c level events.
 		This is the most generic printing method. It is intended to be
 		invoked by <b>wrapper</b> classes.
 

diff --git a/src/test/cpp/helpers/messagebuffertest.cpp b/src/test/cpp/helpers/messagebuffertest.cpp
@@ -22,6 +22,10 @@
 #include <log4cxx/logstring.h>
 #include <log4cxx/helpers/loglog.h>
 
+#if LOG4CXX_CFSTRING_API
+	#include <CoreFoundation/CFString.h>
+#endif
+
 using namespace log4cxx;
 using namespace log4cxx::helpers;
 

diff --git a/src/test/cpp/leveltestcase.cpp b/src/test/cpp/leveltestcase.cpp
@@ -21,6 +21,10 @@
 #include "logunit.h"
 #include <log4cxx/helpers/loglog.h>
 
+#if LOG4CXX_CFSTRING_API
+	#include <CoreFoundation/CFString.h>
+#endif
+
 using namespace log4cxx;
 
 LOGUNIT_CLASS(LevelTestCase)
@@ -36,6 +40,9 @@ LOGUNIT_CLASS(LevelTestCase)
 #endif
 #if LOG4CXX_UNICHAR_API
 	LOGUNIT_TEST(testUniCharStringToTrace);
+#endif
+#if LOG4CXX_CFSTRING_API
+	LOGUNIT_TEST(testCFStringToTrace);
 #endif
 	LOGUNIT_TEST(testTrimmedToTrace);
 	LOGUNIT_TEST_SUITE_END();
@@ -115,6 +122,17 @@ LOGUNIT_CLASS(LevelTestCase)
 	}
 #endif
 
+#if LOG4CXX_CFSTRING_API
+	/**
+	 * Tests Level.toLevel(CFSTR("TRACE"));
+	 */
+	void testCFStringToTrace()
+	{
+		LevelPtr trace(Level::toLevel(CFSTR("TRACE")));
+		LOGUNIT_ASSERT(trace->toString() == LOG4CXX_STR("TRACE"));
+	}
+#endif
+
 	/**
 	 * Tests Level.toLevel("TRACE ");
 	 */

diff --git a/src/test/cpp/streamtestcase.cpp b/src/test/cpp/streamtestcase.cpp
@@ -32,6 +32,10 @@
 #include <log4cxx/stream.h>
 #include <log4cxx/helpers/loglog.h>
 
+#if LOG4CXX_CFSTRING_API
+	#include <CoreFoundation/CFString.h>
+#endif
+
 using namespace log4cxx;
 using namespace log4cxx::helpers;
 using namespace std;