Author: ihabunek
Date: Fri May 20 11:27:20 2011
New Revision: 1125330
URL: http://svn.apache.org/viewvc?rev=1125330&view=rev
Log:
* Configured tests which require mongo db extension to be skipped if the
extension is not loaded.
* Fixed formatting.
Modified:
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMongoDBTest.php
logging/log4php/trunk/src/test/php/helpers/LoggerLoggingEventBsonifierTest.php
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=1125330&r1=1125329&r2=1125330&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMongoDBTest.php
(original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderMongoDBTest.php
Fri May 20 11:27:20 2011
@@ -45,6 +45,14 @@ class LoggerAppenderMongoDBTest extends
self::$event = null;
}
+ protected function setUp() {
+ if (extension_loaded('mongo') == false) {
+ $this->markTestSkipped(
+ 'The Mongo extension is not available.'
+ );
+ }
+ }
+
public function test__construct() {
$appender = new LoggerAppenderMongoDB('mongo_appender');
$this->assertTrue($appender instanceof LoggerAppenderMongoDB);
@@ -116,21 +124,21 @@ class LoggerAppenderMongoDBTest extends
public function testGetUserName() {
$expected = 'char0n';
self::$appender->setUserName($expected);
- $result = self::$appender->getUserName();
+ $result = self::$appender->getUserName();
$this->assertEquals($expected, $result, 'UserName doesn\'t
match expted value');
}
public function testSetPassword() {
$expected = 'secret pass';
self::$appender->setPassword($expected);
- $result = self::$appender->getPassword();
+ $result = self::$appender->getPassword();
$this->assertEquals($expected, $result, 'Password doesn\'t
match expted value');
}
public function testGetPassword() {
$expected = 'secret pass';
self::$appender->setPassword($expected);
- $result = self::$appender->getPassword();
+ $result = self::$appender->getPassword();
$this->assertEquals($expected, $result, 'Password doesn\'t
match expted value');
}
@@ -144,10 +152,10 @@ class LoggerAppenderMongoDBTest extends
}
}
- public function testAppend() {
+ public function testAppend() {
self::$appender->append(self::$event);
}
-
+
public function testMongoDB() {
self::$appender->activateOptions();
$mongo = self::$appender->getConnection();
@@ -158,12 +166,12 @@ class LoggerAppenderMongoDBTest extends
self::$appender->append(self::$event);
$this->assertNotEquals(null, $collection->findOne(),
'Collection should return one record');
- }
+ }
public function testMongoDBException() {
- self::$appender->activateOptions();
+ self::$appender->activateOptions();
$mongo = self::$appender->getConnection();
- $db = $mongo->selectDB('log4php_mongodb');
+ $db = $mongo->selectDB('log4php_mongodb');
$db->drop('logs');
$collection = $db->selectCollection('logs');
@@ -177,7 +185,7 @@ class LoggerAppenderMongoDBTest extends
public function testMongoDBInnerException() {
self::$appender->activateOptions();
$mongo = self::$appender->getConnection();
- $db = $mongo->selectDB('log4php_mongodb');
+ $db = $mongo->selectDB('log4php_mongodb');
$db->drop('logs');
$collection = $db->selectCollection('logs');
@@ -188,7 +196,7 @@ class LoggerAppenderMongoDBTest extends
$this->assertNotEquals(null, $collection->findOne(),
'Collection should return one record');
}
-
+
public function testClose() {
self::$appender->close();
}
Modified:
logging/log4php/trunk/src/test/php/helpers/LoggerLoggingEventBsonifierTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/helpers/LoggerLoggingEventBsonifierTest.php?rev=1125330&r1=1125329&r2=1125330&view=diff
==============================================================================
---
logging/log4php/trunk/src/test/php/helpers/LoggerLoggingEventBsonifierTest.php
(original)
+++
logging/log4php/trunk/src/test/php/helpers/LoggerLoggingEventBsonifierTest.php
Fri May 20 11:27:20 2011
@@ -37,13 +37,21 @@ class LoggerLoggingEventBsonifierTest ex
public static function setUpBeforeClass() {
self::$logger = Logger::getLogger('test.Logger');
self::$bsonifier = new LoggerLoggingEventBsonifier();
- }
+ }
public static function tearDownAfterClass() {
self::$logger = null;
self::$bsonifier = null;
}
+ protected function setUp() {
+ if (extension_loaded('mongo') == false) {
+ $this->markTestSkipped(
+ 'The Mongo extension is not available.'
+ );
+ }
+ }
+
public function testFormatSimple() {
$event = new LoggerLoggingEvent(
'testFqcn',
@@ -174,38 +182,38 @@ class LoggerLoggingEventBsonifierTest ex
}
public function testIsThreadInteger() {
- $event = new LoggerLoggingEvent(
- 'testFqcn',
- self::$logger,
- LoggerLevel::getLevelWarn(),
- 'test message'
- );
- $bsonifiedEvent = self::$bsonifier->bsonify($event);
+ $event = new LoggerLoggingEvent(
+ 'testFqcn',
+ self::$logger,
+ LoggerLevel::getLevelWarn(),
+ 'test message'
+ );
+ $bsonifiedEvent = self::$bsonifier->bsonify($event);
$this->assertTrue(is_int($bsonifiedEvent['thread']));
}
- public function testIsLocationInfoLineNumberIntegerOrNA() {
- $event = new LoggerLoggingEvent(
- 'testFqcn',
- self::$logger,
- LoggerLevel::getLevelWarn(),
- 'test message'
- );
- $bsonifiedEvent = self::$bsonifier->bsonify($event);
- $this->assertTrue(is_int($bsonifiedEvent['lineNumber']) ||
$bsonifiedEvent['lineNumber'] == 'NA');
- }
+ public function testIsLocationInfoLineNumberIntegerOrNA() {
+ $event = new LoggerLoggingEvent(
+ 'testFqcn',
+ self::$logger,
+ LoggerLevel::getLevelWarn(),
+ 'test message'
+ );
+ $bsonifiedEvent = self::$bsonifier->bsonify($event);
+ $this->assertTrue(is_int($bsonifiedEvent['lineNumber']) ||
$bsonifiedEvent['lineNumber'] == 'NA');
+ }
- public function testIsThrowableInfoExceptionCodeInteger() {
- $event = new LoggerLoggingEvent(
- 'testFqcn',
- self::$logger,
- LoggerLevel::getLevelWarn(),
- 'test message',
- microtime(true),
- new Exception('test exeption', 1, new Exception('test
exception inner', 2))
- );
- $bsonifiedEvent = self::$bsonifier->bsonify($event);
- $this->assertTrue(is_int($bsonifiedEvent['exception']['code']));
- }
+ public function testIsThrowableInfoExceptionCodeInteger() {
+ $event = new LoggerLoggingEvent(
+ 'testFqcn',
+ self::$logger,
+ LoggerLevel::getLevelWarn(),
+ 'test message',
+ microtime(true),
+ new Exception('test exeption', 1, new Exception('test
exception inner', 2))
+ );
+ $bsonifiedEvent = self::$bsonifier->bsonify($event);
+ $this->assertTrue(is_int($bsonifiedEvent['exception']['code']));
+ }
}
?>
\ No newline at end of file
