Refine test code for better coverage and structure.

src/Blob/BlobRestProxy.php

@@ -120,7 +120,7 @@ class BlobRestProxy extends ServiceRestProxy implements IBlob
     }
 
     /**
-     * Set the value for SingleBlobUploadThresholdInBytes, Max 64MB
+     * Set the value for SingleBlobUploadThresholdInBytes, Max 256MB
      *
      * @param int $val The max size to send as a single blob block
      *
@@ -560,7 +560,7 @@ class BlobRestProxy extends ServiceRestProxy implements IBlob
      * @param string                 $action    Either clear or create.
      * @param string                 $container The container name.
      * @param string                 $blob      The blob name.
-     * @param Range          $range     The page ranges.
+     * @param Range                  $range     The page ranges.
      * @param string                 $content   The content string.
      * @param CreateBlobPagesOptions $options   The optional parameters.
      *
@@ -2459,7 +2459,7 @@ class BlobRestProxy extends ServiceRestProxy implements IBlob
      *
      * @param string                         $container The container name.
      * @param string                         $blob      The blob name.
-     * @param Models\BlockList|array         $blockList The block entries.
+     * @param Models\BlockList|Block[]       $blockList The block entries.
      * @param Models\CommitBlobBlocksOptions $options   The optional parameters.
      *
      * @return Models\PutBlobResult
@@ -2493,7 +2493,7 @@ class BlobRestProxy extends ServiceRestProxy implements IBlob
      *
      * @param string                         $container The container name.
      * @param string                         $blob      The blob name.
-     * @param Models\BlockList|array         $blockList The block entries.
+     * @param Models\BlockList|Block[]       $blockList The block entries.
      * @param Models\CommitBlobBlocksOptions $options   The optional parameters.
      *
      * @return \GuzzleHttp\Promise\PromiseInterface
@@ -3816,9 +3816,12 @@ class BlobRestProxy extends ServiceRestProxy implements IBlob
      * @param string                     $container         name of the container
      * @param string                     $blob              name of the blob
      * @param string                     $proposedLeaseId   lease id when acquiring
-     * @param int                        $leaseDuration     the lease duration. A non-infinite
+     * @param int                        $leaseDuration     the lease duration.
-     *                                                      lease can be between 15 and 60 seconds.
+     *                                                      A non-infinite
-     *                                                      Default is never to expire.
+     *                                                      lease can be between
+     *                                                      15 and 60 seconds.
+     *                                                      Default is never
+     *                                                      to expire.
      * @param Models\BlobServiceOptions  $options           optional parameters
      *
      * @return Models\LeaseResult
@@ -3848,9 +3851,12 @@ class BlobRestProxy extends ServiceRestProxy implements IBlob
      * @param string                     $container         name of the container
      * @param string                     $blob              name of the blob
      * @param string                     $proposedLeaseId   lease id when acquiring
-     * @param int                        $leaseDuration     the lease duration. A non-infinite
+     * @param int                        $leaseDuration     the lease duration.
-     *                                                      lease can be between 15 and 60 seconds.
+     *                                                      A non-infinite
-     *                                                      Default is never to expire.
+     *                                                      lease can be between
+     *                                                      15 and 60 seconds.
+     *                                                      Default is never to
+     *                                                      expire.
      * @param Models\BlobServiceOptions  $options           optional parameters
      *
      * @return \GuzzleHttp\Promise\PromiseInterface
@@ -4171,8 +4177,8 @@ class BlobRestProxy extends ServiceRestProxy implements IBlob
     /**
      * Adds optional header to headers if set
      *
-     * @param array                  $headers         The array of request headers.
+     * @param array $headers         The array of request headers.
-     * @param array                  $accessCondition The access condition object.
+     * @param array $accessCondition The access condition object.
      *
      * @return array
      */

src/Blob/Internal/IBlob.php

@@ -762,10 +762,10 @@ interface IBlob
     * block list or from the uncommitted block list, or to commit the most recently
     * uploaded version of the block, whichever list it may belong to.
     *
-    * @param string                             $container name of the container
+    * @param string                                  $container name of the container
-    * @param string                             $blob      name of the blob
+    * @param string                                  $blob      name of the blob
-    * @param BlobModels\BlockList|array         $blockList the block list entries
+    * @param BlobModels\BlockList|BlobModels\Block[] $blockList the block list entries
-    * @param BlobModels\CommitBlobBlocksOptions $options   optional parameters
+    * @param BlobModels\CommitBlobBlocksOptions      $options   optional parameters
     *
     * @return BlobModels\PutBlobResult
     *
@@ -789,11 +789,11 @@ interface IBlob
      * block list or from the uncommitted block list, or to commit the most recently
      * uploaded version of the block, whichever list it may belong to.
      *
-     * @param string                             $container The container name.
+     * @param string                                  $container name of the container
-     * @param string                             $blob      The blob name.
+     * @param string                                  $blob      name of the blob
-     * @param BlobModels\BlockList|array         $blockList The block entries.
+     * @param BlobModels\BlockList|BlobModels\Block[] $blockList the block list
-     * @param BlobModels\CommitBlobBlocksOptions $options   The optional
+     *                                                           entries
-     *                                                      parameters.
+     * @param BlobModels\CommitBlobBlocksOptions      $options   optional parameters
      *
      * @return \GuzzleHttp\Promise\PromiseInterface
      *

src/Blob/Models/AppendBlockOptions.php

@@ -36,9 +36,9 @@ namespace MicrosoftAzure\Storage\Blob\Models;
  */
 class AppendBlockOptions extends BlobServiceOptions
 {
-    private $_contentMD5;
+    private $contentMD5;
-    private $_maxBlobSize;
+    private $maxBlobSize;
-    private $_appendPosition;
+    private $appendPosition;
     
     /**
      * Gets block contentMD5.
@@ -47,7 +47,7 @@ class AppendBlockOptions extends BlobServiceOptions
      */
     public function getContentMD5()
     {
-        return $this->_contentMD5;
+        return $this->contentMD5;
     }
 
     /**
@@ -59,7 +59,7 @@ class AppendBlockOptions extends BlobServiceOptions
      */
     public function setContentMD5($contentMD5)
     {
-        $this->_contentMD5 = $contentMD5;
+        $this->contentMD5 = $contentMD5;
     }
     
     /**
@@ -69,7 +69,7 @@ class AppendBlockOptions extends BlobServiceOptions
      */
     public function getMaxBlobSize()
     {
-        return $this->_maxBlobSize;
+        return $this->maxBlobSize;
     }
 
     /**
@@ -81,7 +81,7 @@ class AppendBlockOptions extends BlobServiceOptions
      */
     public function setMaxBlobSize($maxBlobSize)
     {
-        $this->_maxBlobSize = $maxBlobSize;
+        $this->maxBlobSize = $maxBlobSize;
     }
     
     /**
@@ -91,7 +91,7 @@ class AppendBlockOptions extends BlobServiceOptions
      */
     public function getAppendPosition()
     {
-        return $this->_appendPosition;
+        return $this->appendPosition;
     }
 
     /**
@@ -103,6 +103,6 @@ class AppendBlockOptions extends BlobServiceOptions
      */
     public function setAppendPosition($appendPosition)
     {
-        $this->_appendPosition = $appendPosition;
+        $this->appendPosition = $appendPosition;
     }
 }

src/Blob/Models/BlockList.php

