[GENERIC] Testbed:

- fixed Service_Windows_Azure tests to work on systems Without account
- performance tweaks for this tests

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

tests/TestConfiguration.php.dist

@@ -157,7 +157,7 @@ define('TESTS_ZEND_DB_ADAPTER_DB2_DATABASE', 'sample');
 
 /**
  * Zend_Db_Adapter_Sqlsrv
- * Note: Make sure that you create the "test" database and set a 
+ * Note: Make sure that you create the "test" database and set a
  * username and password
  *
  */
@@ -523,11 +523,11 @@ define('TESTS_ZEND_MAIL_SMTP_AUTH', false);
  *     dbname: "queue"
  * }
  *
- * The PlatformJobQueue adapter expects two parameters, the host and password. 
+ * The PlatformJobQueue adapter expects two parameters, the host and password.
  * The HOST string should include both the host and port (typically 10003):
  *     127.0.0.1:10003
- * When running tests against PlatformJobQueue, it's best to do so where 
- * Platform is installed on localhost and has maximum workers set to 20 
+ * When running tests against PlatformJobQueue, it's best to do so where
+ * Platform is installed on localhost and has maximum workers set to 20
  * (default is 5); do so with this zend.ini setting:
  *     zend_jq.max_num_of_request_workers=20
  *
@@ -564,7 +564,7 @@ define('TESTS_ZEND_SERVICE_FLICKR_ONLINE_APIKEY', 'Enter API key here');
 /**
  * Zend_Service_LiveDocx configuration
  *
- * Define username and password in order to run unit tests for LiveDocX web 
+ * Define username and password in order to run unit tests for LiveDocX web
  * services.
  *
  * phpunit/phpunit will typically work.
@@ -652,7 +652,8 @@ define('TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_KEY_PROD',                'I+ebY
 /**
  * Blob storage tests
  */
-define('TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS',                   true);
+// Enable this tests only when you have a working account
+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');
@@ -662,21 +663,22 @@ define('TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOBSA_CONTAINER_PREFIX',         'phpaz
 /**
  * Table storage tests
  */
-define('TESTS_ZEND_SERVICE_WINDOWSAZURE_TABLE_RUNTESTS',                  true);
+// Enable this tests only when you have a working account
+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');
 
@@ -705,7 +707,7 @@ define('TESTS_ZEND_SOAP_AUTODISCOVER_ONLINE_SERVER_BASEURI', false);
  * Setting CRASH_TEST_ENABLED to true will enable some tests that may
  * potentially crash PHP on some systems, due to very deep-nesting regular
  * expressions.
- * 
+ *
  * Only do this if you know what you are doing!
  */
 define('TESTS_ZEND_URI_CRASH_TEST_ENABLED', false);
@@ -713,7 +715,7 @@ define('TESTS_ZEND_URI_CRASH_TEST_ENABLED', false);
 /**
  * Zend_Validate tests
  *
- * Set ONLINE_ENABLED if you wish to run validators that require network 
+ * Set ONLINE_ENABLED if you wish to run validators that require network
  * connectivity.
  */
 define('TESTS_ZEND_VALIDATE_ONLINE_ENABLED', false);

tests/Zend/Service/WindowsAzure/BlobStorageTest.php

@@ -45,27 +45,28 @@ require_once 'Zend/Service/WindowsAzure/Storage/Blob.php';
 class Zend_Service_WindowsAzure_BlobStorageTest extends PHPUnit_Framework_TestCase
 {
     static $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_BlobStorageTest");
-            $result = PHPUnit_TextUI_TestRunner::run($suite);
-        }
+        $suite  = new PHPUnit_Framework_TestSuite("Zend_Service_WindowsAzure_BlobStorageTest");
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
     }
-   
+
     /**
      * Test setup
      */
     protected function setUp()
     {
+        if (!TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
+            $this->markTestSkipped('Windows Azure Tests disabled');
+        }
     }
-    
+
     /**
      * Test teardown
      */
