Просмотр исходного кода

ZF-2585 Unit test cleanup; removing unnecessary require_once statements

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@23513 44c647ce-9c0f-0410-b52a-842ac1e357ba
mjh_ca 15 лет назад
Родитель
Сommit
a42133e04d
100 измененных файлов с 0 добавлено и 258 удалено
  1. 0 1
      tests/Zend/Amf/AuthTest.php
  2. 0 1
      tests/Zend/Amf/ResourceTest.php
  3. 0 1
      tests/Zend/Auth/Adapter/DbTable/BasicSqliteTest.php
  4. 0 1
      tests/Zend/Auth/Adapter/DigestTest.php
  5. 0 1
      tests/Zend/Auth/Adapter/Http/AuthTest.php
  6. 0 1
      tests/Zend/Auth/Adapter/Http/ObjectTest.php
  7. 0 1
      tests/Zend/Auth/Adapter/Http/Resolver/FileTest.php
  8. 0 1
      tests/Zend/Auth/Adapter/OpenId/OpenIdTest.php
  9. 0 5
      tests/Zend/Cache/ApcBackendTest.php
  10. 0 5
      tests/Zend/Cache/ClassFrontendTest.php
  11. 0 5
      tests/Zend/Cache/CommonBackendTest.php
  12. 0 5
      tests/Zend/Cache/CommonExtendedBackendTest.php
  13. 0 5
      tests/Zend/Cache/CoreTest.php
  14. 0 5
      tests/Zend/Cache/FactoryTest.php
  15. 0 5
      tests/Zend/Cache/FileBackendTest.php
  16. 0 5
      tests/Zend/Cache/FileFrontendTest.php
  17. 0 5
      tests/Zend/Cache/FunctionFrontendTest.php
  18. 0 5
      tests/Zend/Cache/LibmemcachedBackendTest.php
  19. 0 5
      tests/Zend/Cache/MemcachedBackendTest.php
  20. 0 5
      tests/Zend/Cache/OutputFrontendTest.php
  21. 0 5
      tests/Zend/Cache/PageFrontendTest.php
  22. 0 1
      tests/Zend/Cache/SkipTests.php
  23. 0 5
      tests/Zend/Cache/SqliteBackendTest.php
  24. 0 5
      tests/Zend/Cache/StaticBackendTest.php
  25. 0 5
      tests/Zend/Cache/TwoLevelsBackendTest.php
  26. 0 5
      tests/Zend/Cache/XcacheBackendTest.php
  27. 0 5
      tests/Zend/Cache/ZendPlatformBackendTest.php
  28. 0 5
      tests/Zend/Cache/ZendServerDiskTest.php
  29. 0 5
      tests/Zend/Cache/ZendServerShMemTest.php
  30. 0 1
      tests/Zend/Captcha/ImageTest.php
  31. 0 5
      tests/Zend/Console/GetoptTest.php
  32. 0 3
      tests/Zend/Controller/Action/Helper/ActionStackTest.php
  33. 0 3
      tests/Zend/Controller/Action/Helper/AjaxContextTest.php
  34. 0 3
      tests/Zend/Controller/Action/Helper/AutoCompleteTest.php
  35. 0 3
      tests/Zend/Controller/Action/Helper/CacheTest.php
  36. 0 3
      tests/Zend/Controller/Action/Helper/ContextSwitchTest.php
  37. 0 3
      tests/Zend/Controller/Action/Helper/JsonTest.php
  38. 0 3
      tests/Zend/Controller/Action/Helper/NamespaceTest.php
  39. 0 1
      tests/Zend/Controller/Action/Helper/RedirectorTest.php
  40. 0 3
      tests/Zend/Controller/Action/Helper/UrlTest.php
  41. 0 1
      tests/Zend/Controller/Action/HelperBrokerTest.php
  42. 0 3
      tests/Zend/Controller/ActionTest.php
  43. 0 3
      tests/Zend/Controller/FrontTest.php
  44. 0 3
      tests/Zend/Controller/Plugin/ActionStackTest.php
  45. 0 3
      tests/Zend/Controller/Plugin/BrokerTest.php
  46. 0 3
      tests/Zend/Controller/Plugin/ErrorHandlerTest.php
  47. 0 1
      tests/Zend/Controller/Plugin/PutHandlerTest.php
  48. 0 3
      tests/Zend/Controller/Request/Apache404Test.php
  49. 0 3
      tests/Zend/Controller/Request/SimpleTest.php
  50. 0 1
      tests/Zend/Controller/Response/HttpTest.php
  51. 0 5
      tests/Zend/Controller/Router/RewriteTest.php
  52. 0 1
      tests/Zend/Controller/Router/Route/ChainTest.php
  53. 0 4
      tests/Zend/Controller/Router/Route/HostnameTest.php
  54. 0 3
      tests/Zend/Controller/Router/Route/ModuleTest.php
  55. 0 3
      tests/Zend/Controller/Router/RouteTest.php
  56. 0 1
      tests/Zend/Crypt/DiffieHellmanTest.php
  57. 0 1
      tests/Zend/Crypt/HmacTest.php
  58. 0 1
      tests/Zend/Crypt/Math/BigInteger/BcmathTest.php
  59. 0 1
      tests/Zend/Crypt/Math/BigInteger/GmpTest.php
  60. 0 1
      tests/Zend/Crypt/MathTest.php
  61. 0 1
      tests/Zend/Crypt/Rsa/RsaTest.php
  62. 0 5
      tests/Zend/Db/Adapter/SkipTests.php
  63. 0 2
      tests/Zend/Db/Profiler/FirebugTest.php
  64. 0 1
      tests/Zend/Db/SkipTests.php
  65. 0 1
      tests/Zend/Db/Statement/StaticTest.php
  66. 0 1
      tests/Zend/Db/Table/Relationships/StaticTest.php
  67. 0 1
      tests/Zend/Db/Table/Row/StaticTest.php
  68. 0 1
      tests/Zend/Db/Table/Rowset/StaticTest.php
  69. 0 1
      tests/Zend/Db/Table/StaticTest.php
  70. 0 1
      tests/Zend/Db/TestSetup.php
  71. 0 1
      tests/Zend/Feed/Reader/Entry/AtomStandaloneEntryTest.php
  72. 0 1
      tests/Zend/Feed/Reader/Entry/AtomTest.php
  73. 0 1
      tests/Zend/Feed/Reader/Entry/CommonTest.php
  74. 0 1
      tests/Zend/Feed/Reader/Entry/RssTest.php
  75. 0 1
      tests/Zend/Feed/Reader/Feed/AtomSourceTest.php
  76. 0 1
      tests/Zend/Feed/Reader/Feed/AtomTest.php
  77. 0 1
      tests/Zend/Feed/Reader/Feed/CommonTest.php
  78. 0 1
      tests/Zend/Feed/Reader/Feed/RssTest.php
  79. 0 1
      tests/Zend/Feed/Reader/Integration/H-OnlineComAtom10Test.php
  80. 0 1
      tests/Zend/Feed/Reader/Integration/LautDeRdfTest.php
  81. 0 1
      tests/Zend/Feed/Reader/Integration/PodcastRss2Test.php
  82. 0 1
      tests/Zend/Feed/Reader/Integration/WordpressAtom10Test.php
  83. 0 1
      tests/Zend/Feed/Reader/Integration/WordpressRss2DcAtomTest.php
  84. 0 1
      tests/Zend/Feed/ReaderTest.php
  85. 0 1
      tests/Zend/Filter/StripTagsTest.php
  86. 0 3
      tests/Zend/Filter/Word/CamelCaseToDashTest.php
  87. 0 3
      tests/Zend/Filter/Word/CamelCaseToSeparatorTest.php
  88. 0 3
      tests/Zend/Filter/Word/CamelCaseToUnderscoreTest.php
  89. 0 3
      tests/Zend/Filter/Word/DashToCamelCaseTest.php
  90. 0 3
      tests/Zend/Filter/Word/DashToSeparatorTest.php
  91. 0 3
      tests/Zend/Filter/Word/DashToUnderscoreTest.php
  92. 0 3
      tests/Zend/Filter/Word/SeparatorToCamelCaseTest.php
  93. 0 3
      tests/Zend/Filter/Word/SeparatorToDashTest.php
  94. 0 3
      tests/Zend/Filter/Word/SeparatorToSeparatorTest.php
  95. 0 3
      tests/Zend/Filter/Word/UnderscoreToCamelCaseTest.php
  96. 0 3
      tests/Zend/Filter/Word/UnderscoreToDashTest.php
  97. 0 3
      tests/Zend/Filter/Word/UnderscoreToSeparatorTest.php
  98. 0 3
      tests/Zend/Form/Decorator/AbstractTest.php
  99. 0 1
      tests/Zend/Form/Decorator/CallbackTest.php
  100. 0 3
      tests/Zend/Form/Decorator/DescriptionTest.php

