Author: kurdalen
Date: Mon Apr 27 23:00:02 2009
New Revision: 769194
URL: http://svn.apache.org/viewvc?rev=769194&view=rev
Log:
housekeeping unit test suite
Added:
incubator/log4php/trunk/src/test/php/bootstrap.php
incubator/log4php/trunk/src/test/php/phpunit.xml
Removed:
incubator/log4php/trunk/src/test/php/AllTests.php
incubator/log4php/trunk/src/test/php/appenders/AllTests.php
incubator/log4php/trunk/src/test/php/or/AllTests.php
incubator/log4php/trunk/src/test/php/phpunit.php
incubator/log4php/trunk/src/test/php/spi/AllTests.php
Modified:
incubator/log4php/trunk/src/test/php/LoggerBasicConfiguratorTest.php
incubator/log4php/trunk/src/test/php/LoggerHierarchyTest.php
incubator/log4php/trunk/src/test/php/LoggerLevelTest.php
incubator/log4php/trunk/src/test/php/LoggerLogTest.php
incubator/log4php/trunk/src/test/php/LoggerManagerTest.php
incubator/log4php/trunk/src/test/php/LoggerRootTest.php
incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php
incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php
incubator/log4php/trunk/src/test/php/or/LoggerDefaultRendererTest.php
incubator/log4php/trunk/src/test/php/or/LoggerObjectRendererTest.php
incubator/log4php/trunk/src/test/php/or/LoggerRendererMapTest.php
incubator/log4php/trunk/src/test/php/spi/LoggerLoggingEventTest.php
Modified: incubator/log4php/trunk/src/test/php/LoggerBasicConfiguratorTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/LoggerBasicConfiguratorTest.php?rev=769194&r1=769193&r2=769194&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerBasicConfiguratorTest.php
(original)
+++ incubator/log4php/trunk/src/test/php/LoggerBasicConfiguratorTest.php Mon
Apr 27 23:00:02 2009
@@ -23,62 +23,53 @@
* @link http://logging.apache.org/log4php
*/
-require_once dirname(__FILE__).'/phpunit.php';
require_once LOG4PHP_DIR . '/LoggerBasicConfigurator.php';
class LoggerBasicConfiguratorTest extends PHPUnit_Framework_TestCase {
- protected function setUp() {
- LoggerBasicConfigurator::configure();
- }
+ protected function setUp() {
+ LoggerBasicConfigurator::configure();
+ }
- protected function tearDown() {
- LoggerBasicConfigurator::resetConfiguration();
- }
+ protected function tearDown() {
+ LoggerBasicConfigurator::resetConfiguration();
+ }
- public function testConfigure() {
- $root = LoggerManager::getRootLogger();
- $appender = $root->getAppender('A1');
- self::assertType('LoggerAppenderConsole', $appender);
- $layout = $appender->getLayout();
- self::assertType('LoggerLayoutTTCC', $layout);
- }
-
- public function testResetConfiguration() {
- throw new PHPUnit_Framework_IncompleteTestError();
-
- $this->testConfigure();
-
- //$root = LoggerManager::getRootLogger();
-
- $hierarchy = LoggerHierarchy::singleton();
-
- var_dump(count($hierarchy->getCurrentLoggers()));
-
- LoggerBasicConfigurator::resetConfiguration();
-
- var_dump(count($hierarchy->getCurrentLoggers()));
-
- /*
- $logger = LoggerManager::getLogger('A1');
+ public function testConfigure() {
+ $root = LoggerManager::getRootLogger();
+ $appender = $root->getAppender('A1');
+ self::assertType('LoggerAppenderConsole', $appender);
+ $layout = $appender->getLayout();
+ self::assertType('LoggerLayoutTTCC', $layout);
+ }
- $layout = $logger->getLayout();
- var_dump($layout);
-
- var_dump($logger->getName());
- */
- //$appender =
LoggerManager::getRootLogger()->getAppender('A1');
- //var_dump($appender);
+ public function testResetConfiguration() {
+ self::markTestIncomplete();
- }
+ $this->testConfigure();
+ //$root = LoggerManager::getRootLogger();
+ $hierarchy = LoggerHierarchy::singleton();
+ var_dump(count($hierarchy->getCurrentLoggers()));
+ LoggerBasicConfigurator::resetConfiguration();
+ var_dump(count($hierarchy->getCurrentLoggers()));
+ /*
+ $logger = LoggerManager::getLogger('A1');
+
+ $layout = $logger->getLayout();
+ var_dump($layout);
- /*public function testRootLogger() {
- $root = LoggerManager::getRootLogger();
- $a = $root->getAppender('A1');
- self::assertType('LoggerAppenderConsole', $a);
- $l = $a->getLayout();
- self::assertType('LoggerLayoutTTCC', $l);
- }*/
+ var_dump($logger->getName());
+ */
+ //$appender = LoggerManager::getRootLogger()->getAppender('A1');
+ //var_dump($appender);
+ }
+
+ /*public function testRootLogger() {
+ $root = LoggerManager::getRootLogger();
+ $a = $root->getAppender('A1');
+ self::assertType('LoggerAppenderConsole', $a);
+ $l = $a->getLayout();
+ self::assertType('LoggerLayoutTTCC', $l);
+ }*/
}
-?>
Modified: incubator/log4php/trunk/src/test/php/LoggerHierarchyTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/LoggerHierarchyTest.php?rev=769194&r1=769193&r2=769194&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerHierarchyTest.php (original)
+++ incubator/log4php/trunk/src/test/php/LoggerHierarchyTest.php Mon Apr 27
23:00:02 2009
@@ -23,53 +23,50 @@
* @link http://logging.apache.org/log4php
*/
-require_once dirname(__FILE__).'/phpunit.php';
-
require_once LOG4PHP_DIR . '/layouts/LoggerLayoutTTCC.php';
require_once LOG4PHP_DIR . '/appenders/LoggerAppenderConsole.php';
require_once LOG4PHP_DIR . '/LoggerHierarchy.php';
class LoggerHierarchyTest extends PHPUnit_Framework_TestCase {
- private $hierarchy;
-
- protected function setUp() {
- $this->hierarchy = LoggerHierarchy::singleton();
- }
+ private $hierarchy;
- public function testIfLevelIsInitiallyLevelAll() {
-
$this->assertEquals($this->hierarchy->getRootLogger()->getLevel()->levelStr,
'ALL');
- }
-
- public function testIfNameIsRoot() {
-
$this->assertEquals($this->hierarchy->getRootLogger()->getName(), 'root');
- }
-
- public function testIfParentIsNull() {
-
$this->assertSame($this->hierarchy->getRootLogger()->getParent(), null);
- }
-
- public function testSetParent() {
- $this->hierarchy->getRootLogger()->setParent('dummy');
- $this->testIfParentIsNull();
- }
+ protected function setUp() {
+ $this->hierarchy = LoggerHierarchy::singleton();
+ }
+
+ public function testIfLevelIsInitiallyLevelDebug() {
+ self::assertEquals('DEBUG',
$this->hierarchy->getRootLogger()->getLevel()->levelStr);
+ }
+
+ public function testIfNameIsRoot() {
+ self::assertEquals('root',
$this->hierarchy->getRootLogger()->getName());
+ }
+
+ public function testIfParentIsNull() {
+ self::assertSame(null,
$this->hierarchy->getRootLogger()->getParent());
+ }
+
+ public function testSetParent() {
+ $this->hierarchy->getRootLogger()->setParent('dummy');
+ $this->testIfParentIsNull();
+ }
- public function testResetConfiguration() {
- $root = $this->hierarchy->getRootLogger();
- $appender = new LoggerAppenderConsole('A1');
- $root->addAppender($appender);
- $logger = $this->hierarchy->getLogger('test');
- $this->assertEquals(sizeof($this->hierarchy->getCurrentLoggers()), 1);
- $this->hierarchy->resetConfiguration();
-
$this->assertEquals($this->hierarchy->getRootLogger()->getLevel()->levelStr,
'DEBUG');
- $this->assertEquals($this->hierarchy->getThreshold()->levelStr, 'ALL');
- $this->assertEquals(sizeof($this->hierarchy->getCurrentLoggers()), 1);
- foreach($this->hierarchy->getCurrentLoggers() as $l) {
- $this->assertEquals($l->getLevel(), null);
- $this->assertTrue($l->getAdditivity());
- $this->assertEquals(sizeof($l->getAllAppenders()), 0);
- }
- }
+ public function testResetConfiguration() {
+ $root = $this->hierarchy->getRootLogger();
+ $appender = new LoggerAppenderConsole('A1');
+ $root->addAppender($appender);
+ $logger = $this->hierarchy->getLogger('test');
+
self::assertEquals(sizeof($this->hierarchy->getCurrentLoggers()), 1);
+ $this->hierarchy->resetConfiguration();
+
self::assertEquals($this->hierarchy->getRootLogger()->getLevel()->levelStr,
'DEBUG');
+ self::assertEquals($this->hierarchy->getThreshold()->levelStr,
'ALL');
+
self::assertEquals(sizeof($this->hierarchy->getCurrentLoggers()), 1);
+ foreach($this->hierarchy->getCurrentLoggers() as $l) {
+ self::assertEquals($l->getLevel(), null);
+ self::assertTrue($l->getAdditivity());
+ self::assertEquals(sizeof($l->getAllAppenders()), 0);
+ }
+ }
}
-?>
Modified: incubator/log4php/trunk/src/test/php/LoggerLevelTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/LoggerLevelTest.php?rev=769194&r1=769193&r2=769194&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerLevelTest.php (original)
+++ incubator/log4php/trunk/src/test/php/LoggerLevelTest.php Mon Apr 27
23:00:02 2009
@@ -23,8 +23,6 @@
* @link http://logging.apache.org/log4php
*/
-require_once dirname(__FILE__).'/phpunit.php';
-
require_once LOG4PHP_DIR . '/LoggerLevel.php';
/**
@@ -32,54 +30,52 @@
*/
class LoggerLevelTest extends PHPUnit_Framework_TestCase {
- protected function doTestLevel($o, $code, $str, $syslog) {
- $this->assertTrue( $o instanceof LoggerLevel );
- $this->assertEquals( $o->level, $code);
- $this->assertEquals( $o->levelStr, $str);
- $this->assertEquals( $o->syslogEquivalent, $syslog);
- }
+ protected function doTestLevel($o, $code, $str, $syslog) {
+ self::assertTrue( $o instanceof LoggerLevel );
+ self::assertEquals( $o->level, $code);
+ self::assertEquals( $o->levelStr, $str);
+ self::assertEquals( $o->syslogEquivalent, $syslog);
+ }
- public function testLevelOff() {
- $this->doTestLevel( LoggerLevel::getLevelOff(),
LOG4PHP_LEVEL_OFF_INT, 'OFF', 0 );
- $this->doTestLevel(
LoggerLevel::toLevel(LOG4PHP_LEVEL_OFF_INT), LOG4PHP_LEVEL_OFF_INT, 'OFF', 0 );
- $this->doTestLevel( LoggerLevel::toLevel('OFF'),
LOG4PHP_LEVEL_OFF_INT, 'OFF', 0 );
+ public function testLevelOff() {
+ $this->doTestLevel( LoggerLevel::getLevelOff(),
LOG4PHP_LEVEL_OFF_INT, 'OFF', 0 );
+ $this->doTestLevel(
LoggerLevel::toLevel(LOG4PHP_LEVEL_OFF_INT), LOG4PHP_LEVEL_OFF_INT, 'OFF', 0 );
+ $this->doTestLevel( LoggerLevel::toLevel('OFF'),
LOG4PHP_LEVEL_OFF_INT, 'OFF', 0 );
}
-
- public function testLevelFatal() {
- $this->doTestLevel( LoggerLevel::getLevelFatal(),
LOG4PHP_LEVEL_FATAL_INT, 'FATAL', 0 );
- $this->doTestLevel(
LoggerLevel::toLevel(LOG4PHP_LEVEL_FATAL_INT), LOG4PHP_LEVEL_FATAL_INT,
'FATAL', 0 );
- $this->doTestLevel( LoggerLevel::toLevel('FATAL'),
LOG4PHP_LEVEL_FATAL_INT, 'FATAL', 0 );
+ public function testLevelFatal() {
+ $this->doTestLevel( LoggerLevel::getLevelFatal(),
LOG4PHP_LEVEL_FATAL_INT, 'FATAL', 0 );
+ $this->doTestLevel(
LoggerLevel::toLevel(LOG4PHP_LEVEL_FATAL_INT), LOG4PHP_LEVEL_FATAL_INT,
'FATAL', 0 );
+ $this->doTestLevel( LoggerLevel::toLevel('FATAL'),
LOG4PHP_LEVEL_FATAL_INT, 'FATAL', 0 );
}
- public function testLevelError() {
- $this->doTestLevel( LoggerLevel::getLevelError(),
LOG4PHP_LEVEL_ERROR_INT, 'ERROR', 3 );
- $this->doTestLevel(
LoggerLevel::toLevel(LOG4PHP_LEVEL_ERROR_INT), LOG4PHP_LEVEL_ERROR_INT,
'ERROR', 3 );
- $this->doTestLevel( LoggerLevel::toLevel('ERROR'),
LOG4PHP_LEVEL_ERROR_INT, 'ERROR', 3 );
+ public function testLevelError() {
+ $this->doTestLevel( LoggerLevel::getLevelError(),
LOG4PHP_LEVEL_ERROR_INT, 'ERROR', 3 );
+ $this->doTestLevel(
LoggerLevel::toLevel(LOG4PHP_LEVEL_ERROR_INT), LOG4PHP_LEVEL_ERROR_INT,
'ERROR', 3 );
+ $this->doTestLevel( LoggerLevel::toLevel('ERROR'),
LOG4PHP_LEVEL_ERROR_INT, 'ERROR', 3 );
}
-
- public function testLevelWarn() {
- $this->doTestLevel( LoggerLevel::getLevelWarn(),
LOG4PHP_LEVEL_WARN_INT, 'WARN', 4 );
- $this->doTestLevel(
LoggerLevel::toLevel(LOG4PHP_LEVEL_WARN_INT), LOG4PHP_LEVEL_WARN_INT, 'WARN', 4
);
- $this->doTestLevel( LoggerLevel::toLevel('WARN'),
LOG4PHP_LEVEL_WARN_INT, 'WARN', 4 );
+
+ public function testLevelWarn() {
+ $this->doTestLevel( LoggerLevel::getLevelWarn(),
LOG4PHP_LEVEL_WARN_INT, 'WARN', 4 );
+ $this->doTestLevel(
LoggerLevel::toLevel(LOG4PHP_LEVEL_WARN_INT), LOG4PHP_LEVEL_WARN_INT, 'WARN', 4
);
+ $this->doTestLevel( LoggerLevel::toLevel('WARN'),
LOG4PHP_LEVEL_WARN_INT, 'WARN', 4 );
}
- public function testLevelInfo() {
- $this->doTestLevel( LoggerLevel::getLevelInfo(),
LOG4PHP_LEVEL_INFO_INT, 'INFO', 6 );
- $this->doTestLevel(
LoggerLevel::toLevel(LOG4PHP_LEVEL_INFO_INT), LOG4PHP_LEVEL_INFO_INT, 'INFO', 6
);
- $this->doTestLevel( LoggerLevel::toLevel('INFO'),
LOG4PHP_LEVEL_INFO_INT, 'INFO', 6 );
+ public function testLevelInfo() {
+ $this->doTestLevel( LoggerLevel::getLevelInfo(),
LOG4PHP_LEVEL_INFO_INT, 'INFO', 6 );
+ $this->doTestLevel(
LoggerLevel::toLevel(LOG4PHP_LEVEL_INFO_INT), LOG4PHP_LEVEL_INFO_INT, 'INFO', 6
);
+ $this->doTestLevel( LoggerLevel::toLevel('INFO'),
LOG4PHP_LEVEL_INFO_INT, 'INFO', 6 );
}
- public function testLevelDebug() {
- $this->doTestLevel( LoggerLevel::getLevelDebug(),
LOG4PHP_LEVEL_DEBUG_INT, 'DEBUG', 7 );
- $this->doTestLevel(
LoggerLevel::toLevel(LOG4PHP_LEVEL_DEBUG_INT), LOG4PHP_LEVEL_DEBUG_INT,
'DEBUG', 7 );
- $this->doTestLevel( LoggerLevel::toLevel('DEBUG'),
LOG4PHP_LEVEL_DEBUG_INT, 'DEBUG', 7 );
+ public function testLevelDebug() {
+ $this->doTestLevel( LoggerLevel::getLevelDebug(),
LOG4PHP_LEVEL_DEBUG_INT, 'DEBUG', 7 );
+ $this->doTestLevel(
LoggerLevel::toLevel(LOG4PHP_LEVEL_DEBUG_INT), LOG4PHP_LEVEL_DEBUG_INT,
'DEBUG', 7 );
+ $this->doTestLevel( LoggerLevel::toLevel('DEBUG'),
LOG4PHP_LEVEL_DEBUG_INT, 'DEBUG', 7 );
}
- public function testLevelAll() {
- $this->doTestLevel( LoggerLevel::getLevelAll(),
LOG4PHP_LEVEL_ALL_INT, 'ALL', 7 );
- $this->doTestLevel(
LoggerLevel::toLevel(LOG4PHP_LEVEL_ALL_INT), LOG4PHP_LEVEL_ALL_INT, 'ALL', 7 );
- $this->doTestLevel( LoggerLevel::toLevel('ALL'),
LOG4PHP_LEVEL_ALL_INT, 'ALL', 7 );
+ public function testLevelAll() {
+ $this->doTestLevel( LoggerLevel::getLevelAll(),
LOG4PHP_LEVEL_ALL_INT, 'ALL', 7 );
+ $this->doTestLevel(
LoggerLevel::toLevel(LOG4PHP_LEVEL_ALL_INT), LOG4PHP_LEVEL_ALL_INT, 'ALL', 7 );
+ $this->doTestLevel( LoggerLevel::toLevel('ALL'),
LOG4PHP_LEVEL_ALL_INT, 'ALL', 7 );
}
}
-?>
Modified: incubator/log4php/trunk/src/test/php/LoggerLogTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/LoggerLogTest.php?rev=769194&r1=769193&r2=769194&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerLogTest.php (original)
+++ incubator/log4php/trunk/src/test/php/LoggerLogTest.php Mon Apr 27 23:00:02
2009
@@ -23,25 +23,22 @@
* @link http://logging.apache.org/log4php
*/
-require_once dirname(__FILE__).'/phpunit.php';
-
require_once LOG4PHP_DIR . '/LoggerLog.php';
class LoggerLogTest extends PHPUnit_Framework_TestCase {
- public function testInternalDebuggingIsInitallyFalse() {
- $this->assertFalse( LoggerLog::internalDebugging() );
- }
-
- public function testInternalDebuggingIsSetTrue() {
- LoggerLog::internalDebugging( true );
- $this->assertTrue( LoggerLog::internalDebugging() );
- }
-
- public function testInternalDebuggingIsSetFalse() {
- LoggerLog::internalDebugging( false );
- $this->assertFalse( LoggerLog::internalDebugging() );
- }
+ public function testInternalDebuggingIsInitallyFalse() {
+ self::assertFalse( LoggerLog::internalDebugging() );
+ }
+
+ public function testInternalDebuggingIsSetTrue() {
+ LoggerLog::internalDebugging( true );
+ self::assertTrue( LoggerLog::internalDebugging() );
+ }
+
+ public function testInternalDebuggingIsSetFalse() {
+ LoggerLog::internalDebugging( false );
+ self::assertFalse( LoggerLog::internalDebugging() );
+ }
}
-?>
Modified: incubator/log4php/trunk/src/test/php/LoggerManagerTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/LoggerManagerTest.php?rev=769194&r1=769193&r2=769194&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerManagerTest.php (original)
+++ incubator/log4php/trunk/src/test/php/LoggerManagerTest.php Mon Apr 27
23:00:02 2009
@@ -23,14 +23,8 @@
* @link http://logging.apache.org/log4php
*/
-require_once dirname(__FILE__).'/phpunit.php';
-
require_once LOG4PHP_DIR . '/LoggerManager.php';
class LoggerManagerTest extends PHPUnit_Framework_TestCase {
-
-
-
+
}
-
-?>
Modified: incubator/log4php/trunk/src/test/php/LoggerRootTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/LoggerRootTest.php?rev=769194&r1=769193&r2=769194&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerRootTest.php (original)
+++ incubator/log4php/trunk/src/test/php/LoggerRootTest.php Mon Apr 27 23:00:02
2009
@@ -23,34 +23,31 @@
* @link http://logging.apache.org/log4php
*/
-require_once dirname(__FILE__).'/phpunit.php';
-
require_once LOG4PHP_DIR . '/LoggerRoot.php';
class LoggerRootTest extends PHPUnit_Framework_TestCase {
- private $loggerRoot;
+ private $loggerRoot;
- protected function setUp() {
- $this->loggerRoot = new LoggerRoot();
- }
+ protected function setUp() {
+ $this->loggerRoot = new LoggerRoot();
+ }
- public function testIfLevelIsInitiallyLevelAll() {
- $this->assertEquals($this->loggerRoot->getLevel()->levelStr,
'ALL');
- }
-
- public function testIfNameIsRoot() {
- $this->assertEquals($this->loggerRoot->getName(), 'root');
- }
-
- public function testIfParentIsNull() {
- $this->assertSame($this->loggerRoot->getParent(), null);
- }
-
- public function testSetParent() {
- $this->loggerRoot->setParent('dummy');
- $this->testIfParentIsNull();
- }
+ public function testIfLevelIsInitiallyLevelAll() {
+ self::assertEquals($this->loggerRoot->getLevel()->levelStr,
'ALL');
+ }
+
+ public function testIfNameIsRoot() {
+ self::assertEquals($this->loggerRoot->getName(), 'root');
+ }
+
+ public function testIfParentIsNull() {
+ self::assertSame($this->loggerRoot->getParent(), null);
+ }
+
+ public function testSetParent() {
+ $this->loggerRoot->setParent('dummy');
+ $this->testIfParentIsNull();
+ }
}
-?>
Modified:
incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php?rev=769194&r1=769193&r2=769194&view=diff
==============================================================================
---
incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php
(original)
+++
incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php
Mon Apr 27 23:00:02 2009
@@ -23,34 +23,24 @@
* @link http://logging.apache.org/log4php
*/
-require_once dirname(__FILE__).'/../phpunit.php';
-
require_once LOG4PHP_DIR . '/appenders/LoggerAppenderConsole.php';
class LoggerAppenderConsoleTest extends PHPUnit_Framework_TestCase {
-
- public function setUp() {
- }
-
- public function tearDown() {
- }
- public function testSetTarget() {
- throw new PHPUnit_Framework_IncompleteTestError();
+ public function testSetTarget() {
+ self::markTestIncomplete();
}
-
- public function testGetTarget() {
- throw new PHPUnit_Framework_IncompleteTestError();
+
+ public function testGetTarget() {
+ self::markTestIncomplete();
}
- public function testActivateOptions() {
- throw new PHPUnit_Framework_IncompleteTestError();
+ public function testActivateOptions() {
+ self::markTestIncomplete();
}
-
- public function testClose() {
- throw new PHPUnit_Framework_IncompleteTestError();
+
+ public function testClose() {
+ self::markTestIncomplete();
}
-
+
}
-
-?>
Modified:
incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php?rev=769194&r1=769193&r2=769194&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php
(original)
+++ incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php
Mon Apr 27 23:00:02 2009
@@ -1,5 +1,6 @@
<?php
-/** Licensed to the Apache Software Foundation (ASF) under one or more
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
@@ -21,27 +22,17 @@
* @version SVN: $Id$
* @link http://logging.apache.org/log4php
*/
-
-require_once dirname(__FILE__).'/../phpunit.php';
require_once LOG4PHP_DIR . '/appenders/LoggerAppenderNull.php';
class LoggerAppenderNullTest extends PHPUnit_Framework_TestCase {
- public function setUp() {
- }
-
- public function tearDown() {
- }
-
- public function testActivateOptions() {
- throw new PHPUnit_Framework_IncompleteTestError();
+ public function testActivateOptions() {
+ self::markTestIncomplete();
}
public function testClose() {
- throw new PHPUnit_Framework_IncompleteTestError();
+ self::markTestIncomplete();
}
}
-
-?>
Added: incubator/log4php/trunk/src/test/php/bootstrap.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/bootstrap.php?rev=769194&view=auto
==============================================================================
--- incubator/log4php/trunk/src/test/php/bootstrap.php (added)
+++ incubator/log4php/trunk/src/test/php/bootstrap.php Mon Apr 27 23:00:02 2009
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @category tests
+ * @package log4php
+ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License,
Version 2.0
+ * @version SVN: $Id$
+ * @link http://logging.apache.org/log4php
+ */
+
+if(!defined('LOG4PHP_DIR')) {
+ define('LOG4PHP_DIR', dirname(__FILE__).'/../../main/php');
+}
+
+if(!defined('LOG4PHP_DEFAULT_INIT_OVERRIDE')) {
+ define('LOG4PHP_DEFAULT_INIT_OVERRIDE', true);
+}
+
+set_include_path(LOG4PHP_DIR.':'.get_include_path());
+
+require_once 'PHPUnit/Framework/TestCase.php';
+require_once 'PHPUnit/Framework/TestSuite.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+require_once 'PHPUnit/Util/Filter.php';
\ No newline at end of file
Modified: incubator/log4php/trunk/src/test/php/or/LoggerDefaultRendererTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/or/LoggerDefaultRendererTest.php?rev=769194&r1=769193&r2=769194&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/or/LoggerDefaultRendererTest.php
(original)
+++ incubator/log4php/trunk/src/test/php/or/LoggerDefaultRendererTest.php Mon
Apr 27 23:00:02 2009
@@ -23,29 +23,20 @@
* @link http://logging.apache.org/log4php
*/
-require_once dirname(__FILE__).'/../phpunit.php';
-
require_once LOG4PHP_DIR.'/or/LoggerDefaultRenderer.php';
class DefaultRendererMockObject {
- private $a;
- protected $b;
- public $c;
+ private $a;
+ protected $b;
+ public $c;
}
class LoggerDefaultRendererTest extends PHPUnit_Framework_TestCase {
-
- protected function setUp() {
- }
-
- protected function tearDown() {
- }
-
- public function testDoRender() {
- $class = new DefaultRendererMockObject();
- $renderer = new LoggerDefaultRenderer();
- self::assertEquals(var_export($class, true),
$renderer->doRender($class));
- }
+
+ public function testDoRender() {
+ $class = new DefaultRendererMockObject();
+ $renderer = new LoggerDefaultRenderer();
+ self::assertEquals(var_export($class, true),
$renderer->doRender($class));
+ }
}
-?>
Modified: incubator/log4php/trunk/src/test/php/or/LoggerObjectRendererTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/or/LoggerObjectRendererTest.php?rev=769194&r1=769193&r2=769194&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/or/LoggerObjectRendererTest.php
(original)
+++ incubator/log4php/trunk/src/test/php/or/LoggerObjectRendererTest.php Mon
Apr 27 23:00:02 2009
@@ -23,22 +23,13 @@
* @link http://logging.apache.org/log4php
*/
-require_once dirname(__FILE__).'/../phpunit.php';
-
require_once LOG4PHP_DIR.'/or/LoggerObjectRenderer.php';
class LoggerObjectRendererTest extends PHPUnit_Framework_TestCase {
-
- protected function setUp() {
- }
-
- protected function tearDown() {
- }
-
- public function testFactory() {
- $renderer =
LoggerObjectRenderer::factory('LoggerDefaultRenderer');
- self::assertType('LoggerDefaultRenderer', $renderer);
- }
+
+ public function testFactory() {
+ $renderer =
LoggerObjectRenderer::factory('LoggerDefaultRenderer');
+ self::assertType('LoggerDefaultRenderer', $renderer);
+ }
}
-?>
Modified: incubator/log4php/trunk/src/test/php/or/LoggerRendererMapTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/or/LoggerRendererMapTest.php?rev=769194&r1=769193&r2=769194&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/or/LoggerRendererMapTest.php (original)
+++ incubator/log4php/trunk/src/test/php/or/LoggerRendererMapTest.php Mon Apr
27 23:00:02 2009
@@ -23,59 +23,45 @@
* @link http://logging.apache.org/log4php
*/
-require_once dirname(__FILE__).'/../phpunit.php';
-
require_once LOG4PHP_DIR.'/or/LoggerRendererMap.php';
require_once LOG4PHP_DIR.'/LoggerHierarchy.php';
class LoggerRendererMapTest extends PHPUnit_Framework_TestCase {
-
- protected function setUp() {
- }
-
- protected function tearDown() {
- }
-
- public function testAddRenderer() {
-
- $hierarchy = LoggerHierarchy::singleton();
-
- //print_r($hierarchy);
-
- LoggerRendererMap::addRenderer($hierarchy, 'string',
'LoggerDefaultRenderer');
-
- //print_r($hierarchy);
-
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testFindAndRender() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testGetByObject() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testGetByClassName() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testGetDefaultRenderer() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testClear() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testPut() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
-
- public function testRendererExists() {
- throw new PHPUnit_Framework_IncompleteTestError();
- }
+
+ public function testAddRenderer() {
+ $hierarchy = LoggerHierarchy::singleton();
+ //print_r($hierarchy);
+ LoggerRendererMap::addRenderer($hierarchy, 'string',
'LoggerDefaultRenderer');
+ //print_r($hierarchy);
+ self::markTestIncomplete();
+ }
+
+ public function testFindAndRender() {
+ self::markTestIncomplete();
+ }
+
+ public function testGetByObject() {
+ self::markTestIncomplete();
+ }
+
+ public function testGetByClassName() {
+ self::markTestIncomplete();
+ }
+
+ public function testGetDefaultRenderer() {
+ self::markTestIncomplete();
+ }
+
+ public function testClear() {
+ self::markTestIncomplete();
+ }
+
+ public function testPut() {
+ self::markTestIncomplete();
+ }
+
+ public function testRendererExists() {
+ self::markTestIncomplete();
+ }
}
-?>
Added: incubator/log4php/trunk/src/test/php/phpunit.xml
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/phpunit.xml?rev=769194&view=auto
==============================================================================
--- incubator/log4php/trunk/src/test/php/phpunit.xml (added)
+++ incubator/log4php/trunk/src/test/php/phpunit.xml Mon Apr 27 23:00:02 2009
@@ -0,0 +1,15 @@
+<phpunit bootstrap="bootstrap.php"
+ colors="true"
+ convertErrorsToExceptions="true"
+ convertNoticesToExceptions="true"
+ convertWarningsToExceptions="true"
+ stopOnFailure="false">
+
+ <testsuite name="log4php">
+ <directory>.</directory>
+ <directory>./appenders</directory>
+ <directory>./or</directory>
+ <directory>./spi</directory>
+ </testsuite>
+
+</phpunit>
Modified: incubator/log4php/trunk/src/test/php/spi/LoggerLoggingEventTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/spi/LoggerLoggingEventTest.php?rev=769194&r1=769193&r2=769194&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/spi/LoggerLoggingEventTest.php
(original)
+++ incubator/log4php/trunk/src/test/php/spi/LoggerLoggingEventTest.php Mon Apr
27 23:00:02 2009
@@ -25,9 +25,6 @@
* @link http://logging.apache.org/log4php
*/
-/** */
-require_once 'PHPUnit/Framework/TestCase.php';
-
require_once LOG4PHP_DIR.'/appenders/LoggerAppenderNull.php';
require_once LOG4PHP_DIR.'/spi/LoggerLoggingEvent.php';
require_once LOG4PHP_DIR.'/LoggerHierarchy.php';
@@ -35,71 +32,69 @@
class LoggerLoggingEventTestCaseAppender extends LoggerAppenderNull {
- protected $requiresLayout = true;
+ protected $requiresLayout = true;
- protected function append($event) {
- $this->layout->format($event);
- }
+ protected function append($event) {
+ $this->layout->format($event);
+ }
}
class LoggerLoggingEventTestCaseLayout extends LoggerLayout {
- public function activateOptions() {
- return;
- }
+ public function activateOptions() {
+ return;
+ }
- public function format($event) {
- LoggerLoggingEventTest::$locationInfo =
$event->getLocationInformation();
- }
+ public function format($event) {
+ LoggerLoggingEventTest::$locationInfo =
$event->getLocationInformation();
+ }
}
class LoggerLoggingEventTest extends PHPUnit_Framework_TestCase {
- public static $locationInfo;
+ public static $locationInfo;
- public function testConstructWithLoggerName() {
- $l = LoggerLevel :: getLevelDebug();
- $e = new LoggerLoggingEvent('fqcn', 'TestLogger', $l, 'test');
- $this->assertEquals($e->getLoggerName(), 'TestLogger');
- }
-
- public function testConstructWithTimestamp() {
- $l = LoggerLevel :: getLevelDebug();
- $timestamp = microtime(true);
- $e = new LoggerLoggingEvent('fqcn', 'TestLogger', $l, 'test',
$timestamp);
- $this->assertEquals($e->getTimeStamp(), $timestamp);
- }
-
- public function testGetStartTime() {
- $time = LoggerLoggingEvent :: getStartTime();
- $this->assertType('float', $time);
- $time2 = LoggerLoggingEvent :: getStartTime();
- $this->assertEquals($time, $time2);
- }
-
- public function testGetLocationInformation() {
- $hierarchy = LoggerHierarchy :: singleton();
- $root = $hierarchy->getRootLogger();
-
- $a = new LoggerLoggingEventTestCaseAppender('A1');
- $a->setLayout( new LoggerLoggingEventTestCaseLayout() );
- $root->addAppender($a);
+ public function testConstructWithLoggerName() {
+ $l = LoggerLevel :: getLevelDebug();
+ $e = new LoggerLoggingEvent('fqcn', 'TestLogger', $l, 'test');
+ self::assertEquals($e->getLoggerName(), 'TestLogger');
+ }
+
+ public function testConstructWithTimestamp() {
+ $l = LoggerLevel :: getLevelDebug();
+ $timestamp = microtime(true);
+ $e = new LoggerLoggingEvent('fqcn', 'TestLogger', $l, 'test',
$timestamp);
+ self::assertEquals($e->getTimeStamp(), $timestamp);
+ }
+
+ public function testGetStartTime() {
+ $time = LoggerLoggingEvent :: getStartTime();
+ self::assertType('float', $time);
+ $time2 = LoggerLoggingEvent :: getStartTime();
+ self::assertEquals($time, $time2);
+ }
+
+ public function testGetLocationInformation() {
+ $hierarchy = LoggerHierarchy :: singleton();
+ $root = $hierarchy->getRootLogger();
+
+ $a = new LoggerLoggingEventTestCaseAppender('A1');
+ $a->setLayout( new LoggerLoggingEventTestCaseLayout() );
+ $root->addAppender($a);
- $logger = $hierarchy->getLogger('test');
+ $logger = $hierarchy->getLogger('test');
- $line = __LINE__; $logger->debug('test');
- $hierarchy->shutdown();
+ $line = __LINE__; $logger->debug('test');
+ $hierarchy->shutdown();
- $li = self::$locationInfo;
+ $li = self::$locationInfo;
- $this->assertEquals($li->getClassName(), get_class($this));
- $this->assertEquals($li->getFileName(), __FILE__);
- $this->assertEquals($li->getLineNumber(), $line);
- $this->assertEquals($li->getMethodName(), __FUNCTION__);
+ self::assertEquals($li->getClassName(), get_class($this));
+ self::assertEquals($li->getFileName(), __FILE__);
+ self::assertEquals($li->getLineNumber(), $line);
+ self::assertEquals($li->getMethodName(), __FUNCTION__);
- }
+ }
}
-?>
-