@@ -88,60 +89,56 @@ class Zend_Service_WindowsAzure_BlobStorageTest extends PHPUnit_Framework_TestCa
         } else {
             $storageClient = new Zend_Service_WindowsAzure_Storage_Blob(TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_HOST_DEV, TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_ACCOUNT_DEV, TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_KEY_DEV, true, Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::retryN(10, 250));
         }
-        
+
         if (TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_USEPROXY) {
             $storageClient->setProxy(TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_USEPROXY, TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_PROXY, TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_PROXY_PORT, TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_PROXY_CREDENTIALS);
         }
 
         return $storageClient;
     }
-    
+
     protected static $uniqId = 0;
-    
+
     protected function generateName()
     {
         self::$uniqId++;
         return TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_CONTAINER_PREFIX . self::$uniqId;
     }
-    
+
     /**
      * Test container exists
      */
     public function testContainerExists()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName1 = $this->generateName();
-            $containerName2 = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createContainer($containerName1);
-            $storageClient->createContainer($containerName2);
-            
-            $result = $storageClient->containerExists($containerName1);
-            $this->assertTrue($result);
-            
-            $result = $storageClient->containerExists(md5(time()));
-            $this->assertFalse($result);
-        }
+        $containerName1 = $this->generateName();
+        $containerName2 = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createContainer($containerName1);
+        $storageClient->createContainer($containerName2);
+
+        $result = $storageClient->containerExists($containerName1);
+        $this->assertTrue($result);
+
+        $result = $storageClient->containerExists(md5(time()));
+        $this->assertFalse($result);
     }
-    
+
     /**
      * Test blob exists
      */
     public function testBlobExists()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createContainer($containerName);
-            $storageClient->putBlob($containerName, 'WindowsAzure1.gif', self::$path . 'WindowsAzure.gif');
-            $storageClient->putBlob($containerName, 'WindowsAzure2.gif', self::$path . 'WindowsAzure.gif');
-            
-            $result = $storageClient->blobExists($containerName, 'WindowsAzure1.gif');
-            $this->assertTrue($result);
-            
-            $result = $storageClient->blobExists($containerName, md5(time()));
-            $this->assertFalse($result);
-        }
+        $containerName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createContainer($containerName);
+        $storageClient->putBlob($containerName, 'WindowsAzure1.gif', self::$path . 'WindowsAzure.gif');
+        $storageClient->putBlob($containerName, 'WindowsAzure2.gif', self::$path . 'WindowsAzure.gif');
+
+        $result = $storageClient->blobExists($containerName, 'WindowsAzure1.gif');
+        $this->assertTrue($result);
+
+        $result = $storageClient->blobExists($containerName, md5(time()));
+        $this->assertFalse($result);
     }
 
     /**
@@ -149,66 +146,58 @@ class Zend_Service_WindowsAzure_BlobStorageTest extends PHPUnit_Framework_TestCa
      */
     public function testCreateContainer()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $result = $storageClient->createContainer($containerName);
-            $this->assertEquals($containerName, $result->Name);
-        }
+        $containerName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $result = $storageClient->createContainer($containerName);
+        $this->assertEquals($containerName, $result->Name);
     }
-    
+
     /**
      * Test get container acl
      */
     public function testGetContainerAcl()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createContainer($containerName);
-            $acl = $storageClient->getContainerAcl($containerName);
-            $this->assertEquals(Zend_Service_WindowsAzure_Storage_Blob::ACL_PRIVATE, $acl);        
-        }
+        $containerName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createContainer($containerName);
+        $acl = $storageClient->getContainerAcl($containerName);
+        $this->assertEquals(Zend_Service_WindowsAzure_Storage_Blob::ACL_PRIVATE, $acl);
     }
-    
+
     /**
      * Test set container acl
      */
     public function testSetContainerAcl()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createContainer($containerName);
