svn commit: r798413 - in /incubator/log4php/trunk/src: changes/changes.xml test/php/configurators/LoggerConfiguratorBasicTest.php

[grobmeier]

Author: grobmeier
Date: Tue Jul 28 06:00:12 2009
New Revision: 798413

URL: http://svn.apache.org/viewvc?rev=798413&view=rev
Log:
LOG4PHP-66 LoggerConfiguratorBasicTest fails in "mvn test" but not in phpunit 
(patch from Christian Hammers)

Modified:
    incubator/log4php/trunk/src/changes/changes.xml
    
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php

Modified: incubator/log4php/trunk/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/changes/changes.xml?rev=798413&r1=798412&r2=798413&view=diff
==============================================================================
--- incubator/log4php/trunk/src/changes/changes.xml (original)
+++ incubator/log4php/trunk/src/changes/changes.xml Tue Jul 28 06:00:12 2009
@@ -64,6 +64,7 @@
                <action type="update" issue="LOG4PHP-62">Does not print warning 
if ini file is corrupt (Christian Hammers)</action>
                <action type="update" issue="LOG4PHP-63">PDOAppender should 
throw LoggerException on database problems (Christian Hammers)</action>
                <action type="fix" issue="LOG4PHP-64">Remove deprecated 
call-by-reference in LoggerLayoutPattern (Christian Hammers)</action>
+               <action type="fix" 
issue="LOG4PHP-66">LoggerConfiguratorBasicTest fails in "mvn test" but not in 
phpunit (Christian Hammers)</action>
                <action type="update">Initial port to PHP 5 (Knut 
Urdalen)</action>
                <action type="update">Established new unit test suite (Knut 
Urdalen)</action>
                <action type="update">Added a range of examples (Knut 
Urdalen)</action>

Modified: 
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php
URL: 
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php?rev=798413&r1=798412&r2=798413&view=diff
==============================================================================
--- 
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php
 (original)
+++ 
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php
 Tue Jul 28 06:00:12 2009
@@ -26,7 +26,7 @@
 class LoggerConfiguratorBasicTest extends PHPUnit_Framework_TestCase {
         
        protected function setUp() {
-               LoggerConfiguratorBasic::configure();
+           LoggerConfiguratorBasic::configure();
        }
         
        protected function tearDown() {
@@ -47,10 +47,18 @@
                self::assertType('LoggerAppenderConsole', $appender);
                $layout = $appender->getLayout();
                self::assertType('LoggerLayoutTTCC', $layout);
-
+               
+               // As PHPUnit runs all tests in one run, there might be some 
loggers left over
+               // from previous runs. ResetConfiguration() only clears the 
appenders, it does
+               // not remove the categories!
                LoggerConfiguratorBasic::resetConfiguration();
                $hierarchy = LoggerHierarchy::singleton();
-               
+        foreach ($hierarchy->getCurrentLoggers() as $logger) {
+            self::assertEquals(0, count($logger->getAllAppenders()));
+        }              
+
+        // This on the other hand really removes the categories:
+        $hierarchy->clear(); 
                self::assertEquals(0, count($hierarchy->getCurrentLoggers()));
                self::assertEquals(0, count($hierarchy->getCurrentLoggers()));
        }