ZF-10472: review tests of Zend_Log

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

library/Zend/Log/Filter/Suppress.php

@@ -21,7 +21,7 @@
  */
 
 /** Zend_Log_Filter_Interface */
-require_once 'Zend/Log/Filter/Interface.php';
+require_once 'Zend/Log/Filter/Abstract.php';
 
 /**
  * @category   Zend
@@ -65,7 +65,7 @@ class Zend_Log_Filter_Suppress extends Zend_Log_Filter_Abstract
 
     /**
      * Create a new instance of Zend_Log_Filter_Suppress
-     * 
+     *
      * @param  array|Zend_Config $config
      * @return Zend_Log_Filter_Suppress
      * @throws Zend_Log_Exception

library/Zend/Log/Writer/Syslog.php

@@ -20,6 +20,9 @@
  * @version    $Id$
  */
 
+/** Zend_Log */
+require_once 'Zend/Log.php';
+
 /** Zend_Log_Writer_Abstract */
 require_once 'Zend/Log/Writer/Abstract.php';
 

tests/Zend/Log/AllTests.php

@@ -27,23 +27,9 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 require_once 'Zend/Log/LogTest.php';
-require_once 'Zend/Log/Filter/ChainingTest.php';
-require_once 'Zend/Log/Filter/PriorityTest.php';
-require_once 'Zend/Log/Filter/MessageTest.php';
-require_once 'Zend/Log/Filter/SuppressTest.php';
-require_once 'Zend/Log/Formatter/SimpleTest.php';
-require_once 'Zend/Log/Formatter/XmlTest.php';
-require_once 'Zend/Log/Writer/AbstractTest.php';
-require_once 'Zend/Log/Writer/DbTest.php';
-if (PHP_OS != 'AIX') {
-    require_once 'Zend/Log/Writer/FirebugTest.php';
-}
-require_once 'Zend/Log/Writer/MailTest.php';
-require_once 'Zend/Log/Writer/MockTest.php';
-require_once 'Zend/Log/Writer/NullTest.php';
-require_once 'Zend/Log/Writer/StreamTest.php';
-require_once 'Zend/Log/Writer/SyslogTest.php';
-require_once 'Zend/Log/Writer/ZendMonitorTest.php';
+require_once 'Zend/Log/Filter/AllTests.php';
+require_once 'Zend/Log/Formatter/AllTests.php';
+require_once 'Zend/Log/Writer/AllTests.php';
 
 /**
  * @category   Zend
@@ -62,29 +48,12 @@ class Zend_Log_AllTests
 
     public static function suite()
     {
-        // hack to allow us to view code coverage for Log.php
-        PHPUnit_Util_Filter::removeFileFromFilter(dirname(__FILE__) . '/../../../library/Zend/Log.php', 'PEAR');
-
         $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Log');
 
         $suite->addTestSuite('Zend_Log_LogTest');
-        $suite->addTestSuite('Zend_Log_Filter_ChainingTest');
-        $suite->addTestSuite('Zend_Log_Filter_PriorityTest');
-        $suite->addTestSuite('Zend_Log_Filter_MessageTest');
-        $suite->addTestSuite('Zend_Log_Filter_SuppressTest');
-        $suite->addTestSuite('Zend_Log_Formatter_SimpleTest');
-        $suite->addTestSuite('Zend_Log_Formatter_XmlTest');
-        $suite->addTestSuite('Zend_Log_Writer_AbstractTest');
-        $suite->addTestSuite('Zend_Log_Writer_DbTest');
-        if (PHP_OS != 'AIX') {
-            $suite->addTestSuite('Zend_Log_Writer_FirebugTest');
-        }
-        $suite->addTestSuite('Zend_Log_Writer_MailTest');
-        $suite->addTestSuite('Zend_Log_Writer_MockTest');
-        $suite->addTestSuite('Zend_Log_Writer_NullTest');
-        $suite->addTestSuite('Zend_Log_Writer_StreamTest');
-        $suite->addTestSuite('Zend_Log_Writer_SyslogTest');
-        $suite->addTestSuite('Zend_Log_Writer_ZendMonitorTest');
+        $suite->addTest(Zend_Log_Filter_AllTests::suite());
+        $suite->addTest(Zend_Log_Formatter_AllTests::suite());
+        $suite->addTest(Zend_Log_Writer_AllTests::suite());
 
         return $suite;
     }
@@ -92,4 +61,4 @@ class Zend_Log_AllTests
 
 if (PHPUnit_MAIN_METHOD == 'Zend_Log_AllTests::main') {
     Zend_Log_AllTests::main();
-}
+}

tests/Zend/Log/Filter/AllTests.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
+
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_Filter_AllTests::main');
+}
+
+require_once 'Zend/Log/Filter/ChainingTest.php';
+require_once 'Zend/Log/Filter/MessageTest.php';
+require_once 'Zend/Log/Filter/PriorityTest.php';
+require_once 'Zend/Log/Filter/SuppressTest.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Log
+ * @group      Zend_Log_Filter
+ */
+class Zend_Log_Filter_AllTests
+{
+    public static function main()
+    {
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Log_Filter');
+
+        $suite->addTestSuite('Zend_Log_Filter_ChainingTest');
+        $suite->addTestSuite('Zend_Log_Filter_MessageTest');
+        $suite->addTestSuite('Zend_Log_Filter_PriorityTest');
+        $suite->addTestSuite('Zend_Log_Filter_SuppressTest');
+
+        return $suite;
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_Filter_AllTests::main') {
+    Zend_Log_Filter_AllTests::main();
+}

tests/Zend/Log/Filter/ChainingTest.php

@@ -20,12 +20,21 @@
  * @version    $Id$
  */
 
-/** PHPUnit_Framework_TestCase */
-require_once 'PHPUnit/Framework/TestCase.php';
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_Filter_ChainingTest::main');
+}
+
+/**
+ * Test helper
+ */
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
 /** Zend_Log */
 require_once 'Zend/Log.php';
 
