improve consistent use of TestHelper, code covering filtering, and @group tags

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

tests/AllTests.php

@@ -20,18 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }
 
-/**
- * Test helper
- */
-require_once 'TestHelper.php';
-
-/**
- * @see Zend_AllTests
- */
 require_once 'Zend/AllTests.php';
 
 /**

tests/TestHelper.php

@@ -40,20 +40,11 @@ error_reporting( E_ALL | E_STRICT );
  * Determine the root, library, and tests directories of the framework
  * distribution.
  */
-$zfRoot        = dirname(__FILE__) . '/..';
+$zfRoot        = realpath(dirname(dirname(__FILE__)));
 $zfCoreLibrary = "$zfRoot/library";
 $zfCoreTests   = "$zfRoot/tests";
 
 /*
- * Omit from code coverage reports the contents of the tests directory
- */
-if (defined('TESTS_GENERATE_REPORT') && TESTS_GENERATE_REPORT === true) {
-    foreach (array('php', 'phtml', 'csv') as $suffix) {
-        PHPUnit_Util_Filter::addDirectoryToFilter($zfCoreTests, ".$suffix");
-    }
-}
-
-/*
  * Prepend the Zend Framework library/ and tests/ directories to the
  * include_path. This allows the tests to run out of the box and helps prevent
  * loading other copies of the framework code and tests that would supersede
@@ -76,6 +67,28 @@ if (is_readable($zfCoreTests . DIRECTORY_SEPARATOR . 'TestConfiguration.php')) {
     require_once $zfCoreTests . DIRECTORY_SEPARATOR . 'TestConfiguration.php.dist';
 }
 
+if (defined('TESTS_GENERATE_REPORT') && TESTS_GENERATE_REPORT === true &&
+    version_compare(PHPUnit_Runner_Version::id(), '3.1.6', '>=')) {
+
+    /*
+     * Add Zend Framework library/ directory to the PHPUnit code coverage
+     * whitelist. This has the effect that only production code source files
+     * appear in the code coverage report and that all production code source
+     * files, even those that are not covered by a test yet, are processed.
+     */
+    PHPUnit_Util_Filter::addDirectoryToWhitelist($zfCoreLibrary);
+
+    /*
+     * Omit from code coverage reports the contents of the tests directory
+     */
+    foreach (array('.php', '.phtml', '.csv', '.inc') as $suffix) {
+        PHPUnit_Util_Filter::addDirectoryToFilter($zfCoreTests, $suffix);
+    }
+    PHPUnit_Util_Filter::addDirectoryToFilter(PEAR_INSTALL_DIR);
+    PHPUnit_Util_Filter::addDirectoryToFilter(PHP_LIBDIR);
+}
+
+
 /**
  * Start output buffering, if enabled
  */
@@ -84,17 +97,6 @@ if (defined('TESTS_ZEND_OB_ENABLED') && constant('TESTS_ZEND_OB_ENABLED')) {
 }
 
 /*
- * Add Zend Framework library/ directory to the PHPUnit code coverage
- * whitelist. This has the effect that only production code source files appear
- * in the code coverage report and that all production code source files, even
- * those that are not covered by a test yet, are processed.
- */
-if (defined('TESTS_GENERATE_REPORT') && TESTS_GENERATE_REPORT === true &&
-    version_compare(PHPUnit_Runner_Version::id(), '3.1.6', '>=')) {
-    PHPUnit_Util_Filter::addDirectoryToWhitelist($zfCoreLibrary);
-}
-
-/*
  * Unset global variables that are no longer needed.
  */
 unset($zfRoot, $zfCoreLibrary, $zfCoreTests, $path);

tests/Zend/AllTests.php

@@ -21,9 +21,6 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
 require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
@@ -105,6 +102,7 @@ require_once 'Zend/XmlRpc/AllTests.php';
  * @category   Zend
  * @package    Zend
  * @subpackage UnitTests
+ * @group      Zend
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */

tests/Zend/Amf/AllTests.php

@@ -20,10 +20,8 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Amf_AllTests::main');
 }
@@ -39,7 +37,6 @@ require_once 'Zend/Amf/Value/MessageHeaderTest.php';
 require_once 'Zend/Amf/AuthTest.php';
 require_once 'Zend/Amf/ResourceTest.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Amf

tests/Zend/Application/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Application_AllTests::main');

tests/Zend/Application/Resource/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Application_Resource_AllTests::main');

tests/Zend/Application/Resource/SessionTest.php

@@ -1,10 +1,39 @@
 <?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_Application
+ * @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$
+ */
+
 require_once "Zend/Application/Resource/ResourceAbstract.php";
 require_once "Zend/Application/Resource/Session.php";
 require_once "Zend/Session.php";
 require_once "Zend/Session/SaveHandler/Interface.php";
 
+/**
+ * @category   Zend
+ * @package    Zend_Application
+ * @subpackage UnitTests
+ * @group      Zend_Application
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
 class Zend_Application_Resource_SessionTest extends PHPUnit_Framework_TestCase
 {
     public $resource;

tests/Zend/Auth/Adapter/AllTests.php

@@ -20,54 +20,18 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Auth_Adapter_AllTests::main');
 }
 
-
-/**
- * PHPUnit_Framework_TestSuite
- */
-require_once 'PHPUnit/Framework/TestSuite.php';
-
-
-/**
- * PHPUnit_TextUI_TestRunner
- */
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-
-/**
- * @see Zend_Auth_Adapter_DbTable_AllTests
- */
 require_once 'Zend/Auth/Adapter/DbTable/AllTests.php';
-
-
-/**
- * @see Zend_Auth_Adapter_DigestTest
- */
 require_once 'Zend/Auth/Adapter/DigestTest.php';
-
-
-/**
- * @see Zend_Auth_Adapter_Http_AllTests
- */
 require_once 'Zend/Auth/Adapter/Http/AllTests.php';
-
-
-/**
- * @see Zend_Auth_Adapter_Ldap_AllTests
- */
 require_once 'Zend/Auth/Adapter/Ldap/AllTests.php';
-
-
-/**
- * @see Zend_Auth_Adapter_OpenId_AllTests
- */
 require_once 'Zend/Auth/Adapter/OpenId/AllTests.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Auth

tests/Zend/Auth/Adapter/DbTable/AllTests.php

@@ -20,36 +20,15 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Auth_Adapter_DbTable_AllTests::main');
 }
 
-
-/**
- * PHPUnit_Framework_TestSuite
- */
-require_once 'PHPUnit/Framework/TestSuite.php';
-
-
-/**
- * PHPUnit_TextUI_TestRunner
- */
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-
-/**
- * @see Zend_Auth_Adapter_DbTable_BasicSqliteTest
- */
 require_once 'Zend/Auth/Adapter/DbTable/BasicSqliteTest.php';
-
-
-/**
- * @see Zend_Auth_Adapter_DbTable_BasicSqliteTest_SkipTests
- */
 require_once 'Zend/Auth/Adapter/DbTable/BasicSqliteTest/SkipTests.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Auth