-            
-            $storageClient->setContainerAcl($containerName, Zend_Service_WindowsAzure_Storage_Blob::ACL_PUBLIC);
-            $acl = $storageClient->getContainerAcl($containerName);
-            
-            $this->assertEquals(Zend_Service_WindowsAzure_Storage_Blob::ACL_PUBLIC, $acl);
-        }
+        $containerName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createContainer($containerName);
+
+        $storageClient->setContainerAcl($containerName, Zend_Service_WindowsAzure_Storage_Blob::ACL_PUBLIC);
+        $acl = $storageClient->getContainerAcl($containerName);
+
+        $this->assertEquals(Zend_Service_WindowsAzure_Storage_Blob::ACL_PUBLIC, $acl);
     }
-    
+
     /**
      * Test set container acl advanced
      */
     public function testSetContainerAclAdvanced()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createContainer($containerName);
-            
-            $storageClient->setContainerAcl(
-                $containerName,
-                Zend_Service_WindowsAzure_Storage_Blob::ACL_PRIVATE,
-                array(
-                    new Zend_Service_WindowsAzure_Storage_SignedIdentifier('ABCDEF', '2009-10-10', '2009-10-11', 'r')
-                )
-            );
-            $acl = $storageClient->getContainerAcl($containerName, true);
-            
-            $this->assertEquals(1, count($acl));
-        }
+        $containerName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createContainer($containerName);
+
+        $storageClient->setContainerAcl(
+            $containerName,
+            Zend_Service_WindowsAzure_Storage_Blob::ACL_PRIVATE,
+            array(
+                new Zend_Service_WindowsAzure_Storage_SignedIdentifier('ABCDEF', '2009-10-10', '2009-10-11', 'r')
+            )
+        );
+        $acl = $storageClient->getContainerAcl($containerName, true);
+
+        $this->assertEquals(1, count($acl));
     }
 
     /**
@@ -216,271 +205,255 @@ class Zend_Service_WindowsAzure_BlobStorageTest extends PHPUnit_Framework_TestCa
      */
     public function testSetContainerMetadata()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createContainer($containerName);
-            
-            $storageClient->setContainerMetadata($containerName, array(
-                'createdby' => 'PHPAzure',
-            ));
-            
-            $metadata = $storageClient->getContainerMetadata($containerName);
-            $this->assertEquals('PHPAzure', $metadata['createdby']);
-        }
+        $containerName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createContainer($containerName);
+
+        $storageClient->setContainerMetadata($containerName, array(
+            'createdby' => 'PHPAzure',
+        ));
+
+        $metadata = $storageClient->getContainerMetadata($containerName);
+        $this->assertEquals('PHPAzure', $metadata['createdby']);
     }
-    
+
     /**
      * Test list containers
      */
     public function testListContainers()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName1 = 'testlist1';
-            $containerName2 = 'testlist2';
-            $containerName3 = 'testlist3';
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createContainer($containerName1);
-            $storageClient->createContainer($containerName2);
-            $storageClient->createContainer($containerName3);
-            $result1 = $storageClient->listContainers('testlist');
-            $result2 = $storageClient->listContainers('testlist', 1);
-    
-            // cleanup first
-            $storageClient->deleteContainer($containerName1);
-            $storageClient->deleteContainer($containerName2);
-            $storageClient->deleteContainer($containerName3);
-            
-            $this->assertEquals(3, count($result1));
-            $this->assertEquals($containerName2, $result1[1]->Name);
-            
-            $this->assertEquals(1, count($result2));
-        }
+        $containerName1 = 'testlist1';
+        $containerName2 = 'testlist2';
+        $containerName3 = 'testlist3';
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createContainer($containerName1);
+        $storageClient->createContainer($containerName2);
+        $storageClient->createContainer($containerName3);
+        $result1 = $storageClient->listContainers('testlist');
+        $result2 = $storageClient->listContainers('testlist', 1);
+
+        // cleanup first
+        $storageClient->deleteContainer($containerName1);
+        $storageClient->deleteContainer($containerName2);
+        $storageClient->deleteContainer($containerName3);
+
+        $this->assertEquals(3, count($result1));
+        $this->assertEquals($containerName2, $result1[1]->Name);
+
+        $this->assertEquals(1, count($result2));
     }
-    
+
     /**
      * Test put blob
      */
     public function testPutBlob()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createContainer($containerName);