+/** Zend_Log_Writer_Stream */
+require_once 'Zend/Log/Writer/Stream.php';
+
 /**
  * @category   Zend
  * @package    Zend_Log
@@ -36,6 +45,12 @@ require_once 'Zend/Log.php';
  */
 class Zend_Log_Filter_ChainingTest extends PHPUnit_Framework_TestCase
 {
+    public static function main()
+    {
+        $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
     public function setUp()
     {
         $this->log = fopen('php://memory', 'w');
@@ -84,5 +99,8 @@ class Zend_Log_Filter_ChainingTest extends PHPUnit_Framework_TestCase
         $this->assertContains($err, $logdata);
         $this->assertNotContains($warn, $logdata);
     }
-
 }
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_Filter_ChainingTest::main') {
+    Zend_Log_Filter_ChainingTest::main();
+}

tests/Zend/Log/Filter/MessageTest.php

@@ -20,6 +20,13 @@
  * @version    $Id$
  */
 
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_Filter_MessageTest::main');
+}
+
+/**
+ * Test helper
+ */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
 /** Zend_Log */
@@ -38,6 +45,12 @@ require_once 'Zend/Log/Filter/Message.php';
  */
 class Zend_Log_Filter_MessageTest extends PHPUnit_Framework_TestCase
 {
+    public static function main()
+    {
+        $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
     public function testMessageFilterRecognizesInvalidRegularExpression()
     {
         try {
@@ -55,15 +68,15 @@ 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", 
+            'writerName'   => "Mock",
+            'filterName'   => "Message",
             'filterParams' => array(
-                'regexp'   => "/42/" 
-             ),        
+                'regexp'   => "/42/"
+             ),
         )));
 
         $logger = Zend_Log::factory($cfg['log']);
@@ -74,14 +87,18 @@ class Zend_Log_Filter_MessageTest extends PHPUnit_Framework_TestCase
     {
         require_once 'Zend/Config.php';
         $config = new Zend_Config(array('log' => array('memory' => array(
-            'writerName'   => "Mock", 
-            'filterName'   => "Message", 
+            'writerName'   => "Mock",
+            'filterName'   => "Message",
             'filterParams' => array(
-                'regexp'   => "/42/" 
-             ),        
+                'regexp'   => "/42/"
+             ),
         ))));
 
         $filter = Zend_Log_Filter_Message::factory($config->log->memory->filterParams);
         $this->assertTrue($filter instanceof Zend_Log_Filter_Message);
     }
 }
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_Filter_MessageTest::main') {
+    Zend_Log_Filter_MessageTest::main();
+}

tests/Zend/Log/Filter/PriorityTest.php

@@ -20,8 +20,14 @@
  * @version    $Id$
  */
 
