ZF-10354

- Fixed TestConfiguration.php.dist to disable tests
- Fixed AllTests to include all testcase files
- Removed main() functions from tests cases
- Fixed suite creation to not fail tests with __CLASS__ passed as param
- Properly markTestSkipped() when tests are disabled
- Removed superfluous require_onces (PHPUnit assests & TestConfiguration.php.dist)



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

tests/TestConfiguration.php.dist

@@ -675,7 +675,7 @@ define('TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_KEY_PROD',                'I+ebY
 /**
  * Blob storage tests
  */
-define('TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS',                   true);
+define('TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS',                   false);
 define('TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNONPROD',                  false);
 define('TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNLARGEBLOB',               true);
 define('TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_CONTAINER_PREFIX',           'phpazuretestblob');
@@ -685,28 +685,28 @@ define('TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOBSA_CONTAINER_PREFIX',         'phpaz
 /**
  * Table storage tests
  */
-define('TESTS_ZEND_SERVICE_WINDOWSAZURE_TABLE_RUNTESTS',                  true);
+define('TESTS_ZEND_SERVICE_WINDOWSAZURE_TABLE_RUNTESTS',                  false);
 define('TESTS_ZEND_SERVICE_WINDOWSAZURE_TABLE_RUNONPROD',                 false);
 define('TESTS_ZEND_SERVICE_WINDOWSAZURE_TABLE_TABLENAME_PREFIX',          'phpazuretesttable');
 
 /**
  * Queue storage tests
  */
-define('TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS',                  true);
+define('TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS',                  false);
 define('TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNONPROD',                 false);
 define('TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_PREFIX',                    'phpazuretestqueue');
 
 /**
  * SessionHandler tests
  */
-define('TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS',         true);
+define('TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS',         false);
 define('TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNONPROD',        false);
 define('TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_TABLENAME_PREFIX', 'phpazuretestsession');
 
 /**
  * Diagnostics tests
  */
-define('TESTS_ZEND_SERVICE_WINDOWSAZURE_DIAGNOSTICS_RUNTESTS',            true);
+define('TESTS_ZEND_SERVICE_WINDOWSAZURE_DIAGNOSTICS_RUNTESTS',            false);
 define('TESTS_ZEND_SERVICE_WINDOWSAZURE_DIAGNOSTICS_RUNONPROD',           false);
 define('TESTS_ZEND_SERVICE_WINDOWSAZURE_DIAGNOSTICS_CONTAINER_PREFIX',    'phpazuretestdiag');
 

tests/Zend/Service/WindowsAzure/AllTests.php

@@ -25,10 +25,6 @@
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_AllTests::main');
-}
-
 require_once 'Zend/Service/WindowsAzure/Credentials/AllTests.php';
 require_once 'Zend/Service/WindowsAzure/Diagnostics/AllTests.php';
 require_once 'Zend/Service/WindowsAzure/RetryPolicyTest.php';
@@ -53,41 +49,26 @@ require_once 'Zend/Service/WindowsAzure/SessionHandlerTest.php';
  */
 class Zend_Service_WindowsAzure_AllTests
 {
-    public static function main()
-    {
-        PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
 
     public static function suite()
     {
-        $suite = new PHPUnit_Framework_TestSuite(__CLASS__);
+        $suite = new PHPUnit_Framework_TestSuite();
 
         $suite->addTest(Zend_Service_WindowsAzure_Credentials_AllTests::suite());
         $suite->addTest(Zend_Service_WindowsAzure_Diagnostics_AllTests::suite());
         
         $suite->addTestSuite('Zend_Service_WindowsAzure_RetryPolicyTest');
         $suite->addTestSuite('Zend_Service_WindowsAzure_StorageTest');
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $suite->addTestSuite('Zend_Service_WindowsAzure_BlobStorageTest');
-            $suite->addTestSuite('Zend_Service_WindowsAzure_BlobStorageSharedAccessTest');
-            $suite->addTestSuite('Zend_Service_WindowsAzure_BlobStreamTest');
-        }
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_TABLE_RUNTESTS) {
-            $suite->addTestSuite('Zend_Service_WindowsAzure_TableEntityTest');
-            $suite->addTestSuite('Zend_Service_WindowsAzure_DynamicTableEntityTest');
-            $suite->addTestSuite('Zend_Service_WindowsAzure_TableEntityQueryTest');
-            $suite->addTestSuite('Zend_Service_WindowsAzure_TableStorageTest');
-        }
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS) {
-            $suite->addTestSuite('Zend_Service_WindowsAzure_QueueStorageTest');
-        }
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS) {
-            $suite->addTestSuite('Zend_Service_WindowsAzure_SessionHandlerTest');
-        }
+        $suite->addTestSuite('Zend_Service_WindowsAzure_BlobStorageTest');
+        $suite->addTestSuite('Zend_Service_WindowsAzure_BlobStorageSharedAccessTest');
+        $suite->addTestSuite('Zend_Service_WindowsAzure_BlobStreamTest');
+        $suite->addTestSuite('Zend_Service_WindowsAzure_TableEntityTest');
+        $suite->addTestSuite('Zend_Service_WindowsAzure_DynamicTableEntityTest');
+        $suite->addTestSuite('Zend_Service_WindowsAzure_TableEntityQueryTest');
+        $suite->addTestSuite('Zend_Service_WindowsAzure_TableStorageTest');
+        $suite->addTestSuite('Zend_Service_WindowsAzure_QueueStorageTest');
+        $suite->addTestSuite('Zend_Service_WindowsAzure_SessionHandlerTest');
         return $suite;
     }
 }
 
-if (PHPUnit_MAIN_METHOD == 'Zend_Service_WindowsAzure_AllTests::main') {
-    Zend_Service_WindowsAzure_AllTests::main();
-}

tests/Zend/Service/WindowsAzure/BlobStorageSharedAccessTest.php

@@ -20,16 +20,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_BlobStorageSharedAccessTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage_Blob */
 require_once 'Zend/Service/WindowsAzure/Storage/Blob.php';