-            $result = $storageClient->putBlob($containerName, 'images/WindowsAzure.gif', self::$path . 'WindowsAzure.gif');
-    
-            $this->assertEquals($containerName, $result->Container);
-            $this->assertEquals('images/WindowsAzure.gif', $result->Name);
-        }
+        $containerName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createContainer($containerName);
+        $result = $storageClient->putBlob($containerName, 'images/WindowsAzure.gif', self::$path . 'WindowsAzure.gif');
+
+        $this->assertEquals($containerName, $result->Container);
+        $this->assertEquals('images/WindowsAzure.gif', $result->Name);
     }
-    
+
     /**
      * Test put large blob
      */
     public function testPutLargeBlob()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS && TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNLARGEBLOB) {
-            // Create a file > Zend_Service_WindowsAzure_Storage_Blob::MAX_BLOB_SIZE
-            $fileName = $this->_createLargeFile();
-            
-            // Execute test
-            $containerName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createContainer($containerName);
-            $result = $storageClient->putLargeBlob($containerName, 'LargeFile.txt', $fileName);
-    
-            $this->assertEquals($containerName, $result->Container);
-            $this->assertEquals('LargeFile.txt', $result->Name);
-            
-            // Get block list
-            $blockList = $storageClient->getBlockList($containerName, 'LargeFile.txt');
-            $this->assertTrue(count($blockList['CommittedBlocks']) > 0);
-            
-            // Remove file
-            unlink($fileName);
+        if (!TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNLARGEBLOB) {
+            $this->markTestSkipped('Large Blob Test disabled');
         }
+
+        // Create a file > Zend_Service_WindowsAzure_Storage_Blob::MAX_BLOB_SIZE
+        $fileName = $this->_createLargeFile();
+
+        // Execute test
+        $containerName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createContainer($containerName);
+        $result = $storageClient->putLargeBlob($containerName, 'LargeFile.txt', $fileName);
+
+        $this->assertEquals($containerName, $result->Container);
+        $this->assertEquals('LargeFile.txt', $result->Name);
+
+        // Get block list
+        $blockList = $storageClient->getBlockList($containerName, 'LargeFile.txt');
+        $this->assertTrue(count($blockList['CommittedBlocks']) > 0);
+
+        // Remove file
+        unlink($fileName);
     }
-    
+
     /**
      * Test get blob
      */
     public function testGetBlob()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createContainer($containerName);
-            $storageClient->putBlob($containerName, 'images/WindowsAzure.gif', self::$path . 'WindowsAzure.gif');
-            
-            $fileName = tempnam('', 'tst');
-            $storageClient->getBlob($containerName, 'images/WindowsAzure.gif', $fileName);
-    
-            $this->assertTrue(file_exists($fileName));
-            $this->assertEquals(
-                file_get_contents(self::$path . 'WindowsAzure.gif'),
-                file_get_contents($fileName)
-            );
-            
-            // Remove file
-            unlink($fileName);
-        }
+        $containerName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createContainer($containerName);
+        $storageClient->putBlob($containerName, 'images/WindowsAzure.gif', self::$path . 'WindowsAzure.gif');
+
+        $fileName = tempnam('', 'tst');
+        $storageClient->getBlob($containerName, 'images/WindowsAzure.gif', $fileName);
+
+        $this->assertTrue(file_exists($fileName));
+        $this->assertEquals(
+            file_get_contents(self::$path . 'WindowsAzure.gif'),
+            file_get_contents($fileName)
+        );
+
+        // Remove file
+        unlink($fileName);
     }
-    
+
     /**
      * Test set blob metadata
      */
     public function testSetBlobMetadata()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createContainer($containerName);