@@ -77,7 +56,7 @@ class Zend_Auth_Adapter_DbTable_AllTests
      */
     public static function suite()
     {
-        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Auth_Adapter_Http');
+        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Auth_Adapter_DbTable');
 
         if (!defined('TESTS_ZEND_AUTH_ADAPTER_DBTABLE_PDO_SQLITE_ENABLED') ||
             constant('TESTS_ZEND_AUTH_ADAPTER_DBTABLE_PDO_SQLITE_ENABLED') === false) {

tests/Zend/Auth/Adapter/Http/AllTests.php

@@ -20,42 +20,17 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Auth_Adapter_Http_AllTests::main');
 }
 
-
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
-
-/**
- * @see Zend_Auth_Adapter_Http_AuthTest
- */
 require_once 'Zend/Auth/Adapter/Http/AuthTest.php';
-
-
-/**
- * @see Zend_Auth_Adapter_Http_ObjectTest
- */
 require_once 'Zend/Auth/Adapter/Http/ObjectTest.php';
-
-
-/**
- * @see Zend_Auth_Adapter_Http_ProxyTest
- */
 require_once 'Zend/Auth/Adapter/Http/ProxyTest.php';
-
-
-/**
- * @see Zend_Auth_Adapter_Http_Resolver_AllTests
- */
 require_once 'Zend/Auth/Adapter/Http/Resolver/AllTests.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Auth

tests/Zend/Auth/Adapter/Http/Resolver/AllTests.php

@@ -20,30 +20,14 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Auth_Adapter_Http_Resolver_AllTests::main');
 }
 
-
-/**
- * PHPUnit_Framework_TestSuite
- */
-require_once 'PHPUnit/Framework/TestSuite.php';
-
-
-/**
- * PHPUnit_TextUI_TestRunner
- */
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-
-/**
- * @see Zend_Auth_Adapter_Http_Resolver_FileTest
- */
 require_once 'Zend/Auth/Adapter/Http/Resolver/FileTest.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Auth
@@ -71,7 +55,7 @@ class Zend_Auth_Adapter_Http_Resolver_AllTests
      */
     public static function suite()
     {
-        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Auth_Adapter_Http Resolvers');
+        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Auth_Adapter_Http Resolver');
 
         $suite->addTestSuite('Zend_Auth_Adapter_Http_Resolver_FileTest');
 

tests/Zend/Auth/Adapter/Ldap/AllTests.php

@@ -20,22 +20,19 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
+require_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Auth_Adapter_Ldap_AllTests::main');
 }
 
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
-/**
- * @see Zend_Auth_Adapter_Ldap_OfflineTest
- */
 require_once 'Zend/Auth/Adapter/Ldap/OfflineTest.php';
 
+if (defined('TESTS_ZEND_AUTH_ADAPTER_LDAP_ONLINE_ENABLED')
+    && constant('TESTS_ZEND_AUTH_ADAPTER_LDAP_ONLINE_ENABLED')) {
+    require_once 'Zend/Auth/Adapter/Ldap/OnlineTest.php';
+}
+
 /**
  * @category   Zend
  * @package    Zend_Ldap
@@ -59,10 +56,6 @@ class Zend_Auth_Adapter_Ldap_AllTests
 
         if (defined('TESTS_ZEND_AUTH_ADAPTER_LDAP_ONLINE_ENABLED')
             && constant('TESTS_ZEND_AUTH_ADAPTER_LDAP_ONLINE_ENABLED')) {
-            /**
-             * @see Zend_Auth_Adapter_Ldap_OnlineTest
-             */
-            require_once 'Zend/Auth/Adapter/Ldap/OnlineTest.php';
             $suite->addTestSuite('Zend_Auth_Adapter_Ldap_OnlineTest');
         } else {
             $suite->addTest(new Zend_Auth_Adapter_Ldap_SkipOnlineTests());

tests/Zend/Auth/Adapter/OpenId/AllTests.php

@@ -20,23 +20,14 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Auth_Adapter_OpenId_AllTests::main');
 }
 
-
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
-/**
- * Zend_Auth_Adapter_OpenIdTest
- */
 require_once 'Zend/Auth/Adapter/OpenId/OpenIdTest.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Auth

tests/Zend/Auth/AllTests.php

@@ -20,19 +20,14 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Auth_AllTests::main');
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
-/**
- * @see Zend_Auth_Adapter_AllTests
- */
 require_once 'Zend/Auth/Adapter/AllTests.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Auth

tests/Zend/Cache/AllTests.php

@@ -20,9 +20,6 @@
  * @version    $Id $
  */
 
-/**
- * Test helper
- */
 require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {

tests/Zend/Captcha/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Captcha_AllTests::main');

tests/Zend/CodeGenerator/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_CodeGenerator_AllTests::main');

tests/Zend/CodeGenerator/Php/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_CodeGenerator_Php_AllTests::main');
@@ -39,7 +36,6 @@ require_once 'Zend/CodeGenerator/Php/MethodTest.php';
 require_once 'Zend/CodeGenerator/Php/ParameterTest.php';
 require_once 'Zend/CodeGenerator/Php/PropertyTest.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_CodeGenerator

tests/Zend/Config/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Config_AllTests::main');

tests/Zend/Config/Writer/AllTests.php

@@ -20,10 +20,9 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
+PHPUnit_Util_Filter::addDirectoryToFilter(dirname(__FILE__) . "/temp", "cfg");
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Config_Writer_AllTests::main');
@@ -45,7 +44,6 @@ class Zend_Config_Writer_AllTests
 {
     public static function main()
     {
-    PHPUnit_Util_Filter::addDirectoryToFilter(dirname(__FILE__) . "/temp", "cfg");
         PHPUnit_TextUI_TestRunner::run(self::suite());
     }
 

tests/Zend/Controller/Action/Helper/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id $
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../.././../TestHelper.php';
+require_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Controller_Action_Helper_AllTests::main');

tests/Zend/Controller/AllTests.php

@@ -20,9 +20,6 @@
  * @version    $Id $
  */
 
-/**
- * Test helper
- */
 require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {

tests/Zend/Crypt/AllTests.php

@@ -20,15 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Crypt_AllTests::main');
 }
 
-require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
-
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
 require_once 'DiffieHellmanTest.php';
 require_once 'HmacTest.php';
 require_once 'MathTest.php';

tests/Zend/Crypt/Math/AllTests.php

@@ -20,15 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Crypt_Math_AllTests::main');
 }
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
-
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
 require_once 'BigInteger/BcmathTest.php';
 require_once 'BigInteger/GmpTest.php';
 
@@ -49,7 +46,7 @@ class Zend_Crypt_Math_AllTests
 
     public static function suite()
     {
-        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Math');
+        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Crypt_Math');
 
         $suite->addTestSuite('Zend_Crypt_Math_BigInteger_BcmathTest');
         $suite->addTestSuite('Zend_Crypt_Math_BigInteger_GmpTest');

tests/Zend/Crypt/Rsa/AllTests.php

@@ -20,15 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Crypt_Rsa_AllTests::main');
 }
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
-
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
 require_once 'RsaTest.php';
 
 /**

tests/Zend/Date/AllTests.php

@@ -20,15 +20,14 @@
  * @version    $Id$
  */
 
-error_reporting( E_ALL | E_STRICT ); // now required for each test suite
 // define('TESTS_ZEND_LOCALE_BCMATH_ENABLED', false); // uncomment to disable use of bcmath extension by Zend_Date
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Date_AllTests::main');
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
 require_once 'Zend/Date/DateObjectTest.php';
 
 /**
@@ -48,7 +47,7 @@ class Zend_Date_AllTests
 
     public static function suite()
     {
-        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Date_DateObject');
+        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Date_Date');
 
         $suite->addTestSuite('Zend_Date_DateObjectTest');
 

tests/Zend/Db/AllTests.php

@@ -20,40 +20,14 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Db_AllTests::main');
 }
 
-
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
-/**
- * PHPUnit_Framework_TestSuite
- */
-require_once 'PHPUnit/Framework/TestSuite.php';
-
-/**
- * PHPUnit_TextUI_TestRunner
- */
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-/**
- * @see Zend_Loader
- */
 require_once 'Zend/Loader.php';
-
-/**
- * @see Zend_Db_SkipTests
- */
 require_once 'Zend/Db/SkipTests.php';
-
-/**
- * @see Zend_Db_Profiler_AllTests
- */
 require_once 'Zend/Db/Profiler/AllTests.php';
 
 /**

tests/Zend/Db/Profiler/AllTests.php

@@ -20,15 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Db_Profiler_AllTests::main');
 }
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
-
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
 require_once 'Zend/Db/Profiler/FirebugTest.php';
 
 /**

tests/Zend/Dojo/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Dojo_AllTests::main');

tests/Zend/Dojo/Form/AllTests.php

@@ -20,10 +20,11 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Dojo_Form_AllTests::main');
 }
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
 require_once 'Zend/Dojo/Form/Decorator/AllTests.php';
 require_once 'Zend/Dojo/Form/Element/AllTests.php';

tests/Zend/Dojo/Form/Decorator/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
+require_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Dojo_Form_Decorator_AllTests::main');

tests/Zend/Dojo/Form/Element/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
+require_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Dojo_Form_Element_AllTests::main');

tests/Zend/Dojo/View/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Dojo_View_AllTests::main');

tests/Zend/Dojo/View/Helper/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
+require_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Dojo_View_Helper_AllTests::main');

tests/Zend/Dom/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Dom_AllTests::main');

tests/Zend/Feed/AllTests.php

@@ -20,22 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Feed_AllTests::main');
 }
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
-/**
- * Exclude from code coverage report
- */
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
-
 require_once 'Zend/Feed/ArrayAccessTest.php';
 require_once 'Zend/Feed/AtomEntryOnlyTest.php';
 require_once 'Zend/Feed/AtomPublishingTest.php';

tests/Zend/File/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_File_AllTests::main');

tests/Zend/File/Transfer/Adapter/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
+require_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_File_Transfer_Adapter_AllTests::main');

tests/Zend/File/Transfer/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_File_Transfer_AllTests::main');

tests/Zend/Filter/AllTests.php

@@ -20,130 +20,36 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Filter_AllTests::main');
 }
 