+ 0 - 1
tests/Zend/Amf/AuthTest.php

@@ -25,7 +25,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Amf_AuthTest::main");
 }
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once dirname(__FILE__) . '/../../TestHelper.php';
 require_once 'Zend/Amf/Server.php';
 require_once 'Zend/Amf/Request.php';

+ 0 - 1
tests/Zend/Amf/ResourceTest.php

@@ -25,7 +25,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Amf_ResourceTest::main");
 }
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once dirname(__FILE__) . '/../../TestHelper.php';
 require_once 'Zend/Amf/Server.php';
 require_once 'Zend/Amf/Request.php';

+ 0 - 1
tests/Zend/Auth/Adapter/DbTable/BasicSqliteTest.php

@@ -25,7 +25,6 @@ require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 /**

+ 0 - 1
tests/Zend/Auth/Adapter/DigestTest.php

@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 /**

+ 0 - 1
tests/Zend/Auth/Adapter/Http/AuthTest.php

@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 /**

+ 0 - 1
tests/Zend/Auth/Adapter/Http/ObjectTest.php

@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 /**

+ 0 - 1
tests/Zend/Auth/Adapter/Http/Resolver/FileTest.php

@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 /**

+ 0 - 1
tests/Zend/Auth/Adapter/OpenId/OpenIdTest.php

@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * Zend_OpenId_ResponseHelper

+ 0 - 5
tests/Zend/Cache/ApcBackendTest.php

@@ -32,11 +32,6 @@ require_once 'Zend/Cache/Backend/Apc.php';
 require_once 'CommonExtendedBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests

+ 0 - 5
tests/Zend/Cache/ClassFrontendTest.php

@@ -28,11 +28,6 @@ require_once 'Zend/Cache/Frontend/Class.php';
 require_once 'Zend/Cache/Backend/Test.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @todo: Should this class be named Zend_Cache_Something?
  *
  * @category   Zend

+ 0 - 5
tests/Zend/Cache/CommonBackendTest.php

@@ -24,11 +24,6 @@
 
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests

+ 0 - 5
tests/Zend/Cache/CommonExtendedBackendTest.php

@@ -21,11 +21,6 @@
  */
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @see Zend_Cache_CommonBackendTest
  */
 require_once 'CommonBackendTest.php';