@@ -47,26 +41,21 @@ require_once 'Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php';
  */
 class Zend_Service_WindowsAzure_BlobStorageSharedAccessTest extends PHPUnit_Framework_TestCase
 {
-    static $path;
+    static protected $path;
     
     public function __construct()
     {
         self::$path = dirname(__FILE__).'/_files/';
     }
     
-    public static function main()
-    {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $suite  = new PHPUnit_Framework_TestSuite("Zend_Service_WindowsAzure_BlobStorageSharedAccessTest");
-            $result = PHPUnit_TextUI_TestRunner::run($suite);
-        }
-    }
-   
     /**
      * Test setup
      */
     protected function setUp()
     {
+        if (!TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
+            $this->markTestSkipped('This test case requires TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS to be enabled in TestConfiguration.php');
+        }
     }
     
     /**
@@ -74,6 +63,10 @@ class Zend_Service_WindowsAzure_BlobStorageSharedAccessTest extends PHPUnit_Fram
      */
     protected function tearDown()
     {
+        if ($this->status == PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED) {
+            return;
+        }
+        
         $storageClient = $this->createAdministrativeStorageInstance();
         for ($i = 1; $i <= self::$uniqId; $i++)
         {
@@ -133,46 +126,44 @@ class Zend_Service_WindowsAzure_BlobStorageSharedAccessTest extends PHPUnit_Fram
      */
     public function testSharedAccess_OnlyWrite()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            
-            // Account owner performs this part
-            $administrativeStorageClient = $this->createAdministrativeStorageInstance();
-            $administrativeStorageClient->createContainer($containerName);
-            
-            $sharedAccessUrl = $administrativeStorageClient->generateSharedAccessUrl(
-                $containerName,
-                '',
-            	'c', 
-            	'w',
-            	$administrativeStorageClient->isoDate(time() - 500),
-            	$administrativeStorageClient->isoDate(time() + 3000)
-            );
+        $containerName = $this->generateName();
+        
+        // Account owner performs this part
+        $administrativeStorageClient = $this->createAdministrativeStorageInstance();
+        $administrativeStorageClient->createContainer($containerName);
+        
+        $sharedAccessUrl = $administrativeStorageClient->generateSharedAccessUrl(
+            $containerName,
+            '',
+        	'c', 
+        	'w',
+        	$administrativeStorageClient->isoDate(time() - 500),
+        	$administrativeStorageClient->isoDate(time() + 3000)
+        );
 
-            
-            // Reduced permissions user performs this part
-            $storageClient = $this->createStorageInstance();
-            $credentials = $storageClient->getCredentials();
-            $credentials->setPermissionSet(array(
-                $sharedAccessUrl
-            ));
+        
+        // Reduced permissions user performs this part
+        $storageClient = $this->createStorageInstance();
+        $credentials = $storageClient->getCredentials();
+        $credentials->setPermissionSet(array(
+            $sharedAccessUrl
+        ));
 
-            $result = $storageClient->putBlob($containerName, 'images/WindowsAzure.gif', self::$path . 'WindowsAzure.gif');
-    
-            $this->assertEquals($containerName, $result->Container);
-            $this->assertEquals('images/WindowsAzure.gif', $result->Name);
-            
-            
-            
-            // Now make sure reduced permissions user can not view the uploaded blob
-            $exceptionThrown = false;
-            try {
-                $storageClient->getBlob($containerName, 'images/WindowsAzure.gif', self::$path . 'WindowsAzure.gif');
-            } catch (Exception $ex) {
-                $exceptionThrown = true;
-            }
-            $this->assertTrue($exceptionThrown);
+        $result = $storageClient->putBlob($containerName, 'images/WindowsAzure.gif', self::$path . 'WindowsAzure.gif');
+
+        $this->assertEquals($containerName, $result->Container);
+        $this->assertEquals('images/WindowsAzure.gif', $result->Name);
+        
+        
+        
+        // Now make sure reduced permissions user can not view the uploaded blob
+        $exceptionThrown = false;
+        try {
+            $storageClient->getBlob($containerName, 'images/WindowsAzure.gif', self::$path . 'WindowsAzure.gif');
+        } catch (Exception $ex) {
+            $exceptionThrown = true;
         }
+        $this->assertTrue($exceptionThrown);
     }
     
     /**
@@ -180,44 +171,38 @@ class Zend_Service_WindowsAzure_BlobStorageSharedAccessTest extends PHPUnit_Fram
      */
     public function testDifferentAccounts()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            
-            // Account owner performs this part
-            $administrativeStorageClient = $this->createAdministrativeStorageInstance();
-            $administrativeStorageClient->createContainer($containerName);
-            
-            $sharedAccessUrl1 = $administrativeStorageClient->generateSharedAccessUrl(
-                $containerName,
-                '',
-            	'c', 
-            	'w',
-            	$administrativeStorageClient->isoDate(time() - 500),
-            	$administrativeStorageClient->isoDate(time() + 3000)
-            );
-            $sharedAccessUrl2 = str_replace($administrativeStorageClient->getAccountName(), 'bogusaccount', $sharedAccessUrl1);
+        $containerName = $this->generateName();
+        
+        // Account owner performs this part
+        $administrativeStorageClient = $this->createAdministrativeStorageInstance();
+        $administrativeStorageClient->createContainer($containerName);
+        
+        $sharedAccessUrl1 = $administrativeStorageClient->generateSharedAccessUrl(
+            $containerName,
+            '',
+        	'c', 
+        	'w',
+        	$administrativeStorageClient->isoDate(time() - 500),
+        	$administrativeStorageClient->isoDate(time() + 3000)
+        );
+        $sharedAccessUrl2 = str_replace($administrativeStorageClient->getAccountName(), 'bogusaccount', $sharedAccessUrl1);
 
-            
-            // Reduced permissions user performs this part and should fail,
-            // because different accounts have been used
-            $storageClient = $this->createStorageInstance();
-            $credentials = $storageClient->getCredentials();
+        
+        // Reduced permissions user performs this part and should fail,
+        // because different accounts have been used
+        $storageClient = $this->createStorageInstance();
+        $credentials = $storageClient->getCredentials();
 
-            $exceptionThrown = false;
-            try {
-	            $credentials->setPermissionSet(array(
-	                $sharedAccessUrl1,
-	                $sharedAccessUrl2
-	            ));
-            } catch (Exception $ex) {
-                $exceptionThrown = true;
-            }
-            $this->assertTrue($exceptionThrown);
+        $exceptionThrown = false;
+        try {
+            $credentials->setPermissionSet(array(
+                $sharedAccessUrl1,
+                $sharedAccessUrl2
+            ));
+        } catch (Exception $ex) {
+            $exceptionThrown = true;
         }
+        $this->assertTrue($exceptionThrown);
     }
 }
 
-// Call Zend_Service_WindowsAzure_BlobStorageSharedAccessTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_BlobStorageSharedAccessTest::main") {
-    Zend_Service_WindowsAzure_BlobStorageSharedAccessTest::main();
-}

tests/Zend/Service/WindowsAzure/BlobStreamTest.php

@@ -20,16 +20,11 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_BlobStreamTest::main');
-}
 
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage_Blob */
 require_once 'Zend/Service/WindowsAzure/Storage/Blob.php';
@@ -44,26 +39,23 @@ require_once 'Zend/Service/WindowsAzure/Storage/Blob.php';
  */
 class Zend_Service_WindowsAzure_BlobStreamTest extends PHPUnit_Framework_TestCase
 {
-    static $path;
+    static protected $path;
+
+    protected static $uniqId = 0;
     
     public function __construct()
     {
         self::$path = dirname(__FILE__).'/_files/';
     }
-    
-    public static function main()
-    {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $suite  = new PHPUnit_Framework_TestSuite("Zend_Service_WindowsAzure_BlobStreamTest");
-            $result = PHPUnit_TextUI_TestRunner::run($suite);
-        }
-    }
    
     /**
      * Test setup
      */
     protected function setUp()
     {
+        if (!TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
+            $this->markTestSkipped('This test case must be enabled by TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS in TestConfiguration.php');
+        }
     }
     
     /**
@@ -71,6 +63,10 @@ class Zend_Service_WindowsAzure_BlobStreamTest extends PHPUnit_Framework_TestCas
      */
     protected function tearDown()
     {
+        if ($this->status == PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED) {
+            return;
+        }
+        
         $storageClient = $this->createStorageInstance();
         for ($i = 1; $i <= self::$uniqId; $i++)
         {
@@ -95,8 +91,6 @@ class Zend_Service_WindowsAzure_BlobStreamTest extends PHPUnit_Framework_TestCas
         return $storageClient;
     }
     
-    protected static $uniqId = 0;
-    
     protected function generateName()
     {
         self::$uniqId++;
@@ -108,23 +102,21 @@ class Zend_Service_WindowsAzure_BlobStreamTest extends PHPUnit_Framework_TestCas
      */
     public function testReadFile()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $fileName = 'azure://' . $containerName . '/test.txt';
-            
-            $storageClient = $this->createStorageInstance();
-            $storageClient->registerStreamWrapper();
-            
-            $fh = fopen($fileName, 'w');
-            fwrite($fh, "Hello world!");
-            fclose($fh);
-            
-            $result = file_get_contents($fileName);
-            
-            $storageClient->unregisterStreamWrapper();
-            
-            $this->assertEquals('Hello world!', $result);
-        }
+        $containerName = $this->generateName();
+        $fileName = 'azure://' . $containerName . '/test.txt';
+        
+        $storageClient = $this->createStorageInstance();
+        $storageClient->registerStreamWrapper();
+        
+        $fh = fopen($fileName, 'w');
+        fwrite($fh, "Hello world!");
+        fclose($fh);
+        
+        $result = file_get_contents($fileName);
+        
+        $storageClient->unregisterStreamWrapper();
+        
+        $this->assertEquals('Hello world!', $result);
     }
     
     /**
@@ -132,22 +124,20 @@ class Zend_Service_WindowsAzure_BlobStreamTest extends PHPUnit_Framework_TestCas
      */
     public function testWriteFile()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $fileName = 'azure://' . $containerName . '/test.txt';
-            
-            $storageClient = $this->createStorageInstance();
-            $storageClient->registerStreamWrapper();
-            
-            $fh = fopen($fileName, 'w');
-            fwrite($fh, "Hello world!");
-            fclose($fh);
-            
-            $storageClient->unregisterStreamWrapper();
-            
-            $instance = $storageClient->getBlobInstance($containerName, 'test.txt');
-            $this->assertEquals('test.txt', $instance->Name);
-        }
+        $containerName = $this->generateName();
+        $fileName = 'azure://' . $containerName . '/test.txt';
+        
+        $storageClient = $this->createStorageInstance();
+        $storageClient->registerStreamWrapper();
+        
+        $fh = fopen($fileName, 'w');
+        fwrite($fh, "Hello world!");
+        fclose($fh);
+        
+        $storageClient->unregisterStreamWrapper();
+        
+        $instance = $storageClient->getBlobInstance($containerName, 'test.txt');
+        $this->assertEquals('test.txt', $instance->Name);
     }
     
     /**
@@ -155,24 +145,23 @@ class Zend_Service_WindowsAzure_BlobStreamTest extends PHPUnit_Framework_TestCas
      */
     public function testUnlinkFile()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $fileName = 'azure://' . $containerName . '/test.txt';
