[REVIEW] Merged updated Zend_Log tests to trunk; includes factory() tests

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@19551 44c647ce-9c0f-0410-b52a-842ac1e357ba

tests/Zend/Log/AllTests.php

@@ -17,7 +17,7 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id: AllTests.php 17573 2009-08-13 18:01:41Z alexander $
  */
 
 if (!defined('PHPUnit_MAIN_METHOD')) {

tests/Zend/Log/Filter/ChainingTest.php

@@ -17,7 +17,7 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id: ChainingTest.php 18950 2009-11-12 15:37:56Z alexander $
  */
 
 /** PHPUnit_Framework_TestCase */

tests/Zend/Log/Filter/MessageTest.php

@@ -17,7 +17,7 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id: MessageTest.php 18950 2009-11-12 15:37:56Z alexander $
  */
 
 /** PHPUnit_Framework_TestCase */
@@ -56,5 +56,18 @@ class Zend_Log_Filter_MessageTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($filter->accept(array('message' => 'foo accept bar')));
         $this->assertFalse($filter->accept(array('message' => 'foo reject bar')));
     }
+    
+    public function testFactory()
+    {
+        $cfg = array('log' => array('memory' => array(
+            'writerName'   => "Mock", 
+            'filterName'   => "Message", 
+            'filterParams' => array(
+                'regexp'   => "/42/" 
+             ),        
+        )));
 
+        $logger = Zend_Log::factory($cfg['log']);
+        $this->assertTrue($logger instanceof Zend_Log);
+    }
 }

tests/Zend/Log/Filter/PriorityTest.php

@@ -17,7 +17,7 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id: PriorityTest.php 18950 2009-11-12 15:37:56Z alexander $
  */
 
 /** PHPUnit_Framework_TestCase */
@@ -69,5 +69,30 @@ class Zend_Log_Filter_PriorityTest extends PHPUnit_Framework_TestCase
             $this->assertRegExp('/must be an integer/i', $e->getMessage());
         }
     }
+    
+    public function testFactory()
+    {
+        $cfg = array('log' => array('memory' => array(
+            'writerName' => "Mock", 
+            'filterName' => "Priority", 
+            'filterParams' => array(
+                'priority' => "Zend_Log::CRIT", 
+                'operator' => "<="
+             ),        
+        )));
 
+        $logger = Zend_Log::factory($cfg['log']);
+        $this->assertTrue($logger instanceof Zend_Log);
+        
+        try {
+            $logger = Zend_Log::factory(array('Null' => array(
+                'writerName'   => 'Mock',
+                'filterName'   => 'Priority',
+                'filterParams' => array(),
+            )));            
+        } catch(Exception $e) {
+            $this->assertType('Zend_Log_Exception', $e);
+            $this->assertRegExp('/must be an integer/', $e->getMessage());
+        }
+    }
 }

tests/Zend/Log/Filter/SuppressTest.php

@@ -17,7 +17,7 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id: SuppressTest.php 18950 2009-11-12 15:37:56Z alexander $
  */
 
 /** PHPUnit_Framework_TestCase */
@@ -72,4 +72,15 @@ class Zend_Log_Filter_SuppressTest extends PHPUnit_Framework_TestCase
         $this->filter->suppress(true);
         $this->assertFalse($this->filter->accept(array()));
     }
+    
+    public function testFactory()
+    {
+        $cfg = array('log' => array('memory' => array(
+            'writerName' => "Mock", 
+            'filterName' => "Suppress"
+        )));
+
+        $logger = Zend_Log::factory($cfg['log']);
+        $this->assertTrue($logger instanceof Zend_Log);
+    }
 }

tests/Zend/Log/LogTest.php

@@ -17,7 +17,7 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id: LogTest.php 18950 2009-11-12 15:37:56Z alexander $
  */
 
 require_once dirname(__FILE__) . '/../../TestHelper.php';
@@ -52,7 +52,7 @@ class Zend_Log_LogTest extends PHPUnit_Framework_TestCase
     public function testWriterCanBeAddedWithConstructor()
     {
         $logger = new Zend_Log($this->writer);
-        $logger->log($message = 'message-to-long', Zend_Log::INFO);
+        $logger->log($message = 'message-to-log', Zend_Log::INFO);
 
         rewind($this->log);
         $this->assertContains($message, stream_get_contents($this->log));
@@ -241,4 +241,39 @@ class Zend_Log_LogTest extends PHPUnit_Framework_TestCase
         $info = $event['info'];
         $this->assertContains('nonesuch', $info);
     }