+ 0 - 5
tests/Zend/Cache/CoreTest.php

@@ -28,11 +28,6 @@ require_once 'Zend/Cache/Core.php';
 require_once 'Zend/Cache/Backend/File.php'; // TODO : use only Test backend ?
 require_once 'Zend/Cache/Backend/Test.php';
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 require_once 'Zend/Config.php';
 
 /**

+ 0 - 5
tests/Zend/Cache/FactoryTest.php

@@ -25,11 +25,6 @@
  */
 require_once 'Zend/Cache.php';
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 
 require_once 'Zend/Cache/Backend/File.php';
 class Zend_Cache_Backend_FooBarTest extends Zend_Cache_Backend_File { }

+ 0 - 5
tests/Zend/Cache/FileBackendTest.php

@@ -38,11 +38,6 @@ require_once 'Zend/Log/Writer/Null.php';
 require_once 'CommonExtendedBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests

+ 0 - 5
tests/Zend/Cache/FileFrontendTest.php

@@ -28,11 +28,6 @@ require_once 'Zend/Cache/Frontend/File.php';
 require_once 'Zend/Cache/Backend/Test.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests

+ 0 - 5
tests/Zend/Cache/FunctionFrontendTest.php

@@ -27,11 +27,6 @@ require_once 'Zend/Cache.php';
 require_once 'Zend/Cache/Frontend/Function.php';
 require_once 'Zend/Cache/Backend/Test.php';
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 function foobar($param1, $param2) {
     echo "foobar_output($param1, $param2)";
     return "foobar_return($param1, $param2)";

+ 0 - 5
tests/Zend/Cache/LibmemcachedBackendTest.php

@@ -32,11 +32,6 @@ require_once 'Zend/Cache/Backend/Libmemcached.php';
 require_once 'CommonExtendedBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests

+ 0 - 5
tests/Zend/Cache/MemcachedBackendTest.php

@@ -32,11 +32,6 @@ require_once 'Zend/Cache/Backend/Memcached.php';
 require_once 'CommonExtendedBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests

+ 0 - 5
tests/Zend/Cache/OutputFrontendTest.php

@@ -28,11 +28,6 @@ require_once 'Zend/Cache/Frontend/Output.php';
 require_once 'Zend/Cache/Backend/Test.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests

+ 0 - 5
tests/Zend/Cache/PageFrontendTest.php

@@ -28,11 +28,6 @@ require_once 'Zend/Cache/Frontend/Page.php';
 require_once 'Zend/Cache/Backend/Test.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests

+ 0 - 1
tests/Zend/Cache/SkipTests.php

@@ -23,7 +23,6 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 

+ 0 - 5
tests/Zend/Cache/SqliteBackendTest.php

@@ -32,11 +32,6 @@ require_once 'Zend/Cache/Backend/Sqlite.php';
 require_once 'CommonExtendedBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests

+ 0 - 5
tests/Zend/Cache/StaticBackendTest.php

@@ -22,11 +22,6 @@ require_once 'Zend/Log/Writer/Null.php';
 require_once 'CommonBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @package    Zend_Cache
  * @subpackage UnitTests
  */

+ 0 - 5
tests/Zend/Cache/TwoLevelsBackendTest.php

@@ -32,11 +32,6 @@ require_once 'Zend/Cache/Backend/TwoLevels.php';
 require_once 'CommonExtendedBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests

+ 0 - 5
tests/Zend/Cache/XcacheBackendTest.php

@@ -32,11 +32,6 @@ require_once 'Zend/Cache/Backend/Xcache.php';
 require_once 'CommonBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests

+ 0 - 5
tests/Zend/Cache/ZendPlatformBackendTest.php

@@ -32,11 +32,6 @@ require_once 'Zend/Cache/Backend/ZendPlatform.php';
 require_once 'CommonBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests

+ 0 - 5
tests/Zend/Cache/ZendServerDiskTest.php

@@ -32,11 +32,6 @@ require_once 'Zend/Cache/Backend/ZendServer/Disk.php';
 require_once 'CommonBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests

+ 0 - 5
tests/Zend/Cache/ZendServerShMemTest.php

@@ -32,11 +32,6 @@ require_once 'Zend/Cache/Backend/ZendServer/ShMem.php';
 require_once 'CommonBackendTest.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests

+ 0 - 1
tests/Zend/Captcha/ImageTest.php

@@ -49,7 +49,6 @@ class Zend_Captcha_ImageTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Captcha_ImageTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 5
tests/Zend/Console/GetoptTest.php

@@ -31,11 +31,6 @@ require_once dirname(__FILE__) . '/../../TestHelper.php';
 require_once 'Zend/Console/Getopt.php';
 
 /**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/**
  * @category   Zend
  * @package    Zend_Console_Getopt
  * @subpackage UnitTests

+ 0 - 3
tests/Zend/Controller/Action/Helper/ActionStackTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Controller_Action_Helper_ActionStackTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Action/Helper/ActionStack.php';
 require_once 'Zend/Controller/Front.php';
@@ -66,7 +64,6 @@ class Zend_Controller_Action_Helper_ActionStackTest extends PHPUnit_Framework_Te
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_Helper_ActionStackTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Controller/Action/Helper/AjaxContextTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Controller_Action_Helper_AjaxContextTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Action/Helper/AjaxContext.php';
 
@@ -62,7 +60,6 @@ class Zend_Controller_Action_Helper_AjaxContextTest extends PHPUnit_Framework_Te
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_Helper_AjaxContextTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Controller/Action/Helper/AutoCompleteTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Controller_Action_Helper_AutoCompleteTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Action/Helper/AutoCompleteDojo.php';
 require_once 'Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php';
@@ -62,7 +60,6 @@ class Zend_Controller_Action_Helper_AutoCompleteTest extends PHPUnit_Framework_T
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_Helper_AutoCompleteTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Controller/Action/Helper/CacheTest.php

@@ -5,8 +5,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
 }
 
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Action/Helper/Cache.php';
 require_once 'Zend/Controller/Action/HelperBroker.php';
@@ -32,7 +30,6 @@ class Zend_Controller_Action_Helper_CacheTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_Helper_CacheTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
     }

+ 0 - 3
tests/Zend/Controller/Action/Helper/ContextSwitchTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Controller_Action_Helper_ContextSwitchTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Action/Helper/ContextSwitch.php';
 
@@ -64,7 +62,6 @@ class Zend_Controller_Action_Helper_ContextSwitchTest extends PHPUnit_Framework_
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_Helper_ContextSwitchTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Controller/Action/Helper/JsonTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
 }
 
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Action/Helper/Json.php';
 
@@ -59,7 +57,6 @@ class Zend_Controller_Action_Helper_JsonTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_Helper_JsonTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Controller/Action/Helper/NamespaceTest.php

@@ -26,8 +26,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Controller_Action_Helper_NamespaceTest::main');
 }
 
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Framework/TestSuite.php';
 
 /**
  * Test class for Zend_Controller_Action_Helper_Abstract.
@@ -50,7 +48,6 @@ class Zend_Controller_Action_Helper_NamespaceTest extends PHPUnit_Framework_Test
      */
     public static function main()
     {
-        require_once 'PHPUnit/TextUI/TestRunner.php';
         $suite  = new PHPUnit_Framework_TestSuite('Zend_Controller_Action_Helper_NamespaceTest');
         $result = PHPUnit_TextUI_TestRunner::run($suite);
     }

+ 0 - 1
tests/Zend/Controller/Action/Helper/RedirectorTest.php

@@ -73,7 +73,6 @@ class Zend_Controller_Action_Helper_RedirectorTest extends PHPUnit_Framework_Tes
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_Helper_RedirectorTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Controller/Action/Helper/UrlTest.php

@@ -27,8 +27,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
 
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Action/Helper/Url.php';
 
@@ -56,7 +54,6 @@ class Zend_Controller_Action_Helper_UrlTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_Helper_UrlTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 1
tests/Zend/Controller/Action/HelperBrokerTest.php

@@ -60,7 +60,6 @@ class Zend_Controller_Action_HelperBrokerTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Action_HelperBrokerTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Controller/ActionTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Controller_ActionTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Action.php';
 require_once 'Zend/Controller/Action/Helper/Redirector.php';
@@ -54,7 +52,6 @@ class Zend_Controller_ActionTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_ActionTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Controller/FrontTest.php

@@ -33,8 +33,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     );
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Front.php';
 require_once 'Zend/Controller/Request/Http.php';