-            
-            $storageClient = $this->createStorageInstance();
-            $storageClient->registerStreamWrapper();
-            
-            $fh = fopen($fileName, 'w');
-            fwrite($fh, "Hello world!");
-            fclose($fh);
-            
-            unlink($fileName);
-            
-            $storageClient->unregisterStreamWrapper();
-            
-            $result = $storageClient->listBlobs($containerName);
-            $this->assertEquals(0, count($result));
-        }
+
+        $containerName = $this->generateName();
+        $fileName = 'azure://' . $containerName . '/test.txt';
+        
+        $storageClient = $this->createStorageInstance();
+        $storageClient->registerStreamWrapper();
+        
+        $fh = fopen($fileName, 'w');
+        fwrite($fh, "Hello world!");
+        fclose($fh);
+        
+        unlink($fileName);
+        
+        $storageClient->unregisterStreamWrapper();
+        
+        $result = $storageClient->listBlobs($containerName);
+        $this->assertEquals(0, count($result));
     }
     
     /**
@@ -180,25 +169,24 @@ class Zend_Service_WindowsAzure_BlobStreamTest extends PHPUnit_Framework_TestCas
      */
     public function testCopyFile()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $sourceFileName = 'azure://' . $containerName . '/test.txt';
-            $destinationFileName = 'azure://' . $containerName . '/test2.txt';
-            
-            $storageClient = $this->createStorageInstance();
-            $storageClient->registerStreamWrapper();
-            
-            $fh = fopen($sourceFileName, 'w');
-            fwrite($fh, "Hello world!");
-            fclose($fh);
 
-            copy($sourceFileName, $destinationFileName);
+        $containerName = $this->generateName();
+        $sourceFileName = 'azure://' . $containerName . '/test.txt';
+        $destinationFileName = 'azure://' . $containerName . '/test2.txt';
+        
+        $storageClient = $this->createStorageInstance();
+        $storageClient->registerStreamWrapper();
+        
+        $fh = fopen($sourceFileName, 'w');
+        fwrite($fh, "Hello world!");
+        fclose($fh);
 
-            $storageClient->unregisterStreamWrapper();
-            
-            $instance = $storageClient->getBlobInstance($containerName, 'test2.txt');
-            $this->assertEquals('test2.txt', $instance->Name);
-        }
+        copy($sourceFileName, $destinationFileName);
+
+        $storageClient->unregisterStreamWrapper();
+        
+        $instance = $storageClient->getBlobInstance($containerName, 'test2.txt');
+        $this->assertEquals('test2.txt', $instance->Name);
     }
     
     /**
@@ -206,25 +194,23 @@ class Zend_Service_WindowsAzure_BlobStreamTest extends PHPUnit_Framework_TestCas
      */
     public function testRenameFile()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $sourceFileName = 'azure://' . $containerName . '/test.txt';
-            $destinationFileName = 'azure://' . $containerName . '/test2.txt';
-            
-            $storageClient = $this->createStorageInstance();
-            $storageClient->registerStreamWrapper();
-            
-            $fh = fopen($sourceFileName, 'w');
-            fwrite($fh, "Hello world!");
-            fclose($fh);
-            
-            rename($sourceFileName, $destinationFileName);
-            
-            $storageClient->unregisterStreamWrapper();
-            
-            $instance = $storageClient->getBlobInstance($containerName, 'test2.txt');
-            $this->assertEquals('test2.txt', $instance->Name);
-        }
+        $containerName = $this->generateName();
+        $sourceFileName = 'azure://' . $containerName . '/test.txt';
+        $destinationFileName = 'azure://' . $containerName . '/test2.txt';
+        
+        $storageClient = $this->createStorageInstance();
+        $storageClient->registerStreamWrapper();
+        
+        $fh = fopen($sourceFileName, 'w');
+        fwrite($fh, "Hello world!");
+        fclose($fh);
+        
+        rename($sourceFileName, $destinationFileName);
+        
+        $storageClient->unregisterStreamWrapper();
+        
+        $instance = $storageClient->getBlobInstance($containerName, 'test2.txt');
+        $this->assertEquals('test2.txt', $instance->Name);
     }
     
     /**
@@ -232,21 +218,19 @@ class Zend_Service_WindowsAzure_BlobStreamTest extends PHPUnit_Framework_TestCas
      */
     public function testMkdir()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            
-            $storageClient = $this->createStorageInstance();
-            $storageClient->registerStreamWrapper();
-            
-            mkdir('azure://' . $containerName);
-            
-            $storageClient->unregisterStreamWrapper();
-            
-            $result = $storageClient->listContainers();
-            
-            $this->assertEquals(1, count($result));
-            $this->assertEquals($containerName, $result[0]->Name);
-        }
+        $containerName = $this->generateName();
+        
+        $storageClient = $this->createStorageInstance();
+        $storageClient->registerStreamWrapper();
+        
+        mkdir('azure://' . $containerName);
+        
+        $storageClient->unregisterStreamWrapper();
+        
+        $result = $storageClient->listContainers();
+        
+        $this->assertEquals(1, count($result));
+        $this->assertEquals($containerName, $result[0]->Name);
     }
     
     /**
@@ -254,61 +238,53 @@ class Zend_Service_WindowsAzure_BlobStreamTest extends PHPUnit_Framework_TestCas
      */
     public function testRmdir()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            
-            $storageClient = $this->createStorageInstance();
-            $storageClient->registerStreamWrapper();
-            
-            mkdir('azure://' . $containerName);
-            rmdir('azure://' . $containerName);
-            
-            $storageClient->unregisterStreamWrapper();
-            
-            $result = $storageClient->listContainers();
-            
-            $this->assertEquals(0, count($result));
-        }
-    } 
+
+        $containerName = $this->generateName();
+        
+        $storageClient = $this->createStorageInstance();
+        $storageClient->registerStreamWrapper();
+        
+        mkdir('azure://' . $containerName);
+        rmdir('azure://' . $containerName);
+        
+        $storageClient->unregisterStreamWrapper();
+        
+        $result = $storageClient->listContainers();
+        
+        $this->assertEquals(0, count($result));
+    }
     
     /**
      * Test opendir
      */
     public function testOpendir()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createContainer($containerName);
-            
-            $storageClient->putBlob($containerName, 'images/WindowsAzure1.gif', self::$path . 'WindowsAzure.gif');
-            $storageClient->putBlob($containerName, 'images/WindowsAzure2.gif', self::$path . 'WindowsAzure.gif');
-            $storageClient->putBlob($containerName, 'images/WindowsAzure3.gif', self::$path . 'WindowsAzure.gif');
-            $storageClient->putBlob($containerName, 'images/WindowsAzure4.gif', self::$path . 'WindowsAzure.gif');
-            $storageClient->putBlob($containerName, 'images/WindowsAzure5.gif', self::$path . 'WindowsAzure.gif');
-            
-            $result1 = $storageClient->listBlobs($containerName);
-  
-            $storageClient->registerStreamWrapper();
-            
-            $result2 = array();
-            if ($handle = opendir('azure://' . $containerName)) {
-                while (false !== ($file = readdir($handle))) {
-                    $result2[] = $file;
-                }
-                closedir($handle);
+        $containerName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createContainer($containerName);
+        
+        $storageClient->putBlob($containerName, 'images/WindowsAzure1.gif', self::$path . 'WindowsAzure.gif');
+        $storageClient->putBlob($containerName, 'images/WindowsAzure2.gif', self::$path . 'WindowsAzure.gif');
+        $storageClient->putBlob($containerName, 'images/WindowsAzure3.gif', self::$path . 'WindowsAzure.gif');
+        $storageClient->putBlob($containerName, 'images/WindowsAzure4.gif', self::$path . 'WindowsAzure.gif');
+        $storageClient->putBlob($containerName, 'images/WindowsAzure5.gif', self::$path . 'WindowsAzure.gif');
+        
+        $result1 = $storageClient->listBlobs($containerName);
+
+        $storageClient->registerStreamWrapper();
+        
+        $result2 = array();
+        if ($handle = opendir('azure://' . $containerName)) {
+            while (false !== ($file = readdir($handle))) {
+                $result2[] = $file;
             }
-            
-            $storageClient->unregisterStreamWrapper();
-            
-            $result = $storageClient->listContainers();
-            
-            $this->assertEquals(count($result1), count($result2));
+            closedir($handle);
         }
-    } 
-}
-
-// Call Zend_Service_WindowsAzure_BlobStreamTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_BlobStreamTest::main") {
-    Zend_Service_WindowsAzure_BlobStreamTest::main();
+        
+        $storageClient->unregisterStreamWrapper();
+        
+        $result = $storageClient->listContainers();
+        
+        $this->assertEquals(count($result1), count($result2));
+    }
 }

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