-
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
-/**
- * @see Zend_Filter_AlnumTest
- */
 require_once 'Zend/Filter/AlnumTest.php';
-
-/**
- * @see Zend_Filter_AlphaTest
- */
 require_once 'Zend/Filter/AlphaTest.php';
-
-/**
- * @see Zend_Filter_BaseNameTest
- */
 require_once 'Zend/Filter/BaseNameTest.php';
-
-/**
- * @see Zend_Filter_CallbackTest
- */
 require_once 'Zend/Filter/CallbackTest.php';
-
-/**
- * @see Zend_Filter_CompressTest
- */
 require_once 'Zend/Filter/CompressTest.php';
-
-/**
- * @see Zend_Filter_DecompressTest
- */
 require_once 'Zend/Filter/DecompressTest.php';
-
-/**
- * @see Zend_Filter_DecryptTest
- */
 require_once 'Zend/Filter/DecryptTest.php';
-
-/**
- * @see Zend_Filter_DigitsTest
- */
 require_once 'Zend/Filter/DigitsTest.php';
-
-/**
- * @see Zend_Filter_DirTest
- */
 require_once 'Zend/Filter/DirTest.php';
-
-/**
- * @see Zend_Filter_EncryptTest
- */
 require_once 'Zend/Filter/EncryptTest.php';
-
-/**
- * @see Zend_Filter_HtmlEntitiesTest
- */
 require_once 'Zend/Filter/HtmlEntitiesTest.php';
-
-/**
- * @see Zend_Filter_InflectorTest
- */
 require_once 'Zend/Filter/InflectorTest.php';
-
-/**
- * @see Zend_Filter_InputTest
- */
 require_once 'Zend/Filter/InputTest.php';
-
-/**
- * @see Zend_Filter_IntTest
- */
 require_once 'Zend/Filter/IntTest.php';
-
-/**
- * @see Zend_Filter_NullTest
- */
 require_once 'Zend/Filter/NullTest.php';
-
-/**
- * @see Zend_Filter_PregReplaceTest
- */
 require_once 'Zend/Filter/PregReplaceTest.php';
-
-/**
- * @see Zend_Filter_RealPathTest
- */
 require_once 'Zend/Filter/RealPathTest.php';
-
-/**
- * @see Zend_Filter_StringToLowerTest
- */
 require_once 'Zend/Filter/StringToLowerTest.php';
-
-/**
- * @see Zend_Filter_StringToUpperTest
- */
 require_once 'Zend/Filter/StringToUpperTest.php';
-
-/**
- * @see Zend_Filter_StringTrimTest
- */
 require_once 'Zend/Filter/StringTrimTest.php';
-
-/**
- * @see Zend_Filter_StripNewlinesTest
- */
 require_once 'Zend/Filter/StripNewlinesTest.php';
-
-/**
- * @see Zend_Filter_StripTagsTest
- */
 require_once 'Zend/Filter/StripTagsTest.php';
 
-/**
- * Compress filter tests
- */
+/*
 require_once 'Zend/Filter/Compress/Bz2Test.php';
 require_once 'Zend/Filter/Compress/GzTest.php';
 require_once 'Zend/Filter/Compress/LzfTest.php';
@@ -151,24 +57,15 @@ require_once 'Zend/Filter/Compress/RarTest.php';
 require_once 'Zend/Filter/Compress/TarTest.php';
 require_once 'Zend/Filter/Compress/ZipTest.php';
 
-/**
- * Encrypt filter tests
- */
 require_once 'Zend/Filter/Encrypt/McryptTest.php';
 require_once 'Zend/Filter/Encrypt/OpensslTest.php';
 
-/**
- * File filter tests
- */
 require_once 'Zend/Filter/File/DecryptTest.php';
 require_once 'Zend/Filter/File/EncryptTest.php';
 require_once 'Zend/Filter/File/LowerCaseTest.php';
 require_once 'Zend/Filter/File/RenameTest.php';
 require_once 'Zend/Filter/File/UpperCaseTest.php';
 
-/**
- * Word filter tests
- */
 require_once 'Zend/Filter/Word/CamelCaseToDashTest.php';
 require_once 'Zend/Filter/Word/CamelCaseToSeparatorTest.php';
 require_once 'Zend/Filter/Word/CamelCaseToUnderscoreTest.php';
@@ -181,6 +78,12 @@ require_once 'Zend/Filter/Word/SeparatorToSeparatorTest.php';
 require_once 'Zend/Filter/Word/UnderscoreToCamelCaseTest.php';
 require_once 'Zend/Filter/Word/UnderscoreToDashTest.php';
 require_once 'Zend/Filter/Word/UnderscoreToSeparatorTest.php';
+*/
+
+require_once 'Zend/Filter/Compress/AllTests.php';
+require_once 'Zend/Filter/Encrypt/AllTests.php';
+require_once 'Zend/Filter/File/AllTests.php';
+require_once 'Zend/Filter/Word/AllTests.php';
 
 /**
  * @category   Zend
@@ -232,6 +135,8 @@ class Zend_Filter_AllTests
         $suite->addTestSuite('Zend_Filter_StringTrimTest');
         $suite->addTestSuite('Zend_Filter_StripNewlinesTest');
         $suite->addTestSuite('Zend_Filter_StripTagsTest');
+
+/*
         $suite->addTestSuite('Zend_Filter_Compress_Bz2Test');
         $suite->addTestSuite('Zend_Filter_Compress_GzTest');
         $suite->addTestSuite('Zend_Filter_Compress_LzfTest');
@@ -257,6 +162,12 @@ class Zend_Filter_AllTests
         $suite->addTestSuite('Zend_Filter_Word_UnderscoreToCamelCaseTest');
         $suite->addTestSuite('Zend_Filter_Word_UnderscoreToDashTest');
         $suite->addTestSuite('Zend_Filter_Word_UnderscoreToSeparatorTest');
+*/
+
+        $suite->addTest(Zend_Filter_Compress_AllTests::suite());
+        $suite->addTest(Zend_Filter_Encrypt_AllTests::suite());
+        $suite->addTest(Zend_Filter_File_AllTests::suite());
+        $suite->addTest(Zend_Filter_Word_AllTests::suite());
 
         return $suite;
     }