@@ -66,7 +64,6 @@ class Zend_Controller_FrontTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_FrontTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Controller/Plugin/ActionStackTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Controller_Plugin_ActionStackTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Plugin/ActionStack.php';
 require_once 'Zend/Controller/Request/Simple.php';
@@ -57,7 +55,6 @@ class Zend_Controller_Plugin_ActionStackTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Plugin_ActionStackTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Controller/Plugin/BrokerTest.php

@@ -33,8 +33,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     );
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Front.php';
 require_once 'Zend/Controller/Action/HelperBroker.php';
@@ -63,7 +61,6 @@ class Zend_Controller_Plugin_BrokerTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Plugin_BrokerTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Controller/Plugin/ErrorHandlerTest.php

@@ -32,8 +32,6 @@ if (!defined("PHPUnit_MAIN_METHOD"))
     );
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Plugin/ErrorHandler.php';
 require_once 'Zend/Controller/Request/Http.php';
@@ -84,7 +82,6 @@ class Zend_Controller_Plugin_ErrorHandlerTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Plugin_ErrorHandlerTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 1
tests/Zend/Controller/Plugin/PutHandlerTest.php

@@ -64,7 +64,6 @@ class Zend_Controller_Plugin_PutHandlerTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Plugin_PutHandlerTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Controller/Request/Apache404Test.php

