Merge pull request #332 from itscaro/master

PHPunit 4 compatibility

library/Zend/Test/PHPUnit/Constraint/DomQuery.php

@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/** @see PHPUnit_Runner_Version */
-require_once 'PHPUnit/Runner/Version.php';
-
 if (version_compare(PHPUnit_Runner_Version::id(), '3.5', '>=')) {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'DomQuery37.php');
 } else {

library/Zend/Test/PHPUnit/Constraint/DomQuery34.php

@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/** @see PHPUnit_Framework_Constraint */
-require_once 'PHPUnit/Framework/Constraint.php';
-
 /** @see Zend_Dom_Query */
 require_once 'Zend/Dom/Query.php';
 

library/Zend/Test/PHPUnit/Constraint/DomQuery37.php

@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/** @see PHPUnit_Framework_Constraint */
-require_once 'PHPUnit/Framework/Constraint.php';
-
 /** @see Zend_Dom_Query */
 require_once 'Zend/Dom/Query.php';
 

library/Zend/Test/PHPUnit/Constraint/Exception.php

@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/** @see PHPUnit_Framework_ExpectationFailedException */
-require_once 'PHPUnit/Framework/ExpectationFailedException.php';
-
 /**
  * Zend_Test_PHPUnit_Constraint_Exception
  *

library/Zend/Test/PHPUnit/Constraint/Redirect.php

@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/** @see PHPUnit_Runner_Version */
-require_once 'PHPUnit/Runner/Version.php';
-
 if (version_compare(PHPUnit_Runner_Version::id(), '3.5', '>=')) {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Redirect37.php');
 } else {

library/Zend/Test/PHPUnit/Constraint/Redirect34.php

@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/** @see PHPUnit_Framework_Constraint */
-require_once 'PHPUnit/Framework/Constraint.php';
-
 /**
  * Redirection constraints
  *

library/Zend/Test/PHPUnit/Constraint/Redirect37.php

@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/** @see PHPUnit_Framework_Constraint */
-require_once 'PHPUnit/Framework/Constraint.php';
-
 /**
  * Redirection constraints
  *

library/Zend/Test/PHPUnit/Constraint/ResponseHeader.php

@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/** @see PHPUnit_Runner_Version */
-require_once 'PHPUnit/Runner/Version.php';
-
 if (version_compare(PHPUnit_Runner_Version::id(), '3.5', '>=')) {
     include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'ResponseHeader37.php');
 } else {

library/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php

@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/** @see PHPUnit_Framework_Constraint */
-require_once 'PHPUnit/Framework/Constraint.php';
-
 /**
  * Response header PHPUnit Constraint
  *

library/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php

@@ -20,9 +20,6 @@
  * @version    $Id$
  */
 
-/** @see PHPUnit_Framework_Constraint */
-require_once 'PHPUnit/Framework/Constraint.php';
-
 /**
  * Response header PHPUnit Constraint
  *

library/Zend/Test/PHPUnit/DatabaseTestCase.php

@@ -21,11 +21,6 @@
  */
 
 /**
- * @see PHPUnit_Extensions_Database_TestCase
- */
-require_once "PHPUnit/Extensions/Database/TestCase.php";
-
-/**
  * @see Zend_Test_PHPUnit_Db_Operation_Truncate
  */
 require_once "Zend/Test/PHPUnit/Db/Operation/Truncate.php";

library/Zend/Test/PHPUnit/Db/Connection.php

@@ -21,11 +21,6 @@
  */
 
 /**
- * @see PHPUnit_Extensions_Database_DB_DefaultDatabaseConnection
- */
-require_once "PHPUnit/Extensions/Database/DB/DefaultDatabaseConnection.php";
-
-/**
  * @see Zend_Test_PHPUnit_Db_DataSet_QueryTable
  */
 require_once "Zend/Test/PHPUnit/Db/DataSet/QueryTable.php";

library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php

@@ -26,11 +26,6 @@
 require_once "Zend/Db/Table/Rowset/Abstract.php";
 
 /**
- * @see PHPUnit_Extensions_Database_DataSet_AbstractTable
- */
-require_once "PHPUnit/Extensions/Database/DataSet/AbstractTable.php";
-
-/**
  * Use a Zend_Db Rowset as a datatable for assertions with other PHPUnit Database extension tables.
  *
  * @uses       PHPUnit_Extensions_Database_DataSet_AbstractTable

library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php

@@ -21,11 +21,6 @@
  */
 
 /**
- * @see PHPUnit_Extensions_Database_DataSet_QueryTable
- */
-require_once "PHPUnit/Extensions/Database/DataSet/QueryTable.php";
-
-/**
  * @see Zend_Db_Table_Abstract
  */
 require_once "Zend/Db/Table/Abstract.php";

library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php

@@ -20,10 +20,6 @@
  * @version    $Id$
  */
 
-require_once "PHPUnit/Extensions/Database/DataSet/QueryDataSet.php";
-
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
-
 /**
  * @see Zend_Test_PHPUnit_Db_DataSet_DbTable
  */

library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php

@@ -21,16 +21,6 @@
  */
 
 /**
- * @see PHPUnit_Extensions_Database_DataSet_QueryDataSet
- */
-require_once "PHPUnit/Extensions/Database/DataSet/QueryDataSet.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DB_IDatabaseConnection
- */
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
-
-/**
  * @see Zend_Test_PHPUnit_Db_DataSet_QueryTable
  */
 require_once "Zend/Test/PHPUnit/Db/DataSet/QueryTable.php";

library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php

@@ -21,16 +21,6 @@
  */
 
 /**
- * @see PHPUnit_Extensions_Database_DataSet_QueryTable
- */
-require_once "PHPUnit/Extensions/Database/DataSet/QueryTable.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DB_IDatabaseConnection
- */
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
-
-/**
  * Represent a PHPUnit Database Extension table with Queries using a Zend_Db adapter for assertion against other tables.
  *
  * @uses       PHPUnit_Extensions_Database_DataSet_QueryTable

library/Zend/Test/PHPUnit/Db/Metadata/Generic.php

@@ -26,11 +26,6 @@
 require_once "Zend/Db/Adapter/Abstract.php";
 
 /**
- * @see PHPUnit_Extensions_Database_DB_IMetaData
- */
-require_once "PHPUnit/Extensions/Database/DB/IMetaData.php";
-
-/**
  * Generic Metadata accessor for the Zend_Db adapters
  *
  * @uses       PHPUnit_Extensions_Database_DB_IMetaData

library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php

@@ -21,26 +21,6 @@
  */
 
 /**
- * @see PHPUnit_Extensions_Database_Operation_IDatabaseOperation
- */
-require_once "PHPUnit/Extensions/Database/Operation/IDatabaseOperation.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DB_IDatabaseConnection
- */
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DataSet_IDataSet
- */
-require_once "PHPUnit/Extensions/Database/DataSet/IDataSet.php";
-
-/**
- * @see PHPUnit_Extensions_Database_Operation_Exception
- */
-require_once "PHPUnit/Extensions/Database/Operation/Exception.php";
-
-/**
  * @see Zend_Test_PHPUnit_Db_Connection
  */
 require_once "Zend/Test/PHPUnit/Db/Connection.php";
@@ -73,7 +53,6 @@ class Zend_Test_PHPUnit_Db_Operation_DeleteAll implements PHPUnit_Extensions_Dat
                 $tableName = $table->getTableMetaData()->getTableName();
                 $connection->getConnection()->delete($tableName);
             } catch (Exception $e) {
-                require_once "PHPUnit/Extensions/Database/Operation/Exception.php";
                 throw new PHPUnit_Extensions_Database_Operation_Exception('DELETEALL', 'DELETE FROM '.$tableName.'', array(), $table, $e->getMessage());
             }
         }