-/** PHPUnit_Framework_TestCase */
-require_once 'PHPUnit/Framework/TestCase.php';
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_Filter_PriorityTest::main');
+}
+
+/**
+ * Test helper
+ */
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
 /** Zend_Log */
 require_once 'Zend/Log.php';
@@ -39,6 +45,12 @@ require_once 'Zend/Log/Filter/Priority.php';
  */
 class Zend_Log_Filter_PriorityTest extends PHPUnit_Framework_TestCase
 {
+    public static function main()
+    {
+        $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
     public function testComparisonDefaultsToLessThanOrEqual()
     {
         // accept at or below priority 2
@@ -69,30 +81,34 @@ 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", 
+            'writerName' => "Mock",
+            'filterName' => "Priority",
             'filterParams' => array(
-                'priority' => "Zend_Log::CRIT", 
+                '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());
         }
     }
 }
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_Filter_PriorityTest::main') {
+    Zend_Log_Filter_PriorityTest::main();
+}

tests/Zend/Log/Filter/SuppressTest.php

@@ -20,8 +20,14 @@
  * @version    $Id$
  */
 
-/** PHPUnit_Framework_TestCase */
-require_once 'PHPUnit/Framework/TestCase.php';
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_Filter_SuppressTest::main');
+}
+
+/**
+ * Test helper
+ */
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
 /** Zend_Log */
 require_once 'Zend/Log.php';
@@ -39,6 +45,12 @@ require_once 'Zend/Log/Filter/Suppress.php';
  */
 class Zend_Log_Filter_SuppressTest extends PHPUnit_Framework_TestCase
 {
+    public static function main()
+    {
+        $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
     public function setUp()
     {
         $this->filter = new Zend_Log_Filter_Suppress();
@@ -72,11 +84,11 @@ 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", 
+            'writerName' => "Mock",
             'filterName' => "Suppress"
         )));
 
@@ -84,3 +96,7 @@ class Zend_Log_Filter_SuppressTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($logger instanceof Zend_Log);
     }
 }
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_Filter_SuppressTest::main') {
+    Zend_Log_Filter_SuppressTest::main();
+}

tests/Zend/Log/Formatter/AllTests.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
+
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_Formatter_AllTests::main');
+}
+
+require_once 'Zend/Log/Formatter/SimpleTest.php';
+require_once 'Zend/Log/Formatter/XmlTest.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Log
+ * @group      Zend_Log_Formatter
+ */
+class Zend_Log_Formatter_AllTests
+{
+    public static function main()
+    {
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Log_Formatter');
+
+        $suite->addTestSuite('Zend_Log_Formatter_SimpleTest');
+        $suite->addTestSuite('Zend_Log_Formatter_XmlTest');
+
+        return $suite;
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_Formatter_AllTests::main') {
+    Zend_Log_Formatter_AllTests::main();
+}

tests/Zend/Log/Formatter/XmlTest.php

@@ -20,10 +20,14 @@
  * @version    $Id$
  */
 
-require_once dirname(__FILE__)."/../../../TestHelper.php";
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_Formatter_XmlTest::main');
+}
 
-/** PHPUnit_Framework_TestCase */
-require_once 'PHPUnit/Framework/TestCase.php';
+/**
+ * Test helper
+ */
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
 /** Zend_Log_Formatter_Xml */
 require_once 'Zend/Log/Formatter/Xml.php';
@@ -38,6 +42,12 @@ require_once 'Zend/Log/Formatter/Xml.php';
  */
 class Zend_Log_Formatter_XmlTest extends PHPUnit_Framework_TestCase
 {
+    public static function main()
+    {
+        $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
     public function testDefaultFormat()
     {
         $f = new Zend_Log_Formatter_Xml();
@@ -96,3 +106,7 @@ class Zend_Log_Formatter_XmlTest extends PHPUnit_Framework_TestCase
         $this->assertContains('&amp', $line);
     }
 }
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_Formatter_XmlTest::main') {
+    Zend_Log_Formatter_XmlTest::main();
+}

tests/Zend/Log/LogTest.php

@@ -20,6 +20,13 @@
  * @version    $Id$
  */
 
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_LogTest::main');
+}
+
+/**
+ * Test helper
+ */
 require_once dirname(__FILE__) . '/../../TestHelper.php';
 
 /** Zend_Log */