tests/Zend/Filter/Compress/AllTests.php

@@ -20,49 +20,24 @@
  * @version    $Id: AllTests.php 16225 2009-06-21 20:34:55Z thomas $
  */
 
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Filter_Compress_AllTests::main');
 }
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
- * @see Zend_Filter_Compress_Bz2Test
- */
 require_once 'Zend/Filter/Compress/Bz2Test.php';
-
-/**
- * @see Zend_Filter_Compress_GzTest
- */
 require_once 'Zend/Filter/Compress/GzTest.php';
-
-/**
- * @see Zend_Filter_Compress_LzfTest
- */
 require_once 'Zend/Filter/Compress/LzfTest.php';
-
-/**
- * @see Zend_Filter_Compress_RarTest
- */
 require_once 'Zend/Filter/Compress/RarTest.php';
-
-/**
- * @see Zend_Filter_Compress_TarTest
- */
 require_once 'Zend/Filter/Compress/TarTest.php';
-
-/**
- * @see Zend_Filter_Compress_ZipTest
- */
 require_once 'Zend/Filter/Compress/ZipTest.php';
 
 /**
  * @category   Zend
  * @package    Zend_Filter
  * @subpackage UnitTests
+ * @group      Zend_Filter
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */

tests/Zend/Filter/Compress/Bz2Test.php

@@ -38,6 +38,7 @@ require_once 'Zend/Filter/Compress/Bz2.php';
  * @category   Zend
  * @package    Zend_Filter
  * @subpackage UnitTests
+ * @group      Zend_Filter
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */

tests/Zend/Filter/Compress/GzTest.php

@@ -38,6 +38,7 @@ require_once 'Zend/Filter/Compress/Gz.php';
  * @category   Zend
  * @package    Zend_Filter
  * @subpackage UnitTests
+ * @group      Zend_Filter
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */

tests/Zend/Filter/Compress/LzfTest.php

@@ -38,6 +38,7 @@ require_once 'Zend/Filter/Compress/Lzf.php';
  * @category   Zend
  * @package    Zend_Filter
  * @subpackage UnitTests
+ * @group      Zend_Filter
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */

tests/Zend/Filter/Compress/RarTest.php

@@ -38,6 +38,7 @@ require_once 'Zend/Filter/Compress/Rar.php';
  * @category   Zend
  * @package    Zend_Filter
  * @subpackage UnitTests
+ * @group      Zend_Filter
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */

tests/Zend/Filter/Compress/TarTest.php

@@ -38,6 +38,7 @@ require_once 'Zend/Filter/Compress/Tar.php';
  * @category   Zend
  * @package    Zend_Filter
  * @subpackage UnitTests
+ * @group      Zend_Filter
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */

tests/Zend/Filter/Compress/ZipTest.php

@@ -38,6 +38,7 @@ require_once 'Zend/Filter/Compress/Zip.php';
  * @category   Zend
  * @package    Zend_Filter
  * @subpackage UnitTests
+ * @group      Zend_Filter
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */

tests/Zend/Filter/CompressTest.php

@@ -38,6 +38,7 @@ require_once 'Zend/Filter/Compress.php';
  * @category   Zend
  * @package    Zend_Filter
  * @subpackage UnitTests
+ * @group      Zend_Filter
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */

tests/Zend/Filter/DecompressTest.php

@@ -38,6 +38,7 @@ require_once 'Zend/Filter/Decompress.php';
  * @category   Zend
  * @package    Zend_Filter
  * @subpackage UnitTests
+ * @group      Zend_Filter
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */

tests/Zend/Filter/Encrypt/AllTests.php

@@ -0,0 +1,70 @@
+<?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_Filter
+ * @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: AllTests.php 16225 2009-06-21 20:34:55Z thomas $
+ */
+
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Filter_Encrypt_AllTests::main');
+}
+
+require_once 'Zend/Filter/Encrypt/McryptTest.php';
+require_once 'Zend/Filter/Encrypt/OpensslTest.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @subpackage UnitTests
+ * @group      Zend_Filter
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_Encrypt_AllTests
+{
+    /**
+     * Runs this test suite
+     *
+     * @return void
+     */
+    public static function main()
+    {
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    /**
+     * Creates and returns this test suite
+     *
+     * @return PHPUnit_Framework_TestSuite
+     */
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Filter_Encrypt');
+
+        $suite->addTestSuite('Zend_Filter_Encrypt_McryptTest');
+        $suite->addTestSuite('Zend_Filter_Encrypt_OpensslTest');
+
+        return $suite;
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Filter_Encrypt_AllTests::main') {
+    Zend_Filter_Encrypt_AllTests::main();
+}

tests/Zend/Filter/File/AllTests.php

@@ -0,0 +1,76 @@
+<?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_Filter
+ * @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: AllTests.php 16225 2009-06-21 20:34:55Z thomas $
+ */
+
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Filter_File_AllTests::main');
+}
+
+require_once 'Zend/Filter/File/DecryptTest.php';
+require_once 'Zend/Filter/File/EncryptTest.php';
+require_once 'Zend/Filter/File/LowerCaseTest.php';
+require_once 'Zend/Filter/File/RenameTest.php';
+require_once 'Zend/Filter/File/UpperCaseTest.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ * @subpackage UnitTests
+ * @group      Zend_Filter
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Filter_File_AllTests
+{
+    /**
+     * Runs this test suite
+     *
+     * @return void
+     */
+    public static function main()
+    {
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    /**
+     * Creates and returns this test suite
+     *
+     * @return PHPUnit_Framework_TestSuite
+     */
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Filter_File');
+
+        $suite->addTestSuite('Zend_Filter_File_DecryptTest');
+        $suite->addTestSuite('Zend_Filter_File_EncryptTest');
+        $suite->addTestSuite('Zend_Filter_File_LowerCaseTest');
+        $suite->addTestSuite('Zend_Filter_File_RenameTest');
+        $suite->addTestSuite('Zend_Filter_File_UpperCaseTest');
+
+        return $suite;
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'Zend_Filter_File_AllTests::main') {
+    Zend_Filter_File_AllTests::main();
+}

tests/Zend/Filter/Word/AllTests.php

@@ -20,19 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Filter_Word_AllTests::main');
 }
 
-
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
- * Word filter tests
- */
 require_once 'Zend/Filter/Word/CamelCaseToDashTest.php';
 require_once 'Zend/Filter/Word/CamelCaseToSeparatorTest.php';
 require_once 'Zend/Filter/Word/CamelCaseToUnderscoreTest.php';

tests/Zend/Form/AllTests.php

@@ -20,16 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Form_AllTests::main');
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-// error_reporting(E_ALL);
-
 require_once 'Zend/Form/Decorator/AllTests.php';
 require_once 'Zend/Form/DisplayGroupTest.php';
 require_once 'Zend/Form/ElementTest.php';

tests/Zend/Form/Decorator/AllTests.php

@@ -20,16 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Form_Decorator_AllTests::main');
 }
 
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-// error_reporting(E_ALL);
-
 require_once 'Zend/Form/Decorator/AbstractTest.php';
 require_once 'Zend/Form/Decorator/CallbackTest.php';
 require_once 'Zend/Form/Decorator/DescriptionTest.php';

tests/Zend/Form/Element/AllTests.php

@@ -20,16 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Form_Element_AllTests::main');
 }
 
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-// error_reporting(E_ALL);
-
 require_once 'Zend/Form/Element/ButtonTest.php';
 require_once 'Zend/Form/Element/CaptchaTest.php';
 require_once 'Zend/Form/Element/CheckboxTest.php';

tests/Zend/Gdata/AllTests.php