library/Zend/Test/PHPUnit/Db/Operation/Insert.php

@@ -21,26 +21,6 @@
  */
 
 /**
- * @see PHPUnit_Extensions_Database_Operation_IDatabaseOperation
- */
-require_once "PHPUnit/Extensions/Database/Operation/IDatabaseOperation.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DB_IDatabaseConnection
- */
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DataSet_IDataSet
- */
-require_once "PHPUnit/Extensions/Database/DataSet/IDataSet.php";
-
-/**
- * @see PHPUnit_Extensions_Database_Operation_Exception
- */
-require_once "PHPUnit/Extensions/Database/Operation/Exception.php";
-
-/**
  * @see Zend_Test_PHPUnit_Db_Connection
  */
 require_once "Zend/Test/PHPUnit/Db/Connection.php";

library/Zend/Test/PHPUnit/Db/Operation/Truncate.php

@@ -21,26 +21,6 @@
  */
 
 /**
- * @see PHPUnit_Extensions_Database_Operation_IDatabaseOperation
- */
-require_once "PHPUnit/Extensions/Database/Operation/IDatabaseOperation.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DB_IDatabaseConnection
- */
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DataSet_IDataSet
- */
-require_once "PHPUnit/Extensions/Database/DataSet/IDataSet.php";
-
-/**
- * @see PHPUnit_Extensions_Database_Operation_Exception
- */
-require_once "PHPUnit/Extensions/Database/Operation/Exception.php";
-
-/**
  * @see Zend_Test_PHPUnit_Db_Connection
  */
 require_once "Zend/Test/PHPUnit/Db/Connection.php";