@@ -44,6 +51,12 @@ require_once 'Zend/Log/FactoryInterface.php';
  */
 class Zend_Log_LogTest extends PHPUnit_Framework_TestCase
 {
+    public static function main()
+    {
+        $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
     public function setUp()
     {
         $this->log = fopen('php://memory', 'w+');
@@ -458,3 +471,7 @@ class Zend_Log_Filter_NotImplementsFilterInterface implements Zend_Log_FactoryIn
     {
     }
 }
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_LogTest::main') {
+    Zend_Log_LogTest::main();
+}

tests/Zend/Log/Writer/AbstractTest.php

@@ -20,8 +20,14 @@
  * @version    $Id$
  */
 
-/** PHPUnit_Framework_TestCase */
-require_once 'PHPUnit/Framework/TestCase.php';
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_Writer_AbstractTest::main');
+}
+
+/**
+ * Test helper
+ */
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
 /** Zend_Log_Writer_Abstract */
 require_once 'Zend/Log/Writer/Abstract.php';
@@ -38,6 +44,12 @@ class Zend_Log_Writer_AbstractTest extends PHPUnit_Framework_TestCase
 {
     protected $_writer;
 
+    public static function main()
+    {
+        $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
     protected function setUp()
     {
         $this->_writer = new Zend_Log_Writer_AbstractTest_Concrete();
@@ -86,3 +98,7 @@ class Zend_Log_Writer_AbstractTest_Concrete extends Zend_Log_Writer_Abstract
     {
     }
 }
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_AbstractTest::main') {
+    Zend_Log_Writer_AbstractTest::main();
+}

tests/Zend/Log/Writer/AllTests.php

@@ -0,0 +1,79 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
+
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_Writer_AllTests::main');
+}
+
+require_once 'Zend/Log/Writer/AbstractTest.php';
+require_once 'Zend/Log/Writer/DbTest.php';
+if (PHP_OS != 'AIX') {
+    require_once 'Zend/Log/Writer/FirebugTest.php';
+}
+require_once 'Zend/Log/Writer/MailTest.php';
+require_once 'Zend/Log/Writer/MockTest.php';
+require_once 'Zend/Log/Writer/NullTest.php';
+require_once 'Zend/Log/Writer/StreamTest.php';
+require_once 'Zend/Log/Writer/SyslogTest.php';
+require_once 'Zend/Log/Writer/ZendMonitorTest.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Log
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Log
+ * @group      Zend_Log_Writer
+ */
+class Zend_Log_Writer_AllTests
+{
+    public static function main()
+    {
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Log_Writer');
+
+        $suite->addTestSuite('Zend_Log_Writer_AbstractTest');
+        $suite->addTestSuite('Zend_Log_Writer_DbTest');
+        if (PHP_OS != 'AIX') {
+            $suite->addTestSuite('Zend_Log_Writer_FirebugTest');
+        }
+        $suite->addTestSuite('Zend_Log_Writer_MailTest');
+        $suite->addTestSuite('Zend_Log_Writer_MockTest');
+        $suite->addTestSuite('Zend_Log_Writer_NullTest');
+        $suite->addTestSuite('Zend_Log_Writer_StreamTest');
+        $suite->addTestSuite('Zend_Log_Writer_SyslogTest');
+        $suite->addTestSuite('Zend_Log_Writer_ZendMonitorTest');
+
+        return $suite;
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_AllTests::main') {
+    Zend_Log_Writer_AllTests::main();
+}

tests/Zend/Log/Writer/DbTest.php

@@ -20,10 +20,16 @@
  * @version    $Id$
  */
 
-/** PHPUnit_Framework_TestCase */
-require_once 'PHPUnit/Framework/TestCase.php';
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_Writer_DbTest::main');
+}
+
+/**
+ * Test helper
+ */
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
-/** Zend_Log_Writer_Mock */
+/** Zend_Log_Writer_Db */
 require_once 'Zend/Log/Writer/Db.php';
 
 /**
@@ -36,6 +42,12 @@ require_once 'Zend/Log/Writer/Db.php';
  */
 class Zend_Log_Writer_DbTest extends PHPUnit_Framework_TestCase
 {
+    public static function main()
+    {
+        $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
     public function setUp()
     {
         $this->tableName = 'db-table-name';
@@ -121,6 +133,7 @@ class Zend_Log_Writer_DbTest extends PHPUnit_Framework_TestCase
             ),
         )));
 
+        require_once 'Zend/Log.php';
         $logger = Zend_Log::factory($cfg['log']);
         $this->assertTrue($logger instanceof Zend_Log);
     }