@@ -25,10 +25,6 @@
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_Credentials_AllTests::main');
-}
-
 require_once 'Zend/Service/WindowsAzure/Credentials/SharedKeyTest.php';
 require_once 'Zend/Service/WindowsAzure/Credentials/SharedKeyLiteTest.php';
 require_once 'Zend/Service/WindowsAzure/Credentials/SharedAccessSignatureTest.php';
@@ -43,14 +39,9 @@ require_once 'Zend/Service/WindowsAzure/Credentials/SharedAccessSignatureTest.ph
  */
 class Zend_Service_WindowsAzure_Credentials_AllTests
 {
-    public static function main()
-    {
-        PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
     public static function suite()
     {
-        $suite = new PHPUnit_Framework_TestSuite(__CLASS__);
+        $suite = new PHPUnit_Framework_TestSuite();
 
         $suite->addTestSuite('Zend_Service_WindowsAzure_Credentials_SharedKeyTest');
         $suite->addTestSuite('Zend_Service_WindowsAzure_Credentials_SharedKeyLiteTest');
@@ -59,7 +50,3 @@ class Zend_Service_WindowsAzure_Credentials_AllTests
         return $suite;
     }
 }
-
-if (PHPUnit_MAIN_METHOD == 'Zend_Service_WindowsAzure_Credentials_AllTests::main') {
-    Zend_Service_WindowsAzure_Credentials_AllTests::main();
-}

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

@@ -20,16 +20,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_Credentials_SharedAccessSignatureTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Credentials_SharedAccessSignature */
 require_once 'Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php';
@@ -44,11 +38,6 @@ require_once 'Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php';
  */
 class Zend_Service_WindowsAzure_Credentials_SharedAccessSignatureTest extends PHPUnit_Framework_TestCase
 {
-    public static function main()
-    {
-        $suite  = new PHPUnit_Framework_TestSuite("Zend_Service_WindowsAzure_Credentials_SharedAccessSignatureTest");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
     
     /**
      * Test signing a container
@@ -136,8 +125,3 @@ class Zend_Service_WindowsAzure_Credentials_SharedAccessSignatureTest extends PH
         $this->assertEquals('http://blob.core.windows.net/myaccount/pictures/blob.txt?comp=metadata&' . $queryString, $result);
     }
 }
-
-// Call Zend_Service_WindowsAzure_Credentials_SharedAccessSignatureTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_Credentials_SharedAccessSignatureTest::main") {
-    Zend_Service_WindowsAzure_Credentials_SharedAccessSignatureTest::main();
-}

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

@@ -20,16 +20,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_Credentials_SharedKeyLiteTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Credentials_SharedKeyLite */
 require_once 'Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php';
@@ -44,11 +38,6 @@ require_once 'Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php';
  */
 class Zend_Service_WindowsAzure_Credentials_SharedKeyLiteTest extends PHPUnit_Framework_TestCase
 {
-    public static function main()
-    {
-        $suite  = new PHPUnit_Framework_TestSuite("Zend_Service_WindowsAzure_Credentials_SharedKeyLiteTest");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
 
     /**
      * Test signing for devstore with root path
@@ -164,8 +153,3 @@ class Zend_Service_WindowsAzure_Credentials_SharedKeyLiteTest extends PHPUnit_Fr
         $this->assertEquals("SharedKeyLite testing:vZdOn/j0gW5FG0kAUG9NhSBO9eBjZqfe6RwALPYUtqU=", $signedHeaders["Authorization"]);
     }
 }
-
-// Call Zend_Service_WindowsAzure_Credentials_SharedKeyLiteTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_Credentials_SharedKeyLiteTest::main") {
-    Zend_Service_WindowsAzure_Credentials_SharedKeyLiteTest::main();
-}

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

@@ -20,16 +20,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_Credentials_SharedKeyTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Credentials_SharedKey */
 require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php';
@@ -44,11 +38,6 @@ require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php';
  */
 class Zend_Service_WindowsAzure_Credentials_SharedKeyTest extends PHPUnit_Framework_TestCase
 {
-    public static function main()
-    {
-        $suite  = new PHPUnit_Framework_TestSuite("Zend_Service_WindowsAzure_Credentials_SharedKeyTest");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
 
     /**
      * Test signing for devstore with root path
@@ -164,8 +153,3 @@ class Zend_Service_WindowsAzure_Credentials_SharedKeyTest extends PHPUnit_Framew
         $this->assertEquals("SharedKey testing:vlfVjEbBaRVTv35e924cR4B/Z5zCaSYjbtMz9/k3UCY=", $signedHeaders["Authorization"]);
     }
 }
-
-// Call Zend_Service_WindowsAzure_Credentials_SharedKeyTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_Credentials_SharedKeyTest::main") {
-    Zend_Service_WindowsAzure_Credentials_SharedKeyTest::main();
-}

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

@@ -25,10 +25,6 @@
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_Diagnostics_AllTests::main');
-}
-
 require_once 'Zend/Service/WindowsAzure/Diagnostics/ManagerTest.php';
 
 /**
@@ -41,21 +37,13 @@ require_once 'Zend/Service/WindowsAzure/Diagnostics/ManagerTest.php';
  */
 class Zend_Service_WindowsAzure_Diagnostics_AllTests
 {
-    public static function main()
-    {
-        PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
 
     public static function suite()
     {
-        $suite = new PHPUnit_Framework_TestSuite(__CLASS__);
+        $suite = new PHPUnit_Framework_TestSuite();
 
         $suite->addTestSuite('Zend_Service_WindowsAzure_Diagnostics_ManagerTest');
         
         return $suite;
     }
 }
-
-if (PHPUnit_MAIN_METHOD == 'Zend_Service_WindowsAzure_Diagnostics_AllTests::main') {
-    Zend_Service_WindowsAzure_Diagnostics_AllTests::main();
-}

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

@@ -20,16 +20,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_Diagnostics_ManagerTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage_Blob */
 require_once 'Zend/Service/WindowsAzure/Storage/Blob.php';
@@ -50,17 +44,25 @@ require_once 'Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php';
  */
 class Zend_Service_WindowsAzure_Diagnostics_ManagerTest extends PHPUnit_Framework_TestCase
 {
-    public static function main()
+
+    protected static $uniqId = 0;
+    
+    protected function setup()
     {
-        $suite  = new PHPUnit_Framework_TestSuite("Zend_Service_WindowsAzure_Diagnostics_ManagerTest");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
+        if (!TESTS_ZEND_SERVICE_WINDOWSAZURE_DIAGNOSTICS_RUNTESTS) {
+            $this->markTestSkipped('Skipping Diagnostic tests, to enable set TESTS_ZEND_SERVICE_WINDOWSAZURE_DIAGNOSTICS_RUNTESTS to true in TestConfiguration.php');
+        }
     }
-
+    
     /**
      * Test teardown
      */
     protected function tearDown()
     {
+        if ($this->status == PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED) {
+            return;
+        }
+        
         $storageClient = $this->createStorageInstance();
         for ($i = 1; $i <= self::$uniqId; $i++)
         {
@@ -85,8 +87,6 @@ class Zend_Service_WindowsAzure_Diagnostics_ManagerTest extends PHPUnit_Framewor
         return $storageClient;
     }
     
-    protected static $uniqId = 0;
-    
     protected function generateName()
     {
         self::$uniqId++;
@@ -98,15 +98,13 @@ class Zend_Service_WindowsAzure_Diagnostics_ManagerTest extends PHPUnit_Framewor
      */
     public function testManagerInitialize()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_DIAGNOSTICS_RUNTESTS) {
-    		$controlContainer = $this->generateName();
-    		
-    		$storageClient = $this->createStorageInstance();
-            $manager = new Zend_Service_WindowsAzure_Diagnostics_Manager($storageClient, $controlContainer);
-            
-            $result = $storageClient->containerExists($controlContainer);
-            $this->assertTrue($result);
-    	}
+		$controlContainer = $this->generateName();
+		
+		$storageClient = $this->createStorageInstance();
+        $manager = new Zend_Service_WindowsAzure_Diagnostics_Manager($storageClient, $controlContainer);
+        
+        $result = $storageClient->containerExists($controlContainer);
+        $this->assertTrue($result);
     }
     
 	/**
@@ -114,17 +112,15 @@ class Zend_Service_WindowsAzure_Diagnostics_ManagerTest extends PHPUnit_Framewor
      */
     public function testManagerDefaultConfiguration()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_DIAGNOSTICS_RUNTESTS) {
-    		$controlContainer = $this->generateName();
-    		
-    		$storageClient = $this->createStorageInstance();
-            $manager = new Zend_Service_WindowsAzure_Diagnostics_Manager($storageClient, $controlContainer);
-            
-            $configuration = $manager->getDefaultConfiguration();
-            $manager->setConfigurationForRoleInstance('test', $configuration);
-            
-            $this->assertEquals($configuration->toXml(), $manager->getConfigurationForRoleInstance('test')->toXml());
-    	}
+		$controlContainer = $this->generateName();
+		
+		$storageClient = $this->createStorageInstance();
+        $manager = new Zend_Service_WindowsAzure_Diagnostics_Manager($storageClient, $controlContainer);
+        
+        $configuration = $manager->getDefaultConfiguration();
+        $manager->setConfigurationForRoleInstance('test', $configuration);
+        
+        $this->assertEquals($configuration->toXml(), $manager->getConfigurationForRoleInstance('test')->toXml());
     }
     
 	/**
@@ -132,31 +128,29 @@ class Zend_Service_WindowsAzure_Diagnostics_ManagerTest extends PHPUnit_Framewor
      */
     public function testManagerCustomConfiguration()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_DIAGNOSTICS_RUNTESTS) {
-    		$controlContainer = $this->generateName();
-    		
-    		$storageClient = $this->createStorageInstance();
-            $manager = new Zend_Service_WindowsAzure_Diagnostics_Manager($storageClient, $controlContainer);
-            
-            $configuration = $manager->getDefaultConfiguration();
-			$configuration->DataSources->OverallQuotaInMB = 1;
-			$configuration->DataSources->Logs->BufferQuotaInMB = 1;
-			$configuration->DataSources->Logs->ScheduledTransferPeriodInMinutes = 1;
-			$configuration->DataSources->PerformanceCounters->BufferQuotaInMB = 1;
-			$configuration->DataSources->PerformanceCounters->ScheduledTransferPeriodInMinutes = 1;
-			$configuration->DataSources->DiagnosticInfrastructureLogs->BufferQuotaInMB = 1;
-			$configuration->DataSources->DiagnosticInfrastructureLogs->ScheduledTransferPeriodInMinutes = 1;
-			$configuration->DataSources->PerformanceCounters->addSubscription('\Processor(*)\% Processor Time', 1);
-			$configuration->DataSources->WindowsEventLog->addSubscription('System!*');
-			$configuration->DataSources->WindowsEventLog->addSubscription('Application!*');
-            $manager->setConfigurationForRoleInstance('test', $configuration);
-            
-            $result = $manager->getConfigurationForRoleInstance('test');
-            
-            $this->assertEquals($configuration->toXml(), $result->toXml());
-            $this->assertEquals(1, count($result->DataSources->PerformanceCounters->Subscriptions));
-            $this->assertEquals(2, count($result->DataSources->WindowsEventLog->Subscriptions));
-    	}
+		$controlContainer = $this->generateName();
+		
+		$storageClient = $this->createStorageInstance();
+        $manager = new Zend_Service_WindowsAzure_Diagnostics_Manager($storageClient, $controlContainer);
+        
+        $configuration = $manager->getDefaultConfiguration();
+		$configuration->DataSources->OverallQuotaInMB = 1;
+		$configuration->DataSources->Logs->BufferQuotaInMB = 1;
+		$configuration->DataSources->Logs->ScheduledTransferPeriodInMinutes = 1;
+		$configuration->DataSources->PerformanceCounters->BufferQuotaInMB = 1;
+		$configuration->DataSources->PerformanceCounters->ScheduledTransferPeriodInMinutes = 1;
+		$configuration->DataSources->DiagnosticInfrastructureLogs->BufferQuotaInMB = 1;
+		$configuration->DataSources->DiagnosticInfrastructureLogs->ScheduledTransferPeriodInMinutes = 1;
+		$configuration->DataSources->PerformanceCounters->addSubscription('\Processor(*)\% Processor Time', 1);
+		$configuration->DataSources->WindowsEventLog->addSubscription('System!*');
+		$configuration->DataSources->WindowsEventLog->addSubscription('Application!*');
+        $manager->setConfigurationForRoleInstance('test', $configuration);
+        
+        $result = $manager->getConfigurationForRoleInstance('test');
+        
+        $this->assertEquals($configuration->toXml(), $result->toXml());
+        $this->assertEquals(1, count($result->DataSources->PerformanceCounters->Subscriptions));
+        $this->assertEquals(2, count($result->DataSources->WindowsEventLog->Subscriptions));
     }
     
 	/**
@@ -164,25 +158,18 @@ class Zend_Service_WindowsAzure_Diagnostics_ManagerTest extends PHPUnit_Framewor
      */
     public function testManagerConfigurationExists()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_DIAGNOSTICS_RUNTESTS) {
-    		$controlContainer = $this->generateName();
-    		
-    		$storageClient = $this->createStorageInstance();
-            $manager = new Zend_Service_WindowsAzure_Diagnostics_Manager($storageClient, $controlContainer);
-            
-            $result = $manager->configurationForRoleInstanceExists('test');
-            $this->assertFalse($result);
-            
-            $configuration = $manager->getDefaultConfiguration();
-            $manager->setConfigurationForRoleInstance('test', $configuration);
-            
-            $result = $manager->configurationForRoleInstanceExists('test');
-            $this->assertTrue($result);
-    	}
+		$controlContainer = $this->generateName();
+		
+		$storageClient = $this->createStorageInstance();
+        $manager = new Zend_Service_WindowsAzure_Diagnostics_Manager($storageClient, $controlContainer);
+        
+        $result = $manager->configurationForRoleInstanceExists('test');
+        $this->assertFalse($result);
+        
+        $configuration = $manager->getDefaultConfiguration();
+        $manager->setConfigurationForRoleInstance('test', $configuration);
+        
+        $result = $manager->configurationForRoleInstanceExists('test');
+        $this->assertTrue($result);
     }
 }
-
-// Call Zend_Service_WindowsAzure_Credentials_SharedKeyTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_Diagnostics_ManagerTest::main") {
-    Zend_Service_WindowsAzure_Diagnostics_ManagerTest::main();
-}

tests/Zend/Service/WindowsAzure/DynamicTableEntityTest.php

@@ -20,16 +20,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_DynamicTableEntityTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage_DynamicTableEntity */
 require_once 'Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php';
@@ -44,11 +38,6 @@ require_once 'Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php';
  */
 class Zend_Service_WindowsAzure_DynamicTableEntityTest extends PHPUnit_Framework_TestCase
 {
-    public static function main()
-    {
-        $suite  = new PHPUnit_Framework_TestSuite("Zend_Service_WindowsAzure_DynamicTableEntityTest");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
     
     /**
      * Test constructor
@@ -107,8 +96,3 @@ class Zend_Service_WindowsAzure_DynamicTableEntityTest extends PHPUnit_Framework
         $this->assertEquals(true,         $target->Visible);
     }
 }
-
-// Call Zend_Service_WindowsAzure_DynamicTableEntityTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_DynamicTableEntityTest::main") {
-    Zend_Service_WindowsAzure_DynamicTableEntityTest::main();
-}

tests/Zend/Service/WindowsAzure/QueueStorageTest.php

@@ -20,16 +20,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_QueueStorageTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage_Queue */
 require_once 'Zend/Service/WindowsAzure/Storage/Queue.php';
@@ -44,19 +38,17 @@ require_once 'Zend/Service/WindowsAzure/Storage/Queue.php';
  */
 class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestCase
 {
-    public static function main()
-    {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS)  {
-            $suite  = new PHPUnit_Framework_TestSuite("Zend_Service_WindowsAzure_QueueStorageTest");
-            $result = PHPUnit_TextUI_TestRunner::run($suite);
-        }
-    }
-   
+    
+    protected static $uniqId = 0;
+       
     /**
      * Test setup
      */
     protected function setUp()
     {
+        if (!TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS) {
+            $this->markTestSkipped('This test case requires TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS to be enabled in TestConfiguration.php');
+        }
     }
     
     /**
@@ -64,9 +56,11 @@ class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestC
      */
     protected function tearDown()
     {
+        if ($this->status == PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED) {
+            return;
+        }
         $storageClient = $this->createStorageInstance();
-        for ($i = 1; $i <= self::$uniqId; $i++)
-        {
+        for ($i = 1; $i <= self::$uniqId; $i++) {
             try { $storageClient->deleteQueue(TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_PREFIX . $i); } catch (Exception $e) { }
         }
     }
@@ -87,8 +81,6 @@ class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestC
         return $storageClient;
     }
     
-    protected static $uniqId = 0;
-    
     protected function generateName()
     {
         self::$uniqId++;
@@ -100,19 +92,17 @@ class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestC
      */
     public function testQueueExists()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS) {
-            $queueName1 = $this->generateName();
-            $queueName2 = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createQueue($queueName1);
-            $storageClient->createQueue($queueName2);
+        $queueName1 = $this->generateName();
+        $queueName2 = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createQueue($queueName1);
+        $storageClient->createQueue($queueName2);
 
-            $result = $storageClient->queueExists($queueName1);
-            $this->assertTrue($result);
-            
-            $result = $storageClient->queueExists(md5(time()));
-            $this->assertFalse($result);
-        }
+        $result = $storageClient->queueExists($queueName1);
+        $this->assertTrue($result);
+        
+        $result = $storageClient->queueExists(md5(time()));
+        $this->assertFalse($result);
     }
     
     /**
@@ -120,12 +110,10 @@ class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestC
      */
     public function testCreateQueue()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS) {
-            $queueName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $result = $storageClient->createQueue($queueName);
-            $this->assertEquals($queueName, $result->Name);
-        }
+        $queueName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $result = $storageClient->createQueue($queueName);
+        $this->assertEquals($queueName, $result->Name);
     }
     
     /**
@@ -133,18 +121,16 @@ class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestC
      */
     public function testSetQueueMetadata()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS) {
-            $queueName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createQueue($queueName);
-            
-            $storageClient->setQueueMetadata($queueName, array(
-                'createdby' => 'PHPAzure',
-            ));
-            
-            $metadata = $storageClient->getQueueMetadata($queueName);
-            $this->assertEquals('PHPAzure', $metadata['createdby']);
-        }
+        $queueName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createQueue($queueName);
+        
+        $storageClient->setQueueMetadata($queueName, array(
+            'createdby' => 'PHPAzure',
+        ));
+        
+        $metadata = $storageClient->getQueueMetadata($queueName);
+        $this->assertEquals('PHPAzure', $metadata['createdby']);
     }
     
     /**
@@ -152,15 +138,13 @@ class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestC
      */
     public function testGetQueue()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS) {
-            $queueName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createQueue($queueName);
-            
-            $queue = $storageClient->getQueue($queueName);
-            $this->assertEquals($queueName, $queue->Name);
-            $this->assertEquals(0, $queue->ApproximateMessageCount);
-        }
+        $queueName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createQueue($queueName);
+        
+        $queue = $storageClient->getQueue($queueName);
+        $this->assertEquals($queueName, $queue->Name);
+        $this->assertEquals(0, $queue->ApproximateMessageCount);
     }
     
     /**
@@ -168,27 +152,25 @@ class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestC
      */
     public function testListQueues()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS) {
-            $queueName1 = 'testlist1';
-            $queueName2 = 'testlist2';
-            $queueName3 = 'testlist3';
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createQueue($queueName1);
-            $storageClient->createQueue($queueName2);
-            $storageClient->createQueue($queueName3);
-            $result1 = $storageClient->listQueues('testlist');
-            $result2 = $storageClient->listQueues('testlist', 1);
-    
-            // cleanup first
-            $storageClient->deleteQueue($queueName1);
-            $storageClient->deleteQueue($queueName2);
-            $storageClient->deleteQueue($queueName3);
-            
-            $this->assertEquals(3, count($result1));
-            $this->assertEquals($queueName2, $result1[1]->Name);
-            
-            $this->assertEquals(1, count($result2));
-        }
+        $queueName1 = 'testlist1';
+        $queueName2 = 'testlist2';
+        $queueName3 = 'testlist3';
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createQueue($queueName1);
+        $storageClient->createQueue($queueName2);
+        $storageClient->createQueue($queueName3);
+        $result1 = $storageClient->listQueues('testlist');
+        $result2 = $storageClient->listQueues('testlist', 1);
+
+        // cleanup first
+        $storageClient->deleteQueue($queueName1);
+        $storageClient->deleteQueue($queueName2);
+        $storageClient->deleteQueue($queueName3);
+        
+        $this->assertEquals(3, count($result1));
+        $this->assertEquals($queueName2, $result1[1]->Name);
+        
+        $this->assertEquals(1, count($result2));
     }
     
     /**
@@ -196,19 +178,17 @@ class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestC
      */
     public function testListQueuesWithMetadata()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS) {
-            $queueName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createQueue($queueName, array(
-                'createdby' => 'PHPAzure',
-                'ownedby' => 'PHPAzure',
-            ));
-            
-            $result = $storageClient->listQueues($queueName, null, null, 'metadata');
-            
-            $this->assertEquals('PHPAzure', $result[0]->Metadata['createdby']);
-            $this->assertEquals('PHPAzure', $result[0]->Metadata['ownedby']);
-        }
+        $queueName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createQueue($queueName, array(
+            'createdby' => 'PHPAzure',
+            'ownedby' => 'PHPAzure',
+        ));
+        
+        $result = $storageClient->listQueues($queueName, null, null, 'metadata');
+        
+        $this->assertEquals('PHPAzure', $result[0]->Metadata['createdby']);
+        $this->assertEquals('PHPAzure', $result[0]->Metadata['ownedby']);
     }
     
     /**
@@ -216,18 +196,16 @@ class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestC
      */
     public function testPutMessage()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS) {
-            $queueName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createQueue($queueName);
-            $storageClient->putMessage($queueName, 'Test message', 120);
-            
-            sleep(5); // wait for the message to appear in the queue...
-            
-            $messages = $storageClient->getMessages($queueName);
-            $this->assertEquals(1, count($messages));
-            $this->assertEquals('Test message', $messages[0]->MessageText);
-        }
+        $queueName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createQueue($queueName);
+        $storageClient->putMessage($queueName, 'Test message', 120);
+        
+        sleep(5); // wait for the message to appear in the queue...
+        
+        $messages = $storageClient->getMessages($queueName);
+        $this->assertEquals(1, count($messages));
+        $this->assertEquals('Test message', $messages[0]->MessageText);
     }
     
     /**
@@ -235,25 +213,23 @@ class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestC
      */
     public function testGetMessages()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS) {
-            $queueName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createQueue($queueName);
-            $storageClient->putMessage($queueName, 'Test message 1', 120);
-            $storageClient->putMessage($queueName, 'Test message 2', 120);
-            $storageClient->putMessage($queueName, 'Test message 3', 120);
-            $storageClient->putMessage($queueName, 'Test message 4', 120);
-            
-            sleep(5); // wait for the messages to appear in the queue...
-            
-            $messages1 = $storageClient->getMessages($queueName, 2);
-            $messages2 = $storageClient->getMessages($queueName, 2);
-            $messages3 = $storageClient->getMessages($queueName);
-            
-            $this->assertEquals(2, count($messages1));
-            $this->assertEquals(2, count($messages2));
-            $this->assertEquals(0, count($messages3));
-        }
+        $queueName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createQueue($queueName);
+        $storageClient->putMessage($queueName, 'Test message 1', 120);
+        $storageClient->putMessage($queueName, 'Test message 2', 120);
+        $storageClient->putMessage($queueName, 'Test message 3', 120);
+        $storageClient->putMessage($queueName, 'Test message 4', 120);
+        
+        sleep(5); // wait for the messages to appear in the queue...
+        
+        $messages1 = $storageClient->getMessages($queueName, 2);
+        $messages2 = $storageClient->getMessages($queueName, 2);
+        $messages3 = $storageClient->getMessages($queueName);
+        
+        $this->assertEquals(2, count($messages1));
+        $this->assertEquals(2, count($messages2));
+        $this->assertEquals(0, count($messages3));
     }
     
     /**
@@ -261,23 +237,21 @@ class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestC
      */
     public function testPeekMessages()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS) {
-            $queueName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createQueue($queueName);
-            $storageClient->putMessage($queueName, 'Test message 1', 120);
-            $storageClient->putMessage($queueName, 'Test message 2', 120);
-            $storageClient->putMessage($queueName, 'Test message 3', 120);
-            $storageClient->putMessage($queueName, 'Test message 4', 120);
-            
-            sleep(5); // wait for the messages to appear in the queue...
-            
-            $messages1 = $storageClient->peekMessages($queueName, 4);
-            $messages2 = $storageClient->getMessages($queueName, 4);
-            
-            $this->assertEquals(4, count($messages1));
-            $this->assertEquals(4, count($messages2));
-        }
+        $queueName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createQueue($queueName);
+        $storageClient->putMessage($queueName, 'Test message 1', 120);
+        $storageClient->putMessage($queueName, 'Test message 2', 120);
+        $storageClient->putMessage($queueName, 'Test message 3', 120);
+        $storageClient->putMessage($queueName, 'Test message 4', 120);
+        
+        sleep(5); // wait for the messages to appear in the queue...
+        
+        $messages1 = $storageClient->peekMessages($queueName, 4);
+        $messages2 = $storageClient->getMessages($queueName, 4);
+        
+        $this->assertEquals(4, count($messages1));
+        $this->assertEquals(4, count($messages2));
     }
     
     /**
@@ -285,24 +259,22 @@ class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestC
      */
     public function testDequeueCount()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS) {
-            $queueName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createQueue($queueName);
-            $storageClient->putMessage($queueName, 'Test message 1', 120);
-            
-            sleep(5); // wait for the message to appear in the queue...
-            
-            $expectedDequeueCount = 3;
-            for ($i = 0; $i < $expectedDequeueCount - 1; $i++) {
-	            $storageClient->getMessages($queueName, 1, 1);
-	            sleep(3);
-            }
-            
-            $messages = $storageClient->getMessages($queueName, 1);
-            
-            $this->assertEquals($expectedDequeueCount, $messages[0]->DequeueCount);
+        $queueName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createQueue($queueName);
+        $storageClient->putMessage($queueName, 'Test message 1', 120);
+        
+        sleep(5); // wait for the message to appear in the queue...
+        
+        $expectedDequeueCount = 3;
+        for ($i = 0; $i < $expectedDequeueCount - 1; $i++) {
+            $storageClient->getMessages($queueName, 1, 1);
+            sleep(3);
         }
+        
+        $messages = $storageClient->getMessages($queueName, 1);
+        
+        $this->assertEquals($expectedDequeueCount, $messages[0]->DequeueCount);
     }
     
     /**
@@ -310,27 +282,25 @@ class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestC
      */
     public function testClearMessages()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS) {
-            $queueName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createQueue($queueName);
-            $storageClient->putMessage($queueName, 'Test message 1', 120);
-            $storageClient->putMessage($queueName, 'Test message 2', 120);
-            $storageClient->putMessage($queueName, 'Test message 3', 120);
-            $storageClient->putMessage($queueName, 'Test message 4', 120);
-            
-            sleep(5); // wait for the messages to appear in the queue...
-            
-            $messages1 = $storageClient->peekMessages($queueName, 4);
-            $storageClient->clearMessages($queueName);
-            
-            sleep(5); // wait for the GC...
-            
-            $messages2 = $storageClient->peekMessages($queueName, 4);
-            
-            $this->assertEquals(4, count($messages1));
-            $this->assertEquals(0, count($messages2));
-        }
+        $queueName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createQueue($queueName);
+        $storageClient->putMessage($queueName, 'Test message 1', 120);
+        $storageClient->putMessage($queueName, 'Test message 2', 120);
+        $storageClient->putMessage($queueName, 'Test message 3', 120);
+        $storageClient->putMessage($queueName, 'Test message 4', 120);
+        
+        sleep(5); // wait for the messages to appear in the queue...
+        
+        $messages1 = $storageClient->peekMessages($queueName, 4);
+        $storageClient->clearMessages($queueName);
+        
+        sleep(5); // wait for the GC...
+        
+        $messages2 = $storageClient->peekMessages($queueName, 4);
+        
+        $this->assertEquals(4, count($messages1));
+        $this->assertEquals(0, count($messages2));
     }
     
     /**
@@ -338,34 +308,27 @@ class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestC
      */
     public function testDeleteMessage()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS) {
-            $queueName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createQueue($queueName);
-            $storageClient->putMessage($queueName, 'Test message 1', 120);
-            $storageClient->putMessage($queueName, 'Test message 2', 120);
-            $storageClient->putMessage($queueName, 'Test message 3', 120);
-            $storageClient->putMessage($queueName, 'Test message 4', 120);
-            
-            sleep(5); // wait for the messages to appear in the queue...
-            
-            $messages1 = $storageClient->getMessages($queueName, 2, 10);
-            foreach ($messages1 as $message)
-            {
-                $storageClient->deleteMessage($queueName, $message);
-            }
-            
-            sleep(5); // wait for the GC...
-            
-            $messages2 = $storageClient->getMessages($queueName, 4);
-            
-            $this->assertEquals(2, count($messages1));
-            $this->assertEquals(2, count($messages2));
+        $queueName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createQueue($queueName);
+        $storageClient->putMessage($queueName, 'Test message 1', 120);
+        $storageClient->putMessage($queueName, 'Test message 2', 120);
+        $storageClient->putMessage($queueName, 'Test message 3', 120);
+        $storageClient->putMessage($queueName, 'Test message 4', 120);
+        
+        sleep(5); // wait for the messages to appear in the queue...
+        
+        $messages1 = $storageClient->getMessages($queueName, 2, 10);
+        foreach ($messages1 as $message)
+        {
+            $storageClient->deleteMessage($queueName, $message);
         }
+        
+        sleep(5); // wait for the GC...
+        
+        $messages2 = $storageClient->getMessages($queueName, 4);
+        
+        $this->assertEquals(2, count($messages1));
+        $this->assertEquals(2, count($messages2));
     }
 }