library/Zend/Test/PHPUnit/Db/SimpleTester.php

@@ -21,16 +21,6 @@
  */
 
 /**
- * @see PHPUnit_Extensions_Database_DefaultTester
- */
-require_once "PHPUnit/Extensions/Database/DefaultTester.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DB_IDatabaseConnection
- */
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
-
-/**
  * @see Zend_Test_PHPUnit_Db_Operation_Truncate
  */
 require_once "Zend/Test/PHPUnit/Db/Operation/Truncate.php";
@@ -41,16 +31,6 @@ require_once "Zend/Test/PHPUnit/Db/Operation/Truncate.php";
 require_once "Zend/Test/PHPUnit/Db/Operation/Insert.php";
 
 /**
- * @see PHPUnit_Extensions_Database_Operation_Factory
- */
-require_once "PHPUnit/Extensions/Database/Operation/Factory.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DataSet_IDataSet
- */
-require_once "PHPUnit/Extensions/Database/DataSet/IDataSet.php";
-
-/**
  * Simple Tester for Database Tests when the Abstract Test Case cannot be used.
  *
  * @uses       PHPUnit_Extensions_Database_DefaultTester

tests/TestHelper.php

@@ -23,13 +23,15 @@
 /**
  * Include PHPUnit dependencies
  */
-require_once 'PHPUnit/Runner/Version.php';
+if (version_compare(PHPUnit_Runner_Version::id(), '4.0.0', '<')) {
+    require_once 'PHPUnit/Runner/Version.php';
 
-$phpunitVersion = PHPUnit_Runner_Version::id();
-if ($phpunitVersion == '@package_version@' || version_compare($phpunitVersion, '3.5.5', '>=')) {
-    require_once 'PHPUnit/Autoload.php'; // >= PHPUnit 3.5.5
-} else {
-    require_once 'PHPUnit/Framework.php'; // < PHPUnit 3.5.5
+    $phpunitVersion = PHPUnit_Runner_Version::id();
+    if ($phpunitVersion == '@package_version@' || version_compare($phpunitVersion, '3.5.5', '>=')) {
+        require_once 'PHPUnit/Autoload.php'; // >= PHPUnit 3.5.5
+    } else {
+        require_once 'PHPUnit/Framework.php'; // < PHPUnit 3.5.5
+    }
 }
 
 /*

tests/Zend/Cache/FactoryException.php

@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Extensions/ExceptionTestCase.php';
 require_once 'Zend/Cache.php';
 
 /**

tests/Zend/Form/Element/NoteTest.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/Element/Note.php';
 
@@ -50,8 +48,6 @@ class Zend_Form_Element_NoteTest extends PHPUnit_Framework_TestCase
      */
     public static function main()
     {
-        require_once "PHPUnit/TextUI/TestRunner.php";
-
         $suite  = new PHPUnit_Framework_TestSuite("Zend_Form_Element_NoteTest");
         $result = PHPUnit_TextUI_TestRunner::run($suite);
     }

tests/Zend/Loader/AutoloaderFactoryTest.php

@@ -27,10 +27,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  * Preload a number of classes to ensure they're available once we've disabled
  * other autoloaders.
  */
-require_once 'PHPUnit/Framework/Constraint/IsEqual.php';
-require_once 'PHPUnit/Framework/Constraint/IsInstanceOf.php';
-require_once 'PHPUnit/Framework/Constraint/IsNull.php';
-require_once 'PHPUnit/Framework/Constraint/IsTrue.php';
 require_once 'Zend/Loader/AutoloaderFactory.php';
 require_once 'Zend/Loader/ClassMapAutoloader.php';
 require_once 'Zend/Loader/StandardAutoloader.php';
@@ -54,7 +50,7 @@ class Zend_Loader_AutoloaderFactoryTest extends PHPUnit_Framework_TestCase
             $this->loaders = array();
         }
 