@@ -40,7 +40,7 @@ use MicrosoftAzure\Storage\Common\Internal\Serialization\XmlSerializer;
  */
 class BlockList
 {
-    private $_entries;
+    private $entries;
     private static $xmlRootName = 'BlockList';
     
     /**
@@ -80,7 +80,7 @@ class BlockList
         $block->setBlockId($blockId);
         $block->setType($type);
         
-        $this->_entries[] = $block;
+        $this->entries[] = $block;
     }
     
     /**
@@ -128,7 +128,7 @@ class BlockList
      */
     public function getEntry($blockId)
     {
-        foreach ($this->_entries as $value) {
+        foreach ($this->entries as $value) {
             if ($blockId == $value->getBlockId()) {
                 return $value;
             }
@@ -144,7 +144,7 @@ class BlockList
      */
     public function getEntries()
     {
-        return $this->_entries;
+        return $this->entries;
     }
     
     /**
@@ -161,7 +161,7 @@ class BlockList
         $properties = array(XmlSerializer::ROOT_NAME => self::$xmlRootName);
         $array      = array();
         
-        foreach ($this->_entries as $value) {
+        foreach ($this->entries as $value) {
             $array[] = array(
                 $value->getType() => $value->getBlockId()
             );

src/Blob/Models/LeaseResult.php

@@ -39,7 +39,7 @@ use MicrosoftAzure\Storage\Common\Internal\Utilities;
  */
 class LeaseResult
 {
-    private $_leaseId;
+    private $leaseId;
     
     /**
      * Creates LeaseResult from response headers
@@ -68,7 +68,7 @@ class LeaseResult
      */
     public function getLeaseId()
     {
-        return $this->_leaseId;
+        return $this->leaseId;
     }
     
     /**
@@ -80,6 +80,6 @@ class LeaseResult
      */
     protected function setLeaseId($leaseId)
     {
-        $this->_leaseId = $leaseId;
+        $this->leaseId = $leaseId;
     }
 }

src/Blob/Models/ListBlobBlocksResult.php

@@ -40,12 +40,12 @@ use MicrosoftAzure\Storage\Common\Internal\Utilities;
  */
 class ListBlobBlocksResult
 {
-    private $_lastModified;
+    private $lastModified;
-    private $_etag;
+    private $etag;
-    private $_contentType;
+    private $contentType;
-    private $_contentLength;
+    private $contentLength;
-    private $_committedBlocks;
+    private $committedBlocks;
-    private $_uncommittedBlocks;
+    private $uncommittedBlocks;
     
     /**
      * Gets block entries from parsed response
@@ -55,7 +55,7 @@ class ListBlobBlocksResult
      *
      * @return array
      */
-    private static function _getEntries(array $parsed, $type)
+    private static function getEntries(array $parsed, $type)
     {
         $entries = array();
         
@@ -107,11 +107,11 @@ class ListBlobBlocksResult
             Utilities::tryGetValue($clean, Resources::CONTENT_TYPE)
         );
         
-        $result->_uncommittedBlocks = self::_getEntries(
+        $result->uncommittedBlocks = self::getEntries(
             $parsed,
             'UncommittedBlocks'
         );
-        $result->_committedBlocks   = self::_getEntries($parsed, 'CommittedBlocks');
+        $result->committedBlocks   = self::getEntries($parsed, 'CommittedBlocks');
         
         return $result;
     }
@@ -123,7 +123,7 @@ class ListBlobBlocksResult
      */
     public function getLastModified()
     {
-        return $this->_lastModified;
+        return $this->lastModified;
     }
 
     /**
@@ -136,7 +136,7 @@ class ListBlobBlocksResult
     protected function setLastModified(\DateTime $lastModified)
     {
         Validate::isDate($lastModified);
-        $this->_lastModified = $lastModified;
+        $this->lastModified = $lastModified;
     }
 
     /**
@@ -146,7 +146,7 @@ class ListBlobBlocksResult
      */
     public function getETag()
     {
-        return $this->_etag;
+        return $this->etag;
     }
 
     /**
@@ -158,7 +158,7 @@ class ListBlobBlocksResult
      */
     protected function setETag($etag)
     {
-        $this->_etag = $etag;
+        $this->etag = $etag;
     }
     
     /**
@@ -168,7 +168,7 @@ class ListBlobBlocksResult
      */
     public function getContentType()
     {
-        return $this->_contentType;
+        return $this->contentType;
     }
 
     /**
@@ -180,7 +180,7 @@ class ListBlobBlocksResult
      */
     protected function setContentType($contentType)
     {
-        $this->_contentType = $contentType;
+        $this->contentType = $contentType;
     }
     
     /**
@@ -190,7 +190,7 @@ class ListBlobBlocksResult
      */
     public function getContentLength()
     {
-        return $this->_contentLength;
+        return $this->contentLength;
     }
 
     /**
@@ -203,7 +203,7 @@ class ListBlobBlocksResult
     protected function setContentLength($contentLength)
     {
         Validate::isInteger($contentLength, 'contentLength');
-        $this->_contentLength = $contentLength;
+        $this->contentLength = $contentLength;
     }
     
     /**
@@ -213,7 +213,7 @@ class ListBlobBlocksResult
      */
     public function getUncommittedBlocks()
     {
-        return $this->_uncommittedBlocks;
+        return $this->uncommittedBlocks;
     }
     
     /**
@@ -225,7 +225,7 @@ class ListBlobBlocksResult
      */
     protected function setUncommittedBlocks(array $uncommittedBlocks)
     {
-        $this->_uncommittedBlocks = $uncommittedBlocks;
+        $this->uncommittedBlocks = $uncommittedBlocks;
     }
     
     /**
@@ -235,7 +235,7 @@ class ListBlobBlocksResult
      */
     public function getCommittedBlocks()
     {
-        return $this->_committedBlocks;
+        return $this->committedBlocks;
     }
     
     /**
@@ -247,6 +247,6 @@ class ListBlobBlocksResult
      */
     protected function setCommittedBlocks(array $committedBlocks)
     {
-        $this->_committedBlocks = $committedBlocks;
+        $this->committedBlocks = $committedBlocks;
     }
 }

src/Common/Internal/Serialization/XmlSerializer.php

@@ -54,11 +54,11 @@ class XmlSerializer implements ISerializer
      *
      * @return array
      */
-    private function _sxml2arr($sxml, array $arr = null)
+    private function sxml2arr($sxml, array $arr = null)
     {
         foreach ((array) $sxml as $key => $value) {
             if (is_object($value) || (is_array($value))) {
-                $arr[$key] = $this->_sxml2arr($value);
+                $arr[$key] = $this->sxml2arr($value);
             } else {
                 $arr[$key] = $value;
             }
@@ -77,7 +77,7 @@ class XmlSerializer implements ISerializer
      *
      * @return void
      */
-    private function _arr2xml(\XMLWriter $xmlw, array $data, $defaultTag = null)
+    private function arr2xml(\XMLWriter $xmlw, array $data, $defaultTag = null)
     {
         foreach ($data as $key => $value) {
             if ($key === Resources::XTAG_ATTRIBUTES) {
@@ -93,7 +93,7 @@ class XmlSerializer implements ISerializer
                     }
                 }
                 
-                $this->_arr2xml($xmlw, $value);
+                $this->arr2xml($xmlw, $value);
                 
                 if (!is_int($key)) {
                     $xmlw->endElement();
@@ -113,7 +113,7 @@ class XmlSerializer implements ISerializer
      *
      * @return mixed
      */
-    private static function _getInstanceAttributes($targetObject, array $methodArray)
+    private static function getInstanceAttributes($targetObject, array $methodArray)
     {
         foreach ($methodArray as $method) {
             if ($method->name == 'getAttributes') {
@@ -141,7 +141,7 @@ class XmlSerializer implements ISerializer
         $xmlWriter->setIndent(true);
         $reflectionClass = new \ReflectionClass($targetObject);
         $methodArray     = $reflectionClass->getMethods();
-        $attributes      = self::_getInstanceAttributes(
+        $attributes      = self::getInstanceAttributes(
             $targetObject,
             $methodArray
         );
@@ -222,7 +222,7 @@ class XmlSerializer implements ISerializer
         }
         
         unset($array[Resources::XTAG_NAMESPACE]);
-        self::_arr2xml($xmlw, $array, $defaultTag);
+        self::arr2xml($xmlw, $array, $defaultTag);
 
         $xmlw->endElement();
 
@@ -240,6 +240,6 @@ class XmlSerializer implements ISerializer
     {
         $sxml = new \SimpleXMLElement($serialized);
 
-        return $this->_sxml2arr($sxml);
+        return $this->sxml2arr($sxml);
     }
 }

tests/functional/Blob/BlobServiceFunctionalTest.php

@@ -27,14 +27,23 @@ namespace MicrosoftAzure\Storage\Tests\functional\Blob;
 use MicrosoftAzure\Storage\Tests\Framework\TestResources;
 use MicrosoftAzure\Storage\Blob\Models\BlobServiceOptions;
 use MicrosoftAzure\Storage\Blob\Models\CopyBlobOptions;
+use MicrosoftAzure\Storage\Blob\Models\BlobType;
+use MicrosoftAzure\Storage\Blob\Models\BlobBlockType;
+use MicrosoftAzure\Storage\Blob\Models\Block;
+use MicrosoftAzure\Storage\Blob\Models\BlockList;
 use MicrosoftAzure\Storage\Blob\Models\CreateBlobSnapshotOptions;
 use MicrosoftAzure\Storage\Blob\Models\CreateContainerOptions;
+use MicrosoftAzure\Storage\Blob\Models\CreateBlobOptions;
 use MicrosoftAzure\Storage\Blob\Models\DeleteBlobOptions;
 use MicrosoftAzure\Storage\Blob\Models\GetBlobMetadataOptions;
+use MicrosoftAzure\Storage\Blob\Models\ListPageBlobRangesOptions;
 use MicrosoftAzure\Storage\Blob\Models\GetBlobOptions;
 use MicrosoftAzure\Storage\Blob\Models\GetBlobPropertiesOptions;
+use MicrosoftAzure\Storage\Blob\Models\AppendBlockOptions;
+use MicrosoftAzure\Storage\Blob\Models\CreateBlobPagesOptions;
 use MicrosoftAzure\Storage\Blob\Models\ListBlobsOptions;
 use MicrosoftAzure\Storage\Blob\Models\ListContainersOptions;
+use MicrosoftAzure\Storage\Blob\Models\ListBlobBlocksOptions;
 use MicrosoftAzure\Storage\Blob\Models\PublicAccessType;
 use MicrosoftAzure\Storage\Common\Exceptions\ServiceException;
 use MicrosoftAzure\Storage\Common\Internal\Resources;
@@ -3034,18 +3043,505 @@ class BlobServiceFunctionalTest extends FunctionalTestBase
         );
     }
 
-    //    createBlockBlob
+    /**
-    //    createBlobBlock
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::createBlockBlob
-    //    commitBlobBlocks
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::createBlockBlobAsync
-    //    listBlobBlocks
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::getBlob
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::getBlobAsync
+     */
+    public function testCreateBlockBlobNormal()
+    {
+        $attrs = BlobServiceFunctionalTestData::getCreateBlockBlobAttributes();
+        $container = BlobServiceFunctionalTestData::getContainerName();
 
-    //    createPageBlob
+        foreach ($attrs as $attr) {
-    //    createBlobPages
+            $threshold = array_key_exists('threshold', $attr)?
-    //    clearBlobPages
+                $attr['threshold'] : Resources::MB_IN_BYTES_32;
-    //    listBlobRegions
+            $size = $attr['size'];
+            $this->createBlockBlobWorker($container, $threshold, $size);
+        }
+    }
 
-    //    acquireLease
+    private function createBlockBlobWorker($container, $threshold, $size)
-    //    renewLease
+    {
-    //    releaseLease
+        //create a temp file of size $size.
-    //    breakLease
+        $cwd = getcwd();
+        $uuid = uniqid('test-file-', true);
+        $path = $cwd.DIRECTORY_SEPARATOR.$uuid.'.txt';
+        $resource = fopen($path, 'w+');
+
+        $count = $size / Resources::MB_IN_BYTES_32;
+        for ($i = 0; $i < $count; ++$i) {
+            fwrite($resource, openssl_random_pseudo_bytes(Resources::MB_IN_BYTES_32));
+        }
+        $remain = $size - (Resources::MB_IN_BYTES_32 * $count);
+        fwrite($resource, openssl_random_pseudo_bytes($remain));
+        rewind($resource);
+
+        //upload the blob
+        $blobName = BlobServiceFunctionalTestData::getInterestingBlobName($container);
+        $metadata = array('m1' => 'v1', 'm2' => 'v2');
+        $contentType = 'text/plain; charset=UTF-8';
+        $options = new CreateBlobOptions();
+        $options->setContentType($contentType);
+        $options->setMetadata($metadata);
+        $this->restProxy->setSingleBlobUploadThresholdInBytes($threshold);
+        $this->restProxy->createBlockBlob(
+            $container,
+            $blobName,
+            $resource,
+            $options
+        );
+
+        // Test
+        $result = $this->restProxy->getBlob($container, $blobName);
+
+        //get the path for the file to be downloaded into.
+        $uuid = uniqid('test-file-', true);
+        $downloadPath = $cwd.DIRECTORY_SEPARATOR.$uuid.'.txt';
+        $downloadResource = fopen($downloadPath, 'w');
+        //download the file
+        $content = $result->getContentStream();
+
+        while (!feof($content)) {
+            fwrite(
+                $downloadResource,
+                stream_get_contents($content, Resources::MB_IN_BYTES_32)
+            );
+        }
+
+        // Assert
+        $this->assertEquals(
+            BlobType::BLOCK_BLOB,
+            $result->getProperties()->getBlobType()
+        );
+        $this->assertEquals($metadata, $result->getMetadata());
+        $originMd5 = md5_file($path);
+        $downloadMd5 = md5_file($downloadPath);
+        $this->assertEquals($originMd5, $downloadMd5);
+
+        //clean-up.
+        if (is_resource($resource)) {
+            fclose($resource);
+        }
+        fclose($downloadResource);
+        unlink($path);
+        unlink($downloadPath);
+    }
+
+    /**
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::createBlockBlob
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::createBlockBlobAsync
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::createBlobBlock
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::createBlobBlockAsync
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::commitBlobBlocks
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::commitBlobBlocksAsync
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::listBlobBlocks
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::listBlobBlocksAsync
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::getBlobProperties
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::getBlobPropertiesAsync
+     */
+    public function testBlockBlobBlocks()
+    {
+        //create block blob
+        $container = BlobServiceFunctionalTestData::getContainerName();
+        $blob = BlobServiceFunctionalTestData::getInterestingBlobName($container);
+        $this->restProxy->createBlockBlob($container, $blob, '');
+
+        //create blocks
+        $blockIds = array();
+        $contents = array();
+        for ($i = 0; $i < 5; ++$i) {
+            $blockId = BlobServiceFunctionalTestData::getInterestingBlockId();
+            $content = openssl_random_pseudo_bytes(Resources::MB_IN_BYTES_4);
+            $this->restProxy->createBlobBlock($container, $blob, $blockId, $content);
+            $blockIds[] = $blockId;
+            $contents[] = $content;
+        }
+        $this->verifyBlocks($container, $blob, $blockIds, false);
+        //commit blocks 1 and 3.
+        $latest = BlobBlockType::LATEST_TYPE;
+        $committed = BlobBlockType::COMMITTED_TYPE;
+        $blockList = [
+            new Block($blockIds[1], $latest),
+            new Block($blockIds[3], $latest)
+        ];
+        $this->restProxy->commitBlobBlocks($container, $blob, $blockList);
+        //verify MD5 and uncommitted.
+        $this->verifyBlobMd5($container, $blob, $contents[1] . $contents[3]);
+        $this->verifyBlocks(
+            $container,
+            $blob,
+            [$blockIds[1], $blockIds[3]]
+        );
+
+        //update blob with blocks 3 and 4.
+        for ($i = 0; $i < 5; ++$i) {
+            $this->restProxy->createBlobBlock(
+                $container,
+                $blob,
+                $blockIds[$i],
+                $contents[$i]
+            );
+        }
+        $blockList = [
+            new Block($blockIds[3], $latest),
+            new Block($blockIds[4], $latest),
+        ];
+        $this->restProxy->commitBlobBlocks($container, $blob, $blockList);
+        //verify MD5 and uncommitted.
+        $this->verifyBlobMd5($container, $blob, $contents[3] . $contents[4]);
+        $this->verifyBlocks(
+            $container,
+            $blob,
+            [$blockIds[3], $blockIds[4]]
+        );
+
+        //commit a blob with same id with block 3
+        $this->restProxy->createBlobBlock($container, $blob, $blockIds[0], $contents[0]);
+        $content = openssl_random_pseudo_bytes(Resources::MB_IN_BYTES_4);
+        $this->restProxy->createBlobBlock($container, $blob, $blockIds[3], $content);
+        //test BlobBlockType::COMMITTED_TYPE
+        $blockList = [
+            new Block($blockIds[3], $committed),
+            new Block($blockIds[0], $latest),
+        ];
+        $this->restProxy->commitBlobBlocks($container, $blob, $blockList);
+        //verify MD5 and uncommitted.
+        $this->verifyBlobMd5($container, $blob, $contents[3] . $contents[0]);
+        $this->verifyBlocks(
+            $container,
+            $blob,
+            [$blockIds[0], $blockIds[3]]
+        );
+        //test BlobBlockType::LATEST_TYPE
+        $this->restProxy->createBlobBlock($container, $blob, $blockIds[0], $contents[0]);
+        $content = openssl_random_pseudo_bytes(Resources::MB_IN_BYTES_4);
+        $this->restProxy->createBlobBlock($container, $blob, $blockIds[3], $content);
+        $blockList = [
+            new Block($blockIds[3], $latest),
+            new Block($blockIds[0], $latest),
+        ];
+        $this->restProxy->commitBlobBlocks($container, $blob, $blockList);
+        //verify MD5 and uncommitted.
+        $this->verifyBlobMd5($container, $blob, $content . $contents[0]);
+        $this->verifyBlocks(
+            $container,
+            $blob,
+            [$blockIds[3], $blockIds[0]]
+        );
+    }
+
+    private function verifyBlobMd5($container, $blob, $content)
+    {
+        $c = stream_get_contents($this->restProxy->getBlob($container, $blob)->getContentStream());
+        $expectedMd5 = md5($content);
+        $actualMd5 = md5($c);
+        $this->assertEquals($expectedMd5, $actualMd5);
+    }
+
+    private function verifyBlocks($container, $blob, $list, $isCommitted = true)
+    {
+        $options = new ListBlobBlocksOptions();
+        if ($isCommitted) {
+            $options->setIncludeCommittedBlobs(true);
+        } else {
+            $options->setIncludeUncommittedBlobs(true);
+        }
+        $result = $this->restProxy->listBlobBlocks($container, $blob, $options);
+        $blocks = $isCommitted? $result->getCommittedBlocks() : $result->getUncommittedBlocks();
+        foreach ($list as $blockId) {
+            $this->assertTrue(array_key_exists($blockId, $blocks));
+        }
+    }
+
+    /**
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::createPageBlob
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::createPageBlobAsync
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::createBlobPages
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::createBlobPagesAsync
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::clearBlobPages
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::clearBlobPagesAsync
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::listPageBlobRanges
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::listPageBlobRangesAsync
+     */
+    public function testPutListClearPageRanges()
+    {
+        $rangesArray = BlobServiceFunctionalTestData::getRangesArray();
+        $container = BlobServiceFunctionalTestData::getInterestingContainerName();
+        $this->createContainer($container);
+        $blob = BlobServiceFunctionalTestData::getInterestingBlobName($container);
+        $this->restProxy->createPageBlob($container, $blob, 2048);
+        foreach ($rangesArray as $array) {
+            $this->putListClearPageRangesWorker(
+                $container,
+                $blob,
+                $array['putRange'],
+                $array['clearRange'],
+                $array['listRange'],
+                $array['resultListRange']
+            );
+        }
+        $this->deleteContainer($container);
+    }
+
+    private function putListClearPageRangesWorker(
+        $container,
+        $blob,
+        $putRange,
+        $clearRange,
+        $listRange,
+        $resultListRange
+    ) {
+        if ($putRange != null) {
+            $length = $putRange->getLength();
+            if ($length == null) {
+                $length = 2048 - $putRange->getStart();
+            }
+            $content = \openssl_random_pseudo_bytes($length);
+            $options = new CreateBlobPagesOptions();
+            //setting the wrong md5.
+            $options->setContentMD5(Utilities::calculateContentMD5(''));
+            $message = '';
+            try {
+                $this->restProxy->createBlobPages(
+                    $container,
+                    $blob,
+                    $putRange,
+                    $content,
+                    $options
+                );
+            } catch (ServiceException $e) {
+                $message = $e->getMessage();
+            }
+            $this->assertContains('400', $message);
+            $this->assertContains(
+                'The MD5 value specified in the request did not match with the MD5 value calculated by the server.',
+                $message
+            );
+            //Ends debug code snippet
+            // Now set the correct content MD5
+            $options->setContentMD5(Utilities::calculateContentMD5($content));
+            $this->restProxy->createBlobPages(
+                $container,
+                $blob,
+                $putRange,
+                $content,
+                $options
+            );
+            $getOptions = new GetBlobOptions();
+            $getOptions->setRangeStart($putRange->getStart());
+            $getOptions->setRangeEnd($putRange->getEnd());
+            $getOptions->setComputeRangeMD5(true);
+            $result = $this->restProxy->getBlob($container, $blob, $getOptions);
+            $actualContent = stream_get_contents($result->getContentStream());
+            $actualMD5 = $result->getProperties()->getContentMD5();
+            //Validate
+            $this->assertEquals(Utilities::calculateContentMD5($content), $actualMD5);
+            $this->assertEquals($content, $actualContent);
+        }
+        if ($clearRange != null) {
+            $this->restProxy->clearBlobPages($container, $blob, $clearRange);
+        }
+        //Validate result
+        $listRangeOptions = new ListPageBlobRangesOptions();
+        if ($listRange != null) {
+            $listRangeOptions->setRangeStart($listRange->getStart());
+            $listRangeOptions->setRangeEnd($listRange->getEnd());
+        }
+        $listResult =
+            $this->restProxy->listPageBlobRanges($container, $blob, $listRangeOptions);
+        $this->assertEquals(2048, $listResult->getContentLength());
+        $resultRanges = $listResult->getRanges();
+        for ($i = 0; $i < count($resultRanges); ++$i) {
+            $this->assertEquals($resultListRange[$i], $resultRanges[$i]);
+        }
+    }
+
+    /**
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::createAppendBlob
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::createAppendBlobAsync
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::appendBlock
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::appendBlockAsync
+     */
+    public function testAppendBlob()
+    {
+        $container = BlobServiceFunctionalTestData::getInterestingContainerName();
+        $this->createContainer($container);
+        $blob = BlobServiceFunctionalTestData::getInterestingBlobName($container);
+        $this->restProxy->createAppendBlob($container, $blob);
+
+        $setupArrays = BlobServiceFunctionalTestData::getAppendBlockSetup();
+        foreach ($setupArrays as $setupArray) {
+            $content = openssl_random_pseudo_bytes($setupArray['size']);
+            $options = $setupArray['options'];
+            $errorMsg = $setupArray['error'];
+            $message = '';
+            try {
+                $this->restProxy->appendBlock(
+                    $container,
+                    $blob,
+                    $content,
+                    $options
+                );
+            } catch (ServiceException $e) {
+                $message = $e->getMessage();
+            }
+            if ($errorMsg == '') {
+                $this->assertEquals('', $message);
+            } else {
+                $this->assertContains($errorMsg, $message);
+            }
+        }
+    }
+
+    /**
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::acquireLease
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::acquireLeaseAsync
+     */
+    public function testLeaseContainer()
+    {
+        $container = BlobServiceFunctionalTestData::getInterestingContainerName();
+        $this->restProxy->createContainer($container);
+        $leaseId = Utilities::getGuid();
+        $result = $this->restProxy->acquireLease($container, '', $leaseId);
+        $this->assertEquals($leaseId, $result->getLeaseId());
+        $message = '';
+        try {
+            $this->restProxy->deleteContainer($container);
+        } catch (ServiceException $e) {
+            $message = $e->getMessage();
+        }
+        $this->assertContains('There is currently a lease on the container and no lease ID was specified in the request', $message);
+        $options = new BlobServiceOptions();
+        $options->setLeaseId($leaseId);
+        $this->restProxy->deleteContainer($container, $options);
+    }
+
+    /**
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::acquireLease
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::acquireLeaseAsync
+     */
+    public function testLeaseBlob()
+    {
+        $container = BlobServiceFunctionalTestData::getInterestingContainerName();
+        $this->restProxy->createContainer($container);
+        $blob = BlobServiceFunctionalTestData::getInterestingBlobName($container);
+        $this->restProxy->createPageBlob($container, $blob, 1024);
+        $leaseId = Utilities::getGuid();
+        $result = $this->restProxy->acquireLease($container, $blob, $leaseId);
+        $this->assertEquals($leaseId, $result->getLeaseId());
+        $message = '';
+        try {
+            $this->restProxy->deleteBlob($container, $blob);
+        } catch (ServiceException $e) {
+            $message = $e->getMessage();
+        }
+        $this->assertContains('There is currently a lease on the blob and no lease ID was specified in the request.', $message);
+        $options = new DeleteBlobOptions();
+        $options->setLeaseId($leaseId);
+        $this->restProxy->deleteBlob($container, $blob, $options);
+    }
+
+    /**
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::acquireLease
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::acquireLeaseAsync
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::renewLease
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::renewLeaseAsync
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::releaseLease
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::releaseLeaseAsync
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::changeLease
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::changeLeaseAsync
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::breakLease
+     * @covers MicrosoftAzure\Storage\Blob\BlobRestProxy::breakLeaseAsync
+     */
+    public function testLeaseOperations()
+    {
+        $container = BlobServiceFunctionalTestData::getInterestingContainerName();
+        $this->restProxy->createContainer($container);
+        //configure
+        $blob = BlobServiceFunctionalTestData::getInterestingBlobName($container);
+        $this->restProxy->createPageBlob($container, $blob, 1024);
+        $leaseId = Utilities::getGuid();
+
+        $message = '';
+        //test acquire lease duration no in bound
+        try {
+            $this->restProxy->acquireLease($container, $blob, $leaseId, 14);
+        } catch (ServiceException $e) {
+            $message = $e->getMessage();
+        }
+        $this->assertContains(' The value for one of the HTTP headers is not in the correct format.', $message);
+        try {
+            $this->restProxy->acquireLease($container, $blob, $leaseId, 61);
+        } catch (ServiceException $e) {
+            $message = $e->getMessage();
+        }
+        $this->assertContains(' The value for one of the HTTP headers is not in the correct format.', $message);
+        $result = $this->restProxy->acquireLease($container, $blob, $leaseId, 15);
+        $this->assertEquals($leaseId, $result->getLeaseId());
+        //test lease duration expire
+        \sleep(15);
+        $this->restProxy->deleteBlob($container, $blob);
+
+        //re-configure
+        $blob = BlobServiceFunctionalTestData::getInterestingBlobName($container);
+        $this->restProxy->createPageBlob($container, $blob, 1024);
+        $leaseId = Utilities::getGuid();
+        $this->restProxy->acquireLease($container, $blob, $leaseId);
+        //test change lease
+        $newLeaseId = Utilities::getGuid();
+        $result = $this->restProxy->changeLease($container, $blob, $leaseId, $newLeaseId);
+        $options = new DeleteBlobOptions();
+        $options->setLeaseId($newLeaseId);
+        $this->restProxy->deleteBlob($container, $blob, $options);
+
+        $result = $this->restProxy->listBlobs($container);
+        $this->assertTrue(empty($result->getBlobs()));
+
+        //test renew lease
+        //re-configure
+        $blob = BlobServiceFunctionalTestData::getInterestingBlobName($container);
+        $this->restProxy->createPageBlob($container, $blob, 1024);
+        $leaseId = Utilities::getGuid();
+        $this->restProxy->acquireLease($container, $blob, $leaseId, 15);
+        \sleep(15);
+        $this->restProxy->renewLease($container, $blob, $leaseId);
+        try {
+            $this->restProxy->deleteBlob($container, $blob);
+        } catch (ServiceException $e) {
+            $message = $e->getMessage();
+        }
+        $this->assertContains('There is currently a lease on the blob and no lease ID was specified in the request.', $message);
+
+        //test release lease
+        $this->restProxy->releaseLease($container, $blob, $leaseId);
+        //acquire a lease immediately after.
+        $leaseId = Utilities::getGuid();
+        $this->restProxy->acquireLease($container, $blob, $leaseId);
+        try {
+            $this->restProxy->deleteBlob($container, $blob);
+        } catch (ServiceException $e) {
+            $message = $e->getMessage();
+        }
+        $this->assertContains('There is currently a lease on the blob and no lease ID was specified in the request.', $message);
+
+        //test break lease
+        $result = $this->restProxy->breakLease($container, $blob, 10);
+        $leaseId = Utilities::getGuid();
+        try {
+            $this->restProxy->acquireLease($container, $blob, $leaseId);
+        } catch (ServiceException $e) {
+            $message = $e->getMessage();
+        }
+        $this->assertContains('There is currently a lease on the blob and no lease ID was specified in the request.', $message);
+        \sleep(10);
+        $this->restProxy->acquireLease($container, $blob, $leaseId);
+        $options = new DeleteBlobOptions();
+        $options->setLeaseId($leaseId);
+        $this->restProxy->deleteBlob($container, $blob, $options);
+
+        $result = $this->restProxy->listBlobs($container);
+        $this->assertTrue(empty($result->getBlobs()));
+    }
 }

tests/functional/Blob/BlobServiceFunctionalTestData.php

@@ -32,6 +32,7 @@ use MicrosoftAzure\Storage\Blob\Models\BlobServiceOptions;
 use MicrosoftAzure\Storage\Blob\Models\CreateBlobOptions;
 use MicrosoftAzure\Storage\Blob\Models\CreateBlobSnapshotOptions;
 use MicrosoftAzure\Storage\Blob\Models\CreateContainerOptions;
+use MicrosoftAzure\Storage\Blob\Models\AppendBlockOptions;
 use MicrosoftAzure\Storage\Blob\Models\DeleteBlobOptions;
 use MicrosoftAzure\Storage\Blob\Models\GetBlobOptions;
 use MicrosoftAzure\Storage\Blob\Models\GetBlobPropertiesOptions;
@@ -40,6 +41,8 @@ use MicrosoftAzure\Storage\Blob\Models\ListContainersOptions;
 use MicrosoftAzure\Storage\Blob\Models\PublicAccessType;
 use MicrosoftAzure\Storage\Blob\Models\SetBlobPropertiesOptions;
 use MicrosoftAzure\Storage\Common\Internal\Resources;
+use MicrosoftAzure\Storage\Common\Internal\Utilities;
+use MicrosoftAzure\Storage\Common\Models\Range;
 use MicrosoftAzure\Storage\Common\Models\Logging;
 use MicrosoftAzure\Storage\Common\Models\Metrics;
 use MicrosoftAzure\Storage\Common\Models\CORS;
@@ -54,6 +57,7 @@ class BlobServiceFunctionalTestData
     public static $nonExistBlobPrefix;
     public static $testContainerNames;
     public static $testBlobNames;
+    private static $blockIdCount;
     private static $accountName;
     private static $badETag = '0x123456789ABCDEF';
 
@@ -66,6 +70,7 @@ class BlobServiceFunctionalTestData
         self::$nonExistBlobPrefix = 'qa-' . ($rint . 2) . '-';
         self::$testContainerNames = array( self::$testUniqueId . 'a1', self::$testUniqueId . 'a2', self::$testUniqueId . 'b1' );
         self::$testBlobNames = array( 'b' . self::$testUniqueId . 'a1', 'b' . self::$testUniqueId . 'a2', 'b' . self::$testUniqueId . 'b1' );
+        self::$blockIdCount = 0;
     }
 
     public static function getInterestingContainerName()
@@ -104,6 +109,14 @@ class BlobServiceFunctionalTestData
         return $blobname;
     }
 
+    public static function getInterestingBlockId()
+    {
+        //Block ID must be base64 encoded.
+        return base64_encode(
+            str_pad(self::$blockIdCount++, 6, '0', STR_PAD_LEFT)
+        );
+    }
+
     public static function getSimpleMessageText()
     {
         return 'simple message text #' . (self::$tempBlobCounter++);
@@ -812,11 +825,6 @@ class BlobServiceFunctionalTestData
         $options->setSnapshot('placeholder');
         array_push($ret, $options);
 
-        // TODO: Handle Lease ID
-        //        $options = new GetBlobOptions();
-        //        $options->setLeaseId('setLeaseId');
-        //        array_push($ret, $options);
-
         return $ret;
     }
 
@@ -853,11 +861,6 @@ class BlobServiceFunctionalTestData
         $options->setSnapshot('placeholder');
         array_push($ret, $options);
 
-        // TODO: Handle Lease ID
-        //        $options = new DeleteBlobOptions();
-        //        $options->setLeaseId('setLeaseId');
-        //        array_push($ret, $options);
-
         return $ret;
     }
 
@@ -886,11 +889,6 @@ class BlobServiceFunctionalTestData
         $options->setMetadata(self::getNiceMetadata());
         array_push($ret, $options);
 
-        // TODO: Handle Lease ID
-        //        $options = new CreateBlobSnapshotOptions();
-        //        $options->setLeaseId('setLeaseId');
-        //        array_push($ret, $options);
-
         return $ret;
     }
 
@@ -932,15 +930,121 @@ class BlobServiceFunctionalTestData
         $options = new CopyBlobOptions();
         $options->setSourceSnapshot('placeholder');
         array_push($ret, $options);
+        
+        return $ret;
+    }
 
-        // TODO: Handle Lease ID
+    public static function getCreateBlockBlobAttributes()
-        //        $options = new CopyBlobOptions();
+    {
-        //        $options->setLeaseId('setLeaseId');
+        $ret = array();
-        //        array_push($ret, $options);
+        $ret[] = ['size' => Resources::MB_IN_BYTES_4];
-        //
+        $ret[] = ['size' => Resources::MB_IN_BYTES_32];
-        //        $options = new CopyBlobOptions();
+        $ret[] = ['size' => Resources::MB_IN_BYTES_32 + Resources::MB_IN_BYTES_1];
-        //        $options->setSourceLeaseId('setSourceLeaseId');
+        $ret[] = ['size' => Resources::MB_IN_BYTES_128];
-        //        array_push($ret, $options);
+        $ret[] = ['size' => Resources::MB_IN_BYTES_256];
+        $ret[] = [
+            'threshold' => Resources::MB_IN_BYTES_4,
+            'size' => Resources::MB_IN_BYTES_4 * 2
+        ];
+        $ret[] = [
+            'threshold' => Resources::MB_IN_BYTES_64,
+            'size' => Resources::MB_IN_BYTES_64
+        ];
+        $ret[] = [
+            'threshold' => Resources::MB_IN_BYTES_64,
+            'size' => Resources::MB_IN_BYTES_64 + Resources::MB_IN_BYTES_1
+        ];
+
+        return $ret;
+    }
+
+    public static function getRangesArray()
+    {
+        $ret = array();
+
+        $ret[] = [
+            'putRange' => new Range(0, 511),
+            'clearRange' => null,
+            'listRange' => null,
+            'resultListRange' => [new Range(0, 511)]
+        ];
+
+        $ret[] = [
+            'putRange' => new Range(1024, 1535),
+            'clearRange' => null,
+            'listRange' => null,
+            'resultListRange' => [new Range(0, 511), new Range(1024, 1535)]
+        ];
+
+        $ret[] = [
+            'putRange' => new Range(512, 1023),
+            'clearRange' => null,
+            'listRange' => null,
+            'resultListRange' => [new Range(0, 1535)]
+        ];
+
+        $ret[] = [
+            'putRange' => null,
+            'clearRange' => new Range(1024, 1535),
+            'listRange' => null,
+            'resultListRange' => [new Range(0, 1023)]
+        ];
+
+        $ret[] = [
+            'putRange' => null,
+            'clearRange' => null,
+            'listRange' => new Range(0, 511),
+            'resultListRange' => [new Range(0, 511)]
+        ];
+
+        $ret[] = [
+            'putRange' => new Range(1024, 2047),
+            'clearRange' => new Range(512, 1023),
+            'listRange' => null,
+            'resultListRange' => [new Range(0, 511), new Range(1024, 2047)]
+        ];
+
+        $ret[] = [
+            'putRange' => null,
+            'clearRange' => new Range(0, 2047),
+            'listRange' => null,
+            'resultListRange' => array()
+        ];
+
+        return $ret;
+    }
+
+    public static function getAppendBlockSetup()
+    {
+        $ret = array();
+
+        $size = Resources::MB_IN_BYTES_4;
+        $options = new AppendBlockOptions();
+        $errorMsg = '';
+        $ret[] = ['size' => $size, 'options' => $options, 'error' => $errorMsg];
+
+        $size = Resources::MB_IN_BYTES_1;
+        $options = new AppendBlockOptions();
+        $options->setContentMD5(Utilities::calculateContentMD5(''));
+        $errorMsg = 'The MD5 value specified in the request did not match with the MD5 value calculated by the server.';
+        $ret[] = ['size' => $size, 'options' => $options, 'error' => $errorMsg];
+
+        $size = Resources::MB_IN_BYTES_1;
+        $options = new AppendBlockOptions();
+        $options->setMaxBlobSize(Resources::MB_IN_BYTES_4);
+        $errorMsg = 'The max blob size condition specified was not met';
+        $ret[] = ['size' => $size, 'options' => $options, 'error' => $errorMsg];
+
+        $size = Resources::MB_IN_BYTES_1;
+        $options = new AppendBlockOptions();
+        $options->setAppendPosition(Resources::MB_IN_BYTES_1);
+        $errorMsg = 'The append position condition specified was not met.';
+        $ret[] = ['size' => $size, 'options' => $options, 'error' => $errorMsg];
+
+        $size = Resources::MB_IN_BYTES_1 + Resources::MB_IN_BYTES_4;
+        $options = new AppendBlockOptions();
+        $errorMsg = 'The request body is too large and exceeds the maximum permissible limit.';
+        $ret[] = ['size' => $size, 'options' => $options, 'error' => $errorMsg];
 
         return $ret;
     }

tests/functional/Queue/QueueServiceFunctionalTest.php

@@ -43,7 +43,9 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 {
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getServiceProperties
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getServicePropertiesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::setServiceProperties
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::setServicePropertiesAsync
     */
     public function testGetServicePropertiesNoOptions()
     {
@@ -71,7 +73,9 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getServiceProperties
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getServicePropertiesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::setServiceProperties
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::setServicePropertiesAsync
     */
     public function testGetServiceProperties()
     {
@@ -103,9 +107,6 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::getServiceProperties
-     */
     private function getServicePropertiesWorker($options)
     {
         self::println('Trying $options: ' . self::tmptostring($options));
@@ -204,19 +205,12 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
         );
     }
 
-//     /**
-//     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getServiceProperties
-//     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::setServiceProperties
-//     */
-//     public function testSetServicePropertiesNoOptions()
-//     {
-//         $serviceProperties = QueueServiceFunctionalTestData::getDefaultServiceProperties();
-//         $this->setServicePropertiesWorker($serviceProperties, null);
-//     }
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getServiceProperties
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getServicePropertiesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::setServiceProperties
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::setServicePropertiesAsync
     */
     public function testSetServiceProperties()
     {
@@ -235,10 +229,6 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::getServiceProperties
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::setServiceProperties
-     */
     private function setServicePropertiesWorker($serviceProperties, $options)
     {
         try {
@@ -288,6 +278,7 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listQueues
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listQueuesAsync
     */
     public function testListQueuesNoOptions()
     {
@@ -296,6 +287,7 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listQueues
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listQueuesAsync
     */
     public function testListQueues()
     {
@@ -305,9 +297,6 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::listQueues
-     */
     private function listQueuesWorker($options)
     {
         $finished = false;
@@ -442,9 +431,13 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createQueue
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createQueueAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteQueue
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteQueueAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getQueueMetadata
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getQueueMetadataAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listQueues
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listQueuesAsync
     */
     public function testCreateQueueNoOptions()
     {
@@ -453,9 +446,13 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createQueue
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createQueueAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteQueue
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteQueueAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getQueueMetadata
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getQueueMetadataAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listQueues
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listQueuesAsync
     */
     public function testCreateQueue()
     {
@@ -465,12 +462,6 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::createQueue
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::deleteQueue
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::getQueueMetadata
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::listQueues
-     */
     private function createQueueWorker($options)
     {
         self::println('Trying $options: ' . self::tmptostring($options));
@@ -552,8 +543,11 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createQueue
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createQueueAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteQueue
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteQueueAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listQueues
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listQueuesAsync
     */
     public function testDeleteQueueNoOptions()
     {
@@ -562,8 +556,11 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createQueue
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createQueueAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteQueue
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteQueueAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listQueues
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listQueuesAsync
     */
     public function testDeleteQueue()
     {
@@ -575,11 +572,6 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::createQueue
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::deleteQueue
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::listQueues
-     */
     private function deleteQueueWorker($options)
     {
         self::println('Trying $options: ' . self::tmptostring($options));
@@ -644,14 +636,17 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    // TODO: Negative tests, like accessing a non-existant queue, or recreating an existing queue?
-
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createQueue
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createQueueAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteQueue
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteQueueAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getQueueMetadata
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getQueueMetadataAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::setQueueMetadata
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::setQueueMetadataAsync
     */
     public function testGetQueueMetadataNoOptions()
     {
@@ -663,10 +658,15 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createQueue
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createQueueAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteQueue
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteQueueAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getQueueMetadata
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getQueueMetadataAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::setQueueMetadata
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::setQueueMetadataAsync
     */
     public function testGetQueueMetadata()
     {
@@ -682,13 +682,6 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::createMessage
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::createQueue
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::deleteQueue
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::getQueueMetadata
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::setQueueMetadata
-     */
     private function getQueueMetadataWorker($options, $metadata)
     {
         self::println('Trying $options: ' . self::tmptostring($options) .
@@ -760,9 +753,13 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createQueue
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createQueueAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteQueue
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteQueueAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getQueueMetadata
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getQueueMetadataAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::setQueueMetadata
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::setQueueMetadataAsync
     */
     public function testSetQueueMetadataNoOptions()
     {
@@ -778,9 +775,13 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createQueue
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createQueueAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteQueue
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteQueueAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getQueueMetadata
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::getQueueMetadataAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::setQueueMetadata
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::setQueueMetadataAsync
     */
     public function testSetQueueMetadata()
     {
@@ -800,12 +801,6 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::createQueue
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::deleteQueue
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::getQueueMetadata
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::setQueueMetadata
-     */
     private function setQueueMetadataWorker($options, $metadata)
     {
         self::println('Trying $options: ' . self::tmptostring($options) .
@@ -852,8 +847,11 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessagesAsync
     */
     public function testCreateMessageEmpty()
     {
@@ -862,8 +860,11 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessagesAsync
     */
     public function testCreateMessageUnicodeMessage()
     {
@@ -885,8 +886,11 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessagesAsync
     */
     public function testCreateMessageXmlMessage()
     {
@@ -898,8 +902,11 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessagesAsync
     */
     public function testCreateMessageWithSmallTTL()
     {
@@ -929,8 +936,11 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessagesAsync
     */
     public function testCreateMessage()
     {
@@ -959,11 +969,6 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::clearMessages
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::createMessage
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::listMessages
-     */
     private function createMessageWorker($messageText, $options)
     {
         self::println('Trying $options: ' . self::tmptostring($options));
@@ -1042,9 +1047,13 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::updateMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::updateMessageAsync
     */
     public function testUpdateMessageNoOptions()
     {
@@ -1071,9 +1080,13 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::updateMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::updateMessageAsync
     */
     public function testUpdateMessage()
     {
@@ -1104,12 +1117,6 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::clearMessages
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::createMessage
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::listMessages
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::updateMessage
-     */
     private function updateMessageWorker($messageText, $startingMessage, $visibilityTimeoutInSeconds, $options)
     {
         self::println('Trying $options: ' . self::tmptostring($options) .
@@ -1203,9 +1210,13 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessagesAsync
     */
     public function testDeleteMessageNoOptions()
     {
@@ -1214,9 +1225,13 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::deleteMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessagesAsync
     */
     public function testDeleteMessage()
     {
@@ -1228,12 +1243,6 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::clearMessages
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::createMessage
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::deleteMessage
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::listMessages
-     */
     private function deleteMessageWorker($options)
     {
         self::println('Trying $options: ' . self::tmptostring($options));
@@ -1282,9 +1291,13 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::peekMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::peekMessagesAsync
     */
     public function testListMessagesNoOptions()
     {
@@ -1293,9 +1306,13 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::peekMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::peekMessagesAsync
     */
     public function testListMessages()
     {
@@ -1319,12 +1336,6 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::clearMessages
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::createMessage
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::listMessages
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::peekMessages
-     */
     private function listMessagesWorker($options)
     {
         self::println('Trying $options: ' . self::tmptostring($options));
@@ -1422,9 +1433,13 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::peekMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::peekMessagesAsync
     */
     public function testPeekMessagesNoOptions()
     {
@@ -1433,9 +1448,13 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::peekMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::peekMessagesAsync
     */
     public function testPeekMessages()
     {
@@ -1455,12 +1474,6 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::clearMessages
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::createMessage
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::listMessages
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::peekMessages
-     */
     private function peekMessagesWorker($options)
     {
         self::println('Trying $options: ' . self::tmptostring($options));
@@ -1525,8 +1538,11 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessagesAsync
     */
     public function testClearMessagesNoOptions()
     {
@@ -1535,8 +1551,11 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::clearMessagesAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessage
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::createMessageAsync
     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessages
+    * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listMessagesAsync
     */
     public function testClearMessages()
     {
@@ -1548,11 +1567,6 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::clearMessages
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::createMessage
-     * @covers MicrosoftAzure\Storage\ServiceBus\ServiceBusRestProxy::listMessages
-     */
     private function clearMessagesWorker($options)
     {
         self::println('Trying $options: ' .
@@ -1610,6 +1624,7 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
      * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listQueues
+     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listQueuesAsync
      * @covers MicrosoftAzure\Storage\Common\Internal\ServiceRestProxy::createHandlerStack
      */
     public function testMiddlewares()
@@ -1662,6 +1677,7 @@ class QueueServiceFunctionalTest extends FunctionalTestBase
 
     /**
      * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listQueues
+     * @covers MicrosoftAzure\Storage\Queue\QueueRestProxy::listQueuesAsync
      * @covers MicrosoftAzure\Storage\Common\Internal\ServiceRestProxy::createHandlerStack
      */
     public function testRetryFromSecondary()

tests/functional/Table/TableServiceFunctionalTest.php

@@ -56,7 +56,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 {
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getServiceProperties
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getServicePropertiesAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::setServiceProperties
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::setServicePropertiesAsync
     */
     public function testGetServicePropertiesNoOptions()
     {
@@ -84,7 +86,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getServiceProperties
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getServicePropertiesAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::setServiceProperties
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::setServicePropertiesAsync
     */
     public function testGetServiceProperties()
     {
@@ -105,6 +109,7 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getServiceProperties
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getServicePropertiesAsync
     */
     private function getServicePropertiesWorker($options)
     {
@@ -196,7 +201,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getServiceProperties
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getServicePropertiesAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::setServiceProperties
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::setServicePropertiesAsync
     */
     public function testSetServicePropertiesNoOptions()
     {
@@ -206,7 +213,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getServiceProperties
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getServicePropertiesAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::setServiceProperties
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::setServicePropertiesAsync
     */
     public function testSetServiceProperties()
     {
@@ -224,7 +233,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getServiceProperties
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getServicePropertiesAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::setServiceProperties
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::setServicePropertiesAsync
     */
     private function setServicePropertiesWorker($serviceProperties, $options)
     {
@@ -255,6 +266,7 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTables
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTablesAsync
     */
     public function testQueryTablesNoOptions()
     {
@@ -263,6 +275,7 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTables
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTablesAsync
     */
     public function testQueryTables()
     {
@@ -275,6 +288,7 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTables
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTablesAsync
     */
     private function queryTablesWorker($options)
     {
@@ -372,8 +386,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTableAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTableAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTables
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTablesAsync
     */
     public function testCreateTableNoOptions()
     {
@@ -382,8 +399,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTableAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTableAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTables
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTablesAsync
     */
     public function testCreateTable()
     {
@@ -391,11 +411,6 @@ class TableServiceFunctionalTest extends FunctionalTestBase
         $this->createTableWorker($options);
     }
 
-    /**
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTable
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTable
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTables
-    */
     private function createTableWorker($options)
     {
         $table = TableServiceFunctionalTestData::getInterestingTableName();
@@ -437,8 +452,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTableAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTableAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTables
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTablesAsync
     */
     public function testDeleteTableNoOptions()
     {
@@ -447,8 +465,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTableAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTableAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTables
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTablesAsync
     */
     public function testDeleteTable()
     {
@@ -458,8 +479,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTableAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTableAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTables
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTablesAsync
     */
     private function deleteTableWorker($options)
     {
@@ -518,8 +542,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTableAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTableAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getTableAsync
     */
     public function testGetTableNoOptions()
     {
@@ -528,8 +555,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTableAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTableAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getTableAsync
     */
     public function testGetTable()
     {
@@ -539,8 +569,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::createTableAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteTableAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getTable
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getTableAsync
     */
     private function getTableWorker($options)
     {
@@ -571,7 +604,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     */
     public function testGetEntity()
     {
@@ -584,7 +619,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     */
     private function getEntityWorker($ent, $isGood, $options)
     {
@@ -696,8 +733,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     */
     public function testDeleteEntity()
     {
@@ -712,8 +752,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     */
     private function deleteEntityWorker($ent, $useETag, $options)
     {
@@ -754,7 +797,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertEntity()
     {
@@ -767,7 +812,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertBadEntity()
     {
@@ -786,7 +833,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertEntityBoolean()
     {
@@ -799,30 +848,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-//     /**
-//     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
-//     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
-//     */
-//     public function testInsertEntityBooleanNegative()
-//     {
-//         foreach(TableServiceFunctionalTestData::getInterestingBadBooleans() as $o)  {
-//             $ent = new Entity();
-//             $ent->setPartitionKey(TableServiceFunctionalTestData::getNewKey());
-//             $ent->setRowKey(TableServiceFunctionalTestData::getNewKey());
-//             try {
-//                 $ent->addProperty('BOOLEAN', EdmType::BOOLEAN, $o);
-//                 $this->fail('Should get an exception when trying to parse this value');
-//                 $this->insertEntityWorker($ent, false, null, $o);
-//             } catch (\Exception $e) {
-//                 $this->assertEquals(0, $e->getCode(), 'getCode');
-//                 $this->assertTrue(true, 'got expected exception');
-//             }
-//         }
-//     }
-
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertEntityDate()
     {
@@ -837,7 +867,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertEntityDateNegative()
     {
@@ -858,7 +890,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertEntityDouble()
     {
@@ -873,7 +907,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertEntityDoubleNegative()
     {
@@ -894,7 +930,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertEntityGuid()
     {
@@ -909,7 +947,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertEntityGuidNegative()
     {
@@ -930,7 +970,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertEntityInt()
     {
@@ -945,7 +987,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertEntityIntNegative()
     {
@@ -966,7 +1010,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertEntityLong()
     {
@@ -981,7 +1027,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertEntityLongNegative()
     {
@@ -1002,7 +1050,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertEntityBinary()
     {
@@ -1017,7 +1067,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertEntityBinaryNegative()
     {
@@ -1038,7 +1090,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertEntityString()
     {
@@ -1053,7 +1107,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     private function insertEntityWorker($ent, $isGood, $options, $specialValue = null)
     {
@@ -1102,8 +1158,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntityAsync
     */
     public function testUpdateEntity()
     {
@@ -1120,8 +1179,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntityAsync
     */
     private function updateEntityWorker($initialEnt, $ent, $options)
     {
@@ -1153,8 +1215,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testMergeEntity()
     {
@@ -1171,8 +1236,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     private function mergeEntityWorker($initialEnt, $ent, $options)
     {
@@ -1205,8 +1273,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertOrReplaceEntity()
     {
@@ -1233,8 +1304,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     private function insertOrReplaceEntityWorker($initialEnt, $ent, $options)
     {
@@ -1266,8 +1340,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     public function testInsertOrMergeEntity()
     {
@@ -1294,8 +1371,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntities
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryEntitiesAsync
     */
     private function insertOrMergeEntityWorker($initialEnt, $ent, $options)
     {
@@ -1328,11 +1408,17 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntityAsync
     */
     public function testCRUDdeleteEntity()
     {
@@ -1350,11 +1436,17 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 /*
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntityAsync
     */
     public function testCRUDinsertEntity()
     {
@@ -1372,11 +1464,17 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntityAsync
     */
     public function testCRUDinsertOrMergeEntity()
     {
@@ -1396,11 +1494,17 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 /*
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntityAsync
     */
     public function testCRUDinsertOrReplaceEntity()
     {
@@ -1420,11 +1524,17 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntityAsync
     */
     public function testCRUDmergeEntity()
     {
@@ -1442,11 +1552,19 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntityAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntityAsync
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntityAsync
     */
     public function testCRUDupdateEntity()
     {
@@ -1462,14 +1580,6 @@ class TableServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntity
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntity
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntity
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntity
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntity
-    */
     private function crudWorker($opType, $concurType, $mutatePivot, $ent, $options)
     {
         $exptErr = $this->expectConcurrencyFailure($opType, $concurType);
@@ -1503,7 +1613,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::batch
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::batchAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntityAsync
     */
     public function testBatchPositiveFirstNoKeyMatch()
     {
@@ -1512,7 +1626,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::batch
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::batchAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntityAsync
     */
     public function testBatchPositiveFirstKeyMatchNoETag()
     {
@@ -1521,7 +1639,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::batch
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::batchAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntityAsync
     */
     public function testBatchPositiveFirstKeyMatchETagMismatch()
     {
@@ -1531,7 +1653,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::batch
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::batchAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntityAsync
     */
     public function testBatchPositiveFirstKeyMatchETagMatch()
     {
@@ -1540,7 +1666,11 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::batch
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::batchAsync
     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntityAsync
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntity
+    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntityAsync
     */
     public function testBatchNegative()
     {
@@ -1668,10 +1798,6 @@ class TableServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::batch
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
-    */
     private function batchPositiveOuter($firstConcurType, $seed)
     {
         // The random here is not to generate random values, but to
@@ -1738,10 +1864,6 @@ class TableServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::batch
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
-    */
     private function batchWorker($configs, $options)
     {
         $exptErrs = array();
@@ -1840,9 +1962,6 @@ class TableServiceFunctionalTest extends FunctionalTestBase
         $this->clearTable($table);
     }
 
-    /**
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntity
-    */
     private function verifyEntryData($table, $exptErr, $targetEnt, $opResult)
     {
         if ($opResult instanceof InsertEntityResult) {
@@ -1919,14 +2038,6 @@ class TableServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::deleteEntity
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertEntity
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrMergeEntity
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::insertOrReplaceEntity
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::mergeEntity
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntity
-    */
     private function executeCrudMethod($table, $targetEnt, $opType, $concurType, $options)
     {
         switch ($opType) {
@@ -1982,9 +2093,6 @@ class TableServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::getEntity
-    */
     private function verifyCrudWorker($opType, $table, $initialEnt, $targetEnt, $expectedSuccess)
     {
         $entInTable = null;
@@ -2036,9 +2144,6 @@ class TableServiceFunctionalTest extends FunctionalTestBase
         }
     }
 
-    /**
-    * @covers MicrosoftAzure\Storage\Table\TableRestProxy::updateEntity
-    */
     private function createTargetEntity($table, $initialEnt, $concurType, $mutatePivot)
     {
         $targetEnt = TableServiceFunctionalTestUtils::cloneEntity($initialEnt);
@@ -2139,6 +2244,7 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
      * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTables
+     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTablesAsync
      * @covers MicrosoftAzure\Storage\Common\Internal\ServiceRestProxy::createHandlerStack
      */
     public function testMiddlewares()
@@ -2191,6 +2297,7 @@ class TableServiceFunctionalTest extends FunctionalTestBase
 
     /**
      * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTables
+     * @covers MicrosoftAzure\Storage\Table\TableRestProxy::queryTablesAsync
      * @covers MicrosoftAzure\Storage\Common\Internal\ServiceRestProxy::createHandlerStack
      */
     public function testRetryFromSecondary()

tests/unit/Blob/Models/ListBlobBlocksResultTest.php

@@ -60,7 +60,7 @@ class ListBlobBlocksResultTest extends \PHPUnit_Framework_TestCase
         $sampleHeaders = TestResources::listBlocksMultipleEntriesHeaders();
         $sampleBody    = TestResources::listBlocksMultipleEntriesBody();
         $expectedDate = Utilities::rfc1123ToDateTime($sampleHeaders['Last-Modified']);
-        $getEntry = self::getMethod('_getEntries');
+        $getEntry = self::getMethod('getEntries');
         $uncommittedBlocks = $getEntry->invokeArgs(null, array($sampleBody, 'UncommittedBlocks'));
         $committedBlocks = $getEntry->invokeArgs(null, array($sampleBody, 'CommittedBlocks'));