+    
+    // Factory
+
+    public function testLogConstructFromConfigStream() 
+    {
+        $cfg = array('log' => array('memory' => array(
+            'writerName'      => "Stream", 
+            'writerNamespace' => "Zend_Log_Writer", 
+            'writerParams'    => array(
+                'stream'      => "php://memory"
+            )        
+        )));
+
+        $logger = Zend_Log::factory($cfg['log']);
+        $this->assertTrue($logger instanceof Zend_Log);
+    }
+
+    public function testLogConstructFromConfigStreamAndFilter() 
+    {
+        $cfg = array('log' => array('memory' => array(
+            'writerName'      => "Stream", 
+            'writerNamespace' => "Zend_Log_Writer", 
+            'writerParams'    => array(
+                'stream'      => "php://memory"
+            ), 
+            'filterName'   => "Priority", 
+            'filterParams' => array(
+                'priority' => "Zend_Log::CRIT", 
+                'operator' => "<="
+             ),        
+        )));
+
+        $logger = Zend_Log::factory($cfg['log']);
+        $this->assertTrue($logger instanceof Zend_Log);
+    }
 }

tests/Zend/Log/Writer/DbTest.php

@@ -17,7 +17,7 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id: DbTest.php 17573 2009-08-13 18:01:41Z alexander $
  */
 
 /** PHPUnit_Framework_TestCase */
@@ -109,6 +109,20 @@ class Zend_Log_Writer_DbTest extends PHPUnit_Framework_TestCase
             $this->assertEquals('Database adapter is null', $e->getMessage());
         }
     }
+    
+    public function testFactory()
+    {
+        $cfg = array('log' => array('memory' => array(
+            'writerName'   => "Db",
+            'writerParams' => array(
+                'db'    => $this->db,
+                'table' => $this->tableName,
+            ),
+        )));
+
+        $logger = Zend_Log::factory($cfg['log']);
+        $this->assertTrue($logger instanceof Zend_Log);
+    }
 }
 
 

tests/Zend/Log/Writer/FirebugTest.php

@@ -17,7 +17,7 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id: FirebugTest.php 18950 2009-11-12 15:37:56Z alexander $
  */
 
 /** PHPUnit_Framework_TestCase */
@@ -285,6 +285,16 @@ class Zend_Log_Writer_FirebugTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(serialize($qued_messages),
                             serialize($messages));
     }
+    
+    public function testFactory()
+    {
+        $cfg = array('log' => array('memory' => array(
+            'writerName' => "Firebug"
+        )));
+
+        $logger = Zend_Log::factory($cfg['log']);
+        $this->assertTrue($logger instanceof Zend_Log);
+    }
 }
 
 class Zend_Log_Writer_FirebugTest_Formatter extends Zend_Log_Formatter_Firebug

tests/Zend/Log/Writer/MockTest.php

@@ -17,7 +17,7 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id: MockTest.php 17573 2009-08-13 18:01:41Z alexander $
  */
 
 /** PHPUnit_Framework_TestCase */
@@ -46,4 +46,13 @@ class Zend_Log_Writer_MockTest extends PHPUnit_Framework_TestCase
         $this->assertSame(array($fields), $writer->events);
     }
 
+    public function testFactory()
+    {
+        $cfg = array('log' => array('memory' => array(
+            'writerName' => "Mock"
+        )));
+
+        $logger = Zend_Log::factory($cfg['log']);
+        $this->assertTrue($logger instanceof Zend_Log);
+    }
 }

tests/Zend/Log/Writer/NullTest.php

@@ -17,7 +17,7 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id: NullTest.php 17573 2009-08-13 18:01:41Z alexander $
  */
 
 /** PHPUnit_Framework_TestCase */
@@ -42,4 +42,13 @@ class Zend_Log_Writer_NullTest extends PHPUnit_Framework_TestCase
         $writer->write(array('message' => 'foo', 'priority' => 42));
     }
 
+    public function testFactory()
+    {
+        $cfg = array('log' => array('memory' => array(
+            'writerName' => "Null"
+        )));
+
+        $logger = Zend_Log::factory($cfg['log']);
+        $this->assertTrue($logger instanceof Zend_Log);
+    }
 }

tests/Zend/Log/Writer/StreamTest.php

@@ -17,7 +17,7 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id: StreamTest.php 18950 2009-11-12 15:37:56Z alexander $
  */
 
 /** PHPUnit_Framework_TestCase */
@@ -145,4 +145,32 @@ class Zend_Log_Writer_StreamTest extends PHPUnit_Framework_TestCase
 
         $this->assertContains($expected, $contents);
     }
+    
+    public function testFactoryStream()
+    {
+        $cfg = array('log' => array('memory' => array(
+            'writerName'   => "Mock",
+            'writerParams' => array(
+                'stream' => 'php://memory',
+                'mode'   => 'a'
+            )
+        )));
+
+        $logger = Zend_Log::factory($cfg['log']);
+        $this->assertTrue($logger instanceof Zend_Log);
+    }
+    
+    public function testFactoryUrl()
+    {
+        $cfg = array('log' => array('memory' => array(
+            'writerName'   => "Mock",
+            'writerParams' => array(
+                'url'  => 'http://localhost',
+                'mode' => 'a'
+            )
+        )));
+
+        $logger = Zend_Log::factory($cfg['log']);
+        $this->assertTrue($logger instanceof Zend_Log);
+    }
 }