-        // Clear out other autoloaders to ensure those being tested are at the 
+        // Clear out other autoloaders to ensure those being tested are at the
         // top of the stack
         foreach ($this->loaders as $loader) {
             spl_autoload_unregister($loader);
@@ -108,7 +104,7 @@ class Zend_Loader_AutoloaderFactoryTest extends PHPUnit_Framework_TestCase
         }
         include dirname(__FILE__) . '/_files/InvalidInterfaceAutoloader.php';
         Zend_Loader_AutoloaderFactory::factory(array(
-            'InvalidInterfaceAutoloader' => array()            
+            'InvalidInterfaceAutoloader' => array()
         ));
     }
 

tests/Zend/Log/Writer/MailTest.php

@@ -43,9 +43,6 @@ require_once 'Zend/Mail/Transport/Exception.php';
 /** Zend_View_Exception */
 require_once 'Zend/View/Exception.php';
 
-/** For some reason these classed have to be manually loaded, because PHPUnit fails to autoload them */
-require_once 'PHPUnit/Framework/MockObject/Stub/Exception.php';
-
 /** Zend_Mail_Transport_Abstract */
 require_once 'Zend/Mail/Transport/Abstract.php';
 

tests/Zend/Navigation/AllTests.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'PHPUnit/Framework/Constraint/TraversableContainsOnly.php';
-
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Navigation_AllTests::main');
 }

tests/Zend/Service/SqlAzure/Management/ManagementClientTest.php

@@ -31,7 +31,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_SqlAzure_Management_Client */
 require_once 'Zend/Service/SqlAzure/Management/Client.php';

tests/Zend/Service/WindowsAzure/BlobSessionHandlerTest.php

@@ -29,7 +29,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_SessionHandler */
 require_once 'Zend/Service/WindowsAzure/SessionHandler.php';

tests/Zend/Service/WindowsAzure/BlobStorageSharedAccessTest.php

@@ -29,7 +29,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage_Blob */
 require_once 'Zend/Service/WindowsAzure/Storage/Blob.php';

tests/Zend/Service/WindowsAzure/BlobStorageTest.php

@@ -29,7 +29,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage_Blob */
 require_once 'Zend/Service/WindowsAzure/Storage/Blob.php';

tests/Zend/Service/WindowsAzure/BlobStreamTest.php

@@ -29,7 +29,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage_Blob */
 require_once 'Zend/Service/WindowsAzure/Storage/Blob.php';

tests/Zend/Service/WindowsAzure/Credentials/SharedAccessSignatureTest.php

@@ -29,7 +29,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Credentials_SharedAccessSignature */
 require_once 'Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php';

tests/Zend/Service/WindowsAzure/Credentials/SharedKeyLiteTest.php

@@ -29,7 +29,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Credentials_SharedKeyLite */
 require_once 'Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php';

tests/Zend/Service/WindowsAzure/Credentials/SharedKeyTest.php

@@ -29,7 +29,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Credentials_SharedKey */
 require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php';

tests/Zend/Service/WindowsAzure/Diagnostics/ManagerTest.php

@@ -29,7 +29,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage_Blob */
 require_once 'Zend/Service/WindowsAzure/Storage/Blob.php';

tests/Zend/Service/WindowsAzure/DynamicTableEntityTest.php

@@ -29,7 +29,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage_Table */
 require_once 'Zend/Service/WindowsAzure/Storage/Table.php';

tests/Zend/Service/WindowsAzure/Management/ManagementClientTest.php

@@ -31,7 +31,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Management_Client */
 require_once 'Zend/Service/WindowsAzure/Management/Client.php';

tests/Zend/Service/WindowsAzure/QueueStorageTest.php

@@ -29,7 +29,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage_Queue */
 require_once 'Zend/Service/WindowsAzure/Storage/Queue.php';

tests/Zend/Service/WindowsAzure/RetryPolicyTest.php

@@ -29,7 +29,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract */
 require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';

tests/Zend/Service/WindowsAzure/StorageTest.php

@@ -29,7 +29,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage */
 require_once 'Zend/Service/WindowsAzure/Storage.php';

tests/Zend/Service/WindowsAzure/TableEntityQueryTest.php

@@ -29,7 +29,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage_TableEntityQuery */
 require_once 'Zend/Service/WindowsAzure/Storage/TableEntityQuery.php';

tests/Zend/Service/WindowsAzure/TableEntityTest.php

@@ -29,7 +29,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage_TableEntity */
 require_once 'Zend/Service/WindowsAzure/Storage/TableEntity.php';

tests/Zend/Service/WindowsAzure/TableSessionHandlerTest.php

@@ -29,7 +29,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_SessionHandler */
 require_once 'Zend/Service/WindowsAzure/SessionHandler.php';

tests/Zend/Service/WindowsAzure/TableStorageTest.php

@@ -29,7 +29,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage_Table */
 require_once 'Zend/Service/WindowsAzure/Storage/Table.php';

