Resolves #ZF-10837 -- removed included of TestHelper in every testfile, as this is now done via the phpunit.xml

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

tests/AllTests.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'TestHelper.php';
-
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }

tests/TestHelper.php

@@ -23,6 +23,7 @@
 /*
  * Include PHPUnit dependencies
  */
+@require_once 'PHPUnit/Framework.php';
 if (!@fopen('PHPUnit/Autoload.php', 'r', true)) {
     require_once 'PHPUnit/Framework.php'; // < PHPUnit 3.5.5
 } else {

tests/Zend/Acl/AclTest.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
-
 require_once 'Zend/Acl.php';
 require_once 'Zend/Acl/Resource.php';
 require_once 'Zend/Acl/Role.php';
@@ -1257,7 +1255,7 @@ class Zend_Acl_AclTest extends PHPUnit_Framework_TestCase
 
         $this->assertTrue($allowed);
     }
-    
+
     /**
      * @group ZF-8468
      */
@@ -1268,10 +1266,10 @@ class Zend_Acl_AclTest extends PHPUnit_Framework_TestCase
         } catch(PHPUnit_Framework_Error $e) {
             return;
         }
-        
+
         $this->fail('An expected notice has not been raised');
     }
-    
+
     /**
      * @group ZF-8468
      */
@@ -1287,7 +1285,7 @@ class Zend_Acl_AclTest extends PHPUnit_Framework_TestCase
         $expected = array('guest', 'staff','editor','administrator');
         $this->assertEquals($expected, $this->_acl->getRoles());
     }
-    
+
     /**
      * @group ZF-8468
      */
@@ -1300,7 +1298,7 @@ class Zend_Acl_AclTest extends PHPUnit_Framework_TestCase
         $expected = array('someResource', 'someOtherResource');
         $this->assertEquals($expected, $this->_acl->getResources());
     }
-    
+
     /**
      * @group ZF-9643
      */
@@ -1317,11 +1315,11 @@ class Zend_Acl_AclTest extends PHPUnit_Framework_TestCase
         $this->_acl->removeAllow('guest', 'newsletter', 'read');
         $this->assertTrue($this->_acl->isAllowed('guest', 'blogpost', 'read'));
         $this->assertFalse($this->_acl->isAllowed('guest', 'newsletter', 'read'));
-        
+
         $this->_acl->removeAllow('guest', null, 'read');
         $this->assertFalse($this->_acl->isAllowed('guest', 'blogpost', 'read'));
         $this->assertFalse($this->_acl->isAllowed('guest', 'newsletter', 'read'));
-        
+
         // ensure allow null/all resoures works
         $this->_acl->allow('guest', null, 'read');
         $this->assertTrue($this->_acl->isAllowed('guest', 'blogpost', 'read'));
@@ -1336,7 +1334,7 @@ class Zend_Acl_AclTest extends PHPUnit_Framework_TestCase
         $this->_acl->addRole('guest');
         $this->_acl->addResource('blogpost');
         $this->_acl->addResource('newsletter');
-        
+
         $this->_acl->allow();
         $this->_acl->deny('guest', 'blogpost', 'read');
         $this->_acl->deny('guest', 'newsletter', 'read');
@@ -1346,17 +1344,17 @@ class Zend_Acl_AclTest extends PHPUnit_Framework_TestCase
         $this->_acl->removeDeny('guest', 'newsletter', 'read');
         $this->assertFalse($this->_acl->isAllowed('guest', 'blogpost', 'read'));
         $this->assertTrue($this->_acl->isAllowed('guest', 'newsletter', 'read'));
-        
+
         $this->_acl->removeDeny('guest', null, 'read');
         $this->assertTrue($this->_acl->isAllowed('guest', 'blogpost', 'read'));
         $this->assertTrue($this->_acl->isAllowed('guest', 'newsletter', 'read'));
-        
+
         // ensure deny null/all resources works
         $this->_acl->deny('guest', null, 'read');
         $this->assertFalse($this->_acl->isAllowed('guest', 'blogpost', 'read'));
         $this->assertFalse($this->_acl->isAllowed('guest', 'newsletter', 'read'));
     }
-    
+
     /**
      * @group ZF-10649
      */
@@ -1364,12 +1362,12 @@ class Zend_Acl_AclTest extends PHPUnit_Framework_TestCase
     {
         $this->_acl->addRole('guest');
         $this->_acl->addResource('blogpost');
-        
+
         $this->_acl->allow('guest');
         $this->assertTrue($this->_acl->isAllowed('guest'));
         $this->assertTrue($this->_acl->isAllowed('guest', 'blogpost'));
         $this->assertTrue($this->_acl->isAllowed('guest', 'blogpost', 'read'));
-        
+
         $this->_acl->deny('guest');
         $this->assertFalse($this->_acl->isAllowed('guest'));
         $this->assertFalse($this->_acl->isAllowed('guest', 'blogpost'));

tests/Zend/AllTests.php

@@ -21,8 +21,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'TestHelper.php';
-
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_AllTests::main');
 }

tests/Zend/Amf/Adobe/IntrospectorTest.php

@@ -25,8 +25,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Amf_Adobe_IntrospectorTest::main");
 }
 
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
 /**
  * @see Zend_Amf_Adobe_Introspector
  */

tests/Zend/Amf/AllTests.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
-
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Amf_AllTests::main');
 }

tests/Zend/Amf/AuthTest.php

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

tests/Zend/Amf/RequestTest.php

@@ -24,7 +24,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Amf_RequestTest::main');
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
 require_once 'Zend/Amf/Request.php';
 require_once 'Zend/Amf/Parse/TypeLoader.php';
 require_once 'Zend/Locale.php';

tests/Zend/Amf/ResourceTest.php

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

tests/Zend/Amf/ResponseTest.php

@@ -24,7 +24,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Amf_ResponseTest::main');
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
 require_once 'Zend/Amf/Response.php';
 require_once 'Zend/Amf/Request.php';
 require_once 'Zend/Amf/Value/MessageBody.php';

tests/Zend/Amf/ServerTest.php

@@ -25,10 +25,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Amf_ServerTest::main");
 }
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
 require_once 'Zend/Amf/Server.php';
 require_once 'Zend/Amf/Request.php';
 require_once 'Zend/Amf/Parse/TypeLoader.php';

tests/Zend/Amf/TypeLoaderTest.php

@@ -24,7 +24,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Amf_TypeloaderTest::main');
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
 require_once 'Zend/Amf/Parse/TypeLoader.php';
 
 /**

tests/Zend/Amf/Util/BinaryStreamTest.php

@@ -24,7 +24,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Amf_Util_BinaryStreamTest::main');
 }
 
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once 'Zend/Amf/Util/BinaryStream.php';
 
 /**

tests/Zend/Amf/Value/ArrayCollectionTest.php

@@ -23,7 +23,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Amf_Value_ArrayCollectionTest::main');
 }
 
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once 'Zend/Amf/Value/Messaging/ArrayCollection.php';
 
 /**
@@ -78,7 +77,7 @@ class Zend_Amf_Value_ArrayCollectionTest extends PHPUnit_Framework_TestCase
 
     public function testConstructorArrayCollectionTwo()
     {
-        $this->_arrayCollection = new Zend_Amf_Value_Messaging_ArrayCollectionTwo($this->_data);
+        $this->_arrayCollection = new Zend_Amf_Value_Messaging_ArrayCollection($this->_data);
         $this->assertEquals('bar2', $this->_arrayCollection[1]['bar']);
     }
 

tests/Zend/Amf/Value/MessageBodyTest.php

@@ -24,7 +24,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Amf_Value_MessageBodyTest::main');
 }
 
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once 'Zend/Amf/Value/MessageBody.php';
 
 /**

tests/Zend/Amf/Value/MessageHeaderTest.php

@@ -24,7 +24,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Amf_Value_MessageHeaderTest::main');
 }
 
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once 'Zend/Amf/Value/MessageHeader.php';
 
 /**

tests/Zend/Application/AllTests.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-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/ApplicationTest.php

@@ -24,11 +24,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Application_ApplicationTest::main');
 }
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
 /** Zend_Loader_Autoloader */
 require_once 'Zend/Loader/Autoloader.php';
 

tests/Zend/Application/Bootstrap/BootstrapAbstractTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';

tests/Zend/Application/Bootstrap/BootstrapTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';

tests/Zend/Application/Module/AutoloaderTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * @see Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';

tests/Zend/Application/Module/BootstrapTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';

tests/Zend/Application/Resource/AllTests.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-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/CacheManagerTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';

tests/Zend/Application/Resource/DbTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';

tests/Zend/Application/Resource/DojoTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';

tests/Zend/Application/Resource/FrontcontrollerTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';
@@ -346,7 +341,7 @@ class Zend_Application_Resource_FrontcontrollerTest extends PHPUnit_Framework_Te
         $front = $resource->getFrontController();
         $this->assertNull($front->getBaseUrl());
     }
-    
+
     /**
      * @group ZF-9044
      */
@@ -365,7 +360,7 @@ class Zend_Application_Resource_FrontcontrollerTest extends PHPUnit_Framework_Te
             5 => 'Zend_Controller_Plugin_PutHandler',
             10 => 'Zend_Controller_Plugin_ErrorHandler',
         );
-        
+
         $resource = new Zend_Application_Resource_Frontcontroller(array(
             'plugins' => $plugins
         ));
@@ -373,7 +368,7 @@ class Zend_Application_Resource_FrontcontrollerTest extends PHPUnit_Framework_Te
         $resource->init();
         $front = $resource->getFrontController();
         $plugins = $front->getPlugins();
-        
+
         $this->assertEquals(count($expected), count($plugins));
         foreach($expected as $index => $class) {
         	$this->assertEquals($class, get_class($plugins[$index]));

tests/Zend/Application/Resource/LayoutTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';

tests/Zend/Application/Resource/LocaleTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';
@@ -117,7 +112,7 @@ class Zend_Application_Resource_LocaleTest extends PHPUnit_Framework_TestCase
         $this->assertTrue(Zend_Registry::isRegistered('Foo_Bar'));
         $this->assertSame(Zend_Registry::get('Foo_Bar'), $locale);
     }