-            $storageClient->putBlob($containerName, 'images/WindowsAzure.gif', self::$path . 'WindowsAzure.gif');
-            
-            $storageClient->setBlobMetadata($containerName, 'images/WindowsAzure.gif', array(
-                'createdby' => 'PHPAzure',
-            ));
-            
-            $metadata = $storageClient->getBlobMetadata($containerName, 'images/WindowsAzure.gif');
-            $this->assertEquals('PHPAzure', $metadata['createdby']);
-        }
+        $containerName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createContainer($containerName);
+        $storageClient->putBlob($containerName, 'images/WindowsAzure.gif', self::$path . 'WindowsAzure.gif');
+
+        $storageClient->setBlobMetadata($containerName, 'images/WindowsAzure.gif', array(
+            'createdby' => 'PHPAzure',
+        ));
+
+        $metadata = $storageClient->getBlobMetadata($containerName, 'images/WindowsAzure.gif');
+        $this->assertEquals('PHPAzure', $metadata['createdby']);
     }
-    
+
     /**
      * Test delete blob
      */
     public function testDeleteBlob()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createContainer($containerName);
-            
-            $storageClient->putBlob($containerName, 'images/WindowsAzure.gif', self::$path . 'WindowsAzure.gif');
-            $storageClient->deleteBlob($containerName, 'images/WindowsAzure.gif');
-            
-            $result = $storageClient->listBlobs($containerName);
-            $this->assertEquals(0, count($result));
-        }
+        $containerName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createContainer($containerName);
+
+        $storageClient->putBlob($containerName, 'images/WindowsAzure.gif', self::$path . 'WindowsAzure.gif');
+        $storageClient->deleteBlob($containerName, 'images/WindowsAzure.gif');
+
+        $result = $storageClient->listBlobs($containerName);
+        $this->assertEquals(0, count($result));
     }
-    
+
     /**
      * Test list blobs
      */
     public function testListBlobs()
     {
-    	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);
-            $this->assertEquals(5, count($result1));
-            $this->assertEquals('images/WindowsAzure5.gif', $result1[4]->Name);
-            
-            $result2 = $storageClient->listBlobs($containerName, '', '', 2);
-            $this->assertEquals(2, count($result2));
-        }
+        $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);
+        $this->assertEquals(5, count($result1));
+        $this->assertEquals('images/WindowsAzure5.gif', $result1[4]->Name);
+
+        $result2 = $storageClient->listBlobs($containerName, '', '', 2);
+        $this->assertEquals(2, count($result2));
     }
-    
+
     /**
      * Test copy blob
      */
     public function testCopyBlob()
     {
-    	if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = $this->generateName();
-            $storageClient = $this->createStorageInstance();
-            $storageClient->createContainer($containerName);
-            $source = $storageClient->putBlob($containerName, 'images/WindowsAzure.gif', self::$path . 'WindowsAzure.gif');
-    
-            $this->assertEquals($containerName, $source->Container);
-            $this->assertEquals('images/WindowsAzure.gif', $source->Name);
-            
-            $destination = $storageClient->copyBlob($containerName, 'images/WindowsAzure.gif', $containerName, 'images/WindowsAzureCopy.gif');
-    
-            $this->assertEquals($containerName, $destination->Container);
-            $this->assertEquals('images/WindowsAzureCopy.gif', $destination->Name);
-        }
+        $containerName = $this->generateName();
+        $storageClient = $this->createStorageInstance();
+        $storageClient->createContainer($containerName);
+        $source = $storageClient->putBlob($containerName, 'images/WindowsAzure.gif', self::$path . 'WindowsAzure.gif');
+
+        $this->assertEquals($containerName, $source->Container);
+        $this->assertEquals('images/WindowsAzure.gif', $source->Name);
+
+        $destination = $storageClient->copyBlob($containerName, 'images/WindowsAzure.gif', $containerName, 'images/WindowsAzureCopy.gif');
+
+        $this->assertEquals($containerName, $destination->Container);
+        $this->assertEquals('images/WindowsAzureCopy.gif', $destination->Name);
     }