@@ -20,18 +20,12 @@
  * @version    $Id $
  */
 
-/**
- * Test helper
- */
 require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Gdata_AllTests::main');
 }
 
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
 /**
  * Tests of the authentication URL generator
  */

tests/Zend/Http/AllTests.php

@@ -20,18 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Http_AllTests::main');
 }
 
-/**
- * Test helper
- */
-require_once realpath(dirname(__FILE__) . '/../../') . '/TestHelper.php';
-
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
 require_once 'Zend/Http/ResponseTest.php';
 require_once 'Zend/Http/CookieTest.php';
 require_once 'Zend/Http/CookieJarTest.php';

tests/Zend/Http/Client/AllTests.php

@@ -20,22 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Http_Client_AllTests::main');
 }
 
-// Read local configuration
-if (! defined('TESTS_ZEND_HTTP_CLIENT_BASEURI') &&
-    is_readable('TestConfiguration.php')) {
-
-    require_once 'TestConfiguration.php';
-}
-
-require_once realpath(dirname(__FILE__) . '/../../../') . '/TestHelper.php';
-
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
 require_once 'Zend/Http/Client/StaticTest.php';
 require_once 'Zend/Http/Client/SocketTest.php';
 require_once 'Zend/Http/Client/SocketKeepaliveTest.php';

tests/Zend/InfoCard/AllTests.php

@@ -20,14 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_InfoCard_AllTests::main');
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
 require_once 'Zend/InfoCard/XmlParsingTest.php';
 require_once 'Zend/InfoCard/ProcessTest.php';
 require_once 'Zend/InfoCard/AssertionTest.php';

tests/Zend/Json/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Json_AllTests::main');

tests/Zend/Json/Server/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Json_Server_AllTests::main');

tests/Zend/Layout/AllTests.php

@@ -20,15 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Layout_AllTests::main');
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
 require_once 'Zend/Layout/LayoutTest.php';
 require_once 'Zend/Layout/HelperTest.php';
 require_once 'Zend/Layout/PluginTest.php';

tests/Zend/Ldap/AllTests.php

@@ -20,15 +20,31 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Ldap_AllTests::main');
 }
 
+require_once 'Zend/Ldap/OfflineTest.php';
+require_once 'Zend/Ldap/AttributeTest.php';
+require_once 'Zend/Ldap/ConverterTest.php';
+require_once 'Zend/Ldap/Dn/AllTests.php';
+require_once 'Zend/Ldap/FilterTest.php';
+require_once 'Zend/Ldap/Node/AllTests.php';
+require_once 'Zend/Ldap/Ldif/AllTests.php';
+
+if (defined('TESTS_ZEND_LDAP_ONLINE_ENABLED')
+    && constant('TESTS_ZEND_LDAP_ONLINE_ENABLED')) {
+    require_once 'Zend/Ldap/ConnectTest.php';
+    require_once 'Zend/Ldap/BindTest.php';
+    require_once 'Zend/Ldap/CanonTest.php';
+    require_once 'Zend/Ldap/SearchTest.php';
+    require_once 'Zend/Ldap/CrudTest.php';
+    require_once 'Zend/Ldap/CopyRenameTest.php';
+    require_once 'Zend/Ldap/ChangePasswordTest.php';
+}
+
 /**
  * @category   Zend
  * @package    Zend_Ldap
@@ -48,78 +64,22 @@ class Zend_Ldap_AllTests
     {
         $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Ldap');
 
-        /**
-         * @see Zend_Ldap_OfflineTest
-         */
-        require_once 'Zend/Ldap/OfflineTest.php';
         $suite->addTestSuite('Zend_Ldap_OfflineTest');
-        /**
-         * @see Zend_Ldap_AttributeTest
-         */
-        require_once 'Zend/Ldap/AttributeTest.php';
         $suite->addTestSuite('Zend_Ldap_AttributeTest');
-        /**
-         * @see Zend_Ldap_ConverterTest
-         */
-        require_once 'Zend/Ldap/ConverterTest.php';
         $suite->addTestSuite('Zend_Ldap_ConverterTest');
-        /**
-         * @see Zend_Ldap_Dn_AllTests
-         */
-        require_once 'Zend/Ldap/Dn/AllTests.php';
         $suite->addTest(Zend_Ldap_Dn_AllTests::suite());
-        /**
-         * @see Zend_Ldap_FilterTest
-         */
-        require_once 'Zend/Ldap/FilterTest.php';
         $suite->addTestSuite('Zend_Ldap_FilterTest');
-        /**
-         * @see Zend_Ldap_Node_AllTests
-         */
-        require_once 'Zend/Ldap/Node/AllTests.php';
         $suite->addTest(Zend_Ldap_Node_AllTests::suite());
-        /**
-         * @see Zend_Ldap_Ldif_AllTests
-         */
-        require_once 'Zend/Ldap/Ldif/AllTests.php';
         $suite->addTest(Zend_Ldap_Ldif_AllTests::suite());
 
         if (defined('TESTS_ZEND_LDAP_ONLINE_ENABLED')
             && constant('TESTS_ZEND_LDAP_ONLINE_ENABLED')) {
-            /**
-             * @see Zend_Ldap_ConnectTest
-             */
-            require_once 'Zend/Ldap/ConnectTest.php';
             $suite->addTestSuite('Zend_Ldap_ConnectTest');
-            /**
-             * @see Zend_Ldap_BindTest
-             */
-            require_once 'Zend/Ldap/BindTest.php';
             $suite->addTestSuite('Zend_Ldap_BindTest');
-            /**
-             * @see Zend_Ldap_CanonTest
-             */
-            require_once 'Zend/Ldap/CanonTest.php';
             $suite->addTestSuite('Zend_Ldap_CanonTest');
-            /**
-             * @see Zend_Ldap_SearchTest
-             */
-            require_once 'Zend/Ldap/SearchTest.php';
             $suite->addTestSuite('Zend_Ldap_SearchTest');
-            /**
-             * @see Zend_Ldap_CrudTest
-             */
-            require_once 'Zend/Ldap/CrudTest.php';
             $suite->addTestSuite('Zend_Ldap_CrudTest');
-            /**
-             * @see Zend_Ldap_CopyRenameTest
-             */
-            require_once 'Zend/Ldap/CopyRenameTest.php';
             $suite->addTestSuite('Zend_Ldap_CopyRenameTest');
-            /**
-             * @see Zend_Ldap_ChangePasswordTest
-             */
-            require_once 'Zend/Ldap/ChangePasswordTest.php';
             $suite->addTestSuite('Zend_Ldap_ChangePasswordTest');
         } else {
             $suite->addTest(new Zend_Ldap_SkipOnlineTests());

tests/Zend/Ldap/ChangePasswordTest.php

@@ -29,6 +29,7 @@ require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'OnlineTestCase.php';
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage UnitTests
+ * @group      Zend_Ldap
  * @copyright  Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
@@ -211,4 +212,4 @@ class Zend_Ldap_ChangePasswordTest extends Zend_Ldap_OnlineTestCase
             $this->fail($e->getMessage());
         }
     }
-}
+}

tests/Zend/Ldap/Dn/AllTests.php

@@ -20,15 +20,19 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Ldap_Dn_AllTests::main');
 }
 
+require_once 'Zend/Ldap/Dn/EscapingTest.php';
+require_once 'Zend/Ldap/Dn/ExplodingTest.php';
+require_once 'Zend/Ldap/Dn/ImplodingTest.php';
+require_once 'Zend/Ldap/Dn/CreationTest.php';
+require_once 'Zend/Ldap/Dn/ModificationTest.php';
+require_once 'Zend/Ldap/Dn/MiscTest.php';
+
 /**
  * @category   Zend
  * @package    Zend_Ldap
@@ -49,35 +53,11 @@ class Zend_Ldap_Dn_AllTests
     {
         $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Ldap_Dn');
 
-        /**
-         * @see Zend_Ldap_Dn_EscapingTest
-         */
-        require_once 'Zend/Ldap/Dn/EscapingTest.php';
         $suite->addTestSuite('Zend_Ldap_Dn_EscapingTest');
