Add LogTest to AllTests suite

Fix name of mock Logger in LogTest Fix expected dates in LoggerTest
bobdia · Jan 10, 2011 · b72432f · b72432f
1 parent 96cb91f
commit b72432f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/tests/AllTests.php b/tests/AllTests.php
@@ -38,6 +38,7 @@
 require_once 'ResponseTest.php';
 require_once 'SlimTest.php';
 require_once 'LoggerTest.php';
+require_once 'LogTest.php';
 
 class AllTests {
 
@@ -50,6 +51,7 @@ public static function suite() {
 		$suite->addTestSuite('RequestTest');
 		$suite->addTestSuite('ResponseTest');
 		$suite->addTestSuite('LoggerTest');
+		$suite->addTestSuite('LogTest');
 		return $suite;
 	}
 

diff --git a/tests/LogTest.php b/tests/LogTest.php
@@ -33,7 +33,7 @@
 require_once '../slim/Log.php';
 require_once 'PHPUnit/Extensions/OutputTestCase.php';
 
-class Logger {
+class MyLogger {
 
 	public function debug( $object ) {
 		return 'debug';
@@ -69,7 +69,7 @@ class LogTest extends PHPUnit_Extensions_OutputTestCase {
 	 * Logger set as Log logger
 	 */
 	public function testSetsLogger() {
-		$logger = new Logger();
+		$logger = new MyLogger();
 		Log::setLogger($logger);
 		$this->assertSame($logger, Log::getLogger());
 	}
@@ -84,7 +84,7 @@ public function testSetsLogger() {
 	 * Expected responses are returned proving Logger was called;
 	 */
 	public function testLoggerMethods() {
-		Log::setLogger(new Logger());
+		Log::setLogger(new MyLogger());
 		$this->assertEquals('debug', Log::debug('Test'));
 		$this->assertEquals('info', Log::info('Test'));
 		$this->assertEquals('warn', Log::warn('Test'));

diff --git a/tests/LoggerTest.php b/tests/LoggerTest.php
@@ -84,7 +84,7 @@ public function testLoggerInstantiation() {
 	 */
 	public function testLogsDebug() {
 		$l = new TestLogger('./logs', 4);
-		$this->expectOutputString('[DEBUG] ' . strftime(DATE_ISO8601) . ' - ' . 'Test Info');
+		$this->expectOutputString('[DEBUG] ' . date('c') . ' - ' . "Test Info\r\n");
 		$l->debug('Test Info');
 	}
 
@@ -93,7 +93,7 @@ public function testLogsDebug() {
 	 */
 	public function testLogsInfo() {
 		$l = new TestLogger('./logs', 3);
-		$this->expectOutputString('[INFO] ' . strftime(DATE_ISO8601) . ' - ' . 'Test Info');
+		$this->expectOutputString('[INFO] ' . date('c') . ' - ' . "Test Info\r\n");
 		$l->debug('Test Info');
 		$l->info('Test Info');
 	}
@@ -103,7 +103,7 @@ public function testLogsInfo() {
 	 */
 	public function testLogsWarn() {
 		$l = new TestLogger('./logs', 2);
-		$this->expectOutputString('[WARN] ' . strftime(DATE_ISO8601) . ' - ' . 'Test Info');
+		$this->expectOutputString('[WARN] ' . date('c') . ' - ' . "Test Info\r\n");
 		$l->info('Test Info');
 		$l->warn('Test Info');
 	}
@@ -113,7 +113,7 @@ public function testLogsWarn() {
 	 */
 	public function testLogsError() {
 		$l = new TestLogger('./logs', 1);
-		$this->expectOutputString('[ERROR] ' . strftime(DATE_ISO8601) . ' - ' . 'Test Info');
+		$this->expectOutputString('[ERROR] ' . date('c') . ' - ' . "Test Info\r\n");
 		$l->warn('test Info');
 		$l->error('Test Info');
 	}
@@ -123,7 +123,7 @@ public function testLogsError() {
 	 */
 	public function testLogsFatal() {
 		$l = new TestLogger('./logs', 0);
-		$this->expectOutputString('[FATAL] ' . strftime(DATE_ISO8601) . ' - ' . 'Test Info');
+		$this->expectOutputString('[FATAL] ' . date('c') . ' - ' . "Test Info\r\n");
 		$l->error('Test Info');
 		$l->fatal('Test Info');
 	}