-    
+
     /**
      * Test root container
      */
     public function testRootContainer()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_BLOB_RUNTESTS) {
-            $containerName = '$root';
-            $storageClient = $this->createStorageInstance();
-            $result = $storageClient->createContainer($containerName);
-            $this->assertEquals($containerName, $result->Name);
-            
-            // ACL
-            $storageClient->setContainerAcl($containerName, Zend_Service_WindowsAzure_Storage_Blob::ACL_PUBLIC);
-            $acl = $storageClient->getContainerAcl($containerName);
-            
-            $this->assertEquals(Zend_Service_WindowsAzure_Storage_Blob::ACL_PUBLIC, $acl);
-            
-            // Metadata
-            $storageClient->setContainerMetadata($containerName, array(
-                'createdby' => 'PHPAzure',
-            ));
-            
-            $metadata = $storageClient->getContainerMetadata($containerName);
-            $this->assertEquals('PHPAzure', $metadata['createdby']);
-            
-            // List
-            $result = $storageClient->listContainers();
-            $this->assertEquals(1, count($result));
-            
-            // Put blob
-            $result = $storageClient->putBlob($containerName, 'WindowsAzure.gif', self::$path . 'WindowsAzure.gif');
-   
-            $this->assertEquals($containerName, $result->Container);
-            $this->assertEquals('WindowsAzure.gif', $result->Name);
-            
-            // Get blob
-            $fileName = tempnam('', 'tst');
-            $storageClient->getBlob($containerName, 'WindowsAzure.gif', $fileName);
-    
-            $this->assertTrue(file_exists($fileName));
-            $this->assertEquals(
-                file_get_contents(self::$path . 'WindowsAzure.gif'),
-                file_get_contents($fileName)
-            );
-            
-            // Remove file
-            unlink($fileName);
-            
-            // Blob metadata
-            $storageClient->setBlobMetadata($containerName, 'WindowsAzure.gif', array(
-                'createdby' => 'PHPAzure',
-            ));
-            
-            $metadata = $storageClient->getBlobMetadata($containerName, 'WindowsAzure.gif');
-            $this->assertEquals('PHPAzure', $metadata['createdby']);
-            
-            // List blobs
-            $result = $storageClient->listBlobs($containerName);
-            $this->assertEquals(1, count($result));
-            
-            // Delete blob
-            $storageClient->deleteBlob($containerName, 'WindowsAzure.gif');
-            
-            $result = $storageClient->listBlobs($containerName);
-            $this->assertEquals(0, count($result));
-        }
+        $containerName = '$root';
+        $storageClient = $this->createStorageInstance();
+        $result = $storageClient->createContainer($containerName);
+        $this->assertEquals($containerName, $result->Name);
+
+        // ACL
+        $storageClient->setContainerAcl($containerName, Zend_Service_WindowsAzure_Storage_Blob::ACL_PUBLIC);
+        $acl = $storageClient->getContainerAcl($containerName);
+
+        $this->assertEquals(Zend_Service_WindowsAzure_Storage_Blob::ACL_PUBLIC, $acl);
+
+        // Metadata
+        $storageClient->setContainerMetadata($containerName, array(
+            'createdby' => 'PHPAzure',
+        ));
+
+        $metadata = $storageClient->getContainerMetadata($containerName);
+        $this->assertEquals('PHPAzure', $metadata['createdby']);
+
+        // List
+        $result = $storageClient->listContainers();
+        $this->assertEquals(1, count($result));
+
+        // Put blob
+        $result = $storageClient->putBlob($containerName, 'WindowsAzure.gif', self::$path . 'WindowsAzure.gif');
+
+        $this->assertEquals($containerName, $result->Container);
+        $this->assertEquals('WindowsAzure.gif', $result->Name);
+
+        // Get blob
+        $fileName = tempnam('', 'tst');
+        $storageClient->getBlob($containerName, 'WindowsAzure.gif', $fileName);
+
+        $this->assertTrue(file_exists($fileName));
+        $this->assertEquals(
+            file_get_contents(self::$path . 'WindowsAzure.gif'),
+            file_get_contents($fileName)
+        );
+
+        // Remove file
+        unlink($fileName);
+
+        // Blob metadata
+        $storageClient->setBlobMetadata($containerName, 'WindowsAzure.gif', array(
+            'createdby' => 'PHPAzure',
+        ));
+
+        $metadata = $storageClient->getBlobMetadata($containerName, 'WindowsAzure.gif');
+        $this->assertEquals('PHPAzure', $metadata['createdby']);
+
+        // List blobs
+        $result = $storageClient->listBlobs($containerName);
+        $this->assertEquals(1, count($result));
+
+        // Delete blob
+        $storageClient->deleteBlob($containerName, 'WindowsAzure.gif');
+
+        $result = $storageClient->listBlobs($containerName);
+        $this->assertEquals(0, count($result));
     }
