svn commit: r771742 - in /incubator/log4php/trunk/src: main/php/configurators/ test/php/ test/php/configurators/ test/php/filters/ test/php/layouts/ test/php/or/ test/php/renderers/

[kurdalen]

Author: kurdalen
Date: Tue May  5 14:29:17 2009
New Revision: 771742

URL: http://svn.apache.org/viewvc?rev=771742&view=rev
Log:
updated tests and one more fix related to #LOG4PHP-41

Added:
    incubator/log4php/trunk/src/test/php/configurators/
    
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php
      - copied, changed from r771577, 
incubator/log4php/trunk/src/test/php/LoggerBasicConfiguratorTest.php
    incubator/log4php/trunk/src/test/php/filters/
    incubator/log4php/trunk/src/test/php/layouts/
    incubator/log4php/trunk/src/test/php/renderers/
      - copied from r771577, incubator/log4php/trunk/src/test/php/or/
    incubator/log4php/trunk/src/test/php/renderers/LoggerDefaultRendererTest.php
      - copied unchanged from r771741, 
incubator/log4php/trunk/src/test/php/or/LoggerDefaultRendererTest.php
    incubator/log4php/trunk/src/test/php/renderers/LoggerObjectRendererTest.php
      - copied unchanged from r771741, 
incubator/log4php/trunk/src/test/php/or/LoggerObjectRendererTest.php
    incubator/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php
      - copied unchanged from r771741, 
incubator/log4php/trunk/src/test/php/or/LoggerRendererMapTest.php
Removed:
    incubator/log4php/trunk/src/test/php/LoggerBasicConfiguratorTest.php
    incubator/log4php/trunk/src/test/php/or/
Modified:
    
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorBasic.php

Modified: 
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorBasic.php
URL: 
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorBasic.php?rev=771742&r1=771741&r2=771742&view=diff
==============================================================================
--- 
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorBasic.php 
(original)
+++ 
incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorBasic.php 
Tue May  5 14:29:17 2009
@@ -28,7 +28,7 @@
  * @version $Revision$
  * @package log4php
  */
-class LoggerBasicConfigurator implements LoggerConfigurator {
+class LoggerConfiguratorBasic implements LoggerConfigurator {
 
        /**
         * Add a {...@link LoggerAppenderConsole} that uses 

Copied: 
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php
 (from r771577, 
incubator/log4php/trunk/src/test/php/LoggerBasicConfiguratorTest.php)
URL: 
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php?p2=incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php&p1=incubator/log4php/trunk/src/test/php/LoggerBasicConfiguratorTest.php&r1=771577&r2=771742&rev=771742&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerBasicConfiguratorTest.php 
(original)
+++ 
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorBasicTest.php
 Tue May  5 14:29:17 2009
@@ -22,14 +22,14 @@
  * @link       http://logging.apache.org/log4php
  */
 
-class LoggerBasicConfiguratorTest extends PHPUnit_Framework_TestCase {
+class LoggerConfiguratorBasicTest extends PHPUnit_Framework_TestCase {
         
        protected function setUp() {
-               LoggerBasicConfigurator::configure();
+               LoggerConfiguratorBasic::configure();
        }
         
        protected function tearDown() {
-               LoggerBasicConfigurator::resetConfiguration();
+               LoggerConfiguratorBasic::resetConfiguration();
        }
         
        public function testConfigure() {
@@ -47,7 +47,7 @@
                //$root = LoggerManager::getRootLogger();
                $hierarchy = LoggerHierarchy::singleton();
                var_dump(count($hierarchy->getCurrentLoggers()));
-               LoggerBasicConfigurator::resetConfiguration();
+               LoggerConfiguratorBasic::resetConfiguration();
                var_dump(count($hierarchy->getCurrentLoggers()));
         /*
         $logger = LoggerManager::getLogger('A1');