-    
+
     public function testOptionsPassedToResourceAreUsedToSetLocaleState1()
     {
         $options = array(
@@ -128,7 +123,7 @@ class Zend_Application_Resource_LocaleTest extends PHPUnit_Framework_TestCase
         $resource->setBootstrap($this->bootstrap);
         $resource->init();
         $locale   = $resource->getLocale();
-        
+
         // This test will fail if your configured locale is kok_IN
         $this->assertFalse('kok_IN' == $locale->__toString());
         $this->assertSame(Zend_Registry::get('Zend_Locale'), $locale);

tests/Zend/Application/Resource/LogTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';
@@ -127,7 +122,7 @@ class Zend_Application_Resource_LogTest extends PHPUnit_Framework_TestCase
         rewind($stream);
         $this->assertContains($message, stream_get_contents($stream));
     }
-    
+
     /**
      * @group ZF-8602
      */

tests/Zend/Application/Resource/MailTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';
@@ -71,7 +66,7 @@ class Zend_Application_Resource_MailTest extends PHPUnit_Framework_TestCase
     public function tearDown()
     {
         Zend_Mail::clearDefaultTransport();
-        
+
         // Restore original autoloaders
         $loaders = spl_autoload_functions();
         foreach ($loaders as $loader) {
@@ -130,9 +125,9 @@ class Zend_Application_Resource_MailTest extends PHPUnit_Framework_TestCase
         $resource->setOptions($options);
 
         $resource->init();
-        $this->assertNull(Zend_Mail::getDefaultTransport()); 
+        $this->assertNull(Zend_Mail::getDefaultTransport());
     }
-    
+
     public function testDefaultFromAndReplyTo()
     {
         $options = array('defaultfrom'    => array('email' => 'foo@example.com',
@@ -154,15 +149,15 @@ class Zend_Application_Resource_MailTest extends PHPUnit_Framework_TestCase
      */
     public function testDefaultTransport() {
         $options = array('transport' => array(//'type' => 'sendmail', // dont define type
-                                              'register' => true)); 
+                                              'register' => true));
         $resource = new Zend_Application_Resource_Mail(array());
         $resource->setBootstrap($this->bootstrap);
         $resource->setOptions($options);
 
         $resource->init();
-        $this->assertTrue(Zend_Mail::getDefaultTransport() instanceof Zend_Mail_Transport_Sendmail);        
+        $this->assertTrue(Zend_Mail::getDefaultTransport() instanceof Zend_Mail_Transport_Sendmail);
     }
-    
+
     /**
     * @group ZF-8811
     */
@@ -178,7 +173,7 @@ class Zend_Application_Resource_MailTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($options['defaultFroM'], Zend_Mail::getDefaultFrom());
         $this->assertEquals($options['defAultReplyTo'], Zend_Mail::getDefaultReplyTo());
     }
-    
+
     /**
      * @group ZF-8981
      */
@@ -190,7 +185,7 @@ class Zend_Application_Resource_MailTest extends PHPUnit_Framework_TestCase
         $resource->setOptions($options);
 
         $resource->init();
-        $this->assertTrue(Zend_Mail::getDefaultTransport() instanceof Zend_Mail_Transport_Sendmail);       
+        $this->assertTrue(Zend_Mail::getDefaultTransport() instanceof Zend_Mail_Transport_Sendmail);
     }
 
     /**
@@ -216,7 +211,7 @@ class Zend_Application_Resource_MailTest extends PHPUnit_Framework_TestCase
 
         $this->assertTrue($resource->init() instanceof Zend_Application_Resource_mailTestCAsE);
     }
-    
+
 }
 
 if (PHPUnit_MAIN_METHOD == 'Zend_Application_Resource_MailTest::main') {

tests/Zend/Application/Resource/ModulesTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';

tests/Zend/Application/Resource/MultidbTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';

tests/Zend/Application/Resource/NavigationTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';

tests/Zend/Application/Resource/ResourceAbstractTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';

tests/Zend/Application/Resource/RouterTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';

tests/Zend/Application/Resource/TranslateTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';

tests/Zend/Application/Resource/UseragentTest.php

@@ -24,15 +24,9 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';
-
 require_once 'Zend/Application/Resource/ResourceAbstract.php';
 require_once 'Zend/Application/Resource/Useragent.php';
 

tests/Zend/Application/Resource/ViewTest.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
  * Zend_Loader_Autoloader
  */
 require_once 'Zend/Loader/Autoloader.php';
@@ -136,7 +131,7 @@ class Zend_Application_Resource_ViewTest extends PHPUnit_Framework_TestCase
         $options = array('contentType' => $contentType);
         $resource = new Zend_Application_Resource_View($options);
         $headMetaHelper = $resource->init()->headMeta();
- 
+
         $actual = null;
         $container = $headMetaHelper->getContainer();
         foreach ($container as $item) {
@@ -151,7 +146,7 @@ class Zend_Application_Resource_ViewTest extends PHPUnit_Framework_TestCase
         Zend_View_Helper_Placeholder_Registry::getRegistry()
             ->deleteContainer('Zend_View_Helper_HeadMeta');
     }
-    
+
     /**
      * @group ZF-10343
      */
@@ -182,7 +177,7 @@ class Zend_Application_Resource_ViewTest extends PHPUnit_Framework_TestCase
         $registry->deleteContainer('Zend_View_Helper_HeadMeta');
         $registry->deleteContainer('Zend_View_Helper_Doctype');
     }
-	
+
     /**
      * @group ZF-10343
      */

tests/Zend/Auth/Adapter/AllTests.php

@@ -20,8 +20,6 @@
  * @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');
 }

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

@@ -20,8 +20,6 @@
  * @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');
 }

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

@@ -20,13 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
-/**
- * PHPUnit_Framework_TestCase
- */
-
-
 /**
  * @see Zend_Db_Adapter_Pdo_Sqlite
  */
@@ -398,9 +391,9 @@ class Zend_Auth_Adapter_DbTable_BasicSqliteTest extends PHPUnit_Framework_TestCa
     }
     /**
      * Test to see same usernames with different passwords can not authenticate
-     * when flag is not set. This is the current state of 
+     * when flag is not set. This is the current state of
      * Zend_Auth_Adapter_DbTable (up to ZF 1.10.6)
-     * 
+     *
      * @group   ZF-7289
      */
     public function testEqualUsernamesDifferentPasswordShouldNotAuthenticateWhenFlagIsNotSet()
@@ -410,7 +403,7 @@ class Zend_Auth_Adapter_DbTable_BasicSqliteTest extends PHPUnit_Framework_TestCa
             'password' => 'my_otherpass',
             'real_name' => 'Test user 2',
         ));
-        
+
         // test if user 1 can authenticate
         $this->_adapter->setIdentity('my_username')
                        ->setCredential('my_password');
@@ -422,7 +415,7 @@ class Zend_Auth_Adapter_DbTable_BasicSqliteTest extends PHPUnit_Framework_TestCa
     /**
      * Test to see same usernames with different passwords can authenticate when
      * a flag is set
-     * 
+     *
      * @group   ZF-7289
      */
     public function testEqualUsernamesDifferentPasswordShouldAuthenticateWhenFlagIsSet()
@@ -432,7 +425,7 @@ class Zend_Auth_Adapter_DbTable_BasicSqliteTest extends PHPUnit_Framework_TestCa
             'password' => 'my_otherpass',
             'real_name' => 'Test user 2',
         ));
-        
+
         // test if user 1 can authenticate
         $this->_adapter->setIdentity('my_username')
                        ->setCredential('my_password')
@@ -442,10 +435,10 @@ class Zend_Auth_Adapter_DbTable_BasicSqliteTest extends PHPUnit_Framework_TestCa
             $result->getMessages()));
         $this->assertTrue($result->isValid());
         $this->assertEquals('my_username', $result->getIdentity());
-        
+
         $this->_adapter = null;
         $this->_setupAuthAdapter();
-        
+
         // test if user 2 can authenticate
         $this->_adapter->setIdentity('my_username')
                        ->setCredential('my_otherpass')

tests/Zend/Auth/Adapter/DbTable/BasicSqliteTest/SkipTests.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(dirname(dirname(__FILE__)))))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
-
 /**
  * @category   Zend
  * @package    Zend_Auth

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

@@ -20,8 +20,6 @@
  * @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');
 }

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

@@ -20,13 +20,6 @@
  * @version    $Id$
  */
 
-
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
-
 /**
  * @see Zend_Auth_Adapter_Http
  */

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

@@ -20,8 +20,6 @@
  * @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');
 }

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

@@ -20,8 +20,6 @@
  * @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_Ldap_AllTests::main');
 }

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

@@ -20,12 +20,6 @@
  * @version    $Id$
  */
 
-
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
 /**
  * @see Zend_Auth_Adapter_Ldap
  */

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

@@ -21,11 +21,6 @@
  */
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
-/**
  * @see Zend_Ldap
  */
 require_once 'Zend/Ldap.php';

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

@@ -20,8 +20,6 @@
  * @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');
 }

tests/Zend/Auth/AllTests.php

@@ -20,8 +20,6 @@
  * @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');
 }

tests/Zend/AuthTest.php

@@ -21,12 +21,6 @@
  */
 
 /**
- * Test helper
- */
-require_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'TestHelper.php';
-
-
-/**
  * @see Zend_Auth
  */
 require_once 'Zend/Auth.php';

tests/Zend/Barcode/AllTests.php

@@ -25,18 +25,6 @@ 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
- */
-
-
-
-
 require_once 'Zend/Barcode/FactoryTest.php';
 
 require_once 'Zend/Barcode/Object/Code39Test.php';

tests/Zend/Barcode/FactoryTest.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . '/TestHelper.php';
-
 require_once 'Zend/Barcode.php';
 require_once 'Zend/Config.php';
 