@@ -150,3 +163,7 @@ class Zend_Log_Writer_DbTest_MockDbAdapter
     }
 
 }
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_DbTest::main') {
+    Zend_Log_Writer_DbTest::main();
+}

tests/Zend/Log/Writer/FirebugTest.php

@@ -20,8 +20,14 @@
  * @version    $Id$
  */
 
-/** PHPUnit_Framework_TestCase */
-require_once 'PHPUnit/Framework/TestCase.php';
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_Writer_FirebugTest::main');
+}
+
+/**
+ * Test helper
+ */
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
 /** Zend_Log */
 require_once 'Zend/Log.php';
@@ -54,8 +60,6 @@ require_once 'Zend/Controller/Response/Http.php';
  */
 class Zend_Log_Writer_FirebugTest extends PHPUnit_Framework_TestCase
 {
-
-
     protected $_controller = null;
     protected $_request = null;
     protected $_response = null;
@@ -70,9 +74,7 @@ class Zend_Log_Writer_FirebugTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
-
-        $suite  = new PHPUnit_Framework_TestSuite("Zend_Log_Writer_FirebugTest");
+        $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
         $result = PHPUnit_TextUI_TestRunner::run($suite);
     }
 
@@ -285,7 +287,7 @@ 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(
@@ -365,5 +367,8 @@ class Zend_Log_Writer_FirebugTest_Response extends Zend_Controller_Response_Http
 
         return true;
     }
-
 }
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_FirebugTest::main') {
+    Zend_Log_Writer_FirebugTest::main();
+}

tests/Zend/Log/Writer/MailTest.php

@@ -60,7 +60,7 @@ class Zend_Log_Writer_MailTest extends PHPUnit_Framework_TestCase
 {
     /**
      * Mock Transport for Zend_Mail
-     * 
+     *
      * @var Zend_Mail_Transport_Abstract
      */
     protected $_transport;
@@ -72,8 +72,7 @@ class Zend_Log_Writer_MailTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
-        $suite = new PHPUnit_Framework_TestSuite("Zend_Log_Writer_MailTest");
+        $suite = new PHPUnit_Framework_TestSuite(__CLASS__);
         $result = PHPUnit_TextUI_TestRunner::run($suite);
     }
 
@@ -504,7 +503,7 @@ class Zend_Log_Writer_MailTest extends PHPUnit_Framework_TestCase
 
     /**
      * Returns a sample of an event
-     * 
+     *
      * @return array
      */
     protected function _getEvent()

tests/Zend/Log/Writer/MockTest.php

@@ -20,8 +20,14 @@
  * @version    $Id$
  */
 
-/** PHPUnit_Framework_TestCase */
-require_once 'PHPUnit/Framework/TestCase.php';
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_Writer_MockTest::main');
+}
+
+/**
+ * Test helper
+ */
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
 /** Zend_Log_Writer_Mock */
 require_once 'Zend/Log/Writer/Mock.php';
@@ -36,6 +42,12 @@ require_once 'Zend/Log/Writer/Mock.php';
  */
 class Zend_Log_Writer_MockTest extends PHPUnit_Framework_TestCase
 {
+    public static function main()
+    {
+        $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
     public function testWrite()
     {
         $writer = new Zend_Log_Writer_Mock();
@@ -52,7 +64,12 @@ class Zend_Log_Writer_MockTest extends PHPUnit_Framework_TestCase
             'writerName' => "Mock"
         )));
 
+        require_once 'Zend/Log.php';
         $logger = Zend_Log::factory($cfg['log']);
         $this->assertTrue($logger instanceof Zend_Log);
     }
 }
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_MockTest::main') {
+    Zend_Log_Writer_MockTest::main();
+}

tests/Zend/Log/Writer/NullTest.php

@@ -20,8 +20,14 @@
  * @version    $Id$
  */
 
-/** PHPUnit_Framework_TestCase */
-require_once 'PHPUnit/Framework/TestCase.php';
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_Writer_NullTest::main');
+}
+
+/**
+ * Test helper
+ */
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
 /** Zend_Log_Writer_Null */
 require_once 'Zend/Log/Writer/Null.php';
@@ -36,6 +42,12 @@ require_once 'Zend/Log/Writer/Null.php';
  */
 class Zend_Log_Writer_NullTest extends PHPUnit_Framework_TestCase
 {
+    public static function main()
+    {
+        $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
     public function testWrite()
     {
         $writer = new Zend_Log_Writer_Null();
@@ -48,7 +60,12 @@ class Zend_Log_Writer_NullTest extends PHPUnit_Framework_TestCase
             'writerName' => "Null"
         )));
 