@@ -25,8 +25,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Controller_Request_Apache404Test::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Request/Apache404.php';
 
@@ -58,7 +56,6 @@ class Zend_Controller_Request_Apache404Test extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Request_Apache404Test");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Controller/Request/SimpleTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Controller_Request_SimpleTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Controller/Request/Simple.php';
 
@@ -52,7 +50,6 @@ class Zend_Controller_Request_SimpleTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Request_SimpleTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 1
tests/Zend/Controller/Response/HttpTest.php

@@ -57,7 +57,6 @@ class Zend_Controller_Response_HttpTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Response_HttpTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 5
tests/Zend/Controller/Router/RewriteTest.php

@@ -50,10 +50,6 @@ require_once 'Zend/Controller/Router/Route/Hostname.php';
 /** Zend_Uri_Http */
 require_once 'Zend/Uri/Http.php';
 
-/** PHPUnit test case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-require_once 'PHPUnit/Runner/Version.php';
 
 /**
  * @category   Zend
@@ -76,7 +72,6 @@ class Zend_Controller_Router_RewriteTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Router_RewriteTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 1
tests/Zend/Controller/Router/Route/ChainTest.php

@@ -81,7 +81,6 @@ class Zend_Controller_Router_Route_ChainTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Router_Route_ChainTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 4
tests/Zend/Controller/Router/Route/HostnameTest.php

@@ -29,9 +29,6 @@ require_once 'Zend/Controller/Router/Route/Hostname.php';
 /** Zend_Controller_Request_Http */
 require_once 'Zend/Controller/Request/Http.php';
 