@@ -39,7 +37,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
     public function testMinimalFactory()
     {
         $this->_checkGDRequirement();
-        
+
         $renderer = Zend_Barcode::factory('code39');
         $this->assertTrue($renderer instanceof Zend_Barcode_Renderer_Image);
         $this->assertTrue($renderer->getBarcode() instanceof Zend_Barcode_Object_Code39);
@@ -55,7 +53,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
     public function testFactoryWithOptions()
     {
         $this->_checkGDRequirement();
-        
+
         $options = array('barHeight' => 123);
         $renderer = Zend_Barcode::factory('code39', 'image', $options);
         $this->assertEquals(123, $renderer->getBarcode()->getBarHeight());
@@ -64,7 +62,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
     public function testFactoryWithAutomaticExceptionRendering()
     {
         $this->_checkGDRequirement();
-        
+
         $options = array('barHeight' => - 1);
         $renderer = Zend_Barcode::factory('code39', 'image', $options);
         $this->assertTrue($renderer instanceof Zend_Barcode_Renderer_Image);
@@ -86,7 +84,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
     public function testFactoryWithoutAutomaticRendererExceptionRendering()
     {
         $this->_checkGDRequirement();
-        
+
         $options = array('imageType' => 'my');
         $renderer = Zend_Barcode::factory('code39', 'image', array(), $options, false);
         $this->markTestIncomplete('Need to throw a configuration exception in renderer');
@@ -95,7 +93,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
     public function testFactoryWithZendConfig()
     {
         $this->_checkGDRequirement();
-        
+
         $config = new Zend_Config(
                 array('barcode' => 'code39' ,
                         'renderer' => 'image'));
@@ -108,7 +106,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
     public function testFactoryWithZendConfigAndObjectOptions()
     {
         $this->_checkGDRequirement();
-        
+
         $config = new Zend_Config(
                 array('barcode' => 'code25' ,
                         'barcodeParams' => array(
@@ -122,7 +120,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
     public function testFactoryWithZendConfigAndRendererOptions()
     {
         $this->_checkGDRequirement();
-        
+
         $config = new Zend_Config(
                 array('barcode' => 'code25' ,
                         'rendererParams' => array(
@@ -136,7 +134,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
     public function testFactoryWithoutBarcodeWithAutomaticExceptionRender()
     {
         $this->_checkGDRequirement();
-        
+
         $renderer = Zend_Barcode::factory(null);
         $this->assertTrue($renderer instanceof Zend_Barcode_Renderer_Image);
         $this->assertTrue($renderer->getBarcode() instanceof Zend_Barcode_Object_Error);
@@ -145,7 +143,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
     public function testFactoryWithoutBarcodeWithAutomaticExceptionRenderWithZendConfig()
     {
         $this->_checkGDRequirement();
-        
+
         $config = new Zend_Config(array('barcode' => null));
         $renderer = Zend_Barcode::factory($config);
         $this->assertTrue($renderer instanceof Zend_Barcode_Renderer_Image);
@@ -155,7 +153,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
     public function testFactoryWithExistingBarcodeObject()
     {
         $this->_checkGDRequirement();
-        
+
         $barcode = new Zend_Barcode_Object_Code25();
         $renderer = Zend_Barcode::factory($barcode);
         $this->assertSame($barcode, $renderer->getBarcode());
@@ -251,7 +249,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
     public function testBarcodeRendererFactoryWithExistingBarcodeRenderer()
     {
         $this->_checkGDRequirement();
-        
+
         $renderer = new Zend_Barcode_Renderer_Image();
         $generatedBarcode = Zend_Barcode::makeRenderer($renderer);
         $this->assertSame($renderer, $generatedBarcode);
@@ -260,7 +258,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
     public function testBarcodeRendererFactoryWithBarcodeAsString()
     {
         $this->_checkGDRequirement();
-        
+
         $renderer = Zend_Barcode::makeRenderer('image');
         $this->assertTrue($renderer instanceof Zend_Barcode_Renderer_Image);
     }
@@ -268,7 +266,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
     public function testBarcodeRendererFactoryWithBarcodeAsStringAndConfigAsArray()
     {
         $this->_checkGDRequirement();
-        
+
         $renderer = Zend_Barcode::makeRenderer('image', array('imageType' => 'gif'));
         $this->assertTrue($renderer instanceof Zend_Barcode_Renderer_Image);
         $this->assertSame('gif', $renderer->getImageType());
@@ -277,7 +275,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
     public function testBarcodeRendererFactoryWithBarcodeAsStringAndConfigAsZendConfig()
     {
         $this->_checkGDRequirement();
-        
+
         $config = new Zend_Config(array('imageType' => 'gif'));
         $renderer = Zend_Barcode::makeRenderer('image', $config);
         $this->assertTrue($renderer instanceof Zend_Barcode_Renderer_Image);
@@ -287,7 +285,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
     public function testBarcodeRendererFactoryWithBarcodeAsZendConfig()
     {
         $this->_checkGDRequirement();
-        
+
         $config = new Zend_Config(
                 array('renderer' => 'image' ,
                         'rendererParams' => array(
@@ -320,7 +318,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
     public function testBarcodeRendererFactoryWithNamespace()
     {
         $this->_checkGDRequirement();
-        
+
         require_once dirname(__FILE__) . '/Renderer/_files/RendererNamespace.php';
         $renderer = Zend_Barcode::makeRenderer('image',
                 array(
@@ -373,7 +371,7 @@ class Zend_Barcode_FactoryTest extends PHPUnit_Framework_TestCase
         $this->assertSame('my_font.ttf', $barcode->getFont());
         Zend_Barcode::setBarcodeFont('');
     }
-    
+
     protected function _checkGDRequirement()
     {
         if (!extension_loaded('gd')) {

tests/Zend/Barcode/Object/Code128Test.php

@@ -20,8 +20,6 @@
  * @version    $Id: Code25Test.php 21667 2010-03-28 17:45:14Z mikaelkael $
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Code128.php';

tests/Zend/Barcode/Object/Code25Test.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Code25.php';

tests/Zend/Barcode/Object/Code25interleavedTest.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Code25interleaved.php';

tests/Zend/Barcode/Object/Code39Test.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Code39.php';

tests/Zend/Barcode/Object/Ean13Test.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Ean13.php';

tests/Zend/Barcode/Object/Ean2Test.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Ean2.php';

tests/Zend/Barcode/Object/Ean5Test.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Ean5.php';

tests/Zend/Barcode/Object/Ean8Test.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Ean8.php';

tests/Zend/Barcode/Object/ErrorTest.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Error.php';

tests/Zend/Barcode/Object/IdentcodeTest.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Identcode.php';

tests/Zend/Barcode/Object/Itf14Test.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Itf14.php';

tests/Zend/Barcode/Object/LeitcodeTest.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Leitcode.php';

tests/Zend/Barcode/Object/PlanetTest.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Planet.php';

tests/Zend/Barcode/Object/PostnetTest.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Postnet.php';

tests/Zend/Barcode/Object/RoyalmailTest.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Royalmail.php';

tests/Zend/Barcode/Object/TestCommon.php

@@ -20,14 +20,6 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
-/**
- * Test helper
- */
 require_once dirname(__FILE__) . '/_files/BarcodeTest.php';
 
 /**

tests/Zend/Barcode/Object/UpcaTest.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Upca.php';

tests/Zend/Barcode/Object/UpceTest.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Object/Upce.php';

tests/Zend/Barcode/Renderer/ImageTest.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Renderer/Image.php';
@@ -127,7 +125,7 @@ class Zend_Barcode_Renderer_ImageTest extends Zend_Barcode_Renderer_TestCommon
     public function testDrawReturnResource()
     {
         $this->_checkTTFRequirement();
-        
+
         $barcode = new Zend_Barcode_Object_Code39(array('text' => '0123456789'));
         $this->_renderer->setBarcode($barcode);
         $resource = $this->_renderer->draw();
@@ -139,7 +137,7 @@ class Zend_Barcode_Renderer_ImageTest extends Zend_Barcode_Renderer_TestCommon
     public function testDrawWithExistantResourceReturnResource()
     {
         $this->_checkTTFRequirement();
-        
+
         $barcode = new Zend_Barcode_Object_Code39(array('text' => '0123456789'));
         $this->_renderer->setBarcode($barcode);
         $imageResource = imagecreatetruecolor(500, 500);
@@ -267,59 +265,59 @@ class Zend_Barcode_Renderer_ImageTest extends Zend_Barcode_Renderer_TestCommon
     public function testHorizontalPositionToLeft()
     {
         $this->_checkTTFRequirement();
-        
+
         parent::testHorizontalPositionToLeft();
     }
 
     public function testHorizontalPositionToCenter()
     {
         $this->_checkTTFRequirement();
-        
+
         parent::testHorizontalPositionToCenter();
     }
 
     public function testHorizontalPositionToRight()
     {
         $this->_checkTTFRequirement();
-        
+
         parent::testHorizontalPositionToRight();
     }
 
     public function testVerticalPositionToTop()
     {
         $this->_checkTTFRequirement();
-        
+
         parent::testVerticalPositionToTop();
     }
 
     public function testVerticalPositionToMiddle()
     {
         $this->_checkTTFRequirement();
-        
+
         parent::testVerticalPositionToMiddle();
     }
 
     public function testVerticalPositionToBottom()
     {
         $this->_checkTTFRequirement();
-        
+
         parent::testVerticalPositionToBottom();
     }
-    
+
     public function testLeftOffsetOverrideHorizontalPosition()
     {
         $this->_checkTTFRequirement();
-        
+
         parent::testLeftOffsetOverrideHorizontalPosition();
     }
-    
+
     public function testTopOffsetOverrideVerticalPosition()
     {
         $this->_checkTTFRequirement();
-        
+
         parent::testTopOffsetOverrideVerticalPosition();
-    } 
-    
+    }
+
     protected function _checkTTFRequirement()
     {
         if (!function_exists('imagettfbbox')) {

tests/Zend/Barcode/Renderer/PdfTest.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Renderer/Pdf.php';

tests/Zend/Barcode/Renderer/SvgTest.php

@@ -20,8 +20,6 @@
  * @version    $Id: SvgTest.php 20096 2010-01-06 02:05:09Z bkarwin $
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/TestHelper.php';
-
 require_once dirname(__FILE__) . '/TestCommon.php';
 
 require_once 'Zend/Barcode/Renderer/Svg.php';
@@ -81,7 +79,7 @@ class Zend_Barcode_Renderer_SvgTest extends Zend_Barcode_Renderer_TestCommon
     {
         $this->_renderer->setWidth(-1);
     }
-    
+
     public function testGoodSvgResource()
     {
         $svgResource = new DOMDocument();

tests/Zend/Barcode/Renderer/TestCommon.php

@@ -20,10 +20,6 @@
  * @version    $Id$
  */
 
-/**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
 require_once 'Zend/Barcode.php';
 require_once 'Zend/Config.php';
 

tests/Zend/Cache/AllTests.php

@@ -20,8 +20,6 @@
  * @version    $Id $
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
-
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Cache_AllTests::main');
 }

tests/Zend/Captcha/AllTests.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-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/Captcha/DumbTest.php

@@ -25,8 +25,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Captcha_DumbTest::main");
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
 require_once 'Zend/Form/Element/Captcha.php';
 require_once 'Zend/View.php';
 

tests/Zend/Captcha/FigletTest.php

@@ -25,8 +25,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Captcha_FigletTest::main");
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
 require_once 'Zend/Form/Element/Captcha.php';
 require_once 'Zend/Captcha/Adapter.php';
 require_once 'Zend/Config.php';
@@ -129,7 +127,7 @@ class Zend_Captcha_FigletTest extends PHPUnit_Framework_TestCase
         $expect = sprintf('for="comment-%s-input"', $this->element->getName());
         $this->assertRegexp("/<label [^>]*?$expect/", $html, $html);
     }
-    
+
     public function testTimeoutPopulatedByDefault()
     {
         $ttl = $this->captcha->getTimeout();
@@ -298,7 +296,7 @@ class Zend_Captcha_FigletTest extends PHPUnit_Framework_TestCase
         $input = array("id" => $this->captcha->getId(), "input" => $this->captcha->getWord());
         $this->assertTrue($this->element->isValid($input));
     }
-    
+
     /**
      * @group ZF-5728
      */

tests/Zend/Captcha/ImageTest.php

@@ -25,8 +25,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Captcha_ImageTest::main");
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
 require_once 'Zend/Form/Element/Captcha.php';
 require_once 'Zend/Captcha/Adapter.php';
 

tests/Zend/Captcha/ReCaptchaTest.php

@@ -25,8 +25,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Captcha_ReCaptchaTest::main");
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
 require_once 'Zend/Form/Element/Captcha.php';
 require_once 'Zend/View.php';
 

tests/Zend/Cloud/AllTests.php

@@ -23,8 +23,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Cloud_AllTests::main');
 }
 
-require_once dirname(__FILE__) . '/../../TestHelper.php';
-
 /**
  * @see Zend_Cloud_DocumentService_AllTests
  */

tests/Zend/Cloud/DocumentService/Adapter/AllTests.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
-/**
  * @see Zend_Cloud_DocumentService_Adapter_SimpleDbTest
  */
 require_once 'Zend/Cloud/DocumentService/Adapter/SimpleDbTest.php';

tests/Zend/Cloud/DocumentService/Adapter/SimpleDbTest.php

@@ -24,12 +24,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Cloud_DocumentService_Adapter_SimpleDbTest::main");
 }
 
-
-/**
- * Test helper 
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
 /**
  * @see Zend_Cloud_DocumentServiceTestCase
  */
@@ -51,7 +45,7 @@ require_once 'Zend/Config.php';
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Cloud_DocumentService_Adapter_SimpleDbTest 
+class Zend_Cloud_DocumentService_Adapter_SimpleDbTest
     extends Zend_Cloud_DocumentService_TestCase
 {
     /**
@@ -61,9 +55,9 @@ class Zend_Cloud_DocumentService_Adapter_SimpleDbTest
      * @var int
      */
     protected $_waitPeriod = 10;
-    
+
     protected $_clientType = 'Zend_Service_Amazon_SimpleDb';
-    
+
 	/**
      * Runs the test methods of this class.
      *
@@ -75,8 +69,8 @@ class Zend_Cloud_DocumentService_Adapter_SimpleDbTest
         $suite  = new PHPUnit_Framework_TestSuite(__CLASS__);
         $result = PHPUnit_TextUI_TestRunner::run($suite);
     }
-    
-    public function testUpdateDocumentMergeAll() 
+
+    public function testUpdateDocumentMergeAll()
     {
         $data = $this->_getDocumentData();
         $name = $this->_collectionName("testMerge");
@@ -86,21 +80,21 @@ class Zend_Cloud_DocumentService_Adapter_SimpleDbTest
         $this->_commonDocument->insertDocument($name, $doc);
         $doc1 = $this->_makeDocument($data[1]);
         $this->_wait();
-        $this->_commonDocument->updateDocument($name, $doc->getID(), $doc1, 
+        $this->_commonDocument->updateDocument($name, $doc->getID(), $doc1,
             array(Zend_Cloud_DocumentService_Adapter_SimpleDb::MERGE_OPTION => true));
         $this->_wait();
-        
+
         $fetchdoc = $this->_commonDocument->fetchDocument($name, $doc->getID());
         $this->assertTrue($fetchdoc instanceof Zend_Cloud_DocumentService_Document, "New document not found");
         $this->assertContains($doc->name, $fetchdoc->name, "Name field did not update: " . var_export($fetchdoc->getFields(), 1));
         $this->assertContains($doc1->name, $fetchdoc->name, "Name field did not update: " . var_export($fetchdoc->getFields(), 1));
         $this->assertContains((string) $doc->year, $fetchdoc->year, "Year field did not update: " . var_export($fetchdoc->getFields(), 1));
         $this->assertContains((string) $doc1->year, $fetchdoc->year, "Year field did not update: " . var_export($fetchdoc->getFields(), 1));
-        
+
         $this->_commonDocument->deleteCollection($name);
     }
-    
-    public function testUpdateDocumentMergeSome() 
+
+    public function testUpdateDocumentMergeSome()
     {
         $data = $this->_getDocumentData();
         $name = $this->_collectionName("testMerge");
@@ -110,11 +104,11 @@ class Zend_Cloud_DocumentService_Adapter_SimpleDbTest
         $this->_commonDocument->insertDocument($name, $doc);
         $doc1 = $this->_makeDocument($data[1]);
         $this->_wait();
-        $this->_commonDocument->updateDocument($name, $doc->getID(), $doc1, 
-            array(Zend_Cloud_DocumentService_Adapter_SimpleDb::MERGE_OPTION => 
+        $this->_commonDocument->updateDocument($name, $doc->getID(), $doc1,
+            array(Zend_Cloud_DocumentService_Adapter_SimpleDb::MERGE_OPTION =>
                 array("year" => true, "pages" => true)));
         $this->_wait();
-        
+
         $fetchdoc = $this->_commonDocument->fetchDocument($name, $doc->getID());
         $this->assertTrue($fetchdoc instanceof Zend_Cloud_DocumentService_Document, "New document not found");
         $this->assertEquals($doc1->name, $fetchdoc->name, "Name field did not update");
@@ -122,10 +116,10 @@ class Zend_Cloud_DocumentService_Adapter_SimpleDbTest
         $this->assertContains((string) $doc->pages, $fetchdoc->pages, "Page field did not update");
         $this->assertContains((string) $doc1->year, $fetchdoc->year, "Year field did not update");
         $this->assertContains((string) $doc->year, $fetchdoc->year, "Year field did not update");
-        
+
         $this->_commonDocument->deleteCollection($name);
     }
-    
+
     static function getConfigArray()
     {
         return array(
@@ -133,29 +127,29 @@ class Zend_Cloud_DocumentService_Adapter_SimpleDbTest
                 Zend_Cloud_DocumentService_Adapter_SimpleDb::AWS_ACCESS_KEY => constant('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ACCESSKEYID'),
                 Zend_Cloud_DocumentService_Adapter_SimpleDb::AWS_SECRET_KEY => constant('TESTS_ZEND_SERVICE_AMAZON_ONLINE_SECRETKEY'),
             );
-    } 
+    }
 
-    protected function _getConfig() 
+    protected function _getConfig()
     {
         if (!defined('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ENABLED') ||
             !constant('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ENABLED') ||
             !defined('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ACCESSKEYID') ||
             !defined('TESTS_ZEND_SERVICE_AMAZON_ONLINE_SECRETKEY')) {
-            $this->markTestSkipped("Amazon SimpleDB access not configured, skipping test");        
-        }        
-        
+            $this->markTestSkipped("Amazon SimpleDB access not configured, skipping test");
+        }
+
         $config = new Zend_Config(self::getConfigArray());
 
         return $config;
     }
-    
+
     protected function _getDocumentData()
     {
-        return array( 
+        return array(
             array(
 	        	parent::ID_FIELD => "0385333498",
 	        	"name" =>	"The Sirens of Titan",
-	        	"author" =>	"Kurt Vonnegut", 
+	        	"author" =>	"Kurt Vonnegut",
 	        	"year"	=> 1959,
 	        	"pages" =>	336,
 	        	"keyword" => array("Book", "Paperback")
@@ -163,7 +157,7 @@ class Zend_Cloud_DocumentService_Adapter_SimpleDbTest
             array(
 	        	parent::ID_FIELD => "0802131786",
 	        	"name" =>	"Tropic of Cancer",
-	        	"author" =>	"Henry Miller", 
+	        	"author" =>	"Henry Miller",
 	        	"year"	=> 1934,
 	        	"pages" =>	318,
 	        	"keyword" => array("Book")
@@ -171,26 +165,26 @@ class Zend_Cloud_DocumentService_Adapter_SimpleDbTest
             array(
 	        	parent::ID_FIELD => "B000T9886K",
 	        	"name" =>	"In Between",
-	        	"author" =>	"Paul Van Dyk", 
+	        	"author" =>	"Paul Van Dyk",
 	        	"year"	=> 2007,
 	        	"keyword" => array("CD", "Music")
 	        	),
 	        array(
 	        	parent::ID_FIELD => "1579124585",
 	        	"name" =>	"The Right Stuff",
-	        	"author" =>	"Tom Wolfe", 
+	        	"author" =>	"Tom Wolfe",
 	        	"year"	=> 1979,
 	        	"pages" =>	304,
 	        	"keyword" => array("American", "Book", "Hardcover")
 	        	),
         );
     }
-    
+
     protected function _queryString($domain, $s1, $s2)
     {
         return "select * from $domain where itemName() = '$s1' OR itemName() = '$s2'";
     }
-    
+
 }
 
 if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_DocumentService_Adapter_SimpleDbTest::main') {

tests/Zend/Cloud/DocumentService/Adapter/WindowsAzureTest.php

@@ -25,8 +25,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Cloud_DocumentService_Adapter_WindowsAzureTest::main");
 }
 
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
 /**
  * @see Zend_Cloud_DocumentServiceTestCase
  */
@@ -52,7 +50,7 @@ require_once 'Zend/Config.php';
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Cloud_DocumentService_Adapter_WindowsAzureTest 
+class Zend_Cloud_DocumentService_Adapter_WindowsAzureTest
     extends Zend_Cloud_DocumentService_TestCase
 {
     /**
@@ -62,9 +60,9 @@ class Zend_Cloud_DocumentService_Adapter_WindowsAzureTest
      * @var int
      */
     protected $_waitPeriod = 10;
-    
+
     protected $_clientType = 'Zend_Service_WindowsAzure_Storage_Table';
-    
+
 	/**
      * Runs the test methods of this class.
      *
@@ -77,7 +75,7 @@ class Zend_Cloud_DocumentService_Adapter_WindowsAzureTest
         $result = PHPUnit_TextUI_TestRunner::run($suite);
     }
 
-    public function testQueryStructOrder() 
+    public function testQueryStructOrder()
     {
         try {
             parent::testQueryStructOrder();
@@ -86,7 +84,7 @@ class Zend_Cloud_DocumentService_Adapter_WindowsAzureTest
             $this->markTestSkipped('Azure query sorting not implemented yet');
         }
     }
-    
+
     static function getConfigArray()
     {
          return array(
@@ -99,28 +97,28 @@ class Zend_Cloud_DocumentService_Adapter_WindowsAzureTest
             Zend_Cloud_DocumentService_Adapter_WindowsAzure::PROXY_CREDENTIALS => constant('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_STORAGE_PROXY_CREDENTIALS'),
         );
     }
-    
-    protected function _getConfig() 
+
+    protected function _getConfig()
     {
         if (!defined('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ENABLED') ||
             !constant('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ENABLED') ||
             !defined('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ACCOUNTNAME') ||
             !defined('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ACCOUNTKEY')) {
-            $this->markTestSkipped("Windows Azure access not configured, skipping test");        
-        }        
-        
+            $this->markTestSkipped("Windows Azure access not configured, skipping test");
+        }
+
         $config = new Zend_Config(self::getConfigArray());
 
         return $config;
     }
-    
+
     protected function _getDocumentData()
     {
-        return array( 
+        return array(
             array(
 	        	parent::ID_FIELD => array("Amazon", "0385333498"),
 	        	"name" =>	"The Sirens of Titan",
-	        	"author" =>	"Kurt Vonnegut", 
+	        	"author" =>	"Kurt Vonnegut",
 	        	"year"	=> 1959,
 	        	"pages" =>	336,
 	        	"keyword" => "Book"
@@ -128,7 +126,7 @@ class Zend_Cloud_DocumentService_Adapter_WindowsAzureTest
             array(
 	        	parent::ID_FIELD => array("Amazon", "0802131786"),
 	        	"name" =>	"Tropic of Cancer",
-	        	"author" =>	"Henry Miller", 
+	        	"author" =>	"Henry Miller",
 	        	"year"	=> 1934,
 	        	"pages" =>	318,
 	        	"keyword" => "Book"
@@ -136,21 +134,21 @@ class Zend_Cloud_DocumentService_Adapter_WindowsAzureTest
             array(
 	        	parent::ID_FIELD => array("Amazon", "B000T9886K"),
 	        	"name" =>	"In Between",
-	        	"author" =>	"Paul Van Dyk", 
+	        	"author" =>	"Paul Van Dyk",
 	        	"year"	=> 2007,
 	        	"keyword" => "CD"
 	        	),
 	       array(
 	        	parent::ID_FIELD => array("Amazon", "1579124585"),
 	        	"name" =>	"The Right Stuff",
-	        	"author" =>	"Tom Wolfe", 
+	        	"author" =>	"Tom Wolfe",
 	        	"year"	=> 1979,
 	        	"pages" =>	304,
 	        	"keyword" => "Book"
 	        	),
         );
     }
-    
+
     protected function _queryString($domain, $s1, $s2)
     {
         $k1 = $s1[1];

tests/Zend/Cloud/DocumentService/TestCase.php

@@ -19,8 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
 /**
  * @see Zend_Cloud_DocumentService_Adapter
  */
@@ -54,11 +52,11 @@ abstract class Zend_Cloud_DocumentService_TestCase extends PHPUnit_Framework_Tes
     protected $_dummyCollectionNamePrefix = 'TestCollection';
 
     protected $_dummyDataPrefix = 'TestData';
-    
+
     protected $_clientType = 'stdClass';
 
     const ID_FIELD = "__id";
-    
+
     /**
      * Config object
      *
@@ -77,36 +75,36 @@ abstract class Zend_Cloud_DocumentService_TestCase extends PHPUnit_Framework_Tes
 
     public function testDocumentService()
     {
-        $this->assertTrue($this->_commonDocument instanceof Zend_Cloud_DocumentService_Adapter); 
-    } 
+        $this->assertTrue($this->_commonDocument instanceof Zend_Cloud_DocumentService_Adapter);
+    }
 
     public function testGetClient()
     {
-    	$this->assertTrue(is_a($this->_commonDocument->getClient(), $this->_clientType)); 
+    	$this->assertTrue(is_a($this->_commonDocument->getClient(), $this->_clientType));
     }
-    
-    public function testCreateCollection() 
+
+    public function testCreateCollection()
     {
         $name = $this->_collectionName("testCreate");
         $this->_commonDocument->deleteCollection($name);
         $this->_wait();
-        
+
         $this->_commonDocument->createCollection($name);
         $this->_wait();
-        
+
         $collections = $this->_commonDocument->listCollections();
         $this->assertContains($name, $collections, "New collection not in the list");
         $this->_wait();
-        
+
         $this->_commonDocument->deleteCollection($name);
     }
 
-    public function testDeleteCollection() 
+    public function testDeleteCollection()
     {
         $name = $this->_collectionName("testDC");
         $this->_commonDocument->createCollection($name);
         $this->_wait();
-        
+
         $collections = $this->_commonDocument->listCollections();
         $this->assertContains($name, $collections, "New collection not in the list");
         $this->_wait();
@@ -119,12 +117,12 @@ abstract class Zend_Cloud_DocumentService_TestCase extends PHPUnit_Framework_Tes
         $this->assertNotContains($name, $collections, "New collection not in the list");
     }
 
-    public function testListCollections() 
+    public function testListCollections()
     {
         $this->_commonDocument->createCollection($this->_collectionName("test3"));
         $this->_commonDocument->createCollection($this->_collectionName("test4"));
         $this->_wait();
-        
+
         $collections = $this->_commonDocument->listCollections();
         $this->assertContains($this->_collectionName("test3"), $collections, "New collection test3 not in the list");
         $this->assertContains($this->_collectionName("test4"), $collections, "New collection test4 not in the list");
@@ -134,22 +132,22 @@ abstract class Zend_Cloud_DocumentService_TestCase extends PHPUnit_Framework_Tes
         $this->_commonDocument->deleteCollection($this->_collectionName("test4"));
     }
 
-    public function testInsertDocument() 
+    public function testInsertDocument()
     {
         $data = $this->_getDocumentData();
         $name = $this->_collectionName("testID");
         $this->_commonDocument->createCollection($name);
-        
+
         $doc = $this->_makeDocument($data[0]);
         $this->_commonDocument->insertDocument($name, $doc);
         $this->_wait();
-        
+
         $fetchdoc = $this->_commonDocument->fetchDocument($name, $doc->getId());
         $this->assertTrue($fetchdoc instanceof Zend_Cloud_DocumentService_Document, "New document not found");
 
         $this->assertEquals($doc->name, $fetchdoc->name, "Name field wrong");
         $this->assertEquals($doc->keyword, $fetchdoc->keyword, "Keyword field wrong");
-        
+
         $this->_commonDocument->deleteCollection($name);
     }
 
@@ -158,73 +156,73 @@ abstract class Zend_Cloud_DocumentService_TestCase extends PHPUnit_Framework_Tes
         $data = $this->_getDocumentData();
         $name = $this->_collectionName("testDel");
         $this->_commonDocument->createCollection($name);
-        
+
         $doc1 = $this->_makeDocument($data[0]);
         $this->_commonDocument->insertDocument($name, $doc1);
         $this->_wait();
-        
+
         $doc2 = $this->_makeDocument($data[1]);
         $this->_commonDocument->insertDocument($name, $doc2);
         $this->_wait();
-        
+
         $this->_commonDocument->deleteDocument($name, $doc1->getId());
         $this->_wait();
-        
+
         $fetchdoc = $this->_commonDocument->fetchDocument($name, $doc1->getId());
         $this->assertFalse($fetchdoc, "Delete failed");
-        
+
         $fetchdoc = $this->_commonDocument->fetchDocument($name, $doc2->getId());
         $this->assertTrue($fetchdoc instanceof Zend_Cloud_DocumentService_Document, "New document not found");
         $this->assertEquals($doc2->name, $fetchdoc->name, "Name field wrong");
-        
+
         $this->_commonDocument->deleteCollection($name);
     }
 
-    public function testReplaceDocument() 
+    public function testReplaceDocument()
     {
         $data = $this->_getDocumentData();
         $name = $this->_collectionName("testRD");
         $this->_commonDocument->createCollection($name);
-        
+
         $doc1 = $this->_makeDocument($data[0]);
         $this->_commonDocument->insertDocument($name, $doc1);
         $doc2 = $this->_makeDocument($data[1]);
         $this->_commonDocument->insertDocument($name, $doc2);
         $this->_wait();
-        
+
         $doc3 = $this->_makeDocument($data[2]);
         $newdoc = new Zend_Cloud_DocumentService_Document($doc3->getFields(), $doc1->getId());
         $this->_commonDocument->replaceDocument($name, $newdoc);
-        
+
         $fetchdoc = $this->_commonDocument->fetchDocument($name, $doc1->getId());
         $this->assertTrue($fetchdoc instanceof Zend_Cloud_DocumentService_Document, "New document not found");
         $this->assertEquals($doc3->name, $fetchdoc->name, "Name field did not update");
         $this->assertEquals($doc3->keyword, $fetchdoc->keyword, "Keywords did not update");
-        
+
         $this->_commonDocument->deleteCollection($name);
     }
-    
-    public function testUpdateDocumentIDFields() 
+
+    public function testUpdateDocumentIDFields()
     {
         $data = $this->_getDocumentData();
         $name = $this->_collectionName("testUD1");
         $this->_commonDocument->createCollection($name);
-        
+
         $doc = $this->_makeDocument($data[0]);
         $this->_commonDocument->insertDocument($name, $doc);
         $this->_wait();
         $doc1 = $this->_makeDocument($data[1]);
         $this->_commonDocument->updateDocument($name, $doc->getId(), $doc1->getFields());
         $this->_wait();
-        
+
         $fetchdoc = $this->_commonDocument->fetchDocument($name, $doc->getId());
         $this->assertTrue($fetchdoc instanceof Zend_Cloud_DocumentService_Document, "New document not found");
         $this->assertEquals($doc1->name, $fetchdoc->name, "Name field did not update");
-        
+
          $this->_commonDocument->deleteCollection($name);
     }
 
-    public function testUpdateDocumentIDDoc() 
+    public function testUpdateDocumentIDDoc()
     {
         $data = $this->_getDocumentData();
         $name = $this->_collectionName("testUD2");
@@ -235,16 +233,16 @@ abstract class Zend_Cloud_DocumentService_TestCase extends PHPUnit_Framework_Tes
         $doc2 = $this->_makeDocument($data[2]);
         $this->_commonDocument->updateDocument($name, $doc1->getId(), $doc2);
         $this->_wait();
-        
+
         $fetchdoc = $this->_commonDocument->fetchDocument($name, $doc1->getId());
         $this->assertTrue($fetchdoc instanceof Zend_Cloud_DocumentService_Document, "New document not found");
         $this->assertEquals($doc2->name, $fetchdoc->name, "Name field did not update");
-        $this->assertEquals($doc2->keyword, $fetchdoc->keyword, "Keywords did not update");   
+        $this->assertEquals($doc2->keyword, $fetchdoc->keyword, "Keywords did not update");
 
          $this->_commonDocument->deleteCollection($name);
     }
-    
-    public function testUpdateDocumentDoc() 
+
+    public function testUpdateDocumentDoc()
     {
         $data = $this->_getDocumentData();
         $name = $this->_collectionName("testUD3");
@@ -256,16 +254,16 @@ abstract class Zend_Cloud_DocumentService_TestCase extends PHPUnit_Framework_Tes
         $this->_wait();
         $this->_commonDocument->updateDocument($name, null, $doc3);
         $this->_wait();
-        
+
         $fetchdoc = $this->_commonDocument->fetchDocument($name, $doc2->getId());
         $this->assertTrue($fetchdoc instanceof Zend_Cloud_DocumentService_Document, "New document not found");
         $this->assertEquals($doc3->name, $fetchdoc->name, "Name field did not update");
-        $this->assertEquals($doc3->keyword, $fetchdoc->keyword, "Keywords did not update");        
-        
+        $this->assertEquals($doc3->keyword, $fetchdoc->keyword, "Keywords did not update");
+
         $this->_commonDocument->deleteCollection($name);
     }
-   
-    public function testQueryString() 
+
+    public function testQueryString()
     {
         $name = $this->_collectionName("testQuery");
         $doc = $this->_loadData($name);
@@ -281,12 +279,12 @@ abstract class Zend_Cloud_DocumentService_TestCase extends PHPUnit_Framework_Tes
 
         $this->_commonDocument->deleteCollection($name);
     }
-    
-    public function testQueryStruct() 
+
+    public function testQueryStruct()
     {
         $name = $this->_collectionName("testStructQuery1");
         $doc = $this->_loadData($name);
-        
+
         // query by ID
         $query = $this->_commonDocument->select();
         $this->assertTrue($query instanceof Zend_Cloud_DocumentService_QueryAdapter);
@@ -300,12 +298,12 @@ abstract class Zend_Cloud_DocumentService_TestCase extends PHPUnit_Framework_Tes
 
         $this->_commonDocument->deleteCollection($name);
     }
-        
-    public function testQueryStructWhere() 
+
+    public function testQueryStructWhere()
     {
         $name = $this->_collectionName("testStructQuery2");
         $doc = $this->_loadData($name);
-        
+
         // query by field condition
         $query = $this->_commonDocument->select()
             ->from($name)->where("year > ?", array(1945));
@@ -317,12 +315,12 @@ abstract class Zend_Cloud_DocumentService_TestCase extends PHPUnit_Framework_Tes
 
         $this->_commonDocument->deleteCollection($name);
     }
-    
-    public function testQueryStructLimit() 
-    {  
+
+    public function testQueryStructLimit()
+    {
         $name = $this->_collectionName("testStructQuery3");
         $doc = $this->_loadData($name);
-        
+
         // query with limit
         $query = $this->_commonDocument->select()
             ->from($name)->where("year > ?", array(1945))->limit(1);
@@ -332,15 +330,15 @@ abstract class Zend_Cloud_DocumentService_TestCase extends PHPUnit_Framework_Tes
             $this->assertTrue($fdoc["year"] > 1945);
             $this->assertContains($fdoc["name"], array($doc[0]->name, $doc[2]->name, $doc[3]->name), "Wrong name in results");
         }
-        
+
         $this->_commonDocument->deleteCollection($name);
     }
 
-    public function testQueryStructOrder() 
-    {  
+    public function testQueryStructOrder()
+    {
         $name = $this->_collectionName("testStructQuery4");
         $doc = $this->_loadData($name);
-        
+
         // query with sort
         $query = $this->_commonDocument->select()
             ->from($name)->where("year > ?", array(1945))->order("year", "desc");
@@ -353,14 +351,14 @@ abstract class Zend_Cloud_DocumentService_TestCase extends PHPUnit_Framework_Tes
 
         $this->_commonDocument->deleteCollection($name);
     }
-   
-    public function setUp() 
+
+    public function setUp()
     {
         $this->_config = $this->_getConfig();
         $this->_commonDocument = Zend_Cloud_DocumentService_Factory::getAdapter($this->_config);
         parent::setUp();
-    } 
-    
+    }
+
     abstract protected function _getConfig();
     abstract protected function _getDocumentData();
     abstract protected function _queryString($domain, $s1, $s2);
@@ -373,7 +371,7 @@ abstract class Zend_Cloud_DocumentService_TestCase extends PHPUnit_Framework_Tes
     protected function _wait() {
         sleep($this->_waitPeriod);
     }
-    
+
     protected function _makeDocument($arr)
     {
         $id = $arr[self::ID_FIELD];

tests/Zend/Cloud/QueueService/Adapter/AllTests.php

@@ -24,11 +24,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
-/**
  * @see Zend_Cloud_QueueService_Adapter_SqsTest
  */
 require_once 'Zend/Cloud/QueueService/Adapter/SqsTest.php';

tests/Zend/Cloud/QueueService/Adapter/SqsTest.php

@@ -24,8 +24,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Cloud_QueueService_Adapter_SqsTest::main");
 }
 
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
 /**
  * @see Zend_Cloud_QueueServiceTestCase
  */
@@ -53,7 +51,7 @@ class Zend_Cloud_QueueService_Adapter_SqsTest extends Zend_Cloud_QueueService_Te
      */
     protected $_waitPeriod = 10;
 	protected $_clientType = 'Zend_Service_Amazon_Sqs';
-    
+
 	/**
      * Runs the test methods of this class.
      *
@@ -71,7 +69,7 @@ class Zend_Cloud_QueueService_Adapter_SqsTest extends Zend_Cloud_QueueService_Te
      *
      * @return void
      */
-    public function setUp() 
+    public function setUp()
     {
         parent::setUp();
         // Isolate the tests from slow deletes
@@ -130,16 +128,16 @@ class Zend_Cloud_QueueService_Adapter_SqsTest extends Zend_Cloud_QueueService_Te
         $this->markTestSkipped('SQS does not currently support storing metadata');
     }
 
-    protected function _getConfig() 
+    protected function _getConfig()
     {
-        if (!defined('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ENABLED') 
-            || !constant('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ENABLED') 
-            || !defined('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ACCESSKEYID') 
+        if (!defined('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ENABLED')
+            || !constant('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ENABLED')
+            || !defined('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ACCESSKEYID')
             || !defined('TESTS_ZEND_SERVICE_AMAZON_ONLINE_SECRETKEY')
         ) {
-            $this->markTestSkipped("Amazon SQS access not configured, skipping test");        
-        }        
-        
+            $this->markTestSkipped("Amazon SQS access not configured, skipping test");
+        }
+
         $config = new Zend_Config(array(
             Zend_Cloud_QueueService_Factory::QUEUE_ADAPTER_KEY => 'Zend_Cloud_QueueService_Adapter_Sqs',
             Zend_Cloud_QueueService_Adapter_Sqs::AWS_ACCESS_KEY => constant('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ACCESSKEYID'),

tests/Zend/Cloud/QueueService/Adapter/WindowsAzureTest.php

@@ -24,8 +24,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Cloud_QueueService_Adapter_WindowsAzureTest::main");
 }
 
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
 /**
  * @see Zend_Cloud_QueueServiceTestCase
  */
@@ -53,7 +51,7 @@ class Zend_Cloud_QueueService_Adapter_WindowsAzureTest extends Zend_Cloud_QueueS
      */
     protected $_waitPeriod = 10;
 	protected $_clientType = 'Zend_Service_WindowsAzure_Storage_Queue';
-    
+
 	/**
      * Runs the test methods of this class.
      *
@@ -75,17 +73,17 @@ class Zend_Cloud_QueueService_Adapter_WindowsAzureTest extends Zend_Cloud_QueueS
     {
         parent::setUp();
         $this->_wait();
-    }    
-    
-    protected function _getConfig() 
+    }
+
+    protected function _getConfig()
     {
         if (!defined('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ENABLED') ||
             !constant('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ENABLED') ||
             !defined('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ACCOUNTNAME') ||
             !defined('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ACCOUNTKEY')) {
-            $this->markTestSkipped("Windows Azure access not configured, skipping test");        
-        }        
-        
+            $this->markTestSkipped("Windows Azure access not configured, skipping test");
+        }
+
         $config = new Zend_Config(array(
             Zend_Cloud_QueueService_Factory::QUEUE_ADAPTER_KEY => 'Zend_Cloud_QueueService_Adapter_WindowsAzure',
             Zend_Cloud_QueueService_Adapter_WindowsAzure::ACCOUNT_NAME => constant('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ACCOUNTNAME'),

tests/Zend/Cloud/QueueService/Adapter/ZendQueueTest.php

@@ -24,8 +24,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Cloud_QueueService_Adapter_ZendQueueTest::main");
 }
 
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
 /**
  * @see Zend_Cloud_QueueServiceTestCase
  */
@@ -43,7 +41,7 @@ require_once 'Zend/Cloud/QueueService/Adapter/ZendQueue.php';
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Cloud_QueueService_Adapter_ZendQueueTest 
+class Zend_Cloud_QueueService_Adapter_ZendQueueTest
     extends Zend_Cloud_QueueService_TestCase
 {
     /**
@@ -54,7 +52,7 @@ class Zend_Cloud_QueueService_Adapter_ZendQueueTest
      */
     protected $_waitPeriod = 0;
 	protected $_clientType = 'Zend_Queue';
-    
+
 	/**
      * Runs the test methods of this class.
      *
@@ -67,13 +65,13 @@ class Zend_Cloud_QueueService_Adapter_ZendQueueTest
         $result = PHPUnit_TextUI_TestRunner::run($suite);
     }
 
-    public function testPeekMessages() 
+    public function testPeekMessages()
     {
         $this->markTestSkipped('ZendQueue does not currently support peeking messages');
     }
-    
-    protected function _getConfig() 
-    {        
+
+    protected function _getConfig()
+    {
         $config = new Zend_Config(array(
             Zend_Cloud_QueueService_Factory::QUEUE_ADAPTER_KEY => 'Zend_Cloud_QueueService_Adapter_ZendQueue',
             Zend_Cloud_QueueService_Adapter_ZendQueue::ADAPTER => 'Array'
@@ -81,7 +79,7 @@ class Zend_Cloud_QueueService_Adapter_ZendQueueTest
 
         return $config;
     }
-    
+
 }
 
 if (PHPUnit_MAIN_METHOD == 'Zend_Cloud_QueueService_Adapter_ZendQueueTest::main') {

tests/Zend/Cloud/QueueService/AllTests.php

@@ -23,8 +23,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Cloud_Queue_AllTests::main');
 }
 
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
 require_once 'Zend/Cloud/QueueService/Adapter/AllTests.php';
 
 /**

tests/Zend/Cloud/QueueService/FactoryTest.php

@@ -24,8 +24,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Cloud_StorageService_FactoryTest::main");
 }
 
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
 /**
  * @see Zend_Config_Ini
  */
@@ -66,7 +64,7 @@ class Zend_Cloud_QueueService_FactoryTest extends PHPUnit_Framework_TestCase
         $this->assertTrue(is_string(Zend_Cloud_QueueService_Factory::QUEUE_ADAPTER_KEY));
     }
 
-    public function testGetAdapterWithConfig() 
+    public function testGetAdapterWithConfig()
     {
         // SQS adapter
         $sqsConfig = new Zend_Config_Ini(realpath(dirname(__FILE__) . '/_files/config/sqs.ini'));
@@ -84,7 +82,7 @@ class Zend_Cloud_QueueService_FactoryTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('Zend_Cloud_QueueService_Adapter_WindowsAzure', get_class($azureAdapter));
     }
 
-    public function testGetAdapterWithArray() 
+    public function testGetAdapterWithArray()
     {
         // No need to overdo it; we'll test the array config with just one adapter.
         $zqConfig = array(Zend_Cloud_QueueService_Factory::QUEUE_ADAPTER_KEY =>

tests/Zend/Cloud/QueueService/TestCase.php

@@ -19,7 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
 /**
  * @see Zend_Cloud_QueueService_Adapter
  */
@@ -77,12 +76,12 @@ abstract class Zend_Cloud_QueueService_TestCase extends PHPUnit_Framework_TestCa
         $this->_config = $this->_getConfig();
         $this->_commonQueue = Zend_Cloud_QueueService_Factory::getAdapter($this->_config);
     }
-    
+
     public function testGetClient()
     {
-    	$this->assertTrue(is_a($this->_commonQueue->getClient(), $this->_clientType)); 
+    	$this->assertTrue(is_a($this->_commonQueue->getClient(), $this->_clientType));
     }
-    
+
     public function testCreateQueue()
     {
         try {
@@ -262,7 +261,7 @@ abstract class Zend_Cloud_QueueService_TestCase extends PHPUnit_Framework_TestCa
             $texts = array($tests[0]->getBody(), $tests[1]->getBody());
             $this->assertContains($message1, $texts);
             $this->assertContains($message2, $texts);
-            
+
             $this->_commonQueue->deleteQueue($queueURL);
         } catch (Exception $e) {
             if (isset($queueURL)) {
@@ -299,7 +298,7 @@ abstract class Zend_Cloud_QueueService_TestCase extends PHPUnit_Framework_TestCa
             $receivedMessages2 = $this->_commonQueue->receiveMessages($queueURL);
             $this->assertType('Zend_Cloud_QueueService_MessageSet', $receivedMessages2);
 		    $this->assertEquals(0, count($receivedMessages2));
-			
+
 		    $this->_commonQueue->deleteQueue($queueURL);
         } catch (Exception $e) {
             if(isset($queueURL)) $this->_commonQueue->deleteQueue($queueURL);
@@ -345,7 +344,7 @@ abstract class Zend_Cloud_QueueService_TestCase extends PHPUnit_Framework_TestCa
 
     /**
      * Get adapter configuration for concrete test
-     * 
+     *
      * @returns Zend_Config
      */
     abstract protected function _getConfig();

tests/Zend/Cloud/StorageService/Adapter/AllTests.php

@@ -25,11 +25,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 }
 
 /**
- * Test helper
- */
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
-/**
  * @see Zend_Cloud_StorageService_Adapter_WindowsAzureTest
  */
 require_once 'Zend/Cloud/StorageService/Adapter/WindowsAzureTest.php';

tests/Zend/Cloud/StorageService/Adapter/FileSystemTest.php

@@ -24,8 +24,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Cloud_StorageService_Adapter_FileSystemTest::main");
 }
 
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
 /**
  * @see Zend_Cloud_StorageService_TestCase
  */
@@ -43,7 +41,7 @@ require_once 'Zend/Cloud/StorageService/Adapter/FileSystem.php';
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Cloud_StorageService_Adapter_FileSystemTest 
+class Zend_Cloud_StorageService_Adapter_FileSystemTest
     extends Zend_Cloud_StorageService_TestCase
 {
 	/**
@@ -63,7 +61,7 @@ class Zend_Cloud_StorageService_Adapter_FileSystemTest
      *
      * @return void
      */
-    public function setUp() 
+    public function setUp()
     {
         parent::setUp();
         // No need to wait
@@ -73,32 +71,32 @@ class Zend_Cloud_StorageService_Adapter_FileSystemTest
         // If the test directory exists, remove it and replace it
         if (file_exists($path)) {
             $this->_rmRecursive($path);
-        } 
+        }
         mkdir($path, 0755);
     }
-    
+
     public function testGetClient()
     {
-    	$this->assertTrue(is_string($this->_commonStorage->getClient())); 
+    	$this->assertTrue(is_string($this->_commonStorage->getClient()));
     }
-    
+
     public function testNoParams()
     {
 		$this->markTestSkipped('No config params needed for FileSystem');
     }
 
     // TODO: Create a custom test for FileSystem that checks fetchMetadata() with file system MD.
-    public function testFetchMetadata() 
+    public function testFetchMetadata()
     {
         $this->markTestIncomplete('FileSystem doesn\'t support writable metadata.');
     }
 
-    public function testStoreMetadata() 
+    public function testStoreMetadata()
     {
         $this->markTestSkipped('FileSystem doesn\'t support writable metadata.');
     }
 
-    public function testDeleteMetadata() 
+    public function testDeleteMetadata()
     {
         $this->markTestSkipped('FileSystem doesn\'t support writable metadata.');
     }
@@ -108,7 +106,7 @@ class Zend_Cloud_StorageService_Adapter_FileSystemTest
      *
      * @return void
      */
-    public function tearDown() 
+    public function tearDown()
     {
         $path = $this->_config->local_directory;
 
@@ -120,7 +118,7 @@ class Zend_Cloud_StorageService_Adapter_FileSystemTest
         parent::tearDown();
     }
 
-    protected function _rmRecursive($path) 
+    protected function _rmRecursive($path)
     {
         // Tidy up the path
         $path = realpath($path);
@@ -139,7 +137,7 @@ class Zend_Cloud_StorageService_Adapter_FileSystemTest
         }
     }
 
-    protected function _getConfig() 
+    protected function _getConfig()
     {
         $config = new Zend_Config(array(
             Zend_Cloud_StorageService_Factory::STORAGE_ADAPTER_KEY        => 'Zend_Cloud_StorageService_Adapter_Filesystem',

tests/Zend/Cloud/StorageService/Adapter/NirvanixTest.php

@@ -24,8 +24,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Cloud_StorageService_Adapter_NirvanixTest::main");
 }
 
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
 /**
  * @see Zend_Cloud_StorageService_TestCase
  */
@@ -58,13 +56,13 @@ class Zend_Cloud_StorageService_Adapter_NirvanixTest extends Zend_Cloud_StorageS
         $result = PHPUnit_TextUI_TestRunner::run($suite);
     }
 
-    public function testFetchItemStream() 
+    public function testFetchItemStream()
     {
         // The Nirvanix client library doesn't support streams
         $this->markTestSkipped('The Nirvanix client library doesn\'t support streams.');
     }
 
-    public function testStoreItemStream() 
+    public function testStoreItemStream()
     {
         // The Nirvanix client library doesn't support streams
         $this->markTestSkipped('The Nirvanix client library doesn\'t support streams.');
@@ -75,24 +73,24 @@ class Zend_Cloud_StorageService_Adapter_NirvanixTest extends Zend_Cloud_StorageS
      *
      * @return void
      */
-    public function setUp() 
+    public function setUp()
     {
         parent::setUp();
         $this->_waitPeriod = 5;
     }
 
-    protected function _getConfig() 
+    protected function _getConfig()
     {
-        if (!defined('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_ENABLED') 
-            || !constant('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_ENABLED') 
-            || !defined('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_USERNAME') 
-            || !defined('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_ACCESSKEY') 
-            || !defined('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_PASSWORD') 
+        if (!defined('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_ENABLED')
+            || !constant('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_ENABLED')
+            || !defined('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_USERNAME')
+            || !defined('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_ACCESSKEY')
+            || !defined('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_PASSWORD')
             || !defined('TESTS_ZEND_CLOUD_STORAGE_NIRVANIX_DIRECTORY')
         ) {
-            $this->markTestSkipped("Windows Azure access not configured, skipping test");        
-        }        
-        
+            $this->markTestSkipped("Windows Azure access not configured, skipping test");
+        }
+
         $config = new Zend_Config(array(
             Zend_Cloud_StorageService_Factory::STORAGE_ADAPTER_KEY       => 'Zend_Cloud_StorageService_Adapter_Nirvanix',
             Zend_Cloud_StorageService_Adapter_Nirvanix::USERNAME         => constant('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_USERNAME'),
@@ -100,7 +98,7 @@ class Zend_Cloud_StorageService_Adapter_NirvanixTest extends Zend_Cloud_StorageS
             Zend_Cloud_StorageService_Adapter_Nirvanix::PASSWORD         => constant('TESTS_ZEND_SERVICE_NIRVANIX_ONLINE_PASSWORD'),
             Zend_Cloud_StorageService_Adapter_Nirvanix::REMOTE_DIRECTORY => constant('TESTS_ZEND_CLOUD_STORAGE_NIRVANIX_DIRECTORY'),
         ));
-        
+
         return $config;
     }
 }

tests/Zend/Cloud/StorageService/Adapter/S3Test.php

@@ -24,8 +24,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Cloud_StorageService_Adapter_S3Test::main");
 }
 
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
 /**
  * @see Zend_Cloud_StorageService_TestCase
  */
@@ -42,7 +40,7 @@ require_once 'Zend/Cloud/StorageService/Adapter/S3.php';
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Cloud_StorageService_Adapter_S3Test 
+class Zend_Cloud_StorageService_Adapter_S3Test
     extends Zend_Cloud_StorageService_TestCase
 {
 	protected $_clientType = 'Zend_Service_Amazon_S3';
@@ -64,13 +62,13 @@ class Zend_Cloud_StorageService_Adapter_S3Test
      *
      * @return void
      */
-    public function setUp() 
+    public function setUp()
     {
         parent::setUp();
 
         // Create the bucket here
         $s3 = new Zend_Service_Amazon_S3(
-            $this->_config->get(Zend_Cloud_StorageService_Adapter_S3::AWS_ACCESS_KEY), 
+            $this->_config->get(Zend_Cloud_StorageService_Adapter_S3::AWS_ACCESS_KEY),
             $this->_config->get(Zend_Cloud_StorageService_Adapter_S3::AWS_SECRET_KEY)
         );
 
@@ -80,17 +78,17 @@ class Zend_Cloud_StorageService_Adapter_S3Test
     }
 
     // TODO: Create a custom test for S3 that checks fetchMetadata() with an object that has custom metadata.
-    public function testFetchMetadata() 
+    public function testFetchMetadata()
     {
         $this->markTestIncomplete('S3 doesn\'t support storing metadata after an item is created.');
     }
 
-    public function testStoreMetadata() 
+    public function testStoreMetadata()
     {
         $this->markTestSkipped('S3 doesn\'t support storing metadata after an item is created.');
     }
 
-    public function testDeleteMetadata() 
+    public function testDeleteMetadata()
     {
         $this->markTestSkipped('S3 doesn\'t support storing metadata after an item is created.');
     }
@@ -101,7 +99,7 @@ class Zend_Cloud_StorageService_Adapter_S3Test
      *
      * @return void
      */
-    public function tearDown() 
+    public function tearDown()
     {
         if (!$this->_config) {
             return;
@@ -109,7 +107,7 @@ class Zend_Cloud_StorageService_Adapter_S3Test
 
         // Delete the bucket here
         $s3 = new Zend_Service_Amazon_S3(
-            $this->_config->get(Zend_Cloud_StorageService_Adapter_S3::AWS_ACCESS_KEY), 
+            $this->_config->get(Zend_Cloud_StorageService_Adapter_S3::AWS_ACCESS_KEY),
             $this->_config->get(Zend_Cloud_StorageService_Adapter_S3::AWS_SECRET_KEY)
         );
         $s3->removeBucket(
@@ -118,17 +116,17 @@ class Zend_Cloud_StorageService_Adapter_S3Test
         parent::tearDown();
     }
 
-    protected function _getConfig() 
+    protected function _getConfig()
     {
-        if (!defined('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ENABLED') 
-            || !constant('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ENABLED') 
-            || !defined('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ACCESSKEYID') 
-            || !defined('TESTS_ZEND_SERVICE_AMAZON_ONLINE_SECRETKEY') 
+        if (!defined('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ENABLED')
+            || !constant('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ENABLED')
+            || !defined('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ACCESSKEYID')
+            || !defined('TESTS_ZEND_SERVICE_AMAZON_ONLINE_SECRETKEY')
             || !defined('TESTS_ZEND_SERVICE_AMAZON_S3_BUCKET')
         ) {
-            $this->markTestSkipped("Amazon S3 access not configured, skipping test");        
-        }        
-        
+            $this->markTestSkipped("Amazon S3 access not configured, skipping test");
+        }
+
         $config = new Zend_Config(array(
             Zend_Cloud_StorageService_Factory::STORAGE_ADAPTER_KEY => 'Zend_Cloud_StorageService_Adapter_S3',
             Zend_Cloud_StorageService_Adapter_S3::AWS_ACCESS_KEY   => constant('TESTS_ZEND_SERVICE_AMAZON_ONLINE_ACCESSKEYID'),

tests/Zend/Cloud/StorageService/Adapter/WindowsAzureTest.php

@@ -24,8 +24,6 @@ if (!defined("PHPUnit_MAIN_METHOD")) {
     define("PHPUnit_MAIN_METHOD", "Zend_Cloud_StorageService_Adapter_WindowsAzureTest::main");
 }
 
-require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-
 /**
  * @see Zend_Cloud_StorageService_TestCase
  */
@@ -59,17 +57,17 @@ class Zend_Cloud_StorageService_Adapter_WindowsAzureTest extends Zend_Cloud_Stor
         $result = PHPUnit_TextUI_TestRunner::run($suite);
     }
 
-    protected function _getConfig() 
+    protected function _getConfig()
     {
-        if (!defined('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ENABLED') 
-            || !constant('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ENABLED') 
-            || !defined('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ACCOUNTNAME') 
-            || !defined('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ACCOUNTKEY') 
+        if (!defined('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ENABLED')
+            || !constant('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ENABLED')
+            || !defined('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ACCOUNTNAME')
+            || !defined('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ACCOUNTKEY')
             || !defined('TESTS_ZEND_CLOUD_STORAGE_WINDOWSAZURE_CONTAINER')
         ) {
-            $this->markTestSkipped("Windows Azure access not configured, skipping test");        
-        }        
-        
+            $this->markTestSkipped("Windows Azure access not configured, skipping test");
+        }
+
         $config = new Zend_Config(array(
             Zend_Cloud_StorageService_Factory::STORAGE_ADAPTER_KEY => 'Zend_Cloud_StorageService_Adapter_WindowsAzure',
             Zend_Cloud_StorageService_Adapter_WindowsAzure::ACCOUNT_NAME => constant('TESTS_ZEND_SERVICE_WINDOWSAZURE_ONLINE_ACCOUNTNAME'),

tests/Zend/Cloud/StorageService/AllTests.php

@@ -23,8 +23,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Zend_Cloud_StorageService_AllTests::main');
 }
 
-require_once dirname(__FILE__) . '/../../../TestHelper.php';
-
 require_once 'Zend/Cloud/StorageService/Adapter/AllTests.php';
 
 /**