tests/Zend/Test/PHPUnit/Db/DataSet/DbRowsetTest.php

@@ -22,7 +22,6 @@
 
 require_once "Zend/Test/PHPUnit/Db/DataSet/DbRowset.php";
 require_once "Zend/Db/Table/Rowset.php";
-require_once "PHPUnit/Extensions/Database/DataSet/DefaultTableMetaData.php";
 require_once 'Zend/Test/PHPUnit/Db/Exception.php';
 require_once 'Zend/Db/Table/Abstract.php';
 

tests/Zend/Test/PHPUnit/Db/DataSet/QueryDataSetTest.php

@@ -22,8 +22,6 @@
 
 require_once "Zend/Test/DbAdapter.php";
 
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
-
 /**
  * @see Zend_Test_PHPUnit_Db_DataSet_DataSetTestCase
  */

tests/Zend/Test/PHPUnit/Db/DataSet/QueryTableTest.php

@@ -24,7 +24,6 @@
  * @see Zend_Test_PHPUnit_Db_DataSet_DataSetTestCase
  */
 require_once "Zend/Test/PHPUnit/Db/DataSet/DataSetTestCase.php";
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
 
 require_once "Zend/Db/Statement/Interface.php";
 

tests/Zend/Test/PHPUnit/Db/Integration/AbstractTestCase.php

@@ -26,8 +26,6 @@ require_once "Zend/Db/Table.php";
 
 require_once "Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php";
 
-require_once "PHPUnit/Extensions/Database/DataSet/FlatXmlDataSet.php";
-
 require_once "Zend/Test/PHPUnit/Db/SimpleTester.php";
 
 require_once "Zend/Test/PHPUnit/Db/DataSet/DbRowset.php";

tests/Zend/Test/PHPUnit/Db/Operation/DeleteAllTest.php

@@ -24,11 +24,6 @@ require_once "Zend/Test/DbAdapter.php";
 
 require_once "Zend/Test/PHPUnit/Db/Operation/DeleteAll.php";
 
-require_once "PHPUnit/Extensions/Database/DataSet/FlatXmlDataSet.php";
-
-require_once 'PHPUnit/Extensions/Database/DataSet/IDataSet.php';
-require_once 'PHPUnit/Extensions/Database/DB/IDatabaseConnection.php';
-
 /**
  * @category   Zend
  * @package    Zend_Test

tests/Zend/Test/PHPUnit/Db/Operation/InsertTest.php

@@ -24,11 +24,6 @@ require_once "Zend/Test/DbAdapter.php";
 
 require_once "Zend/Test/PHPUnit/Db/Operation/Insert.php";
 
-require_once "PHPUnit/Extensions/Database/DataSet/FlatXmlDataSet.php";
-
-require_once 'PHPUnit/Extensions/Database/DataSet/IDataSet.php';
-require_once 'PHPUnit/Extensions/Database/DB/IDatabaseConnection.php';
-
 /**
  * @category   Zend
  * @package    Zend_Test

tests/Zend/Test/PHPUnit/Db/Operation/TruncateTest.php

@@ -24,11 +24,6 @@ require_once "Zend/Test/DbAdapter.php";
 
 require_once "Zend/Test/PHPUnit/Db/Operation/Truncate.php";
 
-require_once "PHPUnit/Extensions/Database/DataSet/FlatXmlDataSet.php";
-
-require_once 'PHPUnit/Extensions/Database/DataSet/IDataSet.php';
-require_once 'PHPUnit/Extensions/Database/DB/IDatabaseConnection.php';
-
 /**
  * @category   Zend
  * @package    Zend_Test

tests/Zend/Test/PHPUnit/Db/SimpleTesterTest.php

@@ -23,8 +23,6 @@
 require_once "Zend/Test/PHPUnit/Db/SimpleTester.php";
 require_once "Zend/Test/PHPUnit/Db/Connection.php";
 require_once "Zend/Test/DbAdapter.php";
-require_once "PHPUnit/Extensions/Database/DataSet/IDataSet.php";
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
 require_once "Zend/Test/PHPUnit/Db/Exception.php";
 
 /**

tests/Zend/Test/PHPUnit/Db/TestCaseTest.php

@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-require_once "PHPUnit/Extensions/Database/DataSet/CompositeDataSet.php";
 require_once "Zend/Test/PHPUnit/DatabaseTestCase.php";
 require_once "Zend/Test/PHPUnit/Db/Connection.php";
 require_once "Zend/Db/Adapter/Abstract.php";