+        require_once 'Zend/Log.php';
         $logger = Zend_Log::factory($cfg['log']);
         $this->assertTrue($logger instanceof Zend_Log);
     }
 }
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_NullTest::main') {
+    Zend_Log_Writer_NullTest::main();
+}

tests/Zend/Log/Writer/StreamTest.php

@@ -20,10 +20,19 @@
  * @version    $Id$
  */
 
-/** PHPUnit_Framework_TestCase */
-require_once 'PHPUnit/Framework/TestCase.php';
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_Writer_StreamTest::main');
+}
+
+/**
+ * Test helper
+ */
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
+
+/** Zend_Log */
+require_once 'Zend/Log.php';
 
-/** Zend_Log_Writer_Mock */
+/** Zend_Log_Writer_Stream */
 require_once 'Zend/Log/Writer/Stream.php';
 
 /**
@@ -36,6 +45,12 @@ require_once 'Zend/Log/Writer/Stream.php';
  */
 class Zend_Log_Writer_StreamTest extends PHPUnit_Framework_TestCase
 {
+    public static function main()
+    {
+        $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
     public function testConstructorThrowsWhenResourceIsNotStream()
     {
         $resource = xml_parser_create();
@@ -145,7 +160,7 @@ class Zend_Log_Writer_StreamTest extends PHPUnit_Framework_TestCase
 
         $this->assertContains($expected, $contents);
     }
-    
+
     public function testFactoryStream()
     {
         $cfg = array('log' => array('memory' => array(
@@ -159,7 +174,7 @@ class Zend_Log_Writer_StreamTest extends PHPUnit_Framework_TestCase
         $logger = Zend_Log::factory($cfg['log']);
         $this->assertTrue($logger instanceof Zend_Log);
     }
-    
+
     public function testFactoryUrl()
     {
         $cfg = array('log' => array('memory' => array(
@@ -174,3 +189,7 @@ class Zend_Log_Writer_StreamTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($logger instanceof Zend_Log);
     }
 }
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_StreamTest::main') {
+    Zend_Log_Writer_StreamTest::main();
+}

tests/Zend/Log/Writer/SyslogTest.php

@@ -20,8 +20,14 @@
  * @version    $Id$
  */
 
-/** PHPUnit_Framework_TestCase */
-require_once 'PHPUnit/Framework/TestCase.php';
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_Writer_SyslogTest::main');
+}
+
+/**
+ * Test helper
+ */
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
 /** Zend_Log_Writer_Syslog */
 require_once 'Zend/Log/Writer/Syslog.php';
@@ -36,6 +42,12 @@ require_once 'Zend/Log/Writer/Syslog.php';
  */
 class Zend_Log_Writer_SyslogTest extends PHPUnit_Framework_TestCase
 {
+    public static function main()
+    {
+        $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
     public function testWrite()
     {
         $fields = array('message' => 'foo', 'priority' => LOG_NOTICE);
@@ -97,3 +109,7 @@ class Zend_Log_Writer_SyslogTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($instance instanceof Zend_Log_Writer_Syslog);
     }
 }
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_SyslogTest::main') {
+    Zend_Log_Writer_SyslogTest::main();
+}

tests/Zend/Log/Writer/ZendMonitorTest.php

@@ -20,8 +20,14 @@
  * @version    $Id$
  */
 
-/** PHPUnit_Framework_TestCase */
-require_once 'PHPUnit/Framework/TestCase.php';
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Log_Writer_ZendMonitorTest::main');
+}
+
+/**
+ * Test helper
+ */
+require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
 /** Zend_Log_Writer_ZendMonitor */
 require_once 'Zend/Log/Writer/ZendMonitor.php';
@@ -36,6 +42,12 @@ require_once 'Zend/Log/Writer/ZendMonitor.php';
  */
 class Zend_Log_Writer_ZendMonitorTest extends PHPUnit_Framework_TestCase
 {
+    public static function main()
+    {
+        $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
     /**
      * @group ZF-10081
      */
@@ -59,3 +71,7 @@ class Zend_Log_Writer_ZendMonitorTest extends PHPUnit_Framework_TestCase
         $this->assertType('boolean', $writer->isEnabled());
     }
 }
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Log_Writer_ZendMonitorTest::main') {
+    Zend_Log_Writer_ZendMonitorTest::main();
+}