-
-// Call Zend_Service_WindowsAzure_QueueStorageTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_QueueStorageTest::main") {
-    Zend_Service_WindowsAzure_QueueStorageTest::main();
-}

tests/Zend/Service/WindowsAzure/RetryPolicyTest.php

@@ -20,16 +20,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_RetryPolicyTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract */
 require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
@@ -57,12 +51,6 @@ class Zend_Service_WindowsAzure_RetryPolicyTest extends PHPUnit_Framework_TestCa
      * @var int
      */
     protected $_exceptionCount = 0;
-    
-    public static function main()
-    {
-        $suite  = new PHPUnit_Framework_TestSuite("Zend_Service_WindowsAzure_RetryPolicyTest");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
 
     /**
      * Test retry policy - noRetry
@@ -112,8 +100,3 @@ class Zend_Service_WindowsAzure_RetryPolicyTest extends PHPUnit_Framework_TestCa
         return $this->_executedRetries;
     }
 }
-
-// Call Zend_Service_WindowsAzure_RetryPolicyTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_RetryPolicyTest::main") {
-    Zend_Service_WindowsAzure_RetryPolicyTest::main();
-}

tests/Zend/Service/WindowsAzure/SessionHandlerTest.php

@@ -20,16 +20,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_SessionHandlerTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_SessionHandler */
 require_once 'Zend/Service/WindowsAzure/SessionHandler.php';
@@ -47,23 +41,21 @@ require_once 'Zend/Service/WindowsAzure/Storage/Table.php';
  */
 class Zend_Service_WindowsAzure_SessionHandlerTest extends PHPUnit_Framework_TestCase
 {
-    public function __construct()
-    {
-    }
     
-    public static function main()
+    protected static $uniqId = 0;
+    
+    public function __construct()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS) {
-            $suite  = new PHPUnit_Framework_TestSuite("Zend_Service_WindowsAzure_SessionHandlerTest");
-            $result = PHPUnit_TextUI_TestRunner::run($suite);
-        }
     }