-    
+
     /**
      * Create large file
-     * 
+     *
      * @return string Filename
      */
     private function _createLargeFile()
@@ -490,7 +463,7 @@ class Zend_Service_WindowsAzure_BlobStorageTest extends PHPUnit_Framework_TestCa
         for ($i = 0; $i < Zend_Service_WindowsAzure_Storage_Blob::MAX_BLOB_SIZE / 1024; $i++)
         {
             fwrite($fp,
-            	'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' .
+                'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' .
                 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' .
                 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' .
                 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' .

tests/Zend/Service/WindowsAzure/QueueStorageTest.php

@@ -46,19 +46,20 @@ class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestC
 {
     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);
-        }
+        $suite  = new PHPUnit_Framework_TestSuite("Zend_Service_WindowsAzure_QueueStorageTest");
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
     }
-   
+
     /**
      * Test setup
      */
     protected function setUp()
     {
+        if (!TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_RUNTESTS) {
+            $this->markTestSkipped('Windows Azure Tests disabled');
+        }
     }
-    
+
     /**
      * Test teardown
      */
@@ -79,244 +80,223 @@ class Zend_Service_WindowsAzure_QueueStorageTest extends PHPUnit_Framework_TestC
         } else {
             $storageClient = new Zend_Service_WindowsAzure_Storage_Queue(TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_HOST_DEV, TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_ACCOUNT_DEV, TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_KEY_DEV, true, Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::retryN(10, 250));
         }
-        
+
         if (TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_USEPROXY) {
             $storageClient->setProxy(TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_USEPROXY, TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_PROXY, TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_PROXY_PORT, TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_PROXY_CREDENTIALS);
         }
 
         return $storageClient;
     }
-    
+
     protected static $uniqId = 0;
-    
+
     protected function generateName()
     {
         self::$uniqId++;
         return TESTS_ZEND_SERVICE_WINDOWSAZURE_QUEUE_PREFIX . self::$uniqId;
     }
-    
+
     /**
      * Test queue exists
      */
     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);
-            
-            $result = $storageClient->queueExists($queueName1);
-            $this->assertTrue($result);
-            
-            $result = $storageClient->queueExists(md5(time()));
-            $this->assertFalse($result);
-        }
+        $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);
     }
-    
+
     /**
      * Test create queue
      */
     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);
     }
-    
+
     /**
      * Test set queue metadata
      */
     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']);
     }
-    
+
     /**
      * Test get queue
      */
     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);
     }
-    
+
     /**
      * Test list queues
      */
     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));
     }
-    
+
     /**
      * Test put message
      */
     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(45); // 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(45); // 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);
     }
-    
+
     /**
      * Test get messages
      */
     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(45); // 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(45); // 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));
     }
-    
+
     /**
      * Test peek messages
      */
     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(45); // 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(45); // 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));
     }
-    
+
     /**
      * Test clear messages
      */
     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(45); // wait for the messages to appear in the queue...
-            
-            $messages1 = $storageClient->peekMessages($queueName, 4);
-            $storageClient->clearMessages($queueName);
-            
-            sleep(45); // 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(45); // wait for the messages to appear in the queue...
+
+        $messages1 = $storageClient->peekMessages($queueName, 4);
+        $storageClient->clearMessages($queueName);
+
+        sleep(45); // wait for the GC...
+
+        $messages2 = $storageClient->peekMessages($queueName, 4);
+
+        $this->assertEquals(4, count($messages1));
+        $this->assertEquals(0, count($messages2));
     }