-/** PHPUnit test case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Controller_Router_Route_HostnameTest::main');
 }
@@ -55,7 +52,6 @@ class Zend_Controller_Router_Route_HostnameTest extends PHPUnit_Framework_TestCa
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Router_Route_HostnameTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Controller/Router/Route/ModuleTest.php

@@ -23,8 +23,6 @@
 /** Test helper */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 /** Zend_Controller_Router_Route_Module */
 require_once 'Zend/Controller/Router/Route/Module.php';
@@ -61,7 +59,6 @@ class Zend_Controller_Router_Route_ModuleTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Controller_Router_Route_ModuleTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Controller/Router/RouteTest.php

@@ -41,9 +41,6 @@ require_once 'Zend/Translate.php';
 /** @see Zend_Registry */
 require_once 'Zend/Registry.php';
 
-/** PHPUnit test case */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 /**
  * @category   Zend
  * @package    Zend_Controller

+ 0 - 1
tests/Zend/Crypt/DiffieHellmanTest.php

@@ -22,7 +22,6 @@
 
 require_once 'Zend/Crypt/DiffieHellman.php';
 require_once 'Zend/Crypt/Math/BigInteger.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * @category   Zend

+ 0 - 1
tests/Zend/Crypt/HmacTest.php

@@ -21,7 +21,6 @@
  */
 
 require_once 'Zend/Crypt/Hmac.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * Outside the Internal Function tests, tests do not distinguish between hash and mhash

+ 0 - 1
tests/Zend/Crypt/Math/BigInteger/BcmathTest.php

@@ -21,7 +21,6 @@
  */
 
 require_once 'Zend/Crypt/Math/BigInteger/Bcmath.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * @category   Zend

+ 0 - 1
tests/Zend/Crypt/Math/BigInteger/GmpTest.php

@@ -21,7 +21,6 @@
  */
 
 require_once 'Zend/Crypt/Math/BigInteger/Gmp.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 require_once 'Zend/Crypt/Math/BigInteger/Bcmath.php';
 

+ 0 - 1
tests/Zend/Crypt/MathTest.php

@@ -21,7 +21,6 @@
  */
 
 require_once 'Zend/Crypt/Math.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 /**

+ 0 - 1
tests/Zend/Crypt/Rsa/RsaTest.php

@@ -21,7 +21,6 @@
  */
 
 require_once 'Zend/Crypt/Rsa.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 /**

