Merge.

Author: wilx

tests/appender_test/main.cxx

@@ -117,8 +117,8 @@ main()
             // Test appender's error handling for wrong layout.
 
             {
-                std::istringstream propsStream (
-                    "layout=log4cplus::WrongLayout");
+                tistringstream propsStream (
+                    LOG4CPLUS_TEXT ("layout=log4cplus::WrongLayout"));
                 Properties props (propsStream);
                 SharedObjectPtr<Appender> append (
                     new ConsoleAppender (props));
@@ -128,8 +128,8 @@ main()
             // Test threshold parsing.
 
             {
-                std::istringstream propsStream (
-                    "Threshold=ERROR");
+                tistringstream propsStream (
+                    LOG4CPLUS_TEXT ("Threshold=ERROR"));
                 Properties props (propsStream);
                 SharedObjectPtr<Appender> append (
                     new ConsoleAppender (props));
@@ -139,8 +139,8 @@ main()
             // Test threshold parsing of wrong log level.
 
             {
-                std::istringstream propsStream (
-                    "Threshold=WRONG");
+                tistringstream propsStream (
+                    LOG4CPLUS_TEXT ("Threshold=WRONG"));
                 Properties props (propsStream);
                 SharedObjectPtr<Appender> append (
                     new ConsoleAppender (props));
@@ -150,8 +150,8 @@ main()
             // Test wrong filter parsing.
 
             {
-                std::istringstream propsStream (
-                    "filters.1=log4cplus::spi::WrongFilter");
+                tistringstream propsStream (
+                    LOG4CPLUS_TEXT ("filters.1=log4cplus::spi::WrongFilter"));
                 Properties props (propsStream);
                 SharedObjectPtr<Appender> append (
                     new ConsoleAppender (props));

tests/fileappender_test/main.cxx

@@ -35,14 +35,15 @@ main()
     }
 
     {
-        std::istringstream propsStream ("File=");
+        tistringstream propsStream (LOG4CPLUS_TEXT ("File="));
         helpers::Properties props (propsStream);
         FileAppender appender (props);
         appender.setName (LOG4CPLUS_TEXT ("Second"));
     }
 
     {
-        std::istringstream propsStream ("File=nonexistent/Test.log");
+        tistringstream propsStream (
+            LOG4CPLUS_TEXT("File=nonexistent/Test.log"));
         helpers::Properties props (propsStream);
         FileAppender appender (props);
         appender.setName (LOG4CPLUS_TEXT ("Third"));

tests/propertyconfig_test/main.cxx

@@ -31,7 +31,8 @@ main()
 
         // Test that DOS EOLs in property files get removed.
 #define TEST_TEXT LOG4CPLUS_TEXT ("this is a test with DOS EOL-->")
-        tistringstream propsStream ("text=" TEST_TEXT "\r\n");
+        tistringstream propsStream (
+            LOG4CPLUS_TEXT ("text=") TEST_TEXT LOG4CPLUS_TEXT ("\r\n"));
         Properties props (propsStream);
         LOG4CPLUS_ASSERT (root,
             props.getProperty (LOG4CPLUS_TEXT ("text")) == TEST_TEXT);