-        /**
-         * @see Zend_Ldap_Dn_ExplodingTest
-         */
-        require_once 'Zend/Ldap/Dn/ExplodingTest.php';
         $suite->addTestSuite('Zend_Ldap_Dn_ExplodingTest');
-        /**
-         * @see Zend_Ldap_Dn_ImplodingTest
-         */
-        require_once 'Zend/Ldap/Dn/ImplodingTest.php';
         $suite->addTestSuite('Zend_Ldap_Dn_ImplodingTest');
-        /**
-         * @see Zend_Ldap_Dn_CreationTest
-         */
-        require_once 'Zend/Ldap/Dn/CreationTest.php';
         $suite->addTestSuite('Zend_Ldap_Dn_CreationTest');
-        /**
-         * @see Zend_Ldap_Dn_ModificationTest
-         */
-        require_once 'Zend/Ldap/Dn/ModificationTest.php';
         $suite->addTestSuite('Zend_Ldap_Dn_ModificationTest');
-        /**
-         * @see Zend_Ldap_Dn_MiscTest
-         */
-        require_once 'Zend/Ldap/Dn/MiscTest.php';
         $suite->addTestSuite('Zend_Ldap_Dn_MiscTest');
 
         return $suite;

tests/Zend/Ldap/Ldif/AllTests.php

@@ -20,15 +20,15 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Ldap_Ldif_AllTests::main');
 }
 
+require_once 'Zend/Ldap/Ldif/SimpleEncoderTest.php';
+require_once 'Zend/Ldap/Ldif/SimpleDecoderTest.php';
+
 /**
  * @category   Zend
  * @package    Zend_Ldap
@@ -49,15 +49,7 @@ class Zend_Ldap_Ldif_AllTests
     {
         $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Ldap_Ldif');
 
-        /**
-         * @see Zend_Ldap_Ldif_SimpleEncoderTest
-         */
-        require_once 'Zend/Ldap/Ldif/SimpleEncoderTest.php';
         $suite->addTestSuite('Zend_Ldap_Ldif_SimpleEncoderTest');
-        /**
-         * @see Zend_Ldap_Ldif_SimpleDecoderTest
-         */
-        require_once 'Zend/Ldap/Ldif/SimpleDecoderTest.php';
         $suite->addTestSuite('Zend_Ldap_Ldif_SimpleDecoderTest');
 
         if (defined('TESTS_ZEND_LDAP_ONLINE_ENABLED')

tests/Zend/Ldap/Node/AllTests.php

@@ -20,15 +20,25 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Ldap_Node_AllTests::main');
 }
 
+require_once 'Zend/Ldap/Node/OfflineTest.php';
+require_once 'Zend/Ldap/Node/AttributeIterationTest.php';
+
+if (defined('TESTS_ZEND_LDAP_ONLINE_ENABLED')
+	&& constant('TESTS_ZEND_LDAP_ONLINE_ENABLED')) {
+    require_once 'Zend/Ldap/Node/OnlineTest.php';
+    require_once 'Zend/Ldap/Node/ChildrenTest.php';
+    require_once 'Zend/Ldap/Node/ChildrenIterationTest.php';
+    require_once 'Zend/Ldap/Node/UpdateTest.php';
+    require_once 'Zend/Ldap/Node/RootDseTest.php';
+    require_once 'Zend/Ldap/Node/SchemaTest.php';
+}
+
 /**
  * @category   Zend
  * @package    Zend_Ldap
@@ -49,48 +59,16 @@ class Zend_Ldap_Node_AllTests
     {
         $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Ldap_Node');
 
-        /**
-         * @see Zend_Ldap_Node_OfflineTest
-         */
-        require_once 'Zend/Ldap/Node/OfflineTest.php';
         $suite->addTestSuite('Zend_Ldap_Node_OfflineTest');
-        /**
-         * @see Zend_Ldap_Node_AttributeIterationTest
-         */
-        require_once 'Zend/Ldap/Node/AttributeIterationTest.php';
         $suite->addTestSuite('Zend_Ldap_Node_AttributeIterationTest');
 
         if (defined('TESTS_ZEND_LDAP_ONLINE_ENABLED')
                 && constant('TESTS_ZEND_LDAP_ONLINE_ENABLED')) {
-            /**
-             * @see Zend_Ldap_Node_OnlineTest
-             */
-            require_once 'Zend/Ldap/Node/OnlineTest.php';
             $suite->addTestSuite('Zend_Ldap_Node_OnlineTest');
-            /**
-             * @see Zend_Ldap_Node_ChildrenTest
-             */
-            require_once 'Zend/Ldap/Node/ChildrenTest.php';
             $suite->addTestSuite('Zend_Ldap_Node_ChildrenTest');
-            /**
-             * @see Zend_Ldap_Node_ChildrenIterationTest
-             */
-            require_once 'Zend/Ldap/Node/ChildrenIterationTest.php';
             $suite->addTestSuite('Zend_Ldap_Node_ChildrenIterationTest');
-            /**
-             * @see Zend_Ldap_Node_UpdateTest
-             */
-            require_once 'Zend/Ldap/Node/UpdateTest.php';
             $suite->addTestSuite('Zend_Ldap_Node_UpdateTest');
-            /**
-             * @see Zend_Ldap_Node_RootDseTest
-             */
-            require_once 'Zend/Ldap/Node/RootDseTest.php';
             $suite->addTestSuite('Zend_Ldap_Node_RootDseTest');
-            /**
-             * @see Zend_Ldap_Node_SchemaTest
-             */
-            require_once 'Zend/Ldap/Node/SchemaTest.php';
             $suite->addTestSuite('Zend_Ldap_Node_SchemaTest');
         } else {
             $suite->addTest(new Zend_Ldap_Node_SkipOnlineTests());

tests/Zend/Loader/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Loader_AllTests::main');

tests/Zend/Locale/AllTests.php

@@ -20,26 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Locale_AllTests::main');
 }
 
-if (!defined('TESTS_ZEND_LOCALE_FORMAT_SETLOCALE')) {
-    /**
-     * Read in user-defined test configuration if available; otherwise, read default test configuration.
-     * This facilitates running "php AllTests.php" in this subdirectory or "phpunit Zend_Locale_AllTests".
-     */
-    $_test_configuration = dirname(__FILE__) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..'
-        . DIRECTORY_SEPARATOR .  'TestConfiguration.php';
-    if (is_readable($_test_configuration)) {
-        include_once $_test_configuration;
-    } else if (is_readable("$_test_configuration.dist")) {
-        include_once "$_test_configuration.dist";
-    }
-}
-
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
 // define('TESTS_ZEND_LOCALE_BCMATH_ENABLED', false); // uncomment to disable use of bcmath extension by Zend_Date
 
 require_once 'Zend/Locale/DataTest.php';

tests/Zend/Log/AllTests.php

@@ -17,15 +17,15 @@
  * @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: AllTests.php 17573 2009-08-13 18:01:41Z alexander $
+ * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Log_AllTests::main');
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
 require_once 'Zend/Log/LogTest.php';
 require_once 'Zend/Log/Filter/ChainingTest.php';
 require_once 'Zend/Log/Filter/PriorityTest.php';

tests/Zend/Mail/AllTests.php

@@ -20,27 +20,12 @@
  * @version    $Id$
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Mail_AllTests::main');
-}
-
-/**
- * Test helper
- */
 require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
-
-if (!defined('TESTS_ZEND_MAIL_POP3_ENABLED')) {
-    if (is_readable('TestConfiguration.php')) {
-        require_once 'TestConfiguration.php';
-    } else {
-        require_once 'TestConfiguration.php.dist';
-    }
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Mail_AllTests::main');
 }
 
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
 require_once 'Zend/Mail/MboxTest.php';
 require_once 'Zend/Mail/MboxMessageOldTest.php';
 require_once 'Zend/Mail/MboxFolderTest.php';

tests/Zend/Measure/AllTests.php

@@ -20,14 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Measure_AllTests::main');
 }
 
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-error_reporting( E_ALL | E_STRICT ); // now required for each test suite
 // define('TESTS_ZEND_LOCALE_BCMATH_ENABLED', false); // uncomment to disable use of bcmath extension by Zend_Date
 
 require_once 'Zend/Measure/Cooking/VolumeTest.php';

tests/Zend/Memory/AllTests.php

@@ -20,15 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Memory_AllTests::main');
 }
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
 require_once 'Zend/Memory/MemoryTest.php';
 require_once 'Zend/Memory/ValueTest.php';
 require_once 'Zend/Memory/MovableTest.php';
@@ -62,7 +59,6 @@ class Zend_Memory_AllTests
         $suite->addTestSuite('Zend_Memory_Container_AccessControllerTest');
         $suite->addTestSuite('Zend_Memory_MemoryManagerTest');
 
-
         return $suite;
     }
 }

tests/Zend/Mime/AllTests.php

@@ -20,13 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Mime_AllTests::main');
 }
 
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
 require_once 'Zend/Mime/PartTest.php';
 require_once 'Zend/Mime/MessageTest.php';
 

tests/Zend/Navigation/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Navigation_AllTests::main');

tests/Zend/Navigation/Page/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Navigation_Page_AllTests::main');

tests/Zend/OpenId/AllTests.php

@@ -20,15 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_OpenId_AllTests::main');
 }
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
 require_once 'Zend/OpenId/ConsumerTest.php';
 require_once 'Zend/OpenId/Consumer/Storage/FileTest.php';
 require_once 'Zend/OpenId/ProviderTest.php';

tests/Zend/Paginator/AllTests.php

@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
 require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {

tests/Zend/Pdf/AllTests.php

@@ -20,12 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Pdf_AllTests::main');
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
 require_once 'Zend/Pdf/ActionTest.php';
 require_once 'Zend/Pdf/DestinationTest.php';
 require_once 'Zend/Pdf/DrawingTest.php';

tests/Zend/Pdf/Element/AllTests.php

@@ -20,13 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Pdf_Element_AllTests::main');
 }
 
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
 require_once 'Zend/Pdf/Element/ArrayTest.php';
 require_once 'Zend/Pdf/Element/BooleanTest.php';
 require_once 'Zend/Pdf/Element/DictionaryTest.php';

tests/Zend/Pdf/Element/Object/AllTests.php

@@ -20,13 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Pdf_Element_Object_AllTests::main');
 }
 
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
 require_once 'Zend/Pdf/Element/Object/StreamTest.php';
 
 /**

tests/Zend/Pdf/Element/String/AllTests.php

@@ -20,13 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Pdf_Element_String_AllTests::main');
 }
 
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
 require_once 'Zend/Pdf/Element/String/BinaryTest.php';
 
 /**

tests/Zend/ProgressBar/Adapter/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_ProgressBar_Adapter_AllTests::main');

tests/Zend/ProgressBar/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_ProgressBar_AllTests::main');

tests/Zend/Queue/Adapter/MessageTestClass.php

@@ -24,6 +24,7 @@
  * @category   Zend
  * @package    Zend_Queue
  * @subpackage UnitTests
+ * @group      Zend_Queue
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */

tests/Zend/Queue/AllTests.php

@@ -20,12 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Queue_AllTests::main');
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
 require_once 'Zend/Queue/FactoryTest.php';
 
 // Queue testing

tests/Zend/Reflection/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Reflection_AllTests::main');

tests/Zend/Reflection/Docblock/AllTests.php

@@ -20,10 +20,7 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Reflection_Docblock_AllTests::main');

tests/Zend/Rest/AllTests.php

@@ -20,12 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Rest_AllTests::main');
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
 require_once 'Zend/Rest/ControllerTest.php';
 require_once 'Zend/Rest/RouteTest.php';
 require_once 'Zend/Rest/ServerTest.php';

tests/Zend/Search/Lucene/AllTests.php

@@ -20,18 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Search_Lucene_AllTests::main');
 }
 
-/**
- * Test helper
- */
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
-
-require_once 'PHPUnit/Framework/TestSuite.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
 require_once 'Zend/Search/Lucene/LuceneTest.php';
 
 require_once 'Zend/Search/Lucene/DocumentTest.php';

tests/Zend/Server/AllTests.php

@@ -20,12 +20,12 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Server_AllTests::main');
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
 require_once 'Zend/Server/DefinitionTest.php';
 require_once 'Zend/Server/Method/DefinitionTest.php';
 require_once 'Zend/Server/Method/CallbackTest.php';

tests/Zend/Service/AllTests.php

@@ -20,97 +20,28 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Service_AllTests::main');
 }
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
-/**
- * Exclude from code coverage report
- */
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
-/**
- * @see Zend_Service_AkismetTest
- */
 require_once 'Zend/Service/AkismetTest.php';
-
-/**
- * @see Zend_Service_Amazon_AllTests
- */
 require_once 'Zend/Service/Amazon/AllTests.php';
-
-/**
- * @see Zend_Service_Audioscrobbler_AllTests
- */
 require_once 'Zend/Service/Audioscrobbler/AllTests.php';
-
-/**
- * @see Zend_Service_Delicious_AllTests
- */
 require_once 'Zend/Service/Delicious/AllTests.php';
-
-/**
- * @see Zend_Service_Flickr_AllTests
- */
 require_once 'Zend/Service/Flickr/AllTests.php';
-
-/**
- * @see Zend_Service_LiveDocx_AllTests
- */
 require_once 'Zend/Service/LiveDocx/AllTests.php';
-
-/**
- * @see Zend_Service_Nirvanix_AllTests
- */
 require_once 'Zend/Service/Nirvanix/AllTests.php';
-
-/**
- * @see Zend_Service_ReCaptcha_AllTests
- */
 require_once 'Zend/Service/ReCaptcha/AllTests.php';
-
-/**
- * @see Zend_Service_Simpy_AllTests
- */
 require_once 'Zend/Service/Simpy/AllTests.php';
-
-/**
- * @see Zend_Service_SlideShareTest
- */
 require_once 'Zend/Service/SlideShareTest.php';
-
-/**
- * @see Zend_Service_StrikeIron_AllTests
- */
 require_once 'Zend/Service/StrikeIron/AllTests.php';
-
-/**
- * @see Zend_Service_Technorati_AllTests
- */
 require_once 'Zend/Service/Technorati/AllTests.php';
-
-/**
- * @see Zend_Service_TwitterTest
- */
 require_once 'Zend/Service/TwitterTest.php';
-
-/**
- * @see Zend_Service_TwitterSearchTest
- */
 require_once 'Zend/Service/TwitterSearchTest.php';
-
-/**
- * @see Zend_Service_Yahoo_AllTests
- */
 require_once 'Zend/Service/Yahoo/AllTests.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Service

tests/Zend/Service/Amazon/AllTests.php

@@ -20,44 +20,16 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Service_Amazon_AllTests::main');
 }
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
- * Exclude from code coverage report
- */
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
-/**
- * @see Zend_Service_Amazon_OfflineTest
- */
 require_once 'Zend/Service/Amazon/OfflineTest.php';
-
-/**
- * @see Zend_Service_Amazon_OnlineTest
- */
 require_once 'Zend/Service/Amazon/OnlineTest.php';