-    
+
     /**
      * Test setup
      */
     protected function setUp()
     {
+        if (!TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS) {
+            $this->markTestSkipped('This test case requires TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS to be enabled in TestConfiguration.php');
+        }
     }
     
     /**
@@ -71,6 +63,9 @@ class Zend_Service_WindowsAzure_SessionHandlerTest extends PHPUnit_Framework_Tes
      */
     protected function tearDown()
     {
+        if ($this->status == PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED) {
+            return;
+        }
         $storageClient = $this->createStorageInstance();
         for ($i = 1; $i <= self::$uniqId; $i++)
         {
@@ -102,9 +97,7 @@ class Zend_Service_WindowsAzure_SessionHandlerTest extends PHPUnit_Framework_Tes
         );
         return $sessionHandler;
     }
-    
-    protected static $uniqId = 0;
-    
+   
     protected function generateName()
     {
         self::$uniqId++;
@@ -116,14 +109,12 @@ class Zend_Service_WindowsAzure_SessionHandlerTest extends PHPUnit_Framework_Tes
      */
     public function testRegister()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS) {
-            $storageClient = $this->createStorageInstance();
-            $tableName = $this->generateName();
-            $sessionHandler = $this->createSessionHandler($storageClient, $tableName);
-            $result = $sessionHandler->register();
-            
-            $this->assertTrue($result);
-        }
+        $storageClient = $this->createStorageInstance();
+        $tableName = $this->generateName();
+        $sessionHandler = $this->createSessionHandler($storageClient, $tableName);
+        $result = $sessionHandler->register();
+        
+        $this->assertTrue($result);
     }
     
     /**
@@ -131,18 +122,15 @@ class Zend_Service_WindowsAzure_SessionHandlerTest extends PHPUnit_Framework_Tes
      */
     public function testOpen()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS) {
-            $storageClient = $this->createStorageInstance();
-            $tableName = $this->generateName();
-            $sessionHandler = $this->createSessionHandler($storageClient, $tableName);
-            $result = $sessionHandler->open();
+        $storageClient = $this->createStorageInstance();
+        $tableName = $this->generateName();
+        $sessionHandler = $this->createSessionHandler($storageClient, $tableName);
+        $result = $sessionHandler->open();
 
-            $this->assertTrue($result);
-            
-            
-            $verifyResult = $storageClient->listTables();
-            $this->assertEquals($tableName, $verifyResult[0]->Name);
-        }
+        $this->assertTrue($result);
+        
+        $verifyResult = $storageClient->listTables();
+        $this->assertEquals($tableName, $verifyResult[0]->Name);
     }
     
     /**
@@ -150,15 +138,13 @@ class Zend_Service_WindowsAzure_SessionHandlerTest extends PHPUnit_Framework_Tes
      */
     public function testClose()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS) {
-            $storageClient = $this->createStorageInstance();
-            $tableName = $this->generateName();
-            $sessionHandler = $this->createSessionHandler($storageClient, $tableName);
-            $sessionHandler->open();
-            $result = $sessionHandler->close();
-            
-            $this->assertTrue($result);
-        }
+        $storageClient = $this->createStorageInstance();
+        $tableName = $this->generateName();
+        $sessionHandler = $this->createSessionHandler($storageClient, $tableName);
+        $sessionHandler->open();
+        $result = $sessionHandler->close();
+        
+        $this->assertTrue($result);
     }
     
     /**
@@ -166,20 +152,18 @@ class Zend_Service_WindowsAzure_SessionHandlerTest extends PHPUnit_Framework_Tes
      */
     public function testRead()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS) {
-            $storageClient = $this->createStorageInstance();
-            $tableName = $this->generateName();
-            $sessionHandler = $this->createSessionHandler($storageClient, $tableName);
-            $sessionHandler->open();
-            
-            $sessionId = $this->session_id();
-            $sessionData = serialize( 'PHPAzure' );
-            $sessionHandler->write($sessionId, $sessionData);
-            
-            $result = unserialize( $sessionHandler->read($sessionId) );
-            
-            $this->assertEquals('PHPAzure', $result);
-        }
+        $storageClient = $this->createStorageInstance();
+        $tableName = $this->generateName();
+        $sessionHandler = $this->createSessionHandler($storageClient, $tableName);
+        $sessionHandler->open();
+        
+        $sessionId = $this->session_id();
+        $sessionData = serialize( 'PHPAzure' );
+        $sessionHandler->write($sessionId, $sessionData);
+        
+        $result = unserialize( $sessionHandler->read($sessionId) );
+        
+        $this->assertEquals('PHPAzure', $result);
     }
     
     /**
@@ -208,22 +192,20 @@ class Zend_Service_WindowsAzure_SessionHandlerTest extends PHPUnit_Framework_Tes
      */
     public function testDestroy()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS) {
-            $storageClient = $this->createStorageInstance();
-            $tableName = $this->generateName();
-            $sessionHandler = $this->createSessionHandler($storageClient, $tableName);
-            $sessionHandler->open();
-            
-            $sessionId = $this->session_id();
-            $sessionData = serialize( 'PHPAzure' );
-            $sessionHandler->write($sessionId, $sessionData);
-            
-            $result = $sessionHandler->destroy($sessionId);
-            $this->assertTrue($result);
-            
-            $verifyResult = $storageClient->retrieveEntities($tableName);
-            $this->assertEquals(0, count($verifyResult));
-        }
+        $storageClient = $this->createStorageInstance();
+        $tableName = $this->generateName();
+        $sessionHandler = $this->createSessionHandler($storageClient, $tableName);
+        $sessionHandler->open();
+        
+        $sessionId = $this->session_id();
+        $sessionData = serialize( 'PHPAzure' );
+        $sessionHandler->write($sessionId, $sessionData);
+        
+        $result = $sessionHandler->destroy($sessionId);
+        $this->assertTrue($result);
+        
+        $verifyResult = $storageClient->retrieveEntities($tableName);
+        $this->assertEquals(0, count($verifyResult));
     }
     
     /**
@@ -231,24 +213,22 @@ class Zend_Service_WindowsAzure_SessionHandlerTest extends PHPUnit_Framework_Tes
      */
     public function testGc()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS) {
-            $storageClient = $this->createStorageInstance();
-            $tableName = $this->generateName();
-            $sessionHandler = $this->createSessionHandler($storageClient, $tableName);
-            $sessionHandler->open();
-            
-            $sessionId = $this->session_id();
-            $sessionData = serialize( 'PHPAzure' );
-            $sessionHandler->write($sessionId, $sessionData);
-            
-            sleep(1); // let time() tick
-            
-            $result = $sessionHandler->gc(0);
-            $this->assertTrue($result);
-            
-            $verifyResult = $storageClient->retrieveEntities($tableName);
-            $this->assertEquals(0, count($verifyResult));
-        }
+        $storageClient = $this->createStorageInstance();
+        $tableName = $this->generateName();
+        $sessionHandler = $this->createSessionHandler($storageClient, $tableName);
+        $sessionHandler->open();
+        
+        $sessionId = $this->session_id();
+        $sessionData = serialize( 'PHPAzure' );
+        $sessionHandler->write($sessionId, $sessionData);
+        
+        sleep(1); // let time() tick
+        
+        $result = $sessionHandler->gc(0);
+        $this->assertTrue($result);
+        
+        $verifyResult = $storageClient->retrieveEntities($tableName);
+        $this->assertEquals(0, count($verifyResult));
     }
 
     protected function session_id()