+ 0 - 5
tests/Zend/Db/Adapter/SkipTests.php

@@ -20,11 +20,6 @@
  * @version    $Id $
  */
 
-/**
- * PHPUnit test case
- */
-require_once 'PHPUnit/Framework/TestCase.php';
-
 
 /**
  * @category   Zend

+ 0 - 2
tests/Zend/Db/Profiler/FirebugTest.php

@@ -26,7 +26,6 @@
 require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 /** PHPUnit_Framework_TestCase */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Db */
 require_once 'Zend/Db.php';
@@ -73,7 +72,6 @@ class Zend_Db_Profiler_FirebugTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Db_Profiler_FirebugTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 1
tests/Zend/Db/SkipTests.php

@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 

+ 0 - 1
tests/Zend/Db/Statement/StaticTest.php

@@ -20,7 +20,6 @@
  * @version    $Id $
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 

+ 0 - 1
tests/Zend/Db/Table/Relationships/StaticTest.php

@@ -24,7 +24,6 @@
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * @see Zend_Db_Table_Row_TestMockRow

+ 0 - 1
tests/Zend/Db/Table/Row/StaticTest.php

@@ -20,7 +20,6 @@
  * @version    $Id $
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
  * @see Zend_Db_Table_Row_TestMockRow

+ 0 - 1
tests/Zend/Db/Table/Rowset/StaticTest.php

@@ -20,7 +20,6 @@
  * @version    $Id $
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 

+ 0 - 1
tests/Zend/Db/Table/StaticTest.php

@@ -22,7 +22,6 @@
 
 require_once 'Zend/Db/Table/TestCommon.php';
 
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 

+ 0 - 1
tests/Zend/Db/TestSetup.php

@@ -39,7 +39,6 @@ require_once 'Zend/Db.php';
 /**
  * PHPUnit_Framework_TestCase
  */
-require_once 'PHPUnit/Framework/TestCase.php';
 
 
 

+ 0 - 1
tests/Zend/Feed/Reader/Entry/AtomStandaloneEntryTest.php

@@ -20,7 +20,6 @@
  * @version    $Id: AtomTest.php 19159 2009-11-21 14:23:15Z padraic $
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**

+ 0 - 1
tests/Zend/Feed/Reader/Entry/AtomTest.php

@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**

+ 0 - 1
tests/Zend/Feed/Reader/Entry/CommonTest.php

@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**

+ 0 - 1
tests/Zend/Feed/Reader/Entry/RssTest.php

@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**

+ 0 - 1
tests/Zend/Feed/Reader/Feed/AtomSourceTest.php

@@ -20,7 +20,6 @@
  * @version    $Id: AtomTest.php 19168 2009-11-21 17:17:18Z padraic $
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**

+ 0 - 1
tests/Zend/Feed/Reader/Feed/AtomTest.php

@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**

+ 0 - 1
tests/Zend/Feed/Reader/Feed/CommonTest.php

@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 require_once 'Zend/Registry.php';
 

+ 0 - 1
tests/Zend/Feed/Reader/Feed/RssTest.php

@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 require_once 'Zend/Registry.php';
 

+ 0 - 1
tests/Zend/Feed/Reader/Integration/H-OnlineComAtom10Test.php

@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**

+ 0 - 1
tests/Zend/Feed/Reader/Integration/LautDeRdfTest.php

@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**

+ 0 - 1
tests/Zend/Feed/Reader/Integration/PodcastRss2Test.php

@@ -21,7 +21,6 @@
  */
 
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**

+ 0 - 1
tests/Zend/Feed/Reader/Integration/WordpressAtom10Test.php

@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**

+ 0 - 1
tests/Zend/Feed/Reader/Integration/WordpressRss2DcAtomTest.php