-
-/**
- * @see Zend_Service_Amazon_Ec2_AllTests
- */
 require_once 'Zend/Service/Amazon/Ec2/AllTests.php';
-
-/**
- * @see Zend_Service_Amazon_S3_AllTests
- */
 require_once 'Zend/Service/Amazon/S3/AllTests.php';
-
-/**
- * @see Zend_Service_Amazon_Sqs_AllTests
- */
 require_once 'Zend/Service/Amazon/Sqs/AllTests.php';
 
 /**

tests/Zend/Service/Amazon/Ec2/AllTests.php

@@ -19,13 +19,12 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
+
+require_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Service_Amazon_Ec2_AllTests::main');
 }
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 
 require_once 'Zend/Service/Amazon/Ec2/AvailabilityzonesTest.php';
 require_once 'Zend/Service/Amazon/Ec2/EbsTest.php';
@@ -70,7 +69,7 @@ class Zend_Service_Amazon_Ec2_AllTests
      */
     public static function suite()
     {
-        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Service_Amazon - Ec2');
+        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Service_Amazon_Ec2');
 
         $suite->addTestSuite('Zend_Service_Amazon_Ec2_AvailabilityzonesTest');
         $suite->addTestSuite('Zend_Service_Amazon_Ec2_EbsTest');

tests/Zend/Service/Amazon/S3/AllTests.php

@@ -20,38 +20,17 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Service_Amazon_S3_AllTests::main');
 }
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
-/**
- * Exclude from code coverage report
- */
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
-/**
- * @see Zend_Service_Amazon_OfflineTest
- */
 require_once 'Zend/Service/Amazon/S3/OfflineTest.php';
-
-/**
- * @see Zend_Service_Amazon_OnlineTest
- */
 require_once 'Zend/Service/Amazon/S3/OnlineTest.php';
-
-/**
- * @see Zend_Service_Amazon_StreamTest
- */
 require_once 'Zend/Service/Amazon/S3/StreamTest.php';
 
 
-
 /**
  * @category   Zend
  * @package    Zend_Service_Amazon_S3

tests/Zend/Service/Amazon/Sqs/AllTests.php

@@ -20,28 +20,13 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Service_Amazon_Sqs_AllTests::main');
 }
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
-/**
- * Exclude from code coverage report
- */
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
-/**
- * @see Zend_Service_Amazon_Sqs_OfflineTest
- */
 require_once 'Zend/Service/Amazon/Sqs/OfflineTest.php';
-
-/**
- * @see Zend_Service_Amazon_Sqs_OnlineTest
- */
 require_once 'Zend/Service/Amazon/Sqs/OnlineTest.php';
 
 /**
@@ -72,7 +57,7 @@ class Zend_Service_Amazon_Sqs_AllTests
      */
     public static function suite()
     {
-        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Service - Amazon - SQS');
+        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Service_Amazon_Sqs');
 
         $suite->addTestSuite('Zend_Service_Amazon_Sqs_OfflineTest');
 

tests/Zend/Service/Audioscrobbler/AllTests.php

@@ -20,57 +20,20 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Service_Audioscrobbler_AllTests::main');
 }
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
- * Exclude from code coverage report
- */
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
-/**
- * @see Zend_Service_Audioscrobbler_AudioscrobblerTest
- */
 require_once 'Zend/Service/Audioscrobbler/AudioscrobblerTest.php';
-
-/**
- * @see Zend_Service_Audioscrobbler_ProfileTest
- */
 require_once 'Zend/Service/Audioscrobbler/ProfileTest.php';
-
-/**
- * @see Zend_Service_Audioscrobbler_ArtistTest
- */
 require_once 'Zend/Service/Audioscrobbler/ArtistTest.php';
-
-/**
- * @see Zend_Service_Audioscrobbler_AlbumDataTest
- */
 require_once 'Zend/Service/Audioscrobbler/AlbumDataTest.php';
-
-/**
- * @see Zend_Service_Audioscrobbler_TrackDataTest
- */
 require_once 'Zend/Service/Audioscrobbler/TrackDataTest.php';
-
-/**
- * @see Zend_Service_Audioscrobbler_TagDataTest
- */
 require_once 'Zend/Service/Audioscrobbler/TagDataTest.php';
-
-/**
- * @see Zend_Service_Audioscrobbler_GroupTest
- */
 require_once 'Zend/Service/Audioscrobbler/GroupTest.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Service_Audioscrobbler

tests/Zend/Service/Delicious/AllTests.php

@@ -20,21 +20,22 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Service_Delicious_AllTests::main');
 }
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
- * Exclude from code coverage report
- */
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
+if (defined('TESTS_ZEND_SERVICE_DELICIOUS_ENABLED') &&
+    constant('TESTS_ZEND_SERVICE_DELICIOUS_ENABLED')) {
+    require_once 'Zend/Service/Delicious/PublicDataTest.php';
+    require_once 'Zend/Service/Delicious/PrivateDataTest.php';
+} else {
+    require_once 'Zend/Service/Delicious/SkipTests.php';
+}
 
+require_once 'Zend/Service/Delicious/SimplePostTest.php';
+require_once 'Zend/Service/Delicious/PostTest.php';
 
 /**
  * @category   Zend
@@ -66,40 +67,16 @@ class Zend_Service_Delicious_AllTests
     {
         $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Service_Delicious');
 
-        if (!defined('TESTS_ZEND_SERVICE_DELICIOUS_ENABLED') ||
-            !constant('TESTS_ZEND_SERVICE_DELICIOUS_ENABLED')) {
-
-            /**
-             * @see Zend_Service_Delicious_SkipTests
-             */
-            require_once 'Zend/Service/Delicious/SkipTests.php';
-            $suite->addTestSuite('Zend_Service_Delicious_SkipTests');
-
-        } else {
-
-            /**
-             * @see Zend_Service_Delicious_PublicDataTest
-             */
-            require_once 'Zend/Service/Delicious/PublicDataTest.php';
+        if (defined('TESTS_ZEND_SERVICE_DELICIOUS_ENABLED') &&
+            constant('TESTS_ZEND_SERVICE_DELICIOUS_ENABLED')) {
             $suite->addTestSuite('Zend_Service_Delicious_PublicDataTest');
-
-            /**
-             * @see Zend_Service_Delicious_PrivateDataTest
-             */
-            require_once 'Zend/Service/Delicious/PrivateDataTest.php';
             $suite->addTestSuite('Zend_Service_Delicious_PrivateDataTest');
+        } else {
+            $suite->addTestSuite('Zend_Service_Delicious_SkipTests');
         }
 
-        /**
-         * @see Zend_Service_Delicious_SimplePostTest
-         */
-        require_once 'Zend/Service/Delicious/SimplePostTest.php';
         $suite->addTestSuite('Zend_Service_Delicious_SimplePostTest');
 
-        /**
-         * @see Zend_Service_Delicious_PostTest
-         */
-        require_once 'Zend/Service/Delicious/PostTest.php';
         $suite->addTestSuite('Zend_Service_Delicious_PostTest');
 
         return $suite;

tests/Zend/Service/Flickr/AllTests.php

@@ -20,32 +20,15 @@
  * @version    $Id$
  */
 
+require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Service_Flickr_AllTests::main');
 }
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
- * Exclude from code coverage report
- */
-PHPUnit_Util_Filter::addFileToFilter(__FILE__);
-
-/**
- * @see Zend_Service_Flickr_OfflineTest
- */
 require_once 'Zend/Service/Flickr/OfflineTest.php';
-
-/**
- * @see Zend_Service_Flickr_OnlineTest
- */
 require_once 'Zend/Service/Flickr/OnlineTest.php';
 
-
 /**
  * @category   Zend
  * @package    Zend_Service_Flickr