-    
+
     /**
      * Test delete message
      */
     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(45); // wait for the messages to appear in the queue...
-            
-            $messages1 = $storageClient->getMessages($queueName, 2, 10);
-            foreach ($messages1 as $message)
-            {
-                $storageClient->deleteMessage($queueName, $message);
-            }
-            
-            sleep(45); // 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(45); // wait for the messages to appear in the queue...
+
+        $messages1 = $storageClient->getMessages($queueName, 2, 10);
+        foreach ($messages1 as $message) {
+            $storageClient->deleteMessage($queueName, $message);
         }
+
+        sleep(45); // wait for the GC...
+
+        $messages2 = $storageClient->getMessages($queueName, 4);
+
+        $this->assertEquals(2, count($messages1));
+        $this->assertEquals(2, count($messages2));
     }
 }
 

tests/Zend/Service/WindowsAzure/SessionHandlerTest.php

@@ -50,22 +50,23 @@ class Zend_Service_WindowsAzure_SessionHandlerTest extends PHPUnit_Framework_Tes
     public function __construct()
     {
     }
-    
+
     public static function main()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS) {
-            $suite  = new PHPUnit_Framework_TestSuite("Zend_Service_WindowsAzure_SessionHandlerTest");
-            $result = PHPUnit_TextUI_TestRunner::run($suite);
-        }
+        $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('Windows Azure Tests disabled');
+        }
     }
-    
+
     /**
      * Test teardown
      */
@@ -77,7 +78,7 @@ class Zend_Service_WindowsAzure_SessionHandlerTest extends PHPUnit_Framework_Tes
             try { $storageClient->deleteTable(TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_TABLENAME_PREFIX . $i); } catch (Exception $e) { }
         }
     }
-    
+
     protected function createStorageInstance()
     {
         $storageClient = null;
@@ -86,14 +87,14 @@ class Zend_Service_WindowsAzure_SessionHandlerTest extends PHPUnit_Framework_Tes
         } else {
             $storageClient = new Zend_Service_WindowsAzure_Storage_Table(TESTS_ZEND_SERVICE_WINDOWSAZURE_TABLE_HOST_DEV, TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_ACCOUNT_DEV, TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_KEY_DEV, true, Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::retryN(10, 250));
         }
-        
+
         if (TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_USEPROXY) {
             $storageClient->setProxy(TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_USEPROXY, TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_PROXY, TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_PROXY_PORT, TESTS_ZEND_SERVICE_WINDOWSAZURE_STORAGE_PROXY_CREDENTIALS);
         }
 
         return $storageClient;
     }
-    
+
     protected function createSessionHandler($storageInstance, $tableName)
     {
         $sessionHandler = new Zend_Service_WindowsAzure_SessionHandler(
@@ -102,153 +103,137 @@ class Zend_Service_WindowsAzure_SessionHandlerTest extends PHPUnit_Framework_Tes
         );
         return $sessionHandler;
     }
-    
+
     protected static $uniqId = 0;
-    
+
     protected function generateName()
     {
         self::$uniqId++;
         return TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_TABLENAME_PREFIX . self::$uniqId;
     }
-    
+
     /**
      * Test register
      */
     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);
     }
-    
+
     /**
      * Test open
      */
     public function testOpen()
     {
-        if (TESTS_ZEND_SERVICE_WINDOWSAZURE_SESSIONHANDLER_RUNTESTS) {
-            $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);
-        }
+        $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);
     }
-    
+
     /**
      * Test close
      */
     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);
     }
-    
+
     /**
      * Test read
      */
     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);
     }
-    
+
     /**
      * Test write
      */
     public function testWrite()
     {
-        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);
-            
-            
-            $verifyResult = $storageClient->retrieveEntities($tableName);
-            $this->assertEquals(1, 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);
+
+        $verifyResult = $storageClient->retrieveEntities($tableName);
+        $this->assertEquals(1, count($verifyResult));
     }
-    
+
     /**
      * Test destroy
      */
     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));
     }
-    
+
     /**
      * Test gc
      */
     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()