@@ -257,7 +237,3 @@ class Zend_Service_WindowsAzure_SessionHandlerTest extends PHPUnit_Framework_Tes
     }
 }
 
-// Call Zend_Service_WindowsAzure_SessionHandlerTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_SessionHandlerTest::main") {
-    Zend_Service_WindowsAzure_SessionHandlerTest::main();
-}

tests/Zend/Service/WindowsAzure/StorageTest.php

@@ -20,16 +20,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_StorageTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage */
 require_once 'Zend/Service/WindowsAzure/Storage.php';
@@ -44,11 +38,6 @@ require_once 'Zend/Service/WindowsAzure/Storage.php';
  */
 class Zend_Service_WindowsAzure_StorageTest extends PHPUnit_Framework_TestCase
 {
-    public static function main()
-    {
-        $suite  = new PHPUnit_Framework_TestSuite("Zend_Service_WindowsAzure_BlobStorageTest");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
 
     /**
      * Test constructor for devstore
@@ -69,7 +58,3 @@ class Zend_Service_WindowsAzure_StorageTest extends PHPUnit_Framework_TestCase
     }
 }
 
-// Call Zend_Service_WindowsAzure_StorageTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_StorageTest::main") {
-    Zend_Service_WindowsAzure_StorageTest::main();
-}

tests/Zend/Service/WindowsAzure/TableEntityQueryTest.php

@@ -20,16 +20,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_TableEntityQueryTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage_TableEntityQuery */
 require_once 'Zend/Service/WindowsAzure/Storage/TableEntityQuery.php';
@@ -44,11 +38,6 @@ require_once 'Zend/Service/WindowsAzure/Storage/TableEntityQuery.php';
  */
 class Zend_Service_WindowsAzure_TableEntityQueryTest extends PHPUnit_Framework_TestCase
 {
-    public static function main()
-    {
-        $suite  = new PHPUnit_Framework_TestSuite("Zend_Service_WindowsAzure_TableEntityQueryTest");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
     
     /**
      * Test all records query
@@ -182,8 +171,3 @@ class Zend_Service_WindowsAzure_TableEntityQueryTest extends PHPUnit_Framework_T
         $this->assertEquals('MyTable()?$filter=Name eq \'Maarten\' and Visible eq true', $target->__toString());
     }
 }
-
-// Call Zend_Service_WindowsAzure_TableEntityQueryTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_TableEntityQueryTest::main") {
-    Zend_Service_WindowsAzure_TableEntityQueryTest::main();
-}

tests/Zend/Service/WindowsAzure/TableEntityTest.php

@@ -20,16 +20,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_TableEntityTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
 /** Zend_Service_WindowsAzure_Storage_TableEntity */
 require_once 'Zend/Service/WindowsAzure/Storage/TableEntity.php';
@@ -44,11 +38,6 @@ require_once 'Zend/Service/WindowsAzure/Storage/TableEntity.php';
  */
 class Zend_Service_WindowsAzure_TableEntityTest extends PHPUnit_Framework_TestCase
 {
-    public static function main()
-    {
-        $suite  = new PHPUnit_Framework_TestSuite("Zend_Service_WindowsAzure_TableEntityTest");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
     
     /**
      * Test constructor
@@ -148,8 +137,3 @@ class TSETTest_TestEntity extends Zend_Service_WindowsAzure_Storage_TableEntity
      */
     public $Visible = false;
 }
-
-// Call Zend_Service_WindowsAzure_TableEntityTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Service_WindowsAzure_TableEntityTest::main") {
-    Zend_Service_WindowsAzure_TableEntityTest::main();
-}