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
git-svn-id: https://svn.apache.org/repos/asf/logging/log4php/trunk@1374580 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/test/php/LoggerAppenderPoolTest.php b/src/test/php/LoggerAppenderPoolTest.php
index 7416660..89aecff 100644
--- a/src/test/php/LoggerAppenderPoolTest.php
+++ b/src/test/php/LoggerAppenderPoolTest.php
@@ -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
*/
diff --git a/src/test/php/LoggerAppenderTest.php b/src/test/php/LoggerAppenderTest.php
index 8287176..9b5aac8 100644
--- a/src/test/php/LoggerAppenderTest.php
+++ b/src/test/php/LoggerAppenderTest.php
@@ -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
*/
diff --git a/src/test/php/LoggerConfiguratorTest.php b/src/test/php/LoggerConfiguratorTest.php
index 885788a..d82e03c 100644
--- a/src/test/php/LoggerConfiguratorTest.php
+++ b/src/test/php/LoggerConfiguratorTest.php
@@ -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
*/
diff --git a/src/test/php/LoggerExceptionTest.php b/src/test/php/LoggerExceptionTest.php
index cc051bd..5cb9978 100644
--- a/src/test/php/LoggerExceptionTest.php
+++ b/src/test/php/LoggerExceptionTest.php
@@ -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 { }
diff --git a/src/test/php/LoggerFilterTest.php b/src/test/php/LoggerFilterTest.php
index 0f2f4c0..3d32445 100644
--- a/src/test/php/LoggerFilterTest.php
+++ b/src/test/php/LoggerFilterTest.php
@@ -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 {}
diff --git a/src/test/php/LoggerHierarchyTest.php b/src/test/php/LoggerHierarchyTest.php
index 68f4f86..dabc4bc 100644
--- a/src/test/php/LoggerHierarchyTest.php
+++ b/src/test/php/LoggerHierarchyTest.php
@@ -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
*/
diff --git a/src/test/php/LoggerLevelTest.php b/src/test/php/LoggerLevelTest.php
index 9c99391..283c9c5 100644
--- a/src/test/php/LoggerLevelTest.php
+++ b/src/test/php/LoggerLevelTest.php
@@ -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
*/
diff --git a/src/test/php/LoggerLoggingEventTest.php b/src/test/php/LoggerLoggingEventTest.php
index 01f347d..3f1ea3e 100644
--- a/src/test/php/LoggerLoggingEventTest.php
+++ b/src/test/php/LoggerLoggingEventTest.php
@@ -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
*/
diff --git a/src/test/php/LoggerMDCTest.php b/src/test/php/LoggerMDCTest.php
index 39f40fc..20db81a 100644
--- a/src/test/php/LoggerMDCTest.php
+++ b/src/test/php/LoggerMDCTest.php
@@ -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
*/
diff --git a/src/test/php/LoggerNDCTest.php b/src/test/php/LoggerNDCTest.php
index c583b76..380f3ae 100644
--- a/src/test/php/LoggerNDCTest.php
+++ b/src/test/php/LoggerNDCTest.php
@@ -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
*/
diff --git a/src/test/php/LoggerReflectionUtilsTest.php b/src/test/php/LoggerReflectionUtilsTest.php
index 7c34120..cc5187a 100644
--- a/src/test/php/LoggerReflectionUtilsTest.php
+++ b/src/test/php/LoggerReflectionUtilsTest.php
@@ -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
*/
diff --git a/src/test/php/LoggerRootTest.php b/src/test/php/LoggerRootTest.php
index cf76fe4..056a50d 100644
--- a/src/test/php/LoggerRootTest.php
+++ b/src/test/php/LoggerRootTest.php
@@ -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
*/
diff --git a/src/test/php/LoggerTest.php b/src/test/php/LoggerTest.php
index 3909917..a4629e8 100644
--- a/src/test/php/LoggerTest.php
+++ b/src/test/php/LoggerTest.php
@@ -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
*/
diff --git a/src/test/php/LoggerTestHelper.php b/src/test/php/LoggerTestHelper.php
index 26c58f5..0d48812 100644
--- a/src/test/php/LoggerTestHelper.php
+++ b/src/test/php/LoggerTestHelper.php
@@ -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
*/
diff --git a/src/test/php/LoggerThrowableInformationTest.php b/src/test/php/LoggerThrowableInformationTest.php
index 07b1b5e..bc0a296 100644
--- a/src/test/php/LoggerThrowableInformationTest.php
+++ b/src/test/php/LoggerThrowableInformationTest.php
@@ -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
*/
diff --git a/src/test/php/appenders/LoggerAppenderConsoleTest.php b/src/test/php/appenders/LoggerAppenderConsoleTest.php
index dba343d..24b72e0 100644
--- a/src/test/php/appenders/LoggerAppenderConsoleTest.php
+++ b/src/test/php/appenders/LoggerAppenderConsoleTest.php
@@ -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
*/
diff --git a/src/test/php/appenders/LoggerAppenderDailyFileTest.php b/src/test/php/appenders/LoggerAppenderDailyFileTest.php
index 377ccea..5d06876 100644
--- a/src/test/php/appenders/LoggerAppenderDailyFileTest.php
+++ b/src/test/php/appenders/LoggerAppenderDailyFileTest.php
@@ -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);
+ }
}
diff --git a/src/test/php/appenders/LoggerAppenderEchoTest.php b/src/test/php/appenders/LoggerAppenderEchoTest.php
index eb979a0..b70e282 100644
--- a/src/test/php/appenders/LoggerAppenderEchoTest.php
+++ b/src/test/php/appenders/LoggerAppenderEchoTest.php
@@ -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
*/
diff --git a/src/test/php/appenders/LoggerAppenderMailEventTest.php b/src/test/php/appenders/LoggerAppenderMailEventTest.php
index df2a07d..7a19244 100644
--- a/src/test/php/appenders/LoggerAppenderMailEventTest.php
+++ b/src/test/php/appenders/LoggerAppenderMailEventTest.php
@@ -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
*/
diff --git a/src/test/php/appenders/LoggerAppenderMailTest.php b/src/test/php/appenders/LoggerAppenderMailTest.php
index 1f9700b..eeb0500 100644
--- a/src/test/php/appenders/LoggerAppenderMailTest.php
+++ b/src/test/php/appenders/LoggerAppenderMailTest.php
@@ -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
*/
diff --git a/src/test/php/appenders/LoggerAppenderMongoDBTest.php b/src/test/php/appenders/LoggerAppenderMongoDBTest.php
index 02c9e00..7d62fe5 100644
--- a/src/test/php/appenders/LoggerAppenderMongoDBTest.php
+++ b/src/test/php/appenders/LoggerAppenderMongoDBTest.php
@@ -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
*/
diff --git a/src/test/php/appenders/LoggerAppenderNullTest.php b/src/test/php/appenders/LoggerAppenderNullTest.php
index d588933..2a30797 100644
--- a/src/test/php/appenders/LoggerAppenderNullTest.php
+++ b/src/test/php/appenders/LoggerAppenderNullTest.php
@@ -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
*/
diff --git a/src/test/php/appenders/LoggerAppenderPDOTest.php b/src/test/php/appenders/LoggerAppenderPDOTest.php
index d92afa0..33501a5 100644
--- a/src/test/php/appenders/LoggerAppenderPDOTest.php
+++ b/src/test/php/appenders/LoggerAppenderPDOTest.php
@@ -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 @@
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 @@
/** 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 @@
// 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 @@
// 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 @@
$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 @@
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 @@
/**
* 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 @@
$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();
diff --git a/src/test/php/appenders/LoggerAppenderPhpTest.php b/src/test/php/appenders/LoggerAppenderPhpTest.php
index 438b6a2..953315f 100644
--- a/src/test/php/appenders/LoggerAppenderPhpTest.php
+++ b/src/test/php/appenders/LoggerAppenderPhpTest.php
@@ -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
*/
diff --git a/src/test/php/appenders/LoggerAppenderRollingFileTest.php b/src/test/php/appenders/LoggerAppenderRollingFileTest.php
index faf2ef9..77d5c4a 100644
--- a/src/test/php/appenders/LoggerAppenderRollingFileTest.php
+++ b/src/test/php/appenders/LoggerAppenderRollingFileTest.php
@@ -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 @@
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 @@
$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 @@
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 @@
$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 @@
$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 @@
$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');
}
}
diff --git a/src/test/php/appenders/LoggerAppenderSocketTest.php b/src/test/php/appenders/LoggerAppenderSocketTest.php
index 64ffeea..5b9430a 100644
--- a/src/test/php/appenders/LoggerAppenderSocketTest.php
+++ b/src/test/php/appenders/LoggerAppenderSocketTest.php
@@ -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
*/
diff --git a/src/test/php/appenders/LoggerAppenderSyslogTest.php b/src/test/php/appenders/LoggerAppenderSyslogTest.php
index 2c527fd..36d16b0 100644
--- a/src/test/php/appenders/LoggerAppenderSyslogTest.php
+++ b/src/test/php/appenders/LoggerAppenderSyslogTest.php
@@ -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
*/
diff --git a/src/test/php/appenders/socketServer.php b/src/test/php/appenders/socketServer.php
index 7e25d2c..39ec47c 100644
--- a/src/test/php/appenders/socketServer.php
+++ b/src/test/php/appenders/socketServer.php
@@ -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.
diff --git a/src/test/php/bootstrap.php b/src/test/php/bootstrap.php
index 7d6c95a..2dfb255 100644
--- a/src/test/php/bootstrap.php
+++ b/src/test/php/bootstrap.php
@@ -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
*/
diff --git a/src/test/php/filters/LoggerFilterDenyAllTest.php b/src/test/php/filters/LoggerFilterDenyAllTest.php
index 112a410..1e9bb3d 100644
--- a/src/test/php/filters/LoggerFilterDenyAllTest.php
+++ b/src/test/php/filters/LoggerFilterDenyAllTest.php
@@ -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
*/
diff --git a/src/test/php/filters/LoggerFilterLevelMatchTest.php b/src/test/php/filters/LoggerFilterLevelMatchTest.php
index feaca8b..c402030 100644
--- a/src/test/php/filters/LoggerFilterLevelMatchTest.php
+++ b/src/test/php/filters/LoggerFilterLevelMatchTest.php
@@ -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
*/
diff --git a/src/test/php/filters/LoggerFilterLevelRangeTest.php b/src/test/php/filters/LoggerFilterLevelRangeTest.php
index 8ce66f4..7f16590 100644
--- a/src/test/php/filters/LoggerFilterLevelRangeTest.php
+++ b/src/test/php/filters/LoggerFilterLevelRangeTest.php
@@ -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
*/
diff --git a/src/test/php/filters/LoggerFilterStringMatchTest.php b/src/test/php/filters/LoggerFilterStringMatchTest.php
index 7285206..366e685 100644
--- a/src/test/php/filters/LoggerFilterStringMatchTest.php
+++ b/src/test/php/filters/LoggerFilterStringMatchTest.php
@@ -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
*/
diff --git a/src/test/php/helpers/LoggerOptionConverterTest.php b/src/test/php/helpers/LoggerOptionConverterTest.php
index fde2c39..eb31940 100644
--- a/src/test/php/helpers/LoggerOptionConverterTest.php
+++ b/src/test/php/helpers/LoggerOptionConverterTest.php
@@ -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
*/
diff --git a/src/test/php/helpers/LoggerPatternParserTest.php b/src/test/php/helpers/LoggerPatternParserTest.php
index c797aba..d0f68ef 100644
--- a/src/test/php/helpers/LoggerPatternParserTest.php
+++ b/src/test/php/helpers/LoggerPatternParserTest.php
@@ -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
*/
diff --git a/src/test/php/helpers/LoggerUtilsTest.php b/src/test/php/helpers/LoggerUtilsTest.php
index 0ed50e5..5a473ba 100644
--- a/src/test/php/helpers/LoggerUtilsTest.php
+++ b/src/test/php/helpers/LoggerUtilsTest.php
@@ -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
*/
diff --git a/src/test/php/layouts/LoggerLayoutHtmlTest.php b/src/test/php/layouts/LoggerLayoutHtmlTest.php
index 70f4c5a..7b842d1 100644
--- a/src/test/php/layouts/LoggerLayoutHtmlTest.php
+++ b/src/test/php/layouts/LoggerLayoutHtmlTest.php
@@ -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
*/
diff --git a/src/test/php/layouts/LoggerLayoutPatternTest.php b/src/test/php/layouts/LoggerLayoutPatternTest.php
index 0d60f5d..cc322cd 100644
--- a/src/test/php/layouts/LoggerLayoutPatternTest.php
+++ b/src/test/php/layouts/LoggerLayoutPatternTest.php
@@ -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
*/
diff --git a/src/test/php/layouts/LoggerLayoutSerializedTest.php b/src/test/php/layouts/LoggerLayoutSerializedTest.php
index 5cbdb95..7237127 100644
--- a/src/test/php/layouts/LoggerLayoutSerializedTest.php
+++ b/src/test/php/layouts/LoggerLayoutSerializedTest.php
@@ -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
*/
diff --git a/src/test/php/layouts/LoggerLayoutSimpleTest.php b/src/test/php/layouts/LoggerLayoutSimpleTest.php
index 9065fe2..76a35c9 100644
--- a/src/test/php/layouts/LoggerLayoutSimpleTest.php
+++ b/src/test/php/layouts/LoggerLayoutSimpleTest.php
@@ -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
*/
diff --git a/src/test/php/layouts/LoggerLayoutTTCCTest.php b/src/test/php/layouts/LoggerLayoutTTCCTest.php
index cfc5997..9baf060 100644
--- a/src/test/php/layouts/LoggerLayoutTTCCTest.php
+++ b/src/test/php/layouts/LoggerLayoutTTCCTest.php
@@ -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
*/
diff --git a/src/test/php/renderers/LoggerRendererDefaultTest.php b/src/test/php/renderers/LoggerRendererDefaultTest.php
index 0db3f95..66e915c 100644
--- a/src/test/php/renderers/LoggerRendererDefaultTest.php
+++ b/src/test/php/renderers/LoggerRendererDefaultTest.php
@@ -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
*/
diff --git a/src/test/php/renderers/LoggerRendererExceptionTest.php b/src/test/php/renderers/LoggerRendererExceptionTest.php
index 58f9c45..d612228 100644
--- a/src/test/php/renderers/LoggerRendererExceptionTest.php
+++ b/src/test/php/renderers/LoggerRendererExceptionTest.php
@@ -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
*/
diff --git a/src/test/php/renderers/LoggerRendererMapTest.php b/src/test/php/renderers/LoggerRendererMapTest.php
index d40b8d5..f3f2c1c 100644
--- a/src/test/php/renderers/LoggerRendererMapTest.php
+++ b/src/test/php/renderers/LoggerRendererMapTest.php
@@ -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
*/
diff --git a/src/test/php/renderers/LoggerRendererObjectTest.php b/src/test/php/renderers/LoggerRendererObjectTest.php
index c3702ec..090c148 100644
--- a/src/test/php/renderers/LoggerRendererObjectTest.php
+++ b/src/test/php/renderers/LoggerRendererObjectTest.php
@@ -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
*/
diff --git a/src/test/resources/configs/adapters/php/config_empty.php b/src/test/resources/configs/adapters/php/config_empty.php
index a803454..7b0b37c 100644
--- a/src/test/resources/configs/adapters/php/config_empty.php
+++ b/src/test/resources/configs/adapters/php/config_empty.php
@@ -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
*/
diff --git a/src/test/resources/configs/adapters/php/config_invalid_syntax.php b/src/test/resources/configs/adapters/php/config_invalid_syntax.php
index 5d7bb83..bd0220f 100644
--- a/src/test/resources/configs/adapters/php/config_invalid_syntax.php
+++ b/src/test/resources/configs/adapters/php/config_invalid_syntax.php
@@ -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
*/
diff --git a/src/test/resources/configs/adapters/php/config_not_an_array.php b/src/test/resources/configs/adapters/php/config_not_an_array.php
index 112339f..4ed942c 100644
--- a/src/test/resources/configs/adapters/php/config_not_an_array.php
+++ b/src/test/resources/configs/adapters/php/config_not_an_array.php
@@ -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
*/
diff --git a/src/test/resources/configs/adapters/php/config_valid.php b/src/test/resources/configs/adapters/php/config_valid.php
index 972a609..176a704 100644
--- a/src/test/resources/configs/adapters/php/config_valid.php
+++ b/src/test/resources/configs/adapters/php/config_valid.php
@@ -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
*/
