You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ih...@apache.org on 2012/08/18 15:51:04 UTC
svn commit: r1374580 - in /logging/log4php/trunk/src/test: php/
php/appenders/ php/filters/ php/helpers/ php/layouts/ php/renderers/
resources/configs/adapters/php/
Author: ihabunek
Date: Sat Aug 18 13:51:02 2012
New Revision: 1374580
URL: http://svn.apache.org/viewvc?rev=1374580&view=rev
Log:
Updated tests:
- fixed usage of SVN keyword replacement to be consistent with the rest of codebase (using $Revision$)
- replaced relative paths with absolute, using PHPUNIT_TEMP_DIR constant
- various minor improvements
Modified:
logging/log4php/trunk/src/test/php/LoggerAppenderPoolTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/LoggerAppenderTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/LoggerConfiguratorTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/LoggerExceptionTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/LoggerFilterTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/LoggerHierarchyTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/LoggerLevelTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/LoggerLoggingEventTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/LoggerMDCTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/LoggerNDCTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/LoggerReflectionUtilsTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/LoggerRootTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/LoggerTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/LoggerTestHelper.php (contents, props changed)
logging/log4php/trunk/src/test/php/LoggerThrowableInformationTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderDailyFileTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderEchoTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailEventTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMongoDBTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPDOTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPhpTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderRollingFileTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSocketTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSyslogTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/appenders/socketServer.php (contents, props changed)
logging/log4php/trunk/src/test/php/bootstrap.php (contents, props changed)
logging/log4php/trunk/src/test/php/filters/LoggerFilterDenyAllTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/filters/LoggerFilterLevelMatchTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/filters/LoggerFilterLevelRangeTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/filters/LoggerFilterStringMatchTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/helpers/LoggerOptionConverterTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/helpers/LoggerPatternParserTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/helpers/LoggerUtilsTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/layouts/LoggerLayoutHtmlTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/layouts/LoggerLayoutPatternTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/layouts/LoggerLayoutSerializedTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/layouts/LoggerLayoutSimpleTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/layouts/LoggerLayoutTTCCTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/renderers/LoggerRendererDefaultTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/renderers/LoggerRendererExceptionTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php (contents, props changed)
logging/log4php/trunk/src/test/php/renderers/LoggerRendererObjectTest.php (contents, props changed)
logging/log4php/trunk/src/test/resources/configs/adapters/php/config_empty.php (contents, props changed)
logging/log4php/trunk/src/test/resources/configs/adapters/php/config_invalid_syntax.php (contents, props changed)
logging/log4php/trunk/src/test/resources/configs/adapters/php/config_not_an_array.php (contents, props changed)
logging/log4php/trunk/src/test/resources/configs/adapters/php/config_valid.php (contents, props changed)
Modified: logging/log4php/trunk/src/test/php/LoggerAppenderPoolTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerAppenderPoolTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerAppenderPoolTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerAppenderPoolTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage filters
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/LoggerAppenderPoolTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/LoggerAppenderTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerAppenderTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerAppenderTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerAppenderTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/LoggerAppenderTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/LoggerConfiguratorTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerConfiguratorTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerConfiguratorTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerConfiguratorTest.php Sat Aug 18 13:51:02 2012
@@ -20,7 +20,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/LoggerConfiguratorTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/LoggerExceptionTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerExceptionTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerExceptionTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerExceptionTest.php Sat Aug 18 13:51:02 2012
@@ -18,7 +18,7 @@
* @category tests
* @package log4php
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
class MyException extends Exception { }
Propchange: logging/log4php/trunk/src/test/php/LoggerExceptionTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/LoggerFilterTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerFilterTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerFilterTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerFilterTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage filters
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
class MyFilter extends LoggerFilter {}
Propchange: logging/log4php/trunk/src/test/php/LoggerFilterTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/LoggerHierarchyTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerHierarchyTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerHierarchyTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerHierarchyTest.php Sat Aug 18 13:51:02 2012
@@ -18,7 +18,7 @@
* @category tests
* @package log4php
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/LoggerHierarchyTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/LoggerLevelTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerLevelTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerLevelTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerLevelTest.php Sat Aug 18 13:51:02 2012
@@ -18,7 +18,7 @@
* @category tests
* @package log4php
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/LoggerLevelTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/LoggerLoggingEventTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerLoggingEventTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerLoggingEventTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerLoggingEventTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @category tests
* @package log4php
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/LoggerLoggingEventTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/LoggerMDCTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerMDCTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerMDCTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerMDCTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @category tests
* @package log4php
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/LoggerMDCTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/LoggerNDCTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerNDCTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerNDCTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerNDCTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @category tests
* @package log4php
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/LoggerNDCTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/LoggerReflectionUtilsTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerReflectionUtilsTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerReflectionUtilsTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerReflectionUtilsTest.php Sat Aug 18 13:51:02 2012
@@ -18,7 +18,7 @@
* @category tests
* @package log4php
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/LoggerReflectionUtilsTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/LoggerRootTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerRootTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerRootTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerRootTest.php Sat Aug 18 13:51:02 2012
@@ -18,7 +18,7 @@
* @category tests
* @package log4php
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/LoggerRootTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/LoggerTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerTest.php Sat Aug 18 13:51:02 2012
@@ -18,7 +18,7 @@
* @category tests
* @package log4php
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/LoggerTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/LoggerTestHelper.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerTestHelper.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerTestHelper.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerTestHelper.php Sat Aug 18 13:51:02 2012
@@ -20,7 +20,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/LoggerTestHelper.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/LoggerThrowableInformationTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerThrowableInformationTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerThrowableInformationTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerThrowableInformationTest.php Sat Aug 18 13:51:02 2012
@@ -18,7 +18,7 @@
* @category tests
* @package log4php
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/LoggerThrowableInformationTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php (original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderConsoleTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderDailyFileTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderDailyFileTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderDailyFileTest.php (original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderDailyFileTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
@@ -27,72 +27,49 @@
* @group appenders
*/
class LoggerAppenderDailyFileTest extends PHPUnit_Framework_TestCase {
-
- private $t1;
- private $t2;
-
- protected function setUp() {
- $today = date("Ymd");
- if(file_exists('../../../target/temp/phpunit/TEST-daily.txt.'.$today)) {
- unlink('../../../target/temp/phpunit/TEST-daily.txt.'.$today);
- }
- }
-
+
+ protected function setUp() {
+ @unlink(PHPUNIT_TEMP_DIR . '/TEST-daily.txt.' . date('Ymd'));
+ @unlink(PHPUNIT_TEMP_DIR . '/TEST-daily.txt.' . date('Y'));
+ }
+
public function testRequiresLayout() {
$appender = new LoggerAppenderDailyFile();
self::assertTrue($appender->requiresLayout());
}
-
- public function testSimpleLogging() {
- $layout = new LoggerLayoutSimple();
-
- $event = new LoggerLoggingEvent('LoggerAppenderFileTest',
- new Logger('mycategory'),
- LoggerLevel::getLevelWarn(),
- "my message");
-
- $appender = new LoggerAppenderDailyFile("mylogger");
- $appender->setFile('../../../target/temp/phpunit/TEST-daily.txt.%s');
- $appender->setLayout($layout);
+
+ public function testDefaultLayout() {
+ $appender = new LoggerAppenderDailyFile();
+ $actual = $appender->getLayout();
+ self::assertInstanceOf('LoggerLayoutSimple', $actual);
+ }
+
+ public function testSimpleLogging() {
+ $event = LoggerTestHelper::getWarnEvent("my message");
+
+ $appender = new LoggerAppenderDailyFile();
+ $appender->setFile(PHPUNIT_TEMP_DIR . '/TEST-daily.txt.%s');
$appender->activateOptions();
$appender->append($event);
$appender->close();
- $this->t1 = date("Ymd");
- $v = file_get_contents('../../../target/temp/phpunit/TEST-daily.txt.'.$this->t1);
- $e = "WARN - my message".PHP_EOL;
- self::assertEquals($e, $v);
- }
-
- public function testChangedDateFormat() {
- $layout = new LoggerLayoutSimple();
-
- $event = new LoggerLoggingEvent('LoggerAppenderFileTest',
- new Logger('mycategory'),
- LoggerLevel::getLevelWarn(),
- "my message");
-
- $appender = new LoggerAppenderDailyFile("mylogger");
- $appender->setDatePattern('Y');
- $appender->setFile('../../../target/temp/phpunit/TEST-daily.txt.%s');
- $appender->setLayout($layout);
+ $actual = file_get_contents(PHPUNIT_TEMP_DIR . '/TEST-daily.txt.' . date("Ymd"));
+ $expected = "WARN - my message".PHP_EOL;
+ self::assertEquals($expected, $actual);
+ }
+
+ public function testChangedDateFormat() {
+ $event = LoggerTestHelper::getWarnEvent("my message");
+
+ $appender = new LoggerAppenderDailyFile();
+ $appender->setDatePattern('Y');
+ $appender->setFile(PHPUNIT_TEMP_DIR . '/TEST-daily.txt.%s');
$appender->activateOptions();
$appender->append($event);
$appender->close();
- $this->t2 = date("Y");
- $v = file_get_contents('../../../target/temp/phpunit/TEST-daily.txt.'.$this->t2);
- $e = "WARN - my message".PHP_EOL;
- self::assertEquals($e, $v);
- }
-
- protected function tearDown() {
- if(file_exists('../../../target/temp/phpunit/TEST-daily.txt.'.$this->t1)) {
- unlink('../../../target/temp/phpunit/TEST-daily.txt.'.$this->t1);
- }
- if(file_exists('../../../target/temp/phpunit/TEST-daily.txt.'.$this->t2)) {
- unlink('../../../target/temp/phpunit/TEST-daily.txt.'.$this->t2);
- }
- //rmdir('../../../target/temp/phpunit');
- }
+ $actual = file_get_contents(PHPUNIT_TEMP_DIR . '/TEST-daily.txt.' . date("Y"));
+ $expected = "WARN - my message".PHP_EOL;
+ self::assertEquals($expected, $actual);
+ }
}
Propchange: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderDailyFileTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderEchoTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderEchoTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderEchoTest.php (original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderEchoTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderEchoTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailEventTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailEventTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailEventTest.php (original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailEventTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailEventTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailTest.php (original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMailTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMongoDBTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMongoDBTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMongoDBTest.php (original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMongoDBTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMongoDBTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php (original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderNullTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPDOTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPDOTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPDOTest.php (original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPDOTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
@@ -27,10 +27,18 @@
* @group appenders
*/
class LoggerAppenderPDOTest extends PHPUnit_Framework_TestCase {
- const dsn = 'sqlite:../../../target/pdotest.sqlite';
- const file = '../../../target/pdotest.sqlite';
+
+ const FILENAME = 'pdotest.sqlite';
+ private static $dsn;
+ private static $file;
public static function setUpBeforeClass() {
+
+ self::$file = PHPUNIT_TEMP_DIR . '/' . self::FILENAME;
+ self::$dsn = 'sqlite:' . self::$file;
+
+// var_dump(self::$file, self::$dsn); die;
+
if(extension_loaded('pdo_sqlite')) {
$drop = 'DROP TABLE IF EXISTS log4php_log;';
$create = 'CREATE TABLE log4php_log (
@@ -43,14 +51,13 @@ class LoggerAppenderPDOTest extends PHPU
line VARCHAR(10)
);';
- $pdo = new PDO(self::dsn);
+ $pdo = new PDO(self::$dsn);
$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$pdo->exec($drop);
$pdo->exec($create);
}
}
-
/** To start with an empty database for each single test. */
public function setUp() {
if(!extension_loaded('pdo_sqlite')) {
@@ -60,7 +67,7 @@ class LoggerAppenderPDOTest extends PHPU
/** Clean up after the last test was run. */
public static function tearDownAfterClass() {
- if (file_exists(self::file)) @unlink(self::file);
+ @unlink(self::$file);
}
public function testRequiresLayout() {
@@ -73,28 +80,28 @@ class LoggerAppenderPDOTest extends PHPU
// Log event
$event = new LoggerLoggingEvent("LoggerAppenderPDOTest", new Logger("TEST"), LoggerLevel::getLevelError(), "testmessage");
$appender = new LoggerAppenderPDO("myname");
- $appender->setDSN(self::dsn);
+ $appender->setDSN(self::$dsn);
$appender->activateOptions();
$appender->append($event);
$appender->close();
// Test the default pattern
- $db = new PDO(self::dsn);
+ $db = new PDO(self::$dsn);
$query = "SELECT * FROM log4php_log";
$sth = $db->query($query);
$row = $sth->fetch(PDO::FETCH_NUM);
self::assertTrue(is_array($row), "No rows found.");
self::assertEquals(7, count($row));
- self::assertEquals(1, preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/', $row[0])); // %d = date
- self::assertEquals('TEST', $row[1]); // %c = category
- self::assertEquals('ERROR', $row[2]); // %p = priority
- self::assertEquals('testmessage', $row[3]); // %m = message
+ self::assertEquals(1, preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/', $row[0])); // datetime
+ self::assertEquals('TEST', $row[1]); // logger name
+ self::assertEquals('ERROR', $row[2]); // level
+ self::assertEquals('testmessage', $row[3]); // message
if (function_exists('posix_getpid')) {
- self::assertEquals(posix_getpid(), $row[4]); // %t = thread
+ self::assertEquals(posix_getpid(), $row[4]); // process id
}
- self::assertEquals('NA', $row[5]); // %F = file, NA due to phpunit magic
- self::assertEquals('NA', $row[6]); // %L = line, NA due to phpunit magic
+ self::assertEquals('NA', $row[5]); // file, NA due to phpunit magic
+ self::assertEquals('NA', $row[6]); // line, NA due to phpunit magic
}
@@ -105,7 +112,7 @@ class LoggerAppenderPDOTest extends PHPU
// Prepare appender
$appender = new LoggerAppenderPDO("myname");
- $appender->setDSN(self::dsn);
+ $appender->setDSN(self::$dsn);
$appender->setInsertSql("INSERT INTO log4php_log (file, line, thread, timestamp, logger, level, message) VALUES (?,?,?,?,?,?,?)");
$appender->setInsertPattern("%F,%L,%t,%d\{$dateFormat\},%c,%p,%m");
$appender->activateOptions();
@@ -114,10 +121,8 @@ class LoggerAppenderPDOTest extends PHPU
$event = new LoggerLoggingEvent("LoggerAppenderPDOTest2", new Logger("TEST"), LoggerLevel::getLevelError(), "testmessage");
$appender->append($event);
- $date = date($dateFormat, $event->getTimeStamp());
-
// Check
- $db = new PDO(self::dsn);
+ $db = new PDO(self::$dsn);
$result = $db->query("SELECT * FROM log4php_log");
$row = $result->fetch(PDO::FETCH_OBJ);
self::assertTrue(is_object($row));
@@ -126,7 +131,7 @@ class LoggerAppenderPDOTest extends PHPU
if (function_exists('posix_getpid')) {
self::assertEquals(posix_getpid(), $row->thread);
}
- self::assertEquals($date, $row->timestamp);
+ self::assertEquals(1, preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/', $row->timestamp));
self::assertEquals('TEST', $row->logger);
self::assertEquals('ERROR', $row->level);
self::assertEquals('testmessage', $row->message);
@@ -135,7 +140,7 @@ class LoggerAppenderPDOTest extends PHPU
/**
* Tests a warning is shown when connecting to invalid dns.
* @expectedException PHPUnit_Framework_Error
- * @expectedExceptionMessage Failed connecting to database: invalid data source name
+ * @expectedExceptionMessage invalid data source name
*/
public function testException() {
$dsn = 'doenotexist';
@@ -151,7 +156,7 @@ class LoggerAppenderPDOTest extends PHPU
$event = new LoggerLoggingEvent("LoggerAppenderPDOTest", new Logger("TEST"), LoggerLevel::getLevelError(), "testmessage");
$appender = new LoggerAppenderPDO("myname");
- $appender->setDSN(self::dsn);
+ $appender->setDSN(self::$dsn);
$appender->activateOptions();
$appender->append($event);
$appender->close();
Propchange: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPDOTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPhpTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPhpTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPhpTest.php (original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPhpTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderPhpTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderRollingFileTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderRollingFileTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderRollingFileTest.php (original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderRollingFileTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
@@ -27,20 +27,13 @@
* @group appenders
*/
class LoggerAppenderRollingFileTest extends PHPUnit_Framework_TestCase {
- /** Directory for temporary files.
- *
- * @var string
- */
- private $dir;
const WARNING_MASSAGE = 'WARN - my messageXYZ';
protected function setUp() {
- $this->dir = dirname(__FILE__) . '/../../../../target/phpunit';
- @mkdir($this->dir);
- @unlink($this->dir.'/TEST-rolling.txt');
- @unlink($this->dir.'/TEST-rolling.txt.1');
- @unlink($this->dir.'/TEST-rolling.txt.2');
+ @unlink(PHPUNIT_TEMP_DIR . '/TEST-rolling.txt');
+ @unlink(PHPUNIT_TEMP_DIR . '/TEST-rolling.txt.1');
+ @unlink(PHPUNIT_TEMP_DIR . '/TEST-rolling.txt.2');
}
public function testRequiresLayout() {
@@ -79,15 +72,6 @@ class LoggerAppenderRollingFileTest exte
self::assertEquals(1572864, $appender->getMaxFileSize());
}
- public function testSetFileName() {
- $appender = new LoggerAppenderRollingFile("mylogger");
- $appender->setFile($this->dir.'/../././phpunit/doesnotexist.log');
- $expandedFileName = self::readAttribute($appender, 'expandedFileName');
-
- $expectedFilePattern = '/' . implode(preg_quote(DIRECTORY_SEPARATOR, '/'), array('target', 'phpunit', 'doesnotexist\.log')) . '$/';
- self::assertEquals(preg_match($expectedFilePattern, $expandedFileName), 1, $expandedFileName);
- }
-
/**
* @return LoggerAppenderRollingFile
*/
@@ -95,7 +79,7 @@ class LoggerAppenderRollingFileTest exte
$layout = new LoggerLayoutSimple();
$appender = new LoggerAppenderRollingFile("mylogger");
- $appender->setFile($this->dir.'/TEST-rolling.txt');
+ $appender->setFile(PHPUNIT_TEMP_DIR . '/TEST-rolling.txt');
$appender->setLayout($layout);
$appender->setMaxFileSize('1KB');
$appender->setMaxBackupIndex(2);
@@ -106,38 +90,30 @@ class LoggerAppenderRollingFileTest exte
public function testSimpleLogging() {
$appender = $this->createRolloverAppender();
-
- $event = new LoggerLoggingEvent('LoggerAppenderFileTest',
- new Logger('mycategory'),
- LoggerLevel::getLevelWarn(),
- "my message123");
+
+ $event = LoggerTestHelper::getWarnEvent("my message123");
for($i = 0; $i < 1000; $i++) {
$appender->append($event);
}
- $event = new LoggerLoggingEvent('LoggerAppenderFileTest',
- new Logger('mycategory'),
- LoggerLevel::getLevelWarn(),
- "my messageXYZ");
-
- $appender->append($event);
+ $appender->append(LoggerTestHelper::getWarnEvent("my messageXYZ"));
$appender->close();
- $file = $this->dir.'/TEST-rolling.txt';
+ $file = PHPUNIT_TEMP_DIR . '/TEST-rolling.txt';
$data = file($file);
$line = $data[count($data)-1];
$e = "WARN - my messageXYZ".PHP_EOL;
self::assertEquals($e, $line);
- $file = $this->dir.'/TEST-rolling.txt.1';
+ $file = PHPUNIT_TEMP_DIR . '/TEST-rolling.txt.1';
$this->checkFileContent($file);
- $file = $this->dir.'/TEST-rolling.txt.2';
+ $file = PHPUNIT_TEMP_DIR . '/TEST-rolling.txt.2';
$this->checkFileContent($file);
- $this->assertFalse(file_exists($this->dir.'/TEST-rolling.txt.3'), 'should not roll over three times');
+ $this->assertFalse(file_exists(PHPUNIT_TEMP_DIR.'/TEST-rolling.txt.3'), 'should not roll over three times');
}
public function testLoggingViaLogger() {
@@ -154,20 +130,20 @@ class LoggerAppenderRollingFileTest exte
$logger->warn("my messageXYZ");
- $file = $this->dir.'/TEST-rolling.txt';
+ $file = PHPUNIT_TEMP_DIR.'/TEST-rolling.txt';
$data = file($file);
$line = $data[count($data)-1];
$e = "WARN - my messageXYZ".PHP_EOL;
self::assertEquals($e, $line);
- $file = $this->dir.'/TEST-rolling.txt.1';
+ $file = PHPUNIT_TEMP_DIR.'/TEST-rolling.txt.1';
$this->checkFileContent($file);
- $file = $this->dir.'/TEST-rolling.txt.2';
+ $file = PHPUNIT_TEMP_DIR.'/TEST-rolling.txt.2';
$this->checkFileContent($file);
- $this->assertFalse(file_exists($this->dir.'/TEST-rolling.txt.3'), 'should not roll over three times');
+ $this->assertFalse(file_exists(PHPUNIT_TEMP_DIR.'/TEST-rolling.txt.3'), 'should not roll over three times');
}
public function testRolloverWithCompression() {
@@ -185,23 +161,23 @@ class LoggerAppenderRollingFileTest exte
$logger->warn("my messageXYZ");
- $file = $this->dir.'/TEST-rolling.txt';
+ $file = PHPUNIT_TEMP_DIR . '/TEST-rolling.txt';
$data = file($file);
$line = $data[count($data)-1];
$e = self::WARNING_MASSAGE.PHP_EOL;
self::assertEquals($e, $line);
- $firstCompressedRollingFile = $this->dir.'/TEST-rolling.txt.1.gz';
+ $firstCompressedRollingFile = PHPUNIT_TEMP_DIR . '/TEST-rolling.txt.1.gz';
$this->assertTrue(file_exists($firstCompressedRollingFile),'TEST-rolling.txt.1.gz not found');
- $firstUncompressedRollingField = $this->dir.'/TEST-rolling.txt.1';
+ $firstUncompressedRollingField = PHPUNIT_TEMP_DIR . '/TEST-rolling.txt.1';
$this->assertFalse(file_exists($firstUncompressedRollingField),'TEST-rolling.txt.1 should be replaced by compressed');
- $secondCompressedRollingFile = $this->dir.'/TEST-rolling.txt.2.gz';
+ $secondCompressedRollingFile = PHPUNIT_TEMP_DIR . '/TEST-rolling.txt.2.gz';
$this->assertTrue(file_exists($secondCompressedRollingFile), 'TEST-rolling.txt.2.gz not found');
- $secondUncompressedRollingField = $this->dir.'/TEST-rolling.txt.2';
+ $secondUncompressedRollingField = PHPUNIT_TEMP_DIR . '/TEST-rolling.txt.2';
$this->assertFalse(file_exists($secondUncompressedRollingField),'TEST-rolling.txt.2 should be replaced by compressed');
}
@@ -216,16 +192,15 @@ class LoggerAppenderRollingFileTest exte
$e = "WARN - my message123".PHP_EOL;
foreach($text as $r) {
self::assertEquals($e, $r);
- }
+ }
}
protected function tearDown() {
- @unlink($this->dir.'/TEST-rolling.txt');
- @unlink($this->dir.'/TEST-rolling.txt.1');
- @unlink($this->dir.'/TEST-rolling.txt.2');
- @unlink($this->dir.'/TEST-rolling.txt.1.gz');
- @unlink($this->dir.'/TEST-rolling.txt.2.gz');
- @rmdir($this->dir);
+ @unlink(PHPUNIT_TEMP_DIR.'/TEST-rolling.txt');
+ @unlink(PHPUNIT_TEMP_DIR.'/TEST-rolling.txt.1');
+ @unlink(PHPUNIT_TEMP_DIR.'/TEST-rolling.txt.2');
+ @unlink(PHPUNIT_TEMP_DIR.'/TEST-rolling.txt.1.gz');
+ @unlink(PHPUNIT_TEMP_DIR.'/TEST-rolling.txt.2.gz');
}
}
Propchange: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderRollingFileTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSocketTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSocketTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSocketTest.php (original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSocketTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSocketTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSyslogTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSyslogTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSyslogTest.php (original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSyslogTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/appenders/LoggerAppenderSyslogTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/appenders/socketServer.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/socketServer.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/socketServer.php (original)
+++ logging/log4php/trunk/src/test/php/appenders/socketServer.php Sat Aug 18 13:51:02 2012
@@ -20,7 +20,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*
* A simple socket server used in LoggerAppenderSocketTest.
Propchange: logging/log4php/trunk/src/test/php/appenders/socketServer.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/bootstrap.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/bootstrap.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/bootstrap.php (original)
+++ logging/log4php/trunk/src/test/php/bootstrap.php Sat Aug 18 13:51:02 2012
@@ -18,7 +18,7 @@
* @category tests
* @package log4php
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/bootstrap.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/filters/LoggerFilterDenyAllTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/filters/LoggerFilterDenyAllTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/filters/LoggerFilterDenyAllTest.php (original)
+++ logging/log4php/trunk/src/test/php/filters/LoggerFilterDenyAllTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage filters
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/filters/LoggerFilterDenyAllTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/filters/LoggerFilterLevelMatchTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/filters/LoggerFilterLevelMatchTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/filters/LoggerFilterLevelMatchTest.php (original)
+++ logging/log4php/trunk/src/test/php/filters/LoggerFilterLevelMatchTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage filters
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/filters/LoggerFilterLevelMatchTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/filters/LoggerFilterLevelRangeTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/filters/LoggerFilterLevelRangeTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/filters/LoggerFilterLevelRangeTest.php (original)
+++ logging/log4php/trunk/src/test/php/filters/LoggerFilterLevelRangeTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage filters
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/filters/LoggerFilterLevelRangeTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/filters/LoggerFilterStringMatchTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/filters/LoggerFilterStringMatchTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/filters/LoggerFilterStringMatchTest.php (original)
+++ logging/log4php/trunk/src/test/php/filters/LoggerFilterStringMatchTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage filters
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/filters/LoggerFilterStringMatchTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/helpers/LoggerOptionConverterTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/helpers/LoggerOptionConverterTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/helpers/LoggerOptionConverterTest.php (original)
+++ logging/log4php/trunk/src/test/php/helpers/LoggerOptionConverterTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage helpers
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/helpers/LoggerOptionConverterTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/helpers/LoggerPatternParserTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/helpers/LoggerPatternParserTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/helpers/LoggerPatternParserTest.php (original)
+++ logging/log4php/trunk/src/test/php/helpers/LoggerPatternParserTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage helpers
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/helpers/LoggerPatternParserTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/helpers/LoggerUtilsTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/helpers/LoggerUtilsTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/helpers/LoggerUtilsTest.php (original)
+++ logging/log4php/trunk/src/test/php/helpers/LoggerUtilsTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage helpers
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/helpers/LoggerUtilsTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/layouts/LoggerLayoutHtmlTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/layouts/LoggerLayoutHtmlTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/layouts/LoggerLayoutHtmlTest.php (original)
+++ logging/log4php/trunk/src/test/php/layouts/LoggerLayoutHtmlTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/layouts/LoggerLayoutHtmlTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/layouts/LoggerLayoutPatternTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/layouts/LoggerLayoutPatternTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/layouts/LoggerLayoutPatternTest.php (original)
+++ logging/log4php/trunk/src/test/php/layouts/LoggerLayoutPatternTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/layouts/LoggerLayoutPatternTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/layouts/LoggerLayoutSerializedTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/layouts/LoggerLayoutSerializedTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/layouts/LoggerLayoutSerializedTest.php (original)
+++ logging/log4php/trunk/src/test/php/layouts/LoggerLayoutSerializedTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/layouts/LoggerLayoutSerializedTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/layouts/LoggerLayoutSimpleTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/layouts/LoggerLayoutSimpleTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/layouts/LoggerLayoutSimpleTest.php (original)
+++ logging/log4php/trunk/src/test/php/layouts/LoggerLayoutSimpleTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/layouts/LoggerLayoutSimpleTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/layouts/LoggerLayoutTTCCTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/layouts/LoggerLayoutTTCCTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/layouts/LoggerLayoutTTCCTest.php (original)
+++ logging/log4php/trunk/src/test/php/layouts/LoggerLayoutTTCCTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage appenders
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/layouts/LoggerLayoutTTCCTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/renderers/LoggerRendererDefaultTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/renderers/LoggerRendererDefaultTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/renderers/LoggerRendererDefaultTest.php (original)
+++ logging/log4php/trunk/src/test/php/renderers/LoggerRendererDefaultTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage renderers
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/renderers/LoggerRendererDefaultTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/renderers/LoggerRendererExceptionTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/renderers/LoggerRendererExceptionTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/renderers/LoggerRendererExceptionTest.php (original)
+++ logging/log4php/trunk/src/test/php/renderers/LoggerRendererExceptionTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage renderers
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/renderers/LoggerRendererExceptionTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php (original)
+++ logging/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage renderers
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/php/renderers/LoggerRendererObjectTest.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/renderers/LoggerRendererObjectTest.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/renderers/LoggerRendererObjectTest.php (original)
+++ logging/log4php/trunk/src/test/php/renderers/LoggerRendererObjectTest.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @package log4php
* @subpackage renderers
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/php/renderers/LoggerRendererObjectTest.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/resources/configs/adapters/php/config_empty.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/resources/configs/adapters/php/config_empty.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/resources/configs/adapters/php/config_empty.php (original)
+++ logging/log4php/trunk/src/test/resources/configs/adapters/php/config_empty.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @category tests
* @package log4php
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/resources/configs/adapters/php/config_empty.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/resources/configs/adapters/php/config_invalid_syntax.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/resources/configs/adapters/php/config_invalid_syntax.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/resources/configs/adapters/php/config_invalid_syntax.php (original)
+++ logging/log4php/trunk/src/test/resources/configs/adapters/php/config_invalid_syntax.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @category tests
* @package log4php
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/resources/configs/adapters/php/config_invalid_syntax.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/resources/configs/adapters/php/config_not_an_array.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/resources/configs/adapters/php/config_not_an_array.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/resources/configs/adapters/php/config_not_an_array.php (original)
+++ logging/log4php/trunk/src/test/resources/configs/adapters/php/config_not_an_array.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @category tests
* @package log4php
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/resources/configs/adapters/php/config_not_an_array.php
------------------------------------------------------------------------------
svn:keywords = Revision
Modified: logging/log4php/trunk/src/test/resources/configs/adapters/php/config_valid.php
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/resources/configs/adapters/php/config_valid.php?rev=1374580&r1=1374579&r2=1374580&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/resources/configs/adapters/php/config_valid.php (original)
+++ logging/log4php/trunk/src/test/resources/configs/adapters/php/config_valid.php Sat Aug 18 13:51:02 2012
@@ -19,7 +19,7 @@
* @category tests
* @package log4php
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @version SVN: $Id$
+ * @version $Revision$
* @link http://logging.apache.org/log4php
*/
Propchange: logging/log4php/trunk/src/test/resources/configs/adapters/php/config_valid.php
------------------------------------------------------------------------------
svn:keywords = Revision