Merge.

Author: wilx

tests/appender_test/main.cxx

@@ -47,7 +47,8 @@ main()
     {
         AppenderAttachableImpl aai;
         try {
-            SharedObjectPtr<Appender> append_1(new ConsoleAppender());
+            SharedObjectPtr<Appender> append_1(
+                new ConsoleAppender(false, true));
             append_1->setName(LOG4CPLUS_TEXT("First"));
 
             SharedObjectPtr<Appender> append_2(new ConsoleAppender());

tests/propertyconfig_test/main.cxx

@@ -19,24 +19,23 @@ main()
     LogLog::getLogLog()->setInternalDebugging(true);
     Logger root = Logger::getRoot();
     try {
-        PropertyConfigurator::doConfigure(LOG4CPLUS_TEXT("log4cplus.properties"));
+        PropertyConfigurator::doConfigure(
+            LOG4CPLUS_TEXT("log4cplus.properties"));
         Logger fileCat = Logger::getInstance(LOG4CPLUS_TEXT("filelogger"));
 
 	LOG4CPLUS_WARN(root, LOG4CPLUS_TEXT("Testing...."));
-
 	LOG4CPLUS_WARN(root, LOG4CPLUS_TEXT("Writing messages to log...."));
-        for(int i=0; i<10000; ++i) {
-	    LOG4CPLUS_WARN(fileCat, LOG4CPLUS_TEXT("This is a WARNING...") << i);
-        }
+        for (int i=0; i<10000; ++i)
+	    LOG4CPLUS_WARN(fileCat, LOG4CPLUS_TEXT("This is a WARNING...")
+                << i);
 
         // Test that DOS EOLs in property files get removed.
-
 #define TEST_TEXT LOG4CPLUS_TEXT ("this is a test with DOS EOL-->")
         tistringstream propsStream (
             LOG4CPLUS_TEXT ("text=") TEST_TEXT LOG4CPLUS_TEXT ("\r\n"));
         Properties props (propsStream);
-        if (props.getProperty (LOG4CPLUS_TEXT ("text")) != TEST_TEXT)
-            LOG4CPLUS_ERROR (root, LOG4CPLUS_TEXT ("DOS EOLs test has failed"));
+        LOG4CPLUS_ASSERT (root,
+            props.getProperty (LOG4CPLUS_TEXT ("text")) == TEST_TEXT);
     }
     catch(...) {
         tcout << LOG4CPLUS_TEXT("Exception...") << endl;