Author: grobmeier
Date: Mon Aug 31 06:52:03 2009
New Revision: 809474
URL: http://svn.apache.org/viewvc?rev=809474&view=rev
Log:
added renderermap tests
Modified:
incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php
incubator/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php
Modified: incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php?rev=809474&r1=809473&r2=809474&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php
(original)
+++ incubator/log4php/trunk/src/main/php/renderers/LoggerRendererMap.php Mon
Aug 31 06:52:03 2009
@@ -83,13 +83,13 @@
if(is_object($o)) {
$renderer = $this->getByObject($o);
if($renderer !== null) {
- return $renderer->doRender($o);
+ return $renderer->render($o);
} else {
return null;
}
} else {
$renderer = $this->defaultRenderer;
- return $renderer->doRender($o);
+ return $renderer->render($o);
}
}
}
@@ -145,13 +145,4 @@
private function put($class, $or) {
$this->map[strtolower($class)] = $or;
}
-
- /**
- * @param string $class
- * @return boolean
- */
- public function rendererExists($class) {
- $class = basename($class);
- return class_exists($class);
- }
}
Modified:
incubator/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php?rev=809474&r1=809473&r2=809474&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php
(original)
+++ incubator/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php
Mon Aug 31 06:52:03 2009
@@ -22,43 +22,49 @@
* @version SVN: $Id$
* @link http://logging.apache.org/log4php
*/
+class Fruit3 {
+ public $test1 = 'test1';
+ public $test2 = 'test2';
+ public $test3 = 'test3';
+}
-class LoggerRendererMapTest extends PHPUnit_Framework_TestCase {
-
- public function testAddRenderer() {
- $hierarchy = Logger::getHierarchy();
- //print_r($hierarchy);
- $hierarchy->getRendererMap()->addRenderer('string',
'LoggerRendererDefault');
- //print_r($hierarchy);
- self::markTestIncomplete();
+class FruitRenderer3 implements LoggerRendererObject {
+ public function render($o) {
+ return $o->test1.','.$o->test2.','.$o->test3;
}
+}
+
+class LoggerRendererMapTest extends PHPUnit_Framework_TestCase {
public function testFindAndRender() {
- self::markTestIncomplete();
+ $fruit = new Fruit3();
+ Logger::configure('renderers/test4.properties');
+ Logger::initialize();
+ $hierarchy = Logger::getHierarchy();
+
+ $map = $hierarchy->getRendererMap();
+ $e = $map->findAndRender($fruit);
+ self::assertEquals('test1,test2,test3', $e);
}
public function testGetByObject() {
- self::markTestIncomplete();
+ $fruit = new Fruit3();
+ Logger::configure('renderers/test4.properties');
+ Logger::initialize();
+ $hierarchy = Logger::getHierarchy();
+
+ $map = $hierarchy->getRendererMap();
+ $e = $map->getByObject($fruit);
+ self::assertTrue($e instanceof FruitRenderer3);
}
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();
+ Logger::configure('renderers/test4.properties');
+ Logger::initialize();
+ $hierarchy = Logger::getHierarchy();
+
+ $map = $hierarchy->getRendererMap();
+ $e = $map->getByClassName('Fruit3');
+ self::assertTrue($e instanceof FruitRenderer3);
}
-
}
