Author: grobmeier
Date: Mon Mar 22 06:35:24 2010
New Revision: 925973
URL: http://svn.apache.org/viewvc?rev=925973&view=rev
Log:
LOG4PHP-102: Added patch from Ivan Habunek: LoggerLayoutPattern fails tests
Modified:
incubator/log4php/trunk/src/changes/changes.xml
incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php
incubator/log4php/trunk/src/test/php/layouts/LoggerLayoutPatternTest.php
Modified: incubator/log4php/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/changes/changes.xml?rev=925973&r1=925972&r2=925973&view=diff
==============================================================================
--- incubator/log4php/trunk/src/changes/changes.xml (original)
+++ incubator/log4php/trunk/src/changes/changes.xml Mon Mar 22 06:35:24 2010
@@ -24,7 +24,8 @@
</properties>
<body>
<release version="2.1" description="Stabilizing">
- <action type="update" issue="LOG4PHP-103" by="Moritz
Schmidt">Exception when using more than one LoggerAppenderFile</action>
+ <action type="fix" issue="LOG4PHP-103" by="Moritz
Schmidt">Exception when using more than one LoggerAppenderFile</action>
+ <action type="fix" issue="LOG4PHP-102" by="Ivan
Habunek">LoggerLayoutPattern fails tests</action>
<action type="update" issue="LOG4PHP-100" by="Moritz
Schmidt">Directly assign an array on Logger PHP configuration</action>
<action type="fix" issue="LOG4PHP-91">LoginOptionConverter.php
(used wrong constant name)</action>
<action type="update" issue="LOG4PHP-95" by="Ivan Habunek,
Christian Grobmeier">Add trace level to Log4PHP</action>
Modified:
incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php?rev=925973&r1=925972&r2=925973&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php
(original)
+++ incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php Mon
Mar 22 06:35:24 2010
@@ -18,21 +18,6 @@
* @package log4php
*/
-/**
- * Array for fast space padding
- * Used by {...@link LoggerPatternConverter::spacePad()}.
- *
- * @package log4php
- * @subpackage helpers
- */
-$GLOBALS['log4php.LoggerPatternConverter.spaces'] = array(
- " ", // 1 space
- " ", // 2 spaces
- " ", // 4 spaces
- " ", // 8 spaces
- " ", // 16 spaces
- " " ); // 32 spaces
-
/**
* LoggerPatternConverter is an abstract class that provides the formatting
@@ -49,7 +34,19 @@ $GLOBALS['log4php.LoggerPatternConverter
* @since 0.3
*/
class LoggerPatternConverter {
-
+
+ /**
+ * Array for fast space padding
+ * Used by {...@link LoggerPatternConverter::spacePad()}.
+ */
+ private $spaces = array(
+ " ", // 1 space
+ " ", // 2 spaces
+ " ", // 4 spaces
+ " ", // 8 spaces
+ " ", // 16 spaces
+ " "); // 32 spaces
+
/**
* @var LoggerPatternConverter next converter in converter chain
*/
@@ -123,13 +120,13 @@ class LoggerPatternConverter {
*/
public function spacePad(&$sbuf, $length) {
while($length >= 32) {
- $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][5];
+ $sbuf .= $this->spaces[5];
$length -= 32;
}
for($i = 4; $i >= 0; $i--) {
if(($length & (1<<$i)) != 0) {
- $sbuf .=
$GLOBALS['log4php.LoggerPatternConverter.spaces'][$i];
+ $sbuf .= $this->spaces[$i];
}
}
Modified:
incubator/log4php/trunk/src/test/php/layouts/LoggerLayoutPatternTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/layouts/LoggerLayoutPatternTest.php?rev=925973&r1=925972&r2=925973&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/layouts/LoggerLayoutPatternTest.php
(original)
+++ incubator/log4php/trunk/src/test/php/layouts/LoggerLayoutPatternTest.php
Mon Mar 22 06:35:24 2010
@@ -37,25 +37,13 @@ class LoggerLayoutPatternTest extends PH
self::assertEquals($v, $e);
}
- public function XtestWarnLayout() {
- /*
-Comment in when this has been fixed:
-
-1) testWarnLayout(LoggerLayoutPatternTest)
-Undefined index: log4php.LoggerPatternConverter.spaces
-/Users/cgrobmeier/Documents/Development/workspace/log4php-trunk/src/main/php/helpers/LoggerPatternConverter.php:131
-/Users/cgrobmeier/Documents/Development/workspace/log4php-trunk/src/main/php/helpers/LoggerPatternConverter.php:104
-/Users/cgrobmeier/Documents/Development/workspace/log4php-trunk/src/main/php/layouts/LoggerPatternLayout.php:216
-/Users/cgrobmeier/Documents/Development/workspace/log4php-trunk/src/test/php/layouts/LoggerLayoutPatternTest.php:45
-
- *
- */
+ public function testWarnLayout() {
$event = new LoggerLoggingEvent("LoggerLayoutXml", new
Logger("TEST"), LoggerLevel::getLevelWarn(), "testmessage");
$layout = new LoggerLayoutPattern();
$layout->setConversionPattern("%-5p %c %X{username}: %m in %F
at %L%n");
$v = $layout->format($event);
- $e = 'WARN TEST : testmessage in NA at NA'.PHP_EOL;
+ $e = 'WARN TEST : testmessage in NA at NA'.PHP_EOL;
self::assertEquals($v, $e);
}