@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 
 /**

+ 0 - 1
tests/Zend/Feed/ReaderTest.php

@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
 require_once 'Zend/Cache.php';
 

+ 0 - 1
tests/Zend/Filter/StripTagsTest.php

@@ -60,7 +60,6 @@ class Zend_Filter_StripTagsTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Filter/Word/CamelCaseToDashTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_CamelCaseToDashTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/CamelCaseToDash.php';
 
@@ -51,7 +49,6 @@ class Zend_Filter_Word_CamelCaseToDashTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_CamelCaseToDashTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Filter/Word/CamelCaseToSeparatorTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_CamelCaseToSeparatorTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/CamelCaseToSeparator.php';
 
@@ -50,7 +48,6 @@ class Zend_Filter_Word_CamelCaseToSeparatorTest extends PHPUnit_Framework_TestCa
      * @static
      */
     public static function main() {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_CamelCaseToSeparatorTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Filter/Word/CamelCaseToUnderscoreTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_CamelCaseToUnderscoreTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/CamelCaseToUnderscore.php';
 
@@ -50,7 +48,6 @@ class Zend_Filter_Word_CamelCaseToUnderscoreTest extends PHPUnit_Framework_TestC
      * @static
      */
     public static function main() {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_CamelCaseToUnderscoreTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Filter/Word/DashToCamelCaseTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_DashToCamelCaseTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/DashToCamelCase.php';
 
@@ -51,7 +49,6 @@ class Zend_Filter_Word_DashToCamelCaseTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_DashToCamelCaseTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Filter/Word/DashToSeparatorTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_DashToSeparatorTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/DashToSeparator.php';
 
@@ -51,7 +49,6 @@ class Zend_Filter_Word_DashToSeparatorTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_DashToSeparatorTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Filter/Word/DashToUnderscoreTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_DashToUnderscoreTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/DashToUnderscore.php';
 
@@ -51,7 +49,6 @@ class Zend_Filter_Word_DashToUnderscoreTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_DashToUnderscoreTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Filter/Word/SeparatorToCamelCaseTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_SeparatorToCamelCaseTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/SeparatorToCamelCase.php';
 
@@ -50,7 +48,6 @@ class Zend_Filter_Word_SeparatorToCamelCaseTest extends PHPUnit_Framework_TestCa
      * @static
      */
     public static function main() {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_SeparatorToCamelCaseTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Filter/Word/SeparatorToDashTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_SeparatorToDashTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/SeparatorToDash.php';
 
@@ -51,7 +49,6 @@ class Zend_Filter_Word_SeparatorToDashTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_SeparatorToDashTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Filter/Word/SeparatorToSeparatorTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_SeparatorToSeparatorTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/SeparatorToSeparator.php';
 
@@ -51,7 +49,6 @@ class Zend_Filter_Word_SeparatorToSeparatorTest extends PHPUnit_Framework_TestCa
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_SeparatorToSeparatorTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Filter/Word/UnderscoreToCamelCaseTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_UnderscoreToCamelCaseTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/UnderscoreToCamelCase.php';
 
@@ -51,7 +49,6 @@ class Zend_Filter_Word_UnderscoreToCamelCaseTest extends PHPUnit_Framework_TestC
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_UnderscoreToCamelCaseTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Filter/Word/UnderscoreToDashTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_UnderscoreToDashTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/UnderscoreToDash.php';
 
@@ -51,7 +49,6 @@ class Zend_Filter_Word_UnderscoreToDashTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_UnderscoreToDashTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Filter/Word/UnderscoreToSeparatorTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Filter_Word_UnderscoreToSeparatorTest::main");
 }
 
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Filter/Word/UnderscoreToSeparator.php';
 
@@ -51,7 +49,6 @@ class Zend_Filter_Word_UnderscoreToSeparatorTest extends PHPUnit_Framework_TestC
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Filter_Word_UnderscoreToSeparatorTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Form/Decorator/AbstractTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Form/Decorator/Errors.php';
 
@@ -58,7 +56,6 @@ class Zend_Form_Decorator_AbstractTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Decorator_AbstractTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 1
tests/Zend/Form/Decorator/CallbackTest.php

@@ -49,7 +49,6 @@ class Zend_Form_Decorator_CallbackTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Decorator_CallbackTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

+ 0 - 3
tests/Zend/Form/Decorator/DescriptionTest.php

@@ -26,8 +26,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
 }
 
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
 
 require_once 'Zend/Form/Decorator/Description.php';
 
@@ -53,7 +51,6 @@ class Zend_Form_Decorator_DescriptionTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
 
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Decorator_DescriptionTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);

Некоторые файлы не были показаны из-за большого количества измененных файлов