Renamne Table namespaces.

WindowsAzure/Common/Configuration.php

@@ -29,7 +29,7 @@ use WindowsAzure\Common\Internal\InvalidArgumentTypeException;
 use WindowsAzure\Common\Internal\ServicesBuilder;
 use WindowsAzure\Queue\QueueSettings;
 use WindowsAzure\Blob\BlobSettings;
-use WindowsAzure\Services\Table\TableSettings;
+use WindowsAzure\Table\TableSettings;
 
 /**
  * Contains configuration used to access azure storage accounts. 

WindowsAzure/Common/Internal/ServicesBuilder.php

@@ -40,10 +40,10 @@ use WindowsAzure\Blob\BlobSettings;
 use WindowsAzure\ServiceBus\Internal\ServiceBusRestProxy;
 use WindowsAzure\ServiceBus\ServiceBusSettings;
 use WindowsAzure\ServiceBus\Internal\WrapRestProxy;
-use WindowsAzure\Services\Table\TableRestProxy;
-use WindowsAzure\Services\Table\TableSettings;
-use WindowsAzure\Services\Table\Utilities\AtomReaderWriter;
-use WindowsAzure\Services\Table\Utilities\MimeReaderWriter;
+use WindowsAzure\Table\Internal\TableRestProxy;
+use WindowsAzure\Table\TableSettings;
+use WindowsAzure\Table\Internal\AtomReaderWriter;
+use WindowsAzure\Table\Internal\MimeReaderWriter;
 use WindowsAzure\Common\Internal\Serialization\XmlSerializer;
 use WindowsAzure\ServiceManagement\ServiceManagementSettings;
 use WindowsAzure\ServiceManagement\Internal\ServiceManagementRestProxy;
@@ -208,7 +208,7 @@ class ServicesBuilder implements IServiceBuilder
      *
      * @param WindowsAzure\Common\Configuration $config configuration.
      * 
-     * @return WindowsAzure\Services\Table\ITable.
+     * @return WindowsAzure\Table\Internal\ITable.
      */
     private function _buildTable($config)
     {

WindowsAzure/Table/Internal/AtomReaderWriter.php

@@ -15,24 +15,24 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table
+ * @package   WindowsAzure\Table\Internal
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Utilities;
+namespace WindowsAzure\Table\Internal;
 use WindowsAzure\Common\Internal\Utilities;
 use WindowsAzure\Common\Internal\Resources;
-use WindowsAzure\Services\Table\Models\EdmType;
-use WindowsAzure\Services\Table\Models\Entity;
+use WindowsAzure\Table\Models\EdmType;
+use WindowsAzure\Table\Models\Entity;
 
 /**
  * Serializes and unserializes results from table wrapper calls
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table
+ * @package   WindowsAzure\Table\Internal
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -250,7 +250,7 @@ class AtomReaderWriter implements IAtomReaderWriter
      * 
      * @param \SimpleXML $result The SimpleXML object representing the entity.
      * 
-     * @return \WindowsAzure\Services\Table\Models\Entity
+     * @return \WindowsAzure\Table\Models\Entity
      */
     private static function _parseOneEntity($result)
     {

WindowsAzure/Table/Internal/IAtomReaderWriter.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Utilities
+ * @package   WindowsAzure\Table\Internal
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Utilities;
+namespace WindowsAzure\Table\Internal;
 
 /**
  * Defines how to serialize and unserialize table wrapper xml
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Utilities
+ * @package   WindowsAzure\Table\Internal
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Internal/IMimeReaderWriter.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Utilities
+ * @package   WindowsAzure\Table\Internal
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Utilities;
+namespace WindowsAzure\Table\Internal;
 
 /**
  * Interface for MIME reading and writing.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Utilities
+ * @package   WindowsAzure\Table\Internal
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Internal/ITable.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table
+ * @package   WindowsAzure\Table\Internal
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table;
+namespace WindowsAzure\Table\Internal;
 use WindowsAzure\Common\Internal\FilterableService;
 
 /**
  * This interface has all REST APIs provided by Windows Azure for Table service.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table
+ * @package   WindowsAzure\Table\Internal
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Internal/MimeReaderWriter.php

@@ -15,14 +15,14 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Utilities
+ * @package   WindowsAzure\Table\Internal
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Utilities;
+namespace WindowsAzure\Table\Internal;
 require_once 'PEAR.php';
 require_once 'Mail/mimePart.php';
 require_once 'Mail/mimeDecode.php';
@@ -32,7 +32,7 @@ use WindowsAzure\Common\Internal\Resources;
  * Reads and writes MIME for batch API.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Utilities
+ * @package   WindowsAzure\Table\Internal
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Internal/TableRestProxy.php

@@ -15,44 +15,44 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table
+ * @package   WindowsAzure\Table\Internal
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table;
+namespace WindowsAzure\Table\Internal;
 use WindowsAzure\Common\Internal\Resources;
 use WindowsAzure\Common\Internal\Utilities;
 use WindowsAzure\Common\Internal\Validate;
 use WindowsAzure\Common\Internal\Http\HttpCallContext;
 use WindowsAzure\Common\Models\ServiceProperties;
 use WindowsAzure\Common\Internal\ServiceRestProxy;
-use WindowsAzure\Services\Table\Models\TableServiceOptions;
+use WindowsAzure\Table\Models\TableServiceOptions;
 use WindowsAzure\Common\Models\GetServicePropertiesResult;
-use WindowsAzure\Services\Table\Models\EdmType;
-use WindowsAzure\Services\Table\Models\Filters;
-use WindowsAzure\Services\Table\Models\Filters\Filter;
-use WindowsAzure\Services\Table\Models\GetTableResult;
-use WindowsAzure\Services\Table\Models\QueryTablesOptions;
-use WindowsAzure\Services\Table\Models\QueryTablesResult;
-use WindowsAzure\Services\Table\Models\InsertEntityResult;
-use WindowsAzure\Services\Table\Models\UpdateEntityResult;
-use WindowsAzure\Services\Table\Models\QueryEntitiesOptions;
-use WindowsAzure\Services\Table\Models\QueryEntitiesResult;
-use WindowsAzure\Services\Table\Models\DeleteEntityOptions;
-use WindowsAzure\Services\Table\Models\GetEntityResult;
-use WindowsAzure\Services\Table\Models\BatchOperationType;
-use WindowsAzure\Services\Table\Models\BatchOperationParameterName;
-use WindowsAzure\Services\Table\Models\BatchResult;
+use WindowsAzure\Table\Models\EdmType;
+use WindowsAzure\Table\Models\Filters;
+use WindowsAzure\Table\Models\Filters\Filter;
+use WindowsAzure\Table\Models\GetTableResult;
+use WindowsAzure\Table\Models\QueryTablesOptions;
+use WindowsAzure\Table\Models\QueryTablesResult;
+use WindowsAzure\Table\Models\InsertEntityResult;
+use WindowsAzure\Table\Models\UpdateEntityResult;
+use WindowsAzure\Table\Models\QueryEntitiesOptions;
+use WindowsAzure\Table\Models\QueryEntitiesResult;
+use WindowsAzure\Table\Models\DeleteEntityOptions;
+use WindowsAzure\Table\Models\GetEntityResult;
+use WindowsAzure\Table\Models\BatchOperationType;
+use WindowsAzure\Table\Models\BatchOperationParameterName;
+use WindowsAzure\Table\Models\BatchResult;
 
 /**
  * This class constructs HTTP requests and receive HTTP responses for table
  * service layer.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table
+ * @package   WindowsAzure\Table\Internal
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/BatchError.php

@@ -15,14 +15,14 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 use WindowsAzure\Common\Internal\Resources;
 use WindowsAzure\Common\Internal\Utilities;
 use WindowsAzure\Common\Internal\Validate;
@@ -32,7 +32,7 @@ use WindowsAzure\Common\Internal\ServiceException;
  * Represents an error returned from call to batch API.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -57,7 +57,7 @@ class BatchError
      * @param WindowsAzure\Common\Internal\ServiceException $error   The error object.
      * @param array                              $headers The response headers.
      * 
-     * @return \WindowsAzure\Services\Table\Models\BatchError 
+     * @return \WindowsAzure\Table\Models\BatchError 
      */
     public static function create($error, $headers)
     {

WindowsAzure/Table/Models/BatchOperation.php

@@ -15,14 +15,14 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 use WindowsAzure\Common\Internal\Validate;
 use WindowsAzure\Common\Internal\Resources;
 use WindowsAzure\Common\Internal\Utilities;
@@ -31,7 +31,7 @@ use WindowsAzure\Common\Internal\Utilities;
  * Represents one batch operation
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/BatchOperationParameterName.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 
 /**
  * Batch parameter names.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/BatchOperationType.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 
 /**
  * Supported batch operations.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/BatchOperations.php

@@ -15,14 +15,14 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 use WindowsAzure\Common\Internal\Validate;
 use WindowsAzure\Common\Internal\Resources;
 
@@ -30,7 +30,7 @@ use WindowsAzure\Common\Internal\Resources;
  * Holds batch operation change set.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/BatchResult.php

@@ -15,28 +15,28 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 require_once 'HTTP/Request2/Response.php';
 use WindowsAzure\Common\Internal\Resources;
 use WindowsAzure\Common\Internal\Utilities;
 use WindowsAzure\Common\Internal\Http\HttpClient;
 use WindowsAzure\Common\Internal\ServiceException;
-use WindowsAzure\Services\Table\Models\BatchError;
-use WindowsAzure\Services\Table\Models\InsertEntityResult;
-use WindowsAzure\Services\Table\Models\UpdateEntityResult;
+use WindowsAzure\Table\Models\BatchError;
+use WindowsAzure\Table\Models\InsertEntityResult;
+use WindowsAzure\Table\Models\UpdateEntityResult;
 
 /**
  * Holds results from batch API.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -113,7 +113,7 @@ class BatchResult
      * @param IAtomReaderWriter $atomSerializer The Atom reader and writer.
      * @param IMimeReaderWriter $mimeSerializer The MIME reader and writer.
      * 
-     * @return \WindowsAzure\Services\Table\Models\BatchResult
+     * @return \WindowsAzure\Table\Models\BatchResult
      * 
      * @throws \InvalidArgumentException 
      */

WindowsAzure/Table/Models/DeleteEntityOptions.php

@@ -15,14 +15,14 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 use WindowsAzure\Common\Internal\Utilities;
 use WindowsAzure\Common\Internal\Resources;
 
@@ -30,7 +30,7 @@ use WindowsAzure\Common\Internal\Resources;
  * Holds optional parameters for deleteEntity API.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/EdmType.php

@@ -15,14 +15,14 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 use WindowsAzure\Common\Internal\Utilities;
 use WindowsAzure\Common\Internal\Validate;
 use WindowsAzure\Common\Internal\Resources;
@@ -31,7 +31,7 @@ use WindowsAzure\Common\Internal\Resources;
  * Basic Windows Azure EDM Types used for table entity properties.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/Entity.php

@@ -15,14 +15,14 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 use WindowsAzure\Common\Internal\Utilities;
 use WindowsAzure\Common\Internal\Resources;
 use WindowsAzure\Common\Internal\Validate;
@@ -31,7 +31,7 @@ use WindowsAzure\Common\Internal\Validate;
  * Represents entity object used in tables
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/Filters/BinaryFilter.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models\Filters
+ * @package   WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models\Filters;
+namespace WindowsAzure\Table\Models\Filters;
 
 /**
  * Binary filter
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models\Filters
+ * @package   WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/Filters/ConstantFilter.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models\Filters
+ * @package   WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models\Filters;
-use WindowsAzure\Services\Table\Models\EdmType;
+namespace WindowsAzure\Table\Models\Filters;
+use WindowsAzure\Table\Models\EdmType;
 
 /**
  * Constant filter
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models\Filters
+ * @package   WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/Filters/Filter.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models\Filters
+ * @package   WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models\Filters;
+namespace WindowsAzure\Table\Models\Filters;
 
 /**
  * Filter operations
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models\Filters
+ * @package   WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -43,7 +43,7 @@ class Filter
      * @param Filter $left  The left filter
      * @param Filter $right The right filter
      * 
-     * @return \WindowsAzure\Services\Table\Models\Filters\BinaryFilter 
+     * @return \WindowsAzure\Table\Models\Filters\BinaryFilter 
      */
     public static function applyAnd($left, $right)
     {
@@ -56,7 +56,7 @@ class Filter
      * 
      * @param Filter $operand The operand
      * 
-     * @return \WindowsAzure\Services\Table\Models\Filters\UnaryFilter 
+     * @return \WindowsAzure\Table\Models\Filters\UnaryFilter 
      */
     public static function applyNot($operand)
     {
@@ -168,7 +168,7 @@ class Filter
      * @param mix    $value   The filter value
      * @param string $edmType The value EDM type.
      * 
-     * @return \WindowsAzure\Services\Table\Models\Filters\ConstantFilter 
+     * @return \WindowsAzure\Table\Models\Filters\ConstantFilter 
      */
     public static function applyConstant($value, $edmType = null)
     {
@@ -181,7 +181,7 @@ class Filter
      * 
      * @param string $value The filter value
      * 
-     * @return \WindowsAzure\Services\Table\Models\Filters\PropertyNameFilter 
+     * @return \WindowsAzure\Table\Models\Filters\PropertyNameFilter 
      */
     public static function applyPropertyName($value)
     {
@@ -194,7 +194,7 @@ class Filter
      * 
      * @param string $value The raw string filter expression
      * 
-     * @return \WindowsAzure\Services\Table\Models\Filters\QueryStringFilter 
+     * @return \WindowsAzure\Table\Models\Filters\QueryStringFilter 
      */
     public static function applyQueryString($value)
     {

WindowsAzure/Table/Models/Filters/PropertyNameFilter.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models\Filters
+ * @package   WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models\Filters;
+namespace WindowsAzure\Table\Models\Filters;
 
 /**
  * Constant filter
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models\Filters
+ * @package   WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/Filters/QueryStringFilter.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models\Filters
+ * @package   WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models\Filters;
+namespace WindowsAzure\Table\Models\Filters;
 
 /**
  * Constant filter
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models\Filters
+ * @package   WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/Filters/UnaryFilter.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models\Filters
+ * @package   WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models\Filters;
+namespace WindowsAzure\Table\Models\Filters;
 
 /**
  * Unary filter
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models\Filters
+ * @package   WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/GetEntityResult.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 
 /**
  * Holds result of calling getEntity wrapper.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/GetTableResult.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 use WindowsAzure\Common\Internal\Utilities;
 
 /**
  * Holds result of getTable API.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -49,7 +49,7 @@ class GetTableResult
      * @param string           $body           The HTTP response body.
      * @param AtomReaderWriter $atomSerializer The Atom reader and writer.
      * 
-     * @return \WindowsAzure\Services\Table\Models\GetTableResult
+     * @return \WindowsAzure\Table\Models\GetTableResult
      */
     public static function create($body, $atomSerializer)
     {

WindowsAzure/Table/Models/InsertEntityResult.php

@@ -15,14 +15,14 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 use WindowsAzure\Common\Internal\Utilities;
 use WindowsAzure\Common\Internal\Resources;
 
@@ -30,7 +30,7 @@ use WindowsAzure\Common\Internal\Resources;
  * Holds result of calling insertEntity wrapper
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -51,7 +51,7 @@ class InsertEntityResult
      * @param array             $headers        The HTTP response headers.
      * @param IAtomReaderWriter $atomSerializer The atom reader and writer.
      * 
-     * @return \WindowsAzure\Services\Table\Models\InsertEntityResult
+     * @return \WindowsAzure\Table\Models\InsertEntityResult
      * 
      * @static
      */

WindowsAzure/Table/Models/Property.php

@@ -15,22 +15,22 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\EdmType;
+namespace WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\EdmType;
 use WindowsAzure\Common\Internal\Validate;
 
 /**
  * Represents entity property.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/Query.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 
 /**
  * Query to be performed on a table
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/QueryEntitiesOptions.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 
 /**
  * Holds optional parameters for queryEntities API
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/QueryEntitiesResult.php

@@ -15,14 +15,14 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 use WindowsAzure\Common\Internal\Utilities;
 use WindowsAzure\Common\Internal\Resources;
 
@@ -30,7 +30,7 @@ use WindowsAzure\Common\Internal\Resources;
  * Holds results of calling queryEntities API
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/QueryTablesOptions.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 
 /**
  * Optional parameters for queryTables wrapper.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/QueryTablesResult.php

@@ -15,14 +15,14 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 use WindowsAzure\Common\Internal\Utilities;
 use WindowsAzure\Common\Internal\Resources;
 
@@ -30,7 +30,7 @@ use WindowsAzure\Common\Internal\Resources;
  * QueryTablesResult
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -55,7 +55,7 @@ class QueryTablesResult
      * @param array $headers The HTTP response headers
      * @param array $entries The table entriess
      * 
-     * @return \WindowsAzure\Services\Table\Models\QueryTablesResult 
+     * @return \WindowsAzure\Table\Models\QueryTablesResult 
      */
     public static function create($headers, $entries)
     {

WindowsAzure/Table/Models/TableServiceOptions.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 
 /**
  * Table service options.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/Table/Models/UpdateEntityResult.php

@@ -15,14 +15,14 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table\Models;
+namespace WindowsAzure\Table\Models;
 use WindowsAzure\Common\Internal\Utilities;
 use WindowsAzure\Common\Internal\Resources;
 
@@ -30,7 +30,7 @@ use WindowsAzure\Common\Internal\Resources;
  * Holds result of updateEntity and mergeEntity APIs
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table\Models
+ * @package   WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -49,7 +49,7 @@ class UpdateEntityResult
      * 
      * @param array $headers The HTTP response headers.
      * 
-     * @return \WindowsAzure\Services\Table\Models\UpdateEntityResult 
+     * @return \WindowsAzure\Table\Models\UpdateEntityResult 
      */
     public static function create($headers)
     {

WindowsAzure/Table/TableService.php

@@ -15,14 +15,14 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table
+ * @package   WindowsAzure\Table
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table;
+namespace WindowsAzure\Table;
 use WindowsAzure\Common\Internal\Validate;
 use WindowsAzure\Common\Configuration;
 use WindowsAzure\Common\Internal\IServiceBuilder;
@@ -32,7 +32,7 @@ use WindowsAzure\Common\Internal\Resources;
  * Factory for creating ITable objects
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table
+ * @package   WindowsAzure\Table
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -47,7 +47,7 @@ class TableService
      * @param WindowsAzure\Common\Configuration    $config  The config object.
      * @param WindowsAzure\Common\Internal\IServicesBuilder $builder The builder object.
      * 
-     * @return WindowsAzure\Services\Table\ITable
+     * @return WindowsAzure\Table\Internal\ITable
      */
     public static function create($config, $builder = null)
     {

WindowsAzure/Table/TableSettings.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table
+ * @package   WindowsAzure\Table
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
  
-namespace WindowsAzure\Services\Table;
+namespace WindowsAzure\Table;
 
 /**
  * Basic Table configuration elements.
  *
  * @category  Microsoft
- * @package   WindowsAzure\Services\Table
+ * @package   WindowsAzure\Table
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0

WindowsAzure/WindowsAzure.php

@@ -186,40 +186,40 @@ spl_autoload_register(
             'windowsazure\\serviceruntime\\internal\\xmlgoalstatedeserializer' => '/ServiceRuntime/Internal/XmlGoalStateDeserializer.php',
             'windowsazure\\serviceruntime\\internal\\xmlroleenvironmentdatadeserializer' => '/ServiceRuntime/Internal/XmlRoleEnvironmentDataDeserializer.php',
             'windowsazure\\serviceruntime\\roleenvironment' => '/ServiceRuntime/RoleEnvironment.php',
-            'windowsazure\\services\\table\\itable' => '/Table/Internal/ITable.php',
-            'windowsazure\\services\\table\\models\\batcherror' => '/Table/Models/BatchError.php',
-            'windowsazure\\services\\table\\models\\batchoperation' => '/Table/Models/BatchOperation.php',
-            'windowsazure\\services\\table\\models\\batchoperationparametername' => '/Table/Models/BatchOperationParameterName.php',
-            'windowsazure\\services\\table\\models\\batchoperations' => '/Table/Models/BatchOperations.php',
-            'windowsazure\\services\\table\\models\\batchoperationtype' => '/Table/Models/BatchOperationType.php',
-            'windowsazure\\services\\table\\models\\batchresult' => '/Table/Models/BatchResult.php',
-            'windowsazure\\services\\table\\models\\deleteentityoptions' => '/Table/Models/DeleteEntityOptions.php',
-            'windowsazure\\services\\table\\models\\edmtype' => '/Table/Models/EdmType.php',
-            'windowsazure\\services\\table\\models\\entity' => '/Table/Models/Entity.php',
-            'windowsazure\\services\\table\\models\\filters\\binaryfilter' => '/Table/Models/Filters/BinaryFilter.php',
-            'windowsazure\\services\\table\\models\\filters\\constantfilter' => '/Table/Models/Filters/ConstantFilter.php',
-            'windowsazure\\services\\table\\models\\filters\\filter' => '/Table/Models/Filters/Filter.php',
-            'windowsazure\\services\\table\\models\\filters\\propertynamefilter' => '/Table/Models/Filters/PropertyNameFilter.php',
-            'windowsazure\\services\\table\\models\\filters\\querystringfilter' => '/Table/Models/Filters/QueryStringFilter.php',
-            'windowsazure\\services\\table\\models\\filters\\unaryfilter' => '/Table/Models/Filters/UnaryFilter.php',
-            'windowsazure\\services\\table\\models\\getentityresult' => '/Table/Models/GetEntityResult.php',
-            'windowsazure\\services\\table\\models\\gettableresult' => '/Table/Models/GetTableResult.php',
-            'windowsazure\\services\\table\\models\\insertentityresult' => '/Table/Models/InsertEntityResult.php',
-            'windowsazure\\services\\table\\models\\property' => '/Table/Models/Property.php',
-            'windowsazure\\services\\table\\models\\query' => '/Table/Models/Query.php',
-            'windowsazure\\services\\table\\models\\queryentitiesoptions' => '/Table/Models/QueryEntitiesOptions.php',
-            'windowsazure\\services\\table\\models\\queryentitiesresult' => '/Table/Models/QueryEntitiesResult.php',
-            'windowsazure\\services\\table\\models\\querytablesoptions' => '/Table/Models/QueryTablesOptions.php',
-            'windowsazure\\services\\table\\models\\querytablesresult' => '/Table/Models/QueryTablesResult.php',
-            'windowsazure\\services\\table\\models\\tableserviceoptions' => '/Table/Models/TableServiceOptions.php',
-            'windowsazure\\services\\table\\models\\updateentityresult' => '/Table/Models/UpdateEntityResult.php',
-            'windowsazure\\services\\table\\tablerestproxy' => '/Table/Internal/TableRestProxy.php',
-            'windowsazure\\services\\table\\tableservice' => '/Table/TableService.php',
-            'windowsazure\\services\\table\\tablesettings' => '/Table/TableSettings.php',
-            'windowsazure\\services\\table\\utilities\\atomreaderwriter' => '/Table/Internal/AtomReaderWriter.php',
-            'windowsazure\\services\\table\\utilities\\iatomreaderwriter' => '/Table/Internal/IAtomReaderWriter.php',
-            'windowsazure\\services\\table\\utilities\\imimereaderwriter' => '/Table/Internal/IMimeReaderWriter.php',
-            'windowsazure\\services\\table\\utilities\\mimereaderwriter' => '/Table/Internal/MimeReaderWriter.php'
+            'windowsazure\\table\\internal\\atomreaderwriter' => '/Table/Internal/AtomReaderWriter.php',
+            'windowsazure\\table\\internal\\iatomreaderwriter' => '/Table/Internal/IAtomReaderWriter.php',
+            'windowsazure\\table\\internal\\imimereaderwriter' => '/Table/Internal/IMimeReaderWriter.php',
+            'windowsazure\\table\\internal\\itable' => '/Table/Internal/ITable.php',
+            'windowsazure\\table\\internal\\mimereaderwriter' => '/Table/Internal/MimeReaderWriter.php',
+            'windowsazure\\table\\internal\\tablerestproxy' => '/Table/Internal/TableRestProxy.php',
+            'windowsazure\\table\\models\\batcherror' => '/Table/Models/BatchError.php',
+            'windowsazure\\table\\models\\batchoperation' => '/Table/Models/BatchOperation.php',
+            'windowsazure\\table\\models\\batchoperationparametername' => '/Table/Models/BatchOperationParameterName.php',
+            'windowsazure\\table\\models\\batchoperations' => '/Table/Models/BatchOperations.php',
+            'windowsazure\\table\\models\\batchoperationtype' => '/Table/Models/BatchOperationType.php',
+            'windowsazure\\table\\models\\batchresult' => '/Table/Models/BatchResult.php',
+            'windowsazure\\table\\models\\deleteentityoptions' => '/Table/Models/DeleteEntityOptions.php',
+            'windowsazure\\table\\models\\edmtype' => '/Table/Models/EdmType.php',
+            'windowsazure\\table\\models\\entity' => '/Table/Models/Entity.php',
+            'windowsazure\\table\\models\\filters\\binaryfilter' => '/Table/Models/Filters/BinaryFilter.php',
+            'windowsazure\\table\\models\\filters\\constantfilter' => '/Table/Models/Filters/ConstantFilter.php',
+            'windowsazure\\table\\models\\filters\\filter' => '/Table/Models/Filters/Filter.php',
+            'windowsazure\\table\\models\\filters\\propertynamefilter' => '/Table/Models/Filters/PropertyNameFilter.php',
+            'windowsazure\\table\\models\\filters\\querystringfilter' => '/Table/Models/Filters/QueryStringFilter.php',
+            'windowsazure\\table\\models\\filters\\unaryfilter' => '/Table/Models/Filters/UnaryFilter.php',
+            'windowsazure\\table\\models\\getentityresult' => '/Table/Models/GetEntityResult.php',
+            'windowsazure\\table\\models\\gettableresult' => '/Table/Models/GetTableResult.php',
+            'windowsazure\\table\\models\\insertentityresult' => '/Table/Models/InsertEntityResult.php',
+            'windowsazure\\table\\models\\property' => '/Table/Models/Property.php',
+            'windowsazure\\table\\models\\query' => '/Table/Models/Query.php',
+            'windowsazure\\table\\models\\queryentitiesoptions' => '/Table/Models/QueryEntitiesOptions.php',
+            'windowsazure\\table\\models\\queryentitiesresult' => '/Table/Models/QueryEntitiesResult.php',
+            'windowsazure\\table\\models\\querytablesoptions' => '/Table/Models/QueryTablesOptions.php',
+            'windowsazure\\table\\models\\querytablesresult' => '/Table/Models/QueryTablesResult.php',
+            'windowsazure\\table\\models\\tableserviceoptions' => '/Table/Models/TableServiceOptions.php',
+            'windowsazure\\table\\models\\updateentityresult' => '/Table/Models/UpdateEntityResult.php',
+            'windowsazure\\table\\tableservice' => '/Table/TableService.php',
+            'windowsazure\\table\\tablesettings' => '/Table/TableSettings.php'
           );
       }
       $cn = strtolower($class);

examples/Client/CloudStorageService.php

@@ -24,13 +24,13 @@
  
 namespace Client;
 use WindowsAzure\Common\Configuration;
-use WindowsAzure\Services\Table\TableService;
-use WindowsAzure\Services\Table\TableSettings;
+use WindowsAzure\Table\TableService;
+use WindowsAzure\Table\TableSettings;
 use WindowsAzure\Blob\BlobService;
 use WindowsAzure\Blob\BlobSettings;
 use WindowsAzure\Queue\QueueService;
 use WindowsAzure\Queue\QueueSettings;
-use WindowsAzure\Services\Table\Models\QueryTablesOptions;
+use WindowsAzure\Table\Models\QueryTablesOptions;
 
 /**
  * Encapsulates Windows Azure storage service operations.

examples/Client/CloudTable.php

@@ -23,7 +23,7 @@
  */
  
 namespace Client;
-use WindowsAzure\Services\Table\Models\Entity;
+use WindowsAzure\Table\Models\Entity;
 use WindowsAzure\Common\Internal\Utilities;
 
 /**
@@ -60,7 +60,7 @@ class CloudTable
 	 * Sets default partition key by default using uniqid() function.
      * 
      * @param string                             $name  The table name.
-     * @param WindowsAzure\Services\Table\ITable $proxy The table REST proxy.
+     * @param WindowsAzure\Table\Internal\ITable $proxy The table REST proxy.
      */
     public function __construct($name, $proxy)
     {

examples/tasklist/index.php

@@ -33,7 +33,7 @@ require_once '..\client\client.php';
 use Client\CloudSubscription;
 use Client\CloudTable;
 use WindowsAzure\Common\Internal\Utilities;
-use WindowsAzure\Services\Table\Models\EdmType;
+use WindowsAzure\Table\Models\EdmType;
 
 $subscriptionId      = 'Your subscription';
 $certificatePath     = 'Certificate path';

tests/WindowsAzureTests.php

@@ -27,21 +27,21 @@ spl_autoload_register(
             'tests\\functional\\windowsazure\\queue\\queueservicefunctionaltest' => '/functional/WindowsAzure/Queue/QueueServiceFunctionalTest.php',
             'tests\\functional\\windowsazure\\queue\\queueservicefunctionaltestdata' => '/functional/WindowsAzure/Queue/QueueServiceFunctionalTestData.php',
             'tests\\functional\\windowsazure\\queue\\queueserviceintegrationtest' => '/functional/WindowsAzure/Queue/QueueServiceIntegrationTest.php',
-            'tests\\functional\\windowsazure\\services\\table\\batchworkerconfig' => '/functional/WindowsAzure/Table/TableServiceFunctionalTest.php',
-            'tests\\functional\\windowsazure\\services\\table\\concurtype' => '/functional/WindowsAzure/Table/TableServiceFunctionalTest.php',
-            'tests\\functional\\windowsazure\\services\\table\\faketableinfoentry' => '/functional/WindowsAzure/Table/TableServiceFunctionalTestData.php',
-            'tests\\functional\\windowsazure\\services\\table\\faketentityentry' => '/functional/WindowsAzure/Table/TableServiceFunctionalTestData.php',
-            'tests\\functional\\windowsazure\\services\\table\\functionaltestbase' => '/functional/WindowsAzure/Table/FunctionalTestBase.php',
-            'tests\\functional\\windowsazure\\services\\table\\integrationtestbase' => '/functional/WindowsAzure/Table/IntegrationTestBase.php',
-            'tests\\functional\\windowsazure\\services\\table\\mutatepivot' => '/functional/WindowsAzure/Table/TableServiceFunctionalTestUtils.php',
-            'tests\\functional\\windowsazure\\services\\table\\optype' => '/functional/WindowsAzure/Table/TableServiceFunctionalTest.php',
-            'tests\\functional\\windowsazure\\services\\table\\tableservicefunctionaloptionstest' => '/functional/WindowsAzure/Table/TableServiceFunctionalOptionsTest.php',
-            'tests\\functional\\windowsazure\\services\\table\\tableservicefunctionalparameterstest' => '/functional/WindowsAzure/Table/TableServiceFunctionalParametersTest.php',
-            'tests\\functional\\windowsazure\\services\\table\\tableservicefunctionalquerytest' => '/functional/WindowsAzure/Table/TableServiceFunctionalQueryTest.php',
-            'tests\\functional\\windowsazure\\services\\table\\tableservicefunctionaltest' => '/functional/WindowsAzure/Table/TableServiceFunctionalTest.php',
-            'tests\\functional\\windowsazure\\services\\table\\tableservicefunctionaltestdata' => '/functional/WindowsAzure/Table/TableServiceFunctionalTestData.php',
-            'tests\\functional\\windowsazure\\services\\table\\tableservicefunctionaltestutils' => '/functional/WindowsAzure/Table/TableServiceFunctionalTestUtils.php',
-            'tests\\functional\\windowsazure\\services\\table\\tableserviceintegrationtest' => '/functional/WindowsAzure/Table/TableServiceIntegrationTest.php',
+            'tests\\functional\\windowsazure\\table\\batchworkerconfig' => '/functional/WindowsAzure/Table/TableServiceFunctionalTest.php',
+            'tests\\functional\\windowsazure\\table\\concurtype' => '/functional/WindowsAzure/Table/TableServiceFunctionalTest.php',
+            'tests\\functional\\windowsazure\\table\\faketableinfoentry' => '/functional/WindowsAzure/Table/TableServiceFunctionalTestData.php',
+            'tests\\functional\\windowsazure\\table\\faketentityentry' => '/functional/WindowsAzure/Table/TableServiceFunctionalTestData.php',
+            'tests\\functional\\windowsazure\\table\\functionaltestbase' => '/functional/WindowsAzure/Table/FunctionalTestBase.php',
+            'tests\\functional\\windowsazure\\table\\integrationtestbase' => '/functional/WindowsAzure/Table/IntegrationTestBase.php',
+            'tests\\functional\\windowsazure\\table\\mutatepivot' => '/functional/WindowsAzure/Table/TableServiceFunctionalTestUtils.php',
+            'tests\\functional\\windowsazure\\table\\optype' => '/functional/WindowsAzure/Table/TableServiceFunctionalTest.php',
+            'tests\\functional\\windowsazure\\table\\tableservicefunctionaloptionstest' => '/functional/WindowsAzure/Table/TableServiceFunctionalOptionsTest.php',
+            'tests\\functional\\windowsazure\\table\\tableservicefunctionalparameterstest' => '/functional/WindowsAzure/Table/TableServiceFunctionalParametersTest.php',
+            'tests\\functional\\windowsazure\\table\\tableservicefunctionalquerytest' => '/functional/WindowsAzure/Table/TableServiceFunctionalQueryTest.php',
+            'tests\\functional\\windowsazure\\table\\tableservicefunctionaltest' => '/functional/WindowsAzure/Table/TableServiceFunctionalTest.php',
+            'tests\\functional\\windowsazure\\table\\tableservicefunctionaltestdata' => '/functional/WindowsAzure/Table/TableServiceFunctionalTestData.php',
+            'tests\\functional\\windowsazure\\table\\tableservicefunctionaltestutils' => '/functional/WindowsAzure/Table/TableServiceFunctionalTestUtils.php',
+            'tests\\functional\\windowsazure\\table\\tableserviceintegrationtest' => '/functional/WindowsAzure/Table/TableServiceIntegrationTest.php',
             'tests\\mock\\windowsazure\\common\\internal\\authentication\\sharedkeyauthschememock' => '/mock/WindowsAzure/Common/Internal/Authentication/SharedKeyAuthSchemeMock.php',
             'tests\\mock\\windowsazure\\common\\internal\\authentication\\storageauthschememock' => '/mock/WindowsAzure/Common/Internal/Authentication/StorageAuthSchemeMock.php',
             'tests\\mock\\windowsazure\\common\\internal\\authentication\\tablesharedkeyliteauthschememock' => '/mock/WindowsAzure/Common/Internal/Authentication/TableSharedKeyLiteAuthSchemeMock.php',
@@ -186,34 +186,34 @@ spl_autoload_register(
             'tests\\unit\\windowsazure\\serviceruntime\\internal\\xmlroleenvironmentdatadeserializertest' => '/unit/WindowsAzure/ServiceRuntime/Internal/XmlRoleEnvironmentDataDeserializerTest.php',
             'tests\\unit\\windowsazure\\serviceruntime\\myclass' => '/unit/WindowsAzure/ServiceRuntime/RoleEnvironmentTest.php',
             'tests\\unit\\windowsazure\\serviceruntime\\roleenvironmenttest' => '/unit/WindowsAzure/ServiceRuntime/RoleEnvironmentTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\batcherrortest' => '/unit/WindowsAzure/Table/Models/BatchErrorTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\batchoperationparameternametest' => '/unit/WindowsAzure/Table/Models/BatchOperationParameterNameTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\batchoperationstest' => '/unit/WindowsAzure/Table/Models/BatchOperationsTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\batchoperationtest' => '/unit/WindowsAzure/Table/Models/BatchOperationTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\batchoperationtypetest' => '/unit/WindowsAzure/Table/Models/BatchOperationTypeTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\batchresulttest' => '/unit/WindowsAzure/Table/Models/BatchResultTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\deleteentityoptionstest' => '/unit/WindowsAzure/Table/Models/DeleteEntityOptionsTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\edmtypetest' => '/unit/WindowsAzure/Table/Models/EdmTypeTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\entitytest' => '/unit/WindowsAzure/Table/Models/EntityTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\filters\\binaryfiltertest' => '/unit/WindowsAzure/Table/Models/Filters/BinaryFilterTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\filters\\constantfiltertest' => '/unit/WindowsAzure/Table/Models/Filters/ConstantFilterTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\filters\\filtertest' => '/unit/WindowsAzure/Table/Models/Filters/FilterTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\filters\\propertynamefiltertest' => '/unit/WindowsAzure/Table/Models/Filters/PropertyNameFilterTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\filters\\querystringfiltertest' => '/unit/WindowsAzure/Table/Models/Filters/QueryStringFilterTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\filters\\unaryfiltertest' => '/unit/WindowsAzure/Table/Models/Filters/UnaryFilterTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\getentityresulttest' => '/unit/WindowsAzure/Table/Models/GetEntityResultTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\gettableresulttest' => '/unit/WindowsAzure/Table/Models/GetTableResultTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\insertentityresulttest' => '/unit/WindowsAzure/Table/Models/InsertEntityResultTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\propertytest' => '/unit/WindowsAzure/Table/Models/PropertyTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\queryentitiesoptionstest' => '/unit/WindowsAzure/Table/Models/QueryEntitiesOptionsTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\queryentitiesresulttest' => '/unit/WindowsAzure/Table/Models/QueryEntitiesResultTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\querytablesoptionstest' => '/unit/WindowsAzure/Table/Models/QueryTablesOptionsTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\querytablesresulttest' => '/unit/WindowsAzure/Table/Models/QueryTablesResultTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\querytest' => '/unit/WindowsAzure/Table/Models/QueryTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\tableserviceoptionstest' => '/unit/WindowsAzure/Table/Models/TableServiceOptionsTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\models\\updateentityresulttest' => '/unit/WindowsAzure/Table/Models/UpdateEntityResultTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\tablerestproxytest' => '/unit/WindowsAzure/Table/Internal/TableRestProxyTest.php',
-            'tests\\unit\\windowsazure\\services\\table\\tableservicetest' => '/unit/WindowsAzure/Table/TableServiceTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\batcherrortest' => '/unit/WindowsAzure/Table/Models/BatchErrorTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\batchoperationparameternametest' => '/unit/WindowsAzure/Table/Models/BatchOperationParameterNameTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\batchoperationstest' => '/unit/WindowsAzure/Table/Models/BatchOperationsTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\batchoperationtest' => '/unit/WindowsAzure/Table/Models/BatchOperationTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\batchoperationtypetest' => '/unit/WindowsAzure/Table/Models/BatchOperationTypeTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\batchresulttest' => '/unit/WindowsAzure/Table/Models/BatchResultTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\deleteentityoptionstest' => '/unit/WindowsAzure/Table/Models/DeleteEntityOptionsTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\edmtypetest' => '/unit/WindowsAzure/Table/Models/EdmTypeTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\entitytest' => '/unit/WindowsAzure/Table/Models/EntityTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\filters\\binaryfiltertest' => '/unit/WindowsAzure/Table/Models/Filters/BinaryFilterTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\filters\\constantfiltertest' => '/unit/WindowsAzure/Table/Models/Filters/ConstantFilterTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\filters\\filtertest' => '/unit/WindowsAzure/Table/Models/Filters/FilterTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\filters\\propertynamefiltertest' => '/unit/WindowsAzure/Table/Models/Filters/PropertyNameFilterTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\filters\\querystringfiltertest' => '/unit/WindowsAzure/Table/Models/Filters/QueryStringFilterTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\filters\\unaryfiltertest' => '/unit/WindowsAzure/Table/Models/Filters/UnaryFilterTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\getentityresulttest' => '/unit/WindowsAzure/Table/Models/GetEntityResultTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\gettableresulttest' => '/unit/WindowsAzure/Table/Models/GetTableResultTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\insertentityresulttest' => '/unit/WindowsAzure/Table/Models/InsertEntityResultTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\propertytest' => '/unit/WindowsAzure/Table/Models/PropertyTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\queryentitiesoptionstest' => '/unit/WindowsAzure/Table/Models/QueryEntitiesOptionsTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\queryentitiesresulttest' => '/unit/WindowsAzure/Table/Models/QueryEntitiesResultTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\querytablesoptionstest' => '/unit/WindowsAzure/Table/Models/QueryTablesOptionsTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\querytablesresulttest' => '/unit/WindowsAzure/Table/Models/QueryTablesResultTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\querytest' => '/unit/WindowsAzure/Table/Models/QueryTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\tableserviceoptionstest' => '/unit/WindowsAzure/Table/Models/TableServiceOptionsTest.php',
+            'tests\\unit\\windowsazure\\table\\models\\updateentityresulttest' => '/unit/WindowsAzure/Table/Models/UpdateEntityResultTest.php',
+            'tests\\unit\\windowsazure\\table\\tablerestproxytest' => '/unit/WindowsAzure/Table/Internal/TableRestProxyTest.php',
+            'tests\\unit\\windowsazure\\table\\tableservicetest' => '/unit/WindowsAzure/Table/TableServiceTest.php',
             'tests\\unit\\windowsazure\\utilitiestest' => '/unit/WindowsAzure/Common/Internal/UtilitiesTest.php',
             'tests\\unit\\windowsazure\\validatetest' => '/unit/WindowsAzure/Common/Internal/ValidateTest.php',
             'wrapfiltertest' => '/unit/WindowsAzure/Common/Internal/Filters/WrapFilterTest.php'

tests/framework/TableServiceRestProxyTestBase.php

@@ -25,8 +25,8 @@ namespace Tests\Framework;
 use Tests\Framework\ServiceRestProxyTestBase;
 use Tests\Framework\TestResources;
 use WindowsAzure\Common\Configuration;
-use WindowsAzure\Services\Table\TableSettings;
-use WindowsAzure\Services\Table\TableService;
+use WindowsAzure\Table\TableSettings;
+use WindowsAzure\Table\TableService;
 
 /**
  * TestBase class for each unit test class.

tests/framework/TestResources.php

@@ -24,8 +24,8 @@
  */
  
 namespace Tests\Framework;
-use WindowsAzure\Services\Table\Models\EdmType;
-use WindowsAzure\Services\Table\Models\Entity;
+use WindowsAzure\Table\Models\EdmType;
+use WindowsAzure\Table\Models\Entity;
 use WindowsAzure\Common\Internal\Utilities;
 
 /**

tests/functional/WindowsAzure/Table/FunctionalTestBase.php

@@ -17,27 +17,27 @@
  * limitations under the License.
  *
  * @category   Microsoft
- * @package    Tests\Functional\WindowsAzure\Services\Table
+ * @package    Tests\Functional\WindowsAzure\Table
  * @author     Jason Cooke <jcooke@microsoft.com>
  * @copyright  2012 Microsoft Corporation
  * @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link       http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Functional\WindowsAzure\Services\Table;
+namespace Tests\Functional\WindowsAzure\Table;
 
 use Tests\Framework\FiddlerFilter;
 use Tests\Framework\TableServiceRestProxyTestBase;
 use Tests\Framework\TestResources;
-use Tests\Functional\WindowsAzure\Services\Table\TableServiceFunctionalTestData;
+use Tests\Functional\WindowsAzure\Table\TableServiceFunctionalTestData;
 use WindowsAzure\Common\Internal\Resources;
 use WindowsAzure\Common\Internal\Utilities;
 use WindowsAzure\Common\Internal\ServiceException;
 use WindowsAzure\Common\Configuration;
-use WindowsAzure\Services\Table\TableService;
-use WindowsAzure\Services\Table\TableSettings;
-use WindowsAzure\Services\Table\Models\Entity;
-use WindowsAzure\Services\Table\Models\Filters\Filter;
+use WindowsAzure\Table\TableService;
+use WindowsAzure\Table\TableSettings;
+use WindowsAzure\Table\Models\Entity;
+use WindowsAzure\Table\Models\Filters\Filter;
 
 class FunctionalTestBase extends TableServiceRestProxyTestBase {
     public function __construct()

tests/functional/WindowsAzure/Table/IntegrationTestBase.php

@@ -17,18 +17,18 @@
  * limitations under the License.
  *
  * @category   Microsoft
- * @package    Tests\Functional\WindowsAzure\Services\Table
+ * @package    Tests\Functional\WindowsAzure\Table
  * @author     Jason Cooke <jcooke@microsoft.com>
  * @copyright  2012 Microsoft Corporation
  * @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link       http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Functional\WindowsAzure\Services\Table;
+namespace Tests\Functional\WindowsAzure\Table;
 
 use Tests\Framework\FiddlerFilter;
 use Tests\Framework\TableServiceRestProxyTestBase;
-use WindowsAzure\Services\Table\TableService;
+use WindowsAzure\Table\TableService;
 
 class IntegrationTestBase extends TableServiceRestProxyTestBase {
     public function __construct()

tests/functional/WindowsAzure/Table/TableServiceFunctionalOptionsTest.php

@@ -17,33 +17,33 @@
  * limitations under the License.
  *
  * @category   Microsoft
- * @package    Tests\Functional\WindowsAzure\Services\Table
+ * @package    Tests\Functional\WindowsAzure\Table
  * @author     Jason Cooke <jcooke@microsoft.com>
  * @copyright  2012 Microsoft Corporation
  * @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link       http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Functional\WindowsAzure\Services\Table;
+namespace Tests\Functional\WindowsAzure\Table;
 
 use WindowsAzure\Common\Models\Logging;
 use WindowsAzure\Common\Models\Metrics;
 use WindowsAzure\Common\Models\RetentionPolicy;
 use WindowsAzure\Common\Models\ServiceProperties;
-use WindowsAzure\Services\Table\Models\DeleteEntityOptions;
-use WindowsAzure\Services\Table\Models\EdmType;
-use WindowsAzure\Services\Table\Models\Entity;
-use WindowsAzure\Services\Table\Models\Property;
-use WindowsAzure\Services\Table\Models\Query;
-use WindowsAzure\Services\Table\Models\QueryEntitiesOptions;
-use WindowsAzure\Services\Table\Models\QueryTablesOptions;
-use WindowsAzure\Services\Table\Models\TableServiceOptions;
-use WindowsAzure\Services\Table\Models\Filters\BinaryFilter;
-use WindowsAzure\Services\Table\Models\Filters\ConstantFilter;
-use WindowsAzure\Services\Table\Models\Filters\Filter;
-use WindowsAzure\Services\Table\Models\Filters\PropertyNameFilter;
-use WindowsAzure\Services\Table\Models\Filters\QueryStringFilter;
-use WindowsAzure\Services\Table\Models\Filters\UnaryFilter;
+use WindowsAzure\Table\Models\DeleteEntityOptions;
+use WindowsAzure\Table\Models\EdmType;
+use WindowsAzure\Table\Models\Entity;
+use WindowsAzure\Table\Models\Property;
+use WindowsAzure\Table\Models\Query;
+use WindowsAzure\Table\Models\QueryEntitiesOptions;
+use WindowsAzure\Table\Models\QueryTablesOptions;
+use WindowsAzure\Table\Models\TableServiceOptions;
+use WindowsAzure\Table\Models\Filters\BinaryFilter;
+use WindowsAzure\Table\Models\Filters\ConstantFilter;
+use WindowsAzure\Table\Models\Filters\Filter;
+use WindowsAzure\Table\Models\Filters\PropertyNameFilter;
+use WindowsAzure\Table\Models\Filters\QueryStringFilter;
+use WindowsAzure\Table\Models\Filters\UnaryFilter;
 
 class TableServiceFunctionalOptionsTest extends \PHPUnit_Framework_TestCase {
     public function testCheckTableServiceOptions() {

tests/functional/WindowsAzure/Table/TableServiceFunctionalParametersTest.php

@@ -17,14 +17,14 @@
  * limitations under the License.
  *
  * @category   Microsoft
- * @package    Tests\Functional\WindowsAzure\Services\Table
+ * @package    Tests\Functional\WindowsAzure\Table
  * @author     Jason Cooke <jcooke@microsoft.com>
  * @copyright  2012 Microsoft Corporation
  * @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link       http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Functional\WindowsAzure\Services\Table;
+namespace Tests\Functional\WindowsAzure\Table;
 
 use WindowsAzure\Common\Internal\Resources;
 use WindowsAzure\Common\Internal\ServiceException;
@@ -33,15 +33,15 @@ use WindowsAzure\Common\Models\Logging;
 use WindowsAzure\Common\Models\Metrics;
 use WindowsAzure\Common\Models\RetentionPolicy;
 use WindowsAzure\Common\Models\ServiceProperties;
-use WindowsAzure\Services\Table\Models\DeleteEntityOptions;
-use WindowsAzure\Services\Table\Models\EdmType;
-use WindowsAzure\Services\Table\Models\Entity;
-use WindowsAzure\Services\Table\Models\Property;
-use WindowsAzure\Services\Table\Models\Query;
-use WindowsAzure\Services\Table\Models\QueryEntitiesOptions;
-use WindowsAzure\Services\Table\Models\QueryTablesOptions;
-use WindowsAzure\Services\Table\Models\TableServiceOptions;
-use WindowsAzure\Services\Table\Models\Filters\Filter;
+use WindowsAzure\Table\Models\DeleteEntityOptions;
+use WindowsAzure\Table\Models\EdmType;
+use WindowsAzure\Table\Models\Entity;
+use WindowsAzure\Table\Models\Property;
+use WindowsAzure\Table\Models\Query;
+use WindowsAzure\Table\Models\QueryEntitiesOptions;
+use WindowsAzure\Table\Models\QueryTablesOptions;
+use WindowsAzure\Table\Models\TableServiceOptions;
+use WindowsAzure\Table\Models\Filters\Filter;
 
 class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     public static function setUpBeforeClass() {
@@ -53,7 +53,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getServiceProperties
     */
     public function testGetServicePropertiesNullOptions() {
         try {
@@ -72,7 +72,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::setServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::setServiceProperties
     */
     public function testSetServicePropertiesNullOptions1() {
         try {
@@ -85,7 +85,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::setServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::setServiceProperties
     */
     public function testSetServicePropertiesNullOptions2() {
         try {
@@ -99,7 +99,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::setServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::setServiceProperties
     */
     public function testSetServicePropertiesNullOptions3() {
         try {
@@ -113,7 +113,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::setServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::setServiceProperties
     */
     public function testSetServicePropertiesNullOptions4() {
         try {
@@ -126,7 +126,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
     */
     public function testQueryTablesNullOptions() {
         $this->wrapper->queryTables(null);
@@ -134,7 +134,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::createTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::createTable
     */
     public function testCreateTableNullOptions() {
         try {
@@ -148,7 +148,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteTable
     */
     public function testDeleteTableNullOptions() {
         try {
@@ -162,7 +162,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getTable
     */
     public function testGetTableNullOptions() {
         try {
@@ -177,7 +177,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
 
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testInsertEntityEntityNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -194,7 +194,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testInsertEntityTableAndEntityNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -211,7 +211,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testInsertEntityTableNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -228,7 +228,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testInsertEntityEntityAndOptionsNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -245,7 +245,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testInsertEntityEntityNullWithOptions() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -262,7 +262,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testInsertEntityOptionsNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -273,7 +273,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testInsertEntityEmptyPartitionKey() {
         // TODO: Fails because of https://github.com/WindowsAzure/azure-sdk-for-php/issues/176
@@ -288,7 +288,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testInsertEntityEmptyRowKey() {
         // TODO: Fails because of https://github.com/WindowsAzure/azure-sdk-for-php/issues/176
@@ -303,7 +303,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testInsertStringWithAllAsciiCharacters() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -345,7 +345,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
     */
     public function testGetEntityPartKeyNull() {
         // TODO: Fails because of https://github.com/WindowsAzure/azure-sdk-for-php/issues/206
@@ -363,7 +363,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
     */
     public function testGetEntityRowKeyNull() {
         // TODO: Fails because of https://github.com/WindowsAzure/azure-sdk-for-php/issues/206
@@ -381,7 +381,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
     */
     public function testGetEntityKeysNull() {
         // TODO: Fails because of https://github.com/WindowsAzure/azure-sdk-for-php/issues/206
@@ -399,7 +399,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
     */
     public function testGetEntityTableAndKeysNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -416,7 +416,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
     */
     public function testGetEntityTableNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -433,7 +433,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
     */
     public function testGetEntityKeysAndOptionsNull() {
         // TODO: Fails because of https://github.com/WindowsAzure/azure-sdk-for-php/issues/206
@@ -451,8 +451,8 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testGetEntityKeysNullWithOptions() {
         // TODO: Fails because of https://github.com/WindowsAzure/azure-sdk-for-php/issues/206
@@ -472,8 +472,8 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testGetEntityOptionsNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -486,7 +486,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
     */
     public function testDeleteEntityPartKeyNull() {
         // TODO: Fails because of https://github.com/WindowsAzure/azure-sdk-for-php/issues/206
@@ -504,7 +504,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
     */
     public function testDeleteEntityRowKeyNull() {
         // TODO: Fails because of https://github.com/WindowsAzure/azure-sdk-for-php/issues/206
@@ -522,7 +522,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
     */
     public function testDeleteEntityKeysNull() {
         // TODO: Fails because of https://github.com/WindowsAzure/azure-sdk-for-php/issues/206
@@ -540,7 +540,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
     */
     public function testDeleteEntityTableAndKeysNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -557,7 +557,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
     */
     public function testDeleteEntityTableNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -574,7 +574,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
     */
     public function testDeleteEntityKeysAndOptionsNull() {
         // TODO: Fails because of https://github.com/WindowsAzure/azure-sdk-for-php/issues/206
@@ -592,8 +592,8 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testDeleteEntityKeysNullWithOptions() {
         // TODO: Fails because of https://github.com/WindowsAzure/azure-sdk-for-php/issues/206
@@ -613,8 +613,8 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testDeleteEntityOptionsNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -627,8 +627,8 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testDeleteEntityTroublesomePartitionKey() {
         // TODO: Fails because of https://github.com/WindowsAzure/azure-sdk-for-php/issues/180
@@ -682,8 +682,8 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testDeleteEntityTroublesomeRowKey() {
         // TODO: Fails because of https://github.com/WindowsAzure/azure-sdk-for-php/issues/180
@@ -737,7 +737,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
     */
     public function testMergeEntityEntityNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -754,7 +754,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
     */
     public function testMergeEntityTableAndEntityNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -771,7 +771,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
     */
     public function testMergeEntityTableNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -788,7 +788,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
     */
     public function testMergeEntityEntityAndOptionsNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -805,7 +805,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
     */
     public function testMergeEntityEntityNullWithOptions() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -822,7 +822,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
     */
     public function testMergeEntityOptionsNull() {
         // TODO: Fails because of https://github.com/WindowsAzure/azure-sdk-for-php/issues/157
@@ -839,7 +839,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     public function testUpdateEntityEntityNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -856,7 +856,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     public function testUpdateEntityTableAndEntityNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -873,7 +873,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     public function testUpdateEntityTableNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -890,7 +890,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     public function testUpdateEntityEntityAndOptionsNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -907,7 +907,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     public function testUpdateEntityEntityNullWithOptions() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -924,7 +924,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     public function testUpdateEntityOptionsNull() {
         // TODO: Fails because of https://github.com/WindowsAzure/azure-sdk-for-php/issues/157
@@ -941,7 +941,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
     */
     public function testInsertOrMergeEntityEntityNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -958,7 +958,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
     */
     public function testInsertOrMergeEntityTableAndEntityNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -975,7 +975,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
     */
     public function testInsertOrMergeEntityTableNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -992,7 +992,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
     */
     public function testInsertOrMergeEntityEntityAndOptionsNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -1009,7 +1009,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
     */
     public function testInsertOrMergeEntityEntityNullWithOptions() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -1026,7 +1026,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
     */
     public function testInsertOrMergeEntityOptionsNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -1045,7 +1045,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
     */
     public function testInsertOrReplaceEntityEntityNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -1062,7 +1062,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
     */
     public function testInsertOrReplaceEntityTableAndEntityNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -1079,7 +1079,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
     */
     public function testInsertOrReplaceEntityTableNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -1096,7 +1096,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
     */
     public function testInsertOrReplaceEntityEntityAndOptionsNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -1113,7 +1113,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
     */
     public function testInsertOrReplaceEntityEntityNullWithOptions() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -1130,7 +1130,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
     */
     public function testInsertOrReplaceEntityOptionsNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -1149,7 +1149,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesTableNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -1166,7 +1166,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesTableNullOptionsNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -1183,7 +1183,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesTableNullWithOptions() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];
@@ -1200,7 +1200,7 @@ class TableServiceFunctionalParametersTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesOptionsNull() {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];

tests/functional/WindowsAzure/Table/TableServiceFunctionalQueryTest.php

@@ -17,22 +17,22 @@
  * limitations under the License.
  *
  * @category   Microsoft
- * @package    Tests\Functional\WindowsAzure\Services\Table
+ * @package    Tests\Functional\WindowsAzure\Table
  * @author     Jason Cooke <jcooke@microsoft.com>
  * @copyright  2012 Microsoft Corporation
  * @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link       http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Functional\WindowsAzure\Services\Table;
+namespace Tests\Functional\WindowsAzure\Table;
 
 use WindowsAzure\Common\Internal\ServiceException;
-use WindowsAzure\Services\Table\Models\BatchOperations;
-use WindowsAzure\Services\Table\Models\EdmType;
-use WindowsAzure\Services\Table\Models\Entity;
-use WindowsAzure\Services\Table\Models\Query;
-use WindowsAzure\Services\Table\Models\QueryEntitiesOptions;
-use WindowsAzure\Services\Table\Models\Filters\Filter;
+use WindowsAzure\Table\Models\BatchOperations;
+use WindowsAzure\Table\Models\EdmType;
+use WindowsAzure\Table\Models\Entity;
+use WindowsAzure\Table\Models\Query;
+use WindowsAzure\Table\Models\QueryEntitiesOptions;
+use WindowsAzure\Table\Models\Filters\Filter;
 
 class TableServiceFunctionalQueryTest extends FunctionalTestBase {
     private static $entitiesInTable;
@@ -371,7 +371,7 @@ class TableServiceFunctionalQueryTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntities() {
         // The emulator has problems with non-standard queries tested here.
@@ -384,7 +384,7 @@ class TableServiceFunctionalQueryTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesBooleanLevel1() {
         // The emulator has problems with non-standard queries tested here.
@@ -397,7 +397,7 @@ class TableServiceFunctionalQueryTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesDateTimeLevel1() {
         // The emulator has problems with non-standard queries tested here.
@@ -410,7 +410,7 @@ class TableServiceFunctionalQueryTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesDoubleLevel1() {
         // The emulator has problems with non-standard queries tested here.
@@ -423,7 +423,7 @@ class TableServiceFunctionalQueryTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesGuidLevel1() {
         // The emulator has problems with non-standard queries tested here.
@@ -436,7 +436,7 @@ class TableServiceFunctionalQueryTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesIntLevel1() {
         // The emulator has problems with non-standard queries tested here.
@@ -449,7 +449,7 @@ class TableServiceFunctionalQueryTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesLongLevel1() {
         // The emulator has problems with non-standard queries tested here.
@@ -462,7 +462,7 @@ class TableServiceFunctionalQueryTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesStringLevel1() {
         // The emulator has problems with non-standard queries tested here.
@@ -475,7 +475,7 @@ class TableServiceFunctionalQueryTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesBinaryLevel1() {
         // The emulator has problems with non-standard queries tested here.
@@ -488,7 +488,7 @@ class TableServiceFunctionalQueryTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesLevel2() {
         // The emulator has problems with non-standard queries tested here.
@@ -501,7 +501,7 @@ class TableServiceFunctionalQueryTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesLevel3() {
         // The emulator has problems with non-standard queries tested here.
@@ -514,7 +514,7 @@ class TableServiceFunctionalQueryTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     private function queryEntitiesWorker($options) {
         $table = TableServiceFunctionalTestData::$TEST_TABLE_NAMES[0];

tests/functional/WindowsAzure/Table/TableServiceFunctionalTest.php

@@ -17,17 +17,17 @@
  * limitations under the License.
  *
  * @category   Microsoft
- * @package    Tests\Functional\WindowsAzure\Services\Table
+ * @package    Tests\Functional\WindowsAzure\Table
  * @author     Jason Cooke <jcooke@microsoft.com>
  * @copyright  2012 Microsoft Corporation
  * @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link       http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Functional\WindowsAzure\Services\Table;
+namespace Tests\Functional\WindowsAzure\Table;
 
-use Tests\Functional\WindowsAzure\Services\Table\FakeTableInfoEntry;
-use Tests\Functional\WindowsAzure\Services\Table\MutatePivot;
+use Tests\Functional\WindowsAzure\Table\FakeTableInfoEntry;
+use Tests\Functional\WindowsAzure\Table\MutatePivot;
 use WindowsAzure\Common\Internal\Utilities;
 use WindowsAzure\Common\Internal\ServiceException;
 use WindowsAzure\Common\Configuration;
@@ -35,25 +35,25 @@ use WindowsAzure\Common\Models\Logging;
 use WindowsAzure\Common\Models\Metrics;
 use WindowsAzure\Common\Models\RetentionPolicy;
 use WindowsAzure\Common\Models\ServiceProperties;
-use WindowsAzure\Services\Table\Models\BatchError;
-use WindowsAzure\Services\Table\Models\BatchOperations;
-use WindowsAzure\Services\Table\Models\BatchResult;
-use WindowsAzure\Services\Table\Models\DeleteEntityOptions;
-use WindowsAzure\Services\Table\Models\EdmType;
-use WindowsAzure\Services\Table\Models\Entity;
-use WindowsAzure\Services\Table\Models\GetEntityResult;
-use WindowsAzure\Services\Table\Models\GetServicePropertiesResult;
-use WindowsAzure\Services\Table\Models\GetTableResult;
-use WindowsAzure\Services\Table\Models\InsertEntityResult;
-use WindowsAzure\Services\Table\Models\Property;
-use WindowsAzure\Services\Table\Models\Query;
-use WindowsAzure\Services\Table\Models\QueryEntitiesOptions;
-use WindowsAzure\Services\Table\Models\QueryEntitiesResult;
-use WindowsAzure\Services\Table\Models\QueryTablesOptions;
-use WindowsAzure\Services\Table\Models\QueryTablesResult;
-use WindowsAzure\Services\Table\Models\TableServiceOptions;
-use WindowsAzure\Services\Table\Models\UpdateEntityResult;
-use WindowsAzure\Services\Table\Models\Filters\Filter;
+use WindowsAzure\Table\Models\BatchError;
+use WindowsAzure\Table\Models\BatchOperations;
+use WindowsAzure\Table\Models\BatchResult;
+use WindowsAzure\Table\Models\DeleteEntityOptions;
+use WindowsAzure\Table\Models\EdmType;
+use WindowsAzure\Table\Models\Entity;
+use WindowsAzure\Table\Models\GetEntityResult;
+use WindowsAzure\Table\Models\GetServicePropertiesResult;
+use WindowsAzure\Table\Models\GetTableResult;
+use WindowsAzure\Table\Models\InsertEntityResult;
+use WindowsAzure\Table\Models\Property;
+use WindowsAzure\Table\Models\Query;
+use WindowsAzure\Table\Models\QueryEntitiesOptions;
+use WindowsAzure\Table\Models\QueryEntitiesResult;
+use WindowsAzure\Table\Models\QueryTablesOptions;
+use WindowsAzure\Table\Models\QueryTablesResult;
+use WindowsAzure\Table\Models\TableServiceOptions;
+use WindowsAzure\Table\Models\UpdateEntityResult;
+use WindowsAzure\Table\Models\Filters\Filter;
 
 class OpType {
     const deleteEntity          = 'deleteEntity';
@@ -87,8 +87,8 @@ class BatchWorkerConfig {
 
 class TableServiceFunctionalTest extends FunctionalTestBase {
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getServiceProperties
-    * @covers WindowsAzure\Services\Table\TableRestProxy::setServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::setServiceProperties
     */
     public function testGetServicePropertiesNoOptions() {
         $serviceProperties = TableServiceFunctionalTestData::getDefaultServiceProperties();
@@ -114,8 +114,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getServiceProperties
-    * @covers WindowsAzure\Services\Table\TableRestProxy::setServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::setServiceProperties
     */
     public function testGetServiceProperties() {
         $serviceProperties = TableServiceFunctionalTestData::getDefaultServiceProperties();
@@ -134,7 +134,7 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getServiceProperties
     */
     private function getServicePropertiesWorker($options) {
         self::println( 'Trying $options: ' . self::tmptostring($options));
@@ -185,8 +185,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getServiceProperties
-    * @covers WindowsAzure\Services\Table\TableRestProxy::setServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::setServiceProperties
     */
     public function testSetServicePropertiesNoOptions() {
         $serviceProperties = TableServiceFunctionalTestData::getDefaultServiceProperties();
@@ -194,8 +194,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getServiceProperties
-    * @covers WindowsAzure\Services\Table\TableRestProxy::setServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::setServiceProperties
     */
     public function testSetServiceProperties() {
         $interestingServiceProperties = TableServiceFunctionalTestData::getInterestingServiceProperties();
@@ -211,8 +211,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getServiceProperties
-    * @covers WindowsAzure\Services\Table\TableRestProxy::setServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::setServiceProperties
     */
     private function setServicePropertiesWorker($serviceProperties, $options) {
         try {
@@ -235,14 +235,14 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
     */
     public function testQueryTablesNoOptions() {
         $this->queryTablesWorker(null);
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
     */
     public function testQueryTables() {
         $interestingqueryTablesOptions = TableServiceFunctionalTestData::getInterestingQueryTablesOptions();
@@ -252,7 +252,7 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
     */
     private function queryTablesWorker($options) {
         try {
@@ -349,18 +349,18 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::createTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::createTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
     */
     public function testCreateTableNoOptions() {
         $this->createTableWorker(null);
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::createTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::createTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
     */
     public function testCreateTable() {
         $options = new TableServiceOptions();
@@ -368,9 +368,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::createTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::createTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
     */
     private function createTableWorker($options) {
         $table = TableServiceFunctionalTestData::getInterestingTableName();
@@ -407,18 +407,18 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::createTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::createTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
     */
     public function testDeleteTableNoOptions() {
         $this->deleteTableWorker(null);
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::createTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::createTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
     */
     public function testDeleteTable() {
         $options = new TableServiceOptions();
@@ -426,9 +426,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::createTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::createTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
     */
     private function deleteTableWorker($options) {
         $Table = TableServiceFunctionalTestData::getInterestingTableName();
@@ -476,18 +476,18 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::createTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::createTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getTable
     */
     public function testGetTableNoOptions() {
         $this->getTableWorker(null);
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::createTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::createTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getTable
     */
     public function testGetTable() {
         $options = new TableServiceOptions();
@@ -495,9 +495,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::createTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::createTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getTable
     */
     private function getTableWorker($options) {
         $table = TableServiceFunctionalTestData::getInterestingTableName();
@@ -525,8 +525,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testGetEntity() {
         $ents = TableServiceFunctionalTestData::getInterestingEntities();
@@ -537,8 +537,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     private function getEntityWorker($ent, $isGood, $options) {
         $table = $this->getCleanTable();
@@ -627,9 +627,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testDeleteEntity() {
         $ents = TableServiceFunctionalTestData::getSimpleEntities(3);
@@ -642,9 +642,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     private function deleteEntityWorker($ent, $useEtag, $options) {
         $table = $this->getCleanTable();
@@ -687,8 +687,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertEntity() {
         $ents = TableServiceFunctionalTestData::getInterestingEntities();
@@ -699,8 +699,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertBadEntity() {
         $ents = TableServiceFunctionalTestData::getInterestingBadEntities();
@@ -717,8 +717,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertEntityBoolean() {
         foreach(TableServiceFunctionalTestData::getInterestingGoodBooleans() as $o)  {
@@ -731,8 +731,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertEntityBooleanNegative() {
         foreach(TableServiceFunctionalTestData::getInterestingBadBooleans() as $o)  {
@@ -751,8 +751,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertEntityDate() {
         foreach(TableServiceFunctionalTestData::getInterestingGoodDates() as $o)  {
@@ -765,8 +765,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertEntityDateNegative() {
         foreach(TableServiceFunctionalTestData::getInterestingBadDates() as $o)  {
@@ -785,8 +785,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertEntityDouble() {
         foreach(TableServiceFunctionalTestData::getInterestingGoodDoubles() as $o)  {
@@ -799,8 +799,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertEntityDoubleNegative() {
         foreach(TableServiceFunctionalTestData::getInterestingBadDoubles() as $o)  {
@@ -819,8 +819,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertEntityGuid() {
         foreach(TableServiceFunctionalTestData::getInterestingGoodGuids() as $o)  {
@@ -833,8 +833,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertEntityGuidNegative() {
         foreach(TableServiceFunctionalTestData::getInterestingBadGuids() as $o)  {
@@ -853,8 +853,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertEntityInt() {
         foreach(TableServiceFunctionalTestData::getInterestingGoodInts() as $o)  {
@@ -867,8 +867,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertEntityIntNegative() {
         foreach(TableServiceFunctionalTestData::getInterestingBadInts() as $o)  {
@@ -887,8 +887,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertEntityLong() {
         foreach(TableServiceFunctionalTestData::getInterestingGoodLongs() as $o)  {
@@ -901,8 +901,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertEntityLongNegative() {
         foreach(TableServiceFunctionalTestData::getInterestingBadLongs() as $o)  {
@@ -921,8 +921,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertEntityBinary() {
         foreach(TableServiceFunctionalTestData::getInterestingGoodBinaries() as $o)  {
@@ -935,8 +935,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertEntityBinaryNegative() {
         foreach(TableServiceFunctionalTestData::getInterestingBadBinaries() as $o)  {
@@ -955,8 +955,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertEntityString() {
         foreach(TableServiceFunctionalTestData::getInterestingGoodStrings() as $o)  {
@@ -969,8 +969,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     private function insertEntityWorker($ent, $isGood, $options, $specialValue = null) {
         $table = $this->getCleanTable();
@@ -1018,9 +1018,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     public function testUpdateEntity() {
         $ents = TableServiceFunctionalTestData::getSimpleEntities(2);
@@ -1035,9 +1035,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     private function updateEntityWorker($initialEnt, $ent, $options) {
         $table = $this->getCleanTable();
@@ -1068,9 +1068,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testMergeEntity() {
         $ents = TableServiceFunctionalTestData::getSimpleEntities(2);
@@ -1085,9 +1085,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     private function mergeEntityWorker($initialEnt, $ent, $options) {
         $table = $this->getCleanTable();
@@ -1119,9 +1119,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertOrReplaceEntity() {
         $ents = TableServiceFunctionalTestData::getSimpleEntities(2);
@@ -1146,9 +1146,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     private function insertOrReplaceEntityWorker($initialEnt, $ent, $options) {
         $table = $this->getCleanTable();
@@ -1179,9 +1179,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testInsertOrMergeEntity() {
         $ents = TableServiceFunctionalTestData::getSimpleEntities(2);
@@ -1206,9 +1206,9 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     private function insertOrMergeEntityWorker($initialEnt, $ent, $options) {
         $table = $this->getCleanTable();
@@ -1240,12 +1240,12 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     public function testCRUDdeleteEntity() {
         foreach(ConcurType::values() as $concurType)  {
@@ -1261,12 +1261,12 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 /*
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     public function testCRUDinsertEntity() {
         foreach(ConcurType::values() as $concurType)  {
@@ -1282,12 +1282,12 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     public function testCRUDinsertOrMergeEntity() {
         $this->skipIfEmulated();
@@ -1305,12 +1305,12 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 /*
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     public function testCRUDinsertOrReplaceEntity() {
         $this->skipIfEmulated();
@@ -1328,12 +1328,12 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     public function testCRUDmergeEntity() {
         foreach(ConcurType::values() as $concurType)  {
@@ -1349,12 +1349,12 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     public function testCRUDupdateEntity() {
         foreach(ConcurType::values() as $concurType)  {
@@ -1370,12 +1370,12 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     private function crudWorker($opType, $concurType, $mutatePivot, $ent, $options) {
         $exptErr = $this->expectConcurrencyFailure($opType, $concurType);
@@ -1406,24 +1406,24 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testBatchPositiveFirstNoKeyMatch() {
         $this->batchPositiveOuter(ConcurType::NoKeyMatch, 123);
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testBatchPositiveFirstKeyMatchNoEtag() {
         $this->batchPositiveOuter(ConcurType::KeyMatchNoEtag, 234);
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testBatchPositiveFirstKeyMatchEtagMismatch() {
         $this->skipIfEmulated();
@@ -1431,16 +1431,16 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testBatchPositiveFirstKeyMatchEtagMatch() {
         $this->batchPositiveOuter(ConcurType::KeyMatchEtagMatch, 456);
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testBatchNegative() {
         $this->skipIfEmulated();
@@ -1552,8 +1552,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     private function batchPositiveOuter($firstConcurType, $seed) {
         // The random here is not to generate random values, but to
@@ -1621,8 +1621,8 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     private function batchWorker($configs, $options) {
         $exptErrs = array();
@@ -1700,7 +1700,7 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
     */
     private function verifyEntryData($table, $exptErr, $targetEnt, $opResult) {
         if ($opResult instanceof InsertEntityResult) {
@@ -1775,12 +1775,12 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     private function executeCrudMethod($table, $targetEnt, $opType, $concurType, $options) {
         switch ($opType) {
@@ -1833,7 +1833,7 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
     */
     private function verifyCrudWorker($opType, $table, $initialEnt, $targetEnt, $expectedSuccess) {
         $entInTable = null;
@@ -1883,7 +1883,7 @@ class TableServiceFunctionalTest extends FunctionalTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     private function createTargetEntity($table, $initialEnt, $concurType, $mutatePivot) {
         $targetEnt = TableServiceFunctionalTestUtils::cloneEntity($initialEnt);

tests/functional/WindowsAzure/Table/TableServiceFunctionalTestData.php

@@ -17,14 +17,14 @@
  * limitations under the License.
  *
  * @category   Microsoft
- * @package    Tests\Functional\WindowsAzure\Services\Table
+ * @package    Tests\Functional\WindowsAzure\Table
  * @author     Jason Cooke <jcooke@microsoft.com>
  * @copyright  2012 Microsoft Corporation
  * @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link       http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Functional\WindowsAzure\Services\Table;
+namespace Tests\Functional\WindowsAzure\Table;
 
 use WindowsAzure\Common\Internal\Utilities;
 use WindowsAzure\Common\Configuration;
@@ -32,17 +32,17 @@ use WindowsAzure\Common\Models\Logging;
 use WindowsAzure\Common\Models\Metrics;
 use WindowsAzure\Common\Models\RetentionPolicy;
 use WindowsAzure\Common\Models\ServiceProperties;
-use WindowsAzure\Services\Table\Models\EdmType;
-use WindowsAzure\Services\Table\Models\Entity;
-use WindowsAzure\Services\Table\Models\Property;
-use WindowsAzure\Services\Table\Models\Query;
-use WindowsAzure\Services\Table\Models\QueryTablesOptions;
-use WindowsAzure\Services\Table\Models\TableServiceOptions;
-use WindowsAzure\Services\Table\Models\Filters\BinaryFilter;
-use WindowsAzure\Services\Table\Models\Filters\ConstantFilter;
-use WindowsAzure\Services\Table\Models\Filters\Filter;
-use WindowsAzure\Services\Table\Models\Filters\PropertyNameFilter;
-use WindowsAzure\Services\Table\Models\Filters\UnaryFilter;
+use WindowsAzure\Table\Models\EdmType;
+use WindowsAzure\Table\Models\Entity;
+use WindowsAzure\Table\Models\Property;
+use WindowsAzure\Table\Models\Query;
+use WindowsAzure\Table\Models\QueryTablesOptions;
+use WindowsAzure\Table\Models\TableServiceOptions;
+use WindowsAzure\Table\Models\Filters\BinaryFilter;
+use WindowsAzure\Table\Models\Filters\ConstantFilter;
+use WindowsAzure\Table\Models\Filters\Filter;
+use WindowsAzure\Table\Models\Filters\PropertyNameFilter;
+use WindowsAzure\Table\Models\Filters\UnaryFilter;
 
 class FakeTableInfoEntry {
     public $TableName;

tests/functional/WindowsAzure/Table/TableServiceFunctionalTestUtils.php

@@ -17,36 +17,36 @@
  * limitations under the License.
  *
  * @category   Microsoft
- * @package    Tests\Functional\WindowsAzure\Services\Table
+ * @package    Tests\Functional\WindowsAzure\Table
  * @author     Jason Cooke <jcooke@microsoft.com>
  * @copyright  2012 Microsoft Corporation
  * @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link       http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Functional\WindowsAzure\Services\Table;
+namespace Tests\Functional\WindowsAzure\Table;
 
 use WindowsAzure\Common\Internal\Utilities;
 use WindowsAzure\Common\Internal\ServiceException;
-use WindowsAzure\Services\Table\TableService;
-use WindowsAzure\Services\Table\Models\DeleteEntityOptions;
-use WindowsAzure\Services\Table\Models\EdmType;
-use WindowsAzure\Services\Table\Models\Entity;
-use WindowsAzure\Services\Table\Models\InsertEntityResult;
-use WindowsAzure\Services\Table\Models\Property;
-use WindowsAzure\Services\Table\Models\Query;
-use WindowsAzure\Services\Table\Models\QueryEntitiesOptions;
-use WindowsAzure\Services\Table\Models\QueryEntitiesResult;
-use WindowsAzure\Services\Table\Models\QueryTableResults;
-use WindowsAzure\Services\Table\Models\QueryTablesOptions;
-use WindowsAzure\Services\Table\Models\TableServiceOptions;
-use WindowsAzure\Services\Table\Models\UpdateEntityResult;
-use WindowsAzure\Services\Table\Models\Filters\BinaryFilter;
-use WindowsAzure\Services\Table\Models\Filters\ConstantFilter;
-use WindowsAzure\Services\Table\Models\Filters\Filter;
-use WindowsAzure\Services\Table\Models\Filters\PropertyNameFilter;
-use WindowsAzure\Services\Table\Models\Filters\QueryStringFilter;
-use WindowsAzure\Services\Table\Models\Filters\UnaryFilter;
+use WindowsAzure\Table\TableService;
+use WindowsAzure\Table\Models\DeleteEntityOptions;
+use WindowsAzure\Table\Models\EdmType;
+use WindowsAzure\Table\Models\Entity;
+use WindowsAzure\Table\Models\InsertEntityResult;
+use WindowsAzure\Table\Models\Property;
+use WindowsAzure\Table\Models\Query;
+use WindowsAzure\Table\Models\QueryEntitiesOptions;
+use WindowsAzure\Table\Models\QueryEntitiesResult;
+use WindowsAzure\Table\Models\QueryTableResults;
+use WindowsAzure\Table\Models\QueryTablesOptions;
+use WindowsAzure\Table\Models\TableServiceOptions;
+use WindowsAzure\Table\Models\UpdateEntityResult;
+use WindowsAzure\Table\Models\Filters\BinaryFilter;
+use WindowsAzure\Table\Models\Filters\ConstantFilter;
+use WindowsAzure\Table\Models\Filters\Filter;
+use WindowsAzure\Table\Models\Filters\PropertyNameFilter;
+use WindowsAzure\Table\Models\Filters\QueryStringFilter;
+use WindowsAzure\Table\Models\Filters\UnaryFilter;
 
 class MutatePivot {
     const ChangeValues   = 'ChangeValues';

tests/functional/WindowsAzure/Table/TableServiceIntegrationTest.php

@@ -17,38 +17,38 @@
  * limitations under the License.
  *
  * @category   Microsoft
- * @package    Tests\Functional\WindowsAzure\Services\Table
+ * @package    Tests\Functional\WindowsAzure\Table
  * @author     Jason Cooke <jcooke@microsoft.com>
  * @copyright  2012 Microsoft Corporation
  * @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link       http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Functional\WindowsAzure\Services\Table;
+namespace Tests\Functional\WindowsAzure\Table;
 
 use WindowsAzure\Common\Internal\ServiceException;
 use WindowsAzure\Common\Configuration;
-use WindowsAzure\Services\Table\TableService;
-use WindowsAzure\Services\Table\Models\BatchError;
-use WindowsAzure\Services\Table\Models\BatchOperations;
-use WindowsAzure\Services\Table\Models\DeleteEntityOptions;
-use WindowsAzure\Services\Table\Models\EdmType;
-use WindowsAzure\Services\Table\Models\Entity;
-use WindowsAzure\Services\Table\Models\InsertEntityResult;
-use WindowsAzure\Services\Table\Models\Property;
-use WindowsAzure\Services\Table\Models\Query;
-use WindowsAzure\Services\Table\Models\QueryEntitiesOptions;
-use WindowsAzure\Services\Table\Models\QueryEntitiesResult;
-use WindowsAzure\Services\Table\Models\QueryTableResults;
-use WindowsAzure\Services\Table\Models\QueryTablesOptions;
-use WindowsAzure\Services\Table\Models\TableServiceOptions;
-use WindowsAzure\Services\Table\Models\UpdateEntityResult;
-use WindowsAzure\Services\Table\Models\Filters\BinaryFilter;
-use WindowsAzure\Services\Table\Models\Filters\ConstantFilter;
-use WindowsAzure\Services\Table\Models\Filters\Filter;
-use WindowsAzure\Services\Table\Models\Filters\PropertyNameFilter;
-use WindowsAzure\Services\Table\Models\Filters\QueryStringFilter;
-use WindowsAzure\Services\Table\Models\Filters\UnaryFilter;
+use WindowsAzure\Table\TableService;
+use WindowsAzure\Table\Models\BatchError;
+use WindowsAzure\Table\Models\BatchOperations;
+use WindowsAzure\Table\Models\DeleteEntityOptions;
+use WindowsAzure\Table\Models\EdmType;
+use WindowsAzure\Table\Models\Entity;
+use WindowsAzure\Table\Models\InsertEntityResult;
+use WindowsAzure\Table\Models\Property;
+use WindowsAzure\Table\Models\Query;
+use WindowsAzure\Table\Models\QueryEntitiesOptions;
+use WindowsAzure\Table\Models\QueryEntitiesResult;
+use WindowsAzure\Table\Models\QueryTableResults;
+use WindowsAzure\Table\Models\QueryTablesOptions;
+use WindowsAzure\Table\Models\TableServiceOptions;
+use WindowsAzure\Table\Models\UpdateEntityResult;
+use WindowsAzure\Table\Models\Filters\BinaryFilter;
+use WindowsAzure\Table\Models\Filters\ConstantFilter;
+use WindowsAzure\Table\Models\Filters\Filter;
+use WindowsAzure\Table\Models\Filters\PropertyNameFilter;
+use WindowsAzure\Table\Models\Filters\QueryStringFilter;
+use WindowsAzure\Table\Models\Filters\UnaryFilter;
 
 class TableServiceIntegrationTest extends IntegrationTestBase {
     private static $testTablesPrefix = 'sdktest';
@@ -156,7 +156,7 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
     
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getServiceProperties
     */
     public function testGetServicePropertiesWorks() {
         // Arrange
@@ -190,8 +190,8 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getServiceProperties
-    * @covers WindowsAzure\Services\Table\TableRestProxy::setServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getServiceProperties
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::setServiceProperties
     */
     public function testSetServicePropertiesWorks() {
         // Arrange
@@ -231,8 +231,8 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::createTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::createTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getTable
     */
     public function testCreateTablesWorks() {
         // Act
@@ -252,9 +252,9 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::createTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteTable
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::createTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getTable
     */
     public function testDeleteTablesWorks() {
         // Act
@@ -276,7 +276,7 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
     */
     public function testQueryTablesWorks() {
         // Act
@@ -287,7 +287,7 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
     */
     public function testQueryTablesWithPrefixWorks() {
         // Act
@@ -300,7 +300,7 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getTable
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getTable
     */
     public function testGetTableWorks() {
         // Act
@@ -311,7 +311,7 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testInsertEntityWorks() {
         // Arrange
@@ -366,8 +366,8 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
         $this->assertEquals($uuid, $result->getEntity()->getPropertyValue('test7'), 'GUIDs are the same');
     }
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     public function testUpdateEntityWorks() {
         // Arrange
@@ -390,7 +390,7 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
     */
     public function testInsertOrReplaceEntityWorks() {
         // Arrange
@@ -423,7 +423,7 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrMergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrMergeEntity
     */
     public function testInsertOrMergeEntityWorks() {
         // Arrange
@@ -456,8 +456,8 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
     */
     public function testMergeEntityWorks() {
         // Arrange
@@ -482,8 +482,8 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testDeleteEntityWorks() {
         // Arrange
@@ -506,10 +506,10 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testDeleteEntityTroublesomeKeyWorks() {
         // For issue https://github.com/WindowsAzure/azure-sdk-for-php/issues/180
@@ -583,8 +583,8 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testDeleteEntityWithETagWorks() {
         // Arrange
@@ -610,8 +610,8 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testGetEntityWorks() {
         // Arrange
@@ -668,8 +668,8 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesWorks() {
         // Arrange
@@ -716,8 +716,8 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesWithPaginationWorks() {
         // Arrange
@@ -759,8 +759,8 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
     */
     public function testQueryEntitiesWithFilterWorks() {
         // Arrange
@@ -905,7 +905,7 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::batch
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
     */
     public function testBatchInsertWorks() {
         // Arrange
@@ -934,8 +934,8 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testBatchUpdateWorks() {
         // Arrange
@@ -965,8 +965,8 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testBatchMergeWorks() {
         // Arrange
@@ -995,7 +995,7 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::batch
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
     */
     public function testBatchInsertOrReplaceWorks() {
         $this->skipIfEmulated();
@@ -1025,7 +1025,7 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::batch
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
     */
     public function testBatchInsertOrMergeWorks() {
         $this->skipIfEmulated();
@@ -1055,8 +1055,8 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testBatchDeleteWorks() {
         // Arrange
@@ -1085,7 +1085,7 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::batch
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
     */
     public function testBatchLotsOfInsertsWorks() {
         // Arrange
@@ -1140,8 +1140,8 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
     */
     public function testBatchAllOperationsTogetherWorks() {
         // Arrange
@@ -1256,9 +1256,9 @@ class TableServiceIntegrationTest extends IntegrationTestBase {
     }
 
     /**
-    * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-    * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-    * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+    * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
     */
     public function testBatchNegativeWorks() {
         // Arrange

tests/unit/WindowsAzure/Common/ConfigurationTest.php

@@ -132,7 +132,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
         $config->setProperty(QueueSettings::URI, 'http://' . TestResources::ACCOUNT_NAME . TestResources::QUEUE_URI);
         $queueWrapper = $config->create(Resources::QUEUE_TYPE_NAME);
 
-        $this->assertInstanceOf('\WindowsAzure\\Services\\Queue\\' . Resources::QUEUE_TYPE_NAME, $queueWrapper);
+        $this->assertInstanceOf('WindowsAzure\Queue\Internal\IQueue', $queueWrapper);
     }
 
     /**

tests/unit/WindowsAzure/Common/Internal/ServicesBuilderTest.php

@@ -29,7 +29,7 @@ use WindowsAzure\Common\Internal\ServicesBuilder;
 use WindowsAzure\Common\Configuration;
 use WindowsAzure\Queue\QueueSettings;
 use WindowsAzure\Blob\BlobSettings;
-use WindowsAzure\Services\Table\TableSettings;
+use WindowsAzure\Table\TableSettings;
 use WindowsAzure\Common\Internal\InvalidArgumentTypeException;
 
 /**
@@ -108,7 +108,7 @@ class ServicesBuilderTest extends \PHPUnit_Framework_TestCase
         $tableWrapper = $builder->build($config, Resources::TABLE_TYPE_NAME);
         
         // Assert
-        $this->assertInstanceOf('WindowsAzure\Services\Table\ITable', $tableWrapper);
+        $this->assertInstanceOf('WindowsAzure\Table\Internal\ITable', $tableWrapper);
     }
     
     /**

tests/unit/WindowsAzure/Table/Internal/TableRestProxyTest.php

@@ -15,38 +15,38 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table
+ * @package   Tests\Unit\WindowsAzure\Table
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table;
+namespace Tests\Unit\WindowsAzure\Table;
 use WindowsAzure\Common\Internal\Http\HttpClient;
-use WindowsAzure\Services\Table\Utilities\AtomReaderWriter;
-use WindowsAzure\Services\Table\Utilities\MimeReaderWriter;
+use WindowsAzure\Table\Internal\AtomReaderWriter;
+use WindowsAzure\Table\Internal\MimeReaderWriter;
 use Tests\Framework\TableServiceRestProxyTestBase;
 use WindowsAzure\Common\Internal\Utilities;
 use WindowsAzure\Common\Internal\ServiceException;
 use Tests\Framework\TestResources;
 use WindowsAzure\Common\Internal\Resources;
-use WindowsAzure\Services\Table\TableRestProxy;
+use WindowsAzure\Table\Internal\TableRestProxy;
 use WindowsAzure\Common\Models\ServiceProperties;
-use WindowsAzure\Services\Table\Models\QueryTablesOptions;
-use WindowsAzure\Services\Table\Models\Query;
-use WindowsAzure\Services\Table\Models\Filters\Filter;
-use WindowsAzure\Services\Table\Models\Entity;
-use WindowsAzure\Services\Table\Models\EdmType;
-use WindowsAzure\Services\Table\Models\QueryEntitiesOptions;
-use WindowsAzure\Services\Table\Models\BatchOperations;
+use WindowsAzure\Table\Models\QueryTablesOptions;
+use WindowsAzure\Table\Models\Query;
+use WindowsAzure\Table\Models\Filters\Filter;
+use WindowsAzure\Table\Models\Entity;
+use WindowsAzure\Table\Models\EdmType;
+use WindowsAzure\Table\Models\QueryEntitiesOptions;
+use WindowsAzure\Table\Models\BatchOperations;
 use WindowsAzure\Common\Internal\Serialization\XmlSerializer;
 
 /**
  * Unit tests for class TableRestProxy
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table
+ * @package   Tests\Unit\WindowsAzure\Table
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -56,7 +56,7 @@ use WindowsAzure\Common\Internal\Serialization\XmlSerializer;
 class TableRestProxyTest extends TableServiceRestProxyTestBase
 {
     /**
-     * @covers  WindowsAzure\Services\Table\TableRestProxy::__construct
+     * @covers  WindowsAzure\Table\Internal\TableRestProxy::__construct
      */
     public function test__construct()
     {
@@ -74,7 +74,7 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::getServiceProperties
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::getServiceProperties
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testGetServiceProperties()
@@ -89,7 +89,7 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::setServiceProperties
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::setServiceProperties
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testSetServiceProperties()
@@ -108,7 +108,7 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::setServiceProperties
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::setServiceProperties
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testSetServicePropertiesWithEmptyParts()
@@ -129,9 +129,9 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::createTable
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_fillTemplate
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::getTable
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::createTable
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_fillTemplate
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::getTable
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testCreateTable()
@@ -148,11 +148,11 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::getTable
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::getTable
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::parseTable
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Models\GetTableResult::create
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::parseTable
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Models\GetTableResult::create
      */
     public function testGetTable()
     {
@@ -168,7 +168,7 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::deleteTable
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteTable
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testDeleteTable()
@@ -186,16 +186,16 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_buildFilterExpression
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_buildFilterExpressionRec
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_addOptionalQuery
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValues
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValue
-     * @covers WindowsAzure\Services\Table\Models\EdmType::serializeQueryValue
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesResult::create
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::parseTableEntries
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_buildFilterExpression
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_buildFilterExpressionRec
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_addOptionalQuery
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValues
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValue
+     * @covers WindowsAzure\Table\Models\EdmType::serializeQueryValue
+     * @covers WindowsAzure\Table\Models\QueryTablesResult::create
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::parseTableEntries
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testQueryTablesSimple()
@@ -217,16 +217,16 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_buildFilterExpression
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_buildFilterExpressionRec
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_addOptionalQuery
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValues
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValue
-     * @covers WindowsAzure\Services\Table\Models\EdmType::serializeQueryValue
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesResult::create
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::parseTableEntries
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_buildFilterExpression
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_buildFilterExpressionRec
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_addOptionalQuery
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValues
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValue
+     * @covers WindowsAzure\Table\Models\EdmType::serializeQueryValue
+     * @covers WindowsAzure\Table\Models\QueryTablesResult::create
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::parseTableEntries
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testQueryTablesOneTable()
@@ -245,16 +245,16 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_buildFilterExpression
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_buildFilterExpressionRec
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_addOptionalQuery
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValues
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValue
-     * @covers WindowsAzure\Services\Table\Models\EdmType::serializeQueryValue
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesResult::create
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::parseTableEntries
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_buildFilterExpression
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_buildFilterExpressionRec
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_addOptionalQuery
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValues
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValue
+     * @covers WindowsAzure\Table\Models\EdmType::serializeQueryValue
+     * @covers WindowsAzure\Table\Models\QueryTablesResult::create
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::parseTableEntries
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testQueryTablesEmpty()
@@ -268,16 +268,16 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_buildFilterExpression
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_buildFilterExpressionRec
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_addOptionalQuery
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValues
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValue
-     * @covers WindowsAzure\Services\Table\Models\EdmType::serializeQueryValue
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesResult::create
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::parseTableEntries
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_buildFilterExpression
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_buildFilterExpressionRec
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_addOptionalQuery
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValues
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValue
+     * @covers WindowsAzure\Table\Models\EdmType::serializeQueryValue
+     * @covers WindowsAzure\Table\Models\QueryTablesResult::create
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::parseTableEntries
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testQueryTablesWithPrefix()
@@ -305,16 +305,16 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_buildFilterExpression
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_buildFilterExpressionRec
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_addOptionalQuery
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValues
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValue
-     * @covers WindowsAzure\Services\Table\Models\EdmType::serializeQueryValue
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesResult::create
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::parseTableEntries
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_buildFilterExpression
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_buildFilterExpressionRec
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_addOptionalQuery
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValues
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValue
+     * @covers WindowsAzure\Table\Models\EdmType::serializeQueryValue
+     * @covers WindowsAzure\Table\Models\QueryTablesResult::create
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::parseTableEntries
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testQueryTablesWithStringOption()
@@ -341,16 +341,16 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::queryTables
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_buildFilterExpression
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_buildFilterExpressionRec
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_addOptionalQuery
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValues
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValue
-     * @covers WindowsAzure\Services\Table\Models\EdmType::serializeQueryValue
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesResult::create
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::parseTableEntries
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::queryTables
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_buildFilterExpression
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_buildFilterExpressionRec
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_addOptionalQuery
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValues
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValue
+     * @covers WindowsAzure\Table\Models\EdmType::serializeQueryValue
+     * @covers WindowsAzure\Table\Models\QueryTablesResult::create
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::parseTableEntries
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testQueryTablesWithFilterOption()
@@ -387,15 +387,15 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_constructInsertEntityContext
-     * @covers WindowsAzure\Services\Table\Models\EdmType::serializeValue
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::getEntity
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_generatePropertiesXml
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::parseEntity
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseOneEntity
-     * WindowsAzure\Services\Table\Models\InsertEntityResult::create
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_constructInsertEntityContext
+     * @covers WindowsAzure\Table\Models\EdmType::serializeValue
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::getEntity
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_generatePropertiesXml
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::parseEntity
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseOneEntity
+     * WindowsAzure\Table\Models\InsertEntityResult::create
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testInsertEntity()
@@ -417,10 +417,10 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::parseEntities
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseOneEntity
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::parseEntities
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseOneEntity
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testQueryEntitiesWithEmpty()
@@ -439,10 +439,10 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::parseEntities
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseOneEntity
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::parseEntities
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseOneEntity
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testQueryEntitiesWithOneEntity()
@@ -464,13 +464,13 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_addOptionalQuery
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValues
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValue
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::parseEntities
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseOneEntity
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_addOptionalQuery
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValues
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValue
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::parseEntities
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseOneEntity
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testQueryEntitiesQueryStringOption()
@@ -501,13 +501,13 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_addOptionalQuery
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValues
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValue
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::parseEntities
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseOneEntity
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_addOptionalQuery
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValues
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValue
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::parseEntities
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseOneEntity
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testQueryEntitiesFilterOption()
@@ -539,13 +539,13 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_addOptionalQuery
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValues
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValue
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::parseEntities
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseOneEntity
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_addOptionalQuery
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValues
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValue
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::parseEntities
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseOneEntity
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testQueryEntitiesWithMultipleEntities()
@@ -584,13 +584,13 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::queryEntities
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_addOptionalQuery
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValues
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_encodeODataUriValue
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::parseEntities
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseOneEntity
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::queryEntities
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_addOptionalQuery
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValues
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_encodeODataUriValue
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::parseEntities
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseOneEntity
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testQueryEntitiesWithGetTop()
@@ -622,15 +622,15 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::updateEntity
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_getEntityPath
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_putOrMergeEntityImpl
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_constructPutOrMergeEntityContext
-     * @covers WindowsAzure\Services\Table\Models\EdmType::serializeValue
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::getEntity
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_generatePropertiesXml
-     * @covers WindowsAzure\Services\Table\Models\UpdateEntityResult::create
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::updateEntity
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_getEntityPath
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_putOrMergeEntityImpl
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_constructPutOrMergeEntityContext
+     * @covers WindowsAzure\Table\Models\EdmType::serializeValue
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::getEntity
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_generatePropertiesXml
+     * @covers WindowsAzure\Table\Models\UpdateEntityResult::create
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testUpdateEntity()
@@ -659,15 +659,15 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::insertEntity
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_constructInsertEntityContext
-     * @covers WindowsAzure\Services\Table\Models\EdmType::serializeValue
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::getEntity
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_generatePropertiesXml
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::parseEntity
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseOneEntity
-     * WindowsAzure\Services\Table\Models\InsertEntityResult::create
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::insertEntity
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_constructInsertEntityContext
+     * @covers WindowsAzure\Table\Models\EdmType::serializeValue
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::getEntity
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_generatePropertiesXml
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::parseEntity
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseOneEntity
+     * WindowsAzure\Table\Models\InsertEntityResult::create
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testUpdateEntityWithDeleteProperty()
@@ -694,15 +694,15 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::mergeEntity
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_getEntityPath
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_putOrMergeEntityImpl
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_constructPutOrMergeEntityContext
-     * @covers WindowsAzure\Services\Table\Models\EdmType::serializeValue
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::getEntity
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_generatePropertiesXml
-     * @covers WindowsAzure\Services\Table\Models\UpdateEntityResult::create
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::mergeEntity
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_getEntityPath
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_putOrMergeEntityImpl
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_constructPutOrMergeEntityContext
+     * @covers WindowsAzure\Table\Models\EdmType::serializeValue
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::getEntity
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_generatePropertiesXml
+     * @covers WindowsAzure\Table\Models\UpdateEntityResult::create
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testMergeEntity()
@@ -731,14 +731,14 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::insertOrReplaceEntity
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_getEntityPath
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_putOrMergeEntityImpl
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_constructPutOrMergeEntityContext
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::getEntity
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_generatePropertiesXml
-     * @covers WindowsAzure\Services\Table\Models\UpdateEntityResult::create
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::insertOrReplaceEntity
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_getEntityPath
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_putOrMergeEntityImpl
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_constructPutOrMergeEntityContext
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::getEntity
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_generatePropertiesXml
+     * @covers WindowsAzure\Table\Models\UpdateEntityResult::create
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testInsertOrReplaceEntity()
@@ -769,14 +769,14 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::InsertOrMergeEntity
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_getEntityPath
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_putOrMergeEntityImpl
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_constructPutOrMergeEntityContext
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::getEntity
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_generatePropertiesXml
-     * @covers WindowsAzure\Services\Table\Models\UpdateEntityResult::create
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::InsertOrMergeEntity
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_getEntityPath
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_putOrMergeEntityImpl
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_constructPutOrMergeEntityContext
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::getEntity
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_generatePropertiesXml
+     * @covers WindowsAzure\Table\Models\UpdateEntityResult::create
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testInsertOrMergeEntity()
@@ -807,9 +807,9 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_getEntityPath
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_constructDeleteEntityContext
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_getEntityPath
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_constructDeleteEntityContext
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testDeleteEntity()
@@ -832,9 +832,9 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::deleteEntity
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_getEntityPath
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_constructDeleteEntityContext
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::deleteEntity
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_getEntityPath
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_constructDeleteEntityContext
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testDeleteEntityWithSpecialChars()
@@ -857,10 +857,10 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::getEntity
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseBody
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::parseEntity
-     * @covers WindowsAzure\Services\Table\Utilities\AtomReaderWriter::_parseOneEntity
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::getEntity
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseBody
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::parseEntity
+     * @covers WindowsAzure\Table\Internal\AtomReaderWriter::_parseOneEntity
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testGetEntity()
@@ -885,16 +885,16 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_createBatchRequestBody
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_getOperationContext
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_constructInsertEntityContext
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_createOperationsContexts
-     * @covers WindowsAzure\Services\Table\Utilities\MimeReaderWriter::encodeMimeMultipart
-     * @covers WindowsAzure\Services\Table\Utilities\MimeReaderWriter::decodeMimeMultipart
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::create
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::_constructResponses
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::_compareUsingContentId
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_createBatchRequestBody
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_getOperationContext
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_constructInsertEntityContext
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_createOperationsContexts
+     * @covers WindowsAzure\Table\Internal\MimeReaderWriter::encodeMimeMultipart
+     * @covers WindowsAzure\Table\Internal\MimeReaderWriter::decodeMimeMultipart
+     * @covers WindowsAzure\Table\Models\BatchResult::create
+     * @covers WindowsAzure\Table\Models\BatchResult::_constructResponses
+     * @covers WindowsAzure\Table\Models\BatchResult::_compareUsingContentId
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testBatchWithInsert()
@@ -921,16 +921,16 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_createBatchRequestBody
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_getOperationContext
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_createOperationsContexts
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_constructDeleteEntityContext
-     * @covers WindowsAzure\Services\Table\Utilities\MimeReaderWriter::encodeMimeMultipart
-     * @covers WindowsAzure\Services\Table\Utilities\MimeReaderWriter::decodeMimeMultipart
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::create
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::_constructResponses
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::_compareUsingContentId
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_createBatchRequestBody
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_getOperationContext
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_createOperationsContexts
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_constructDeleteEntityContext
+     * @covers WindowsAzure\Table\Internal\MimeReaderWriter::encodeMimeMultipart
+     * @covers WindowsAzure\Table\Internal\MimeReaderWriter::decodeMimeMultipart
+     * @covers WindowsAzure\Table\Models\BatchResult::create
+     * @covers WindowsAzure\Table\Models\BatchResult::_constructResponses
+     * @covers WindowsAzure\Table\Models\BatchResult::_compareUsingContentId
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testBatchWithDelete()
@@ -955,16 +955,16 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_createBatchRequestBody
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_getOperationContext
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_createOperationsContexts
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_constructPutOrMergeEntityContext
-     * @covers WindowsAzure\Services\Table\Utilities\MimeReaderWriter::encodeMimeMultipart
-     * @covers WindowsAzure\Services\Table\Utilities\MimeReaderWriter::decodeMimeMultipart
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::create
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::_constructResponses
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::_compareUsingContentId
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_createBatchRequestBody
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_getOperationContext
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_createOperationsContexts
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_constructPutOrMergeEntityContext
+     * @covers WindowsAzure\Table\Internal\MimeReaderWriter::encodeMimeMultipart
+     * @covers WindowsAzure\Table\Internal\MimeReaderWriter::decodeMimeMultipart
+     * @covers WindowsAzure\Table\Models\BatchResult::create
+     * @covers WindowsAzure\Table\Models\BatchResult::_constructResponses
+     * @covers WindowsAzure\Table\Models\BatchResult::_compareUsingContentId
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testBatchWithUpdate()
@@ -998,16 +998,16 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_createBatchRequestBody
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_getOperationContext
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_createOperationsContexts
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_constructPutOrMergeEntityContext
-     * @covers WindowsAzure\Services\Table\Utilities\MimeReaderWriter::encodeMimeMultipart
-     * @covers WindowsAzure\Services\Table\Utilities\MimeReaderWriter::decodeMimeMultipart
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::create
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::_constructResponses
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::_compareUsingContentId
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_createBatchRequestBody
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_getOperationContext
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_createOperationsContexts
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_constructPutOrMergeEntityContext
+     * @covers WindowsAzure\Table\Internal\MimeReaderWriter::encodeMimeMultipart
+     * @covers WindowsAzure\Table\Internal\MimeReaderWriter::decodeMimeMultipart
+     * @covers WindowsAzure\Table\Models\BatchResult::create
+     * @covers WindowsAzure\Table\Models\BatchResult::_constructResponses
+     * @covers WindowsAzure\Table\Models\BatchResult::_compareUsingContentId
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testBatchWithMerge()
@@ -1041,16 +1041,16 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_createBatchRequestBody
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_getOperationContext
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_createOperationsContexts
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_constructPutOrMergeEntityContext
-     * @covers WindowsAzure\Services\Table\Utilities\MimeReaderWriter::encodeMimeMultipart
-     * @covers WindowsAzure\Services\Table\Utilities\MimeReaderWriter::decodeMimeMultipart
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::create
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::_constructResponses
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::_compareUsingContentId
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_createBatchRequestBody
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_getOperationContext
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_createOperationsContexts
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_constructPutOrMergeEntityContext
+     * @covers WindowsAzure\Table\Internal\MimeReaderWriter::encodeMimeMultipart
+     * @covers WindowsAzure\Table\Internal\MimeReaderWriter::decodeMimeMultipart
+     * @covers WindowsAzure\Table\Models\BatchResult::create
+     * @covers WindowsAzure\Table\Models\BatchResult::_constructResponses
+     * @covers WindowsAzure\Table\Models\BatchResult::_compareUsingContentId
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testBatchWithInsertOrReplace()
@@ -1086,16 +1086,16 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_createBatchRequestBody
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_getOperationContext
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_createOperationsContexts
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_constructPutOrMergeEntityContext
-     * @covers WindowsAzure\Services\Table\Utilities\MimeReaderWriter::encodeMimeMultipart
-     * @covers WindowsAzure\Services\Table\Utilities\MimeReaderWriter::decodeMimeMultipart
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::create
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::_constructResponses
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::_compareUsingContentId
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_createBatchRequestBody
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_getOperationContext
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_createOperationsContexts
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_constructPutOrMergeEntityContext
+     * @covers WindowsAzure\Table\Internal\MimeReaderWriter::encodeMimeMultipart
+     * @covers WindowsAzure\Table\Internal\MimeReaderWriter::decodeMimeMultipart
+     * @covers WindowsAzure\Table\Models\BatchResult::create
+     * @covers WindowsAzure\Table\Models\BatchResult::_constructResponses
+     * @covers WindowsAzure\Table\Models\BatchResult::_compareUsingContentId
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testBatchWithInsertOrMerge()
@@ -1131,16 +1131,16 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_createBatchRequestBody
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_getOperationContext
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_createOperationsContexts
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_constructPutOrMergeEntityContext
-     * @covers WindowsAzure\Services\Table\Utilities\MimeReaderWriter::encodeMimeMultipart
-     * @covers WindowsAzure\Services\Table\Utilities\MimeReaderWriter::decodeMimeMultipart
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::create
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::_constructResponses
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::_compareUsingContentId
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_createBatchRequestBody
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_getOperationContext
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_createOperationsContexts
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_constructPutOrMergeEntityContext
+     * @covers WindowsAzure\Table\Internal\MimeReaderWriter::encodeMimeMultipart
+     * @covers WindowsAzure\Table\Internal\MimeReaderWriter::decodeMimeMultipart
+     * @covers WindowsAzure\Table\Models\BatchResult::create
+     * @covers WindowsAzure\Table\Models\BatchResult::_constructResponses
+     * @covers WindowsAzure\Table\Models\BatchResult::_compareUsingContentId
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testBatchWithMultipleOperations()
@@ -1175,16 +1175,16 @@ class TableRestProxyTest extends TableServiceRestProxyTestBase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\TableRestProxy::batch
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_createBatchRequestBody
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_getOperationContext
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_createOperationsContexts
-     * @covers WindowsAzure\Services\Table\TableRestProxy::_constructPutOrMergeEntityContext
-     * @covers WindowsAzure\Services\Table\Utilities\MimeReaderWriter::encodeMimeMultipart
-     * @covers WindowsAzure\Services\Table\Utilities\MimeReaderWriter::decodeMimeMultipart
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::create
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::_constructResponses
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::_compareUsingContentId
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::batch
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_createBatchRequestBody
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_getOperationContext
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_createOperationsContexts
+     * @covers WindowsAzure\Table\Internal\TableRestProxy::_constructPutOrMergeEntityContext
+     * @covers WindowsAzure\Table\Internal\MimeReaderWriter::encodeMimeMultipart
+     * @covers WindowsAzure\Table\Internal\MimeReaderWriter::decodeMimeMultipart
+     * @covers WindowsAzure\Table\Models\BatchResult::create
+     * @covers WindowsAzure\Table\Models\BatchResult::_constructResponses
+     * @covers WindowsAzure\Table\Models\BatchResult::_compareUsingContentId
      * @covers WindowsAzure\Common\Internal\ServiceRestProxy::sendContext
      */
     public function testBatchWithDifferentPKFail()

tests/unit/WindowsAzure/Table/Models/BatchErrorTest.php

@@ -15,22 +15,22 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\BatchError;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\BatchError;
 use WindowsAzure\Common\Internal\ServiceException;
 
 /**
  * Unit tests for class BatchError
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -40,9 +40,9 @@ use WindowsAzure\Common\Internal\ServiceException;
 class BatchErrorTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\BatchError::create
-     * @covers WindowsAzure\Services\Table\Models\BatchError::getError
-     * @covers WindowsAzure\Services\Table\Models\BatchError::getContentId
+     * @covers WindowsAzure\Table\Models\BatchError::create
+     * @covers WindowsAzure\Table\Models\BatchError::getError
+     * @covers WindowsAzure\Table\Models\BatchError::getContentId
      */
     public function testCreate()
     {
@@ -62,8 +62,8 @@ class BatchErrorTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\BatchError::setError
-     * @covers WindowsAzure\Services\Table\Models\BatchError::getError
+     * @covers WindowsAzure\Table\Models\BatchError::setError
+     * @covers WindowsAzure\Table\Models\BatchError::getError
      * @depends testCreate
      */
     public function testSetError($batchError)
@@ -79,8 +79,8 @@ class BatchErrorTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\BatchError::setContentId
-     * @covers WindowsAzure\Services\Table\Models\BatchError::getContentId
+     * @covers WindowsAzure\Table\Models\BatchError::setContentId
+     * @covers WindowsAzure\Table\Models\BatchError::getContentId
      * @depends testCreate
      */
     public function testSetContentId($batchError)

tests/unit/WindowsAzure/Table/Models/BatchOperationParameterNameTest.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\BatchOperationParameterName;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\BatchOperationParameterName;
 
 /**
  * Unit tests for class BatchOperationParameterName
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -39,7 +39,7 @@ use WindowsAzure\Services\Table\Models\BatchOperationParameterName;
 class BatchOperationParameterNameTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\BatchOperationParameterName::isValid
+     * @covers WindowsAzure\Table\Models\BatchOperationParameterName::isValid
      */
     public function testIsValid()
     {
@@ -54,7 +54,7 @@ class BatchOperationParameterNameTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\BatchOperationParameterName::isValid
+     * @covers WindowsAzure\Table\Models\BatchOperationParameterName::isValid
      */
     public function testIsValidWithInvalid()
     {

tests/unit/WindowsAzure/Table/Models/BatchOperationTest.php

@@ -15,23 +15,23 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\BatchOperation;
-use WindowsAzure\Services\Table\Models\BatchOperationType;
-use WindowsAzure\Services\Table\Models\BatchOperationParameterName;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\BatchOperation;
+use WindowsAzure\Table\Models\BatchOperationType;
+use WindowsAzure\Table\Models\BatchOperationParameterName;
 
 /**
  * Unit tests for class BatchOperation
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -41,8 +41,8 @@ use WindowsAzure\Services\Table\Models\BatchOperationParameterName;
 class BatchOperationTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\BatchOperation::setType
-     * @covers WindowsAzure\Services\Table\Models\BatchOperation::getType
+     * @covers WindowsAzure\Table\Models\BatchOperation::setType
+     * @covers WindowsAzure\Table\Models\BatchOperation::getType
      */
     public function testSetType()
     {
@@ -58,8 +58,8 @@ class BatchOperationTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\BatchOperation::addParameter
-     * @covers WindowsAzure\Services\Table\Models\BatchOperation::getParameter
+     * @covers WindowsAzure\Table\Models\BatchOperation::addParameter
+     * @covers WindowsAzure\Table\Models\BatchOperation::getParameter
      */
     public function testAddParameter()
     {

tests/unit/WindowsAzure/Table/Models/BatchOperationTypeTest.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\BatchOperationType;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\BatchOperationType;
 
 /**
  * Unit tests for class BatchOperationType
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -39,7 +39,7 @@ use WindowsAzure\Services\Table\Models\BatchOperationType;
 class BatchOperationTypeTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\BatchOperationType::isValid
+     * @covers WindowsAzure\Table\Models\BatchOperationType::isValid
      */
     public function testIsValid()
     {
@@ -54,7 +54,7 @@ class BatchOperationTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\BatchOperationType::isValid
+     * @covers WindowsAzure\Table\Models\BatchOperationType::isValid
      */
     public function testIsValidWithInvalid()
     {

tests/unit/WindowsAzure/Table/Models/BatchOperationsTest.php

@@ -15,23 +15,23 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\BatchOperations;
-use WindowsAzure\Services\Table\Models\BatchOperation;
-use WindowsAzure\Services\Table\Models\Entity;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\BatchOperations;
+use WindowsAzure\Table\Models\BatchOperation;
+use WindowsAzure\Table\Models\Entity;
 
 /**
  * Unit tests for class BatchOperations
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -41,8 +41,8 @@ use WindowsAzure\Services\Table\Models\Entity;
 class BatchOperationsTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\BatchOperations::__construct
-     * @covers WindowsAzure\Services\Table\Models\BatchOperations::getOperations
+     * @covers WindowsAzure\Table\Models\BatchOperations::__construct
+     * @covers WindowsAzure\Table\Models\BatchOperations::getOperations
      */
     public function test__construct()
     {
@@ -56,9 +56,9 @@ class BatchOperationsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\BatchOperations::setOperations
-     * @covers WindowsAzure\Services\Table\Models\BatchOperations::getOperations
-     * @covers WindowsAzure\Services\Table\Models\BatchOperations::addOperation
+     * @covers WindowsAzure\Table\Models\BatchOperations::setOperations
+     * @covers WindowsAzure\Table\Models\BatchOperations::getOperations
+     * @covers WindowsAzure\Table\Models\BatchOperations::addOperation
      * @depends test__construct
      */
     public function testSetOperations($operations)
@@ -76,9 +76,9 @@ class BatchOperationsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::addInsertEntity
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::addOperation
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::getOperations
+     *  @covers WindowsAzure\Table\Models\BatchOperations::addInsertEntity
+     *  @covers WindowsAzure\Table\Models\BatchOperations::addOperation
+     *  @covers WindowsAzure\Table\Models\BatchOperations::getOperations
      */
     public function testAddInsertEntity()
     {
@@ -95,9 +95,9 @@ class BatchOperationsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::addUpdateEntity
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::addOperation
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::getOperations
+     *  @covers WindowsAzure\Table\Models\BatchOperations::addUpdateEntity
+     *  @covers WindowsAzure\Table\Models\BatchOperations::addOperation
+     *  @covers WindowsAzure\Table\Models\BatchOperations::getOperations
      */
     public function testAddUpdateEntity()
     {
@@ -114,9 +114,9 @@ class BatchOperationsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::addMergeEntity
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::addOperation
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::getOperations
+     *  @covers WindowsAzure\Table\Models\BatchOperations::addMergeEntity
+     *  @covers WindowsAzure\Table\Models\BatchOperations::addOperation
+     *  @covers WindowsAzure\Table\Models\BatchOperations::getOperations
      */
     public function testAddMergeEntity()
     {
@@ -133,9 +133,9 @@ class BatchOperationsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::addInsertOrReplaceEntity
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::addOperation
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::getOperations
+     *  @covers WindowsAzure\Table\Models\BatchOperations::addInsertOrReplaceEntity
+     *  @covers WindowsAzure\Table\Models\BatchOperations::addOperation
+     *  @covers WindowsAzure\Table\Models\BatchOperations::getOperations
      */
     public function testAddInsertOrReplaceEntity()
     {
@@ -152,9 +152,9 @@ class BatchOperationsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::addInsertOrMergeEntity
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::addOperation
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::getOperations
+     *  @covers WindowsAzure\Table\Models\BatchOperations::addInsertOrMergeEntity
+     *  @covers WindowsAzure\Table\Models\BatchOperations::addOperation
+     *  @covers WindowsAzure\Table\Models\BatchOperations::getOperations
      */
     public function testAddInsertOrMergeEntity()
     {
@@ -171,9 +171,9 @@ class BatchOperationsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::addDeleteEntity
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::addOperation
-     *  @covers WindowsAzure\Services\Table\Models\BatchOperations::getOperations
+     *  @covers WindowsAzure\Table\Models\BatchOperations::addDeleteEntity
+     *  @covers WindowsAzure\Table\Models\BatchOperations::addOperation
+     *  @covers WindowsAzure\Table\Models\BatchOperations::getOperations
      */
     public function testAddDeleteEntity()
     {

tests/unit/WindowsAzure/Table/Models/BatchResultTest.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\BatchResult;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\BatchResult;
 
 /**
  * Unit tests for class BatchResult
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -39,8 +39,8 @@ use WindowsAzure\Services\Table\Models\BatchResult;
 class BatchResultTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::setEntries
-     * @covers WindowsAzure\Services\Table\Models\BatchResult::getEntries
+     * @covers WindowsAzure\Table\Models\BatchResult::setEntries
+     * @covers WindowsAzure\Table\Models\BatchResult::getEntries
      */
     public function testSetEntries()
     {

tests/unit/WindowsAzure/Table/Models/DeleteEntityOptionsTest.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\DeleteEntityOptions;
-use WindowsAzure\Services\Table\Models\Etag;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\DeleteEntityOptions;
+use WindowsAzure\Table\Models\Etag;
 
 /**
  * Unit tests for class DeleteEntityOptions
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -39,8 +39,8 @@ use WindowsAzure\Services\Table\Models\Etag;
 class DeleteEntityOptionsTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\DeleteEntityOptions::setEtag
-     * @covers WindowsAzure\Services\Table\Models\DeleteEntityOptions::getEtag
+     * @covers WindowsAzure\Table\Models\DeleteEntityOptions::setEtag
+     * @covers WindowsAzure\Table\Models\DeleteEntityOptions::getEtag
      */
     public function testSetEtag()
     {

tests/unit/WindowsAzure/Table/Models/EdmTypeTest.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\EdmType;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\EdmType;
 use WindowsAzure\Common\Internal\Utilities;
 
 /**
  * Unit tests for class EdmTypeTest
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -39,7 +39,7 @@ use WindowsAzure\Common\Internal\Utilities;
 class EdmTypeTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::processType
+     * @covers WindowsAzure\Table\Models\EdmType::processType
      */
     public function testProcessTypeWithNull()
     {
@@ -54,7 +54,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::processType
+     * @covers WindowsAzure\Table\Models\EdmType::processType
      */
     public function testProcessType()
     {
@@ -69,7 +69,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::unserializeQueryValue
+     * @covers WindowsAzure\Table\Models\EdmType::unserializeQueryValue
      */
     public function testUnserializeQueryValueWithString()
     {
@@ -86,7 +86,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::unserializeQueryValue
+     * @covers WindowsAzure\Table\Models\EdmType::unserializeQueryValue
      */
     public function testUnserializeQueryValueWithBinary()
     {
@@ -103,7 +103,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::unserializeQueryValue
+     * @covers WindowsAzure\Table\Models\EdmType::unserializeQueryValue
      */
     public function testUnserializeQueryValueWithDate()
     {
@@ -119,7 +119,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::unserializeQueryValue
+     * @covers WindowsAzure\Table\Models\EdmType::unserializeQueryValue
      */
     public function testUnserializeQueryValueWithInt()
     {
@@ -136,7 +136,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::unserializeQueryValue
+     * @covers WindowsAzure\Table\Models\EdmType::unserializeQueryValue
      */
     public function testUnserializeQueryValueWithBoolean()
     {
@@ -153,7 +153,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::unserializeQueryValue
+     * @covers WindowsAzure\Table\Models\EdmType::unserializeQueryValue
      */
     public function testUnserializeQueryValueWithInvalid()
     {
@@ -165,7 +165,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::isValid
+     * @covers WindowsAzure\Table\Models\EdmType::isValid
      */
     public function testIsValid()
     {
@@ -180,7 +180,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::isValid
+     * @covers WindowsAzure\Table\Models\EdmType::isValid
      */
     public function testIsValidWithInvalid()
     {
@@ -195,7 +195,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::validateEdmValue
+     * @covers WindowsAzure\Table\Models\EdmType::validateEdmValue
      */
     public function testValidateEdmValueWithBinary()
     {
@@ -212,7 +212,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::validateEdmValue
+     * @covers WindowsAzure\Table\Models\EdmType::validateEdmValue
      */
     public function testValidateEdmValueWithDate()
     {
@@ -229,7 +229,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::validateEdmValue
+     * @covers WindowsAzure\Table\Models\EdmType::validateEdmValue
      */
     public function testValidateEdmValueWithInt()
     {
@@ -246,7 +246,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::validateEdmValue
+     * @covers WindowsAzure\Table\Models\EdmType::validateEdmValue
      */
     public function testValidateEdmValueWithBoolean()
     {
@@ -263,7 +263,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::validateEdmValue
+     * @covers WindowsAzure\Table\Models\EdmType::validateEdmValue
      */
     public function testValidateEdmValueWithInvalid()
     {
@@ -275,7 +275,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::serializeValue
+     * @covers WindowsAzure\Table\Models\EdmType::serializeValue
      */
     public function testSerializeValueWithBinary()
     {
@@ -292,7 +292,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::serializeValue
+     * @covers WindowsAzure\Table\Models\EdmType::serializeValue
      */
     public function testSerializeValueWithDate()
     {
@@ -309,7 +309,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::serializeValue
+     * @covers WindowsAzure\Table\Models\EdmType::serializeValue
      */
     public function testSerializeValueWithInt()
     {
@@ -326,7 +326,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::serializeValue
+     * @covers WindowsAzure\Table\Models\EdmType::serializeValue
      */
     public function testSerializeValueWithBoolean()
     {
@@ -343,7 +343,7 @@ class EdmTypeTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\EdmType::serializeValue
+     * @covers WindowsAzure\Table\Models\EdmType::serializeValue
      */
     public function testSerializeValueWithInvalid()
     {

tests/unit/WindowsAzure/Table/Models/EntityTest.php

@@ -15,23 +15,23 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\Entity;
-use WindowsAzure\Services\Table\Models\Property;
-use WindowsAzure\Services\Table\Models\EdmType;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\Entity;
+use WindowsAzure\Table\Models\Property;
+use WindowsAzure\Table\Models\EdmType;
 use WindowsAzure\Common\Internal\Utilities;
 
 /**
  * Unit tests for class Entity
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -41,8 +41,8 @@ use WindowsAzure\Common\Internal\Utilities;
 class EntityTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\Entity::getPropertyValue
-     * @covers WindowsAzure\Services\Table\Models\Entity::setPropertyValue
+     * @covers WindowsAzure\Table\Models\Entity::getPropertyValue
+     * @covers WindowsAzure\Table\Models\Entity::setPropertyValue
      */
     public function testGetPropertyValue()
     {
@@ -63,8 +63,8 @@ class EntityTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Entity::setEtag
-     * @covers WindowsAzure\Services\Table\Models\Entity::getEtag
+     * @covers WindowsAzure\Table\Models\Entity::setEtag
+     * @covers WindowsAzure\Table\Models\Entity::getEtag
      */
     public function testSetEtag()
     {
@@ -81,8 +81,8 @@ class EntityTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Entity::setPartitionKey
-     * @covers WindowsAzure\Services\Table\Models\Entity::getPartitionKey
+     * @covers WindowsAzure\Table\Models\Entity::setPartitionKey
+     * @covers WindowsAzure\Table\Models\Entity::getPartitionKey
      */
     public function testSetPartitionKey()
     {
@@ -98,8 +98,8 @@ class EntityTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Entity::setRowKey
-     * @covers WindowsAzure\Services\Table\Models\Entity::getRowKey
+     * @covers WindowsAzure\Table\Models\Entity::setRowKey
+     * @covers WindowsAzure\Table\Models\Entity::getRowKey
      */
     public function testSetRowKey()
     {
@@ -115,8 +115,8 @@ class EntityTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Entity::setTimestamp
-     * @covers WindowsAzure\Services\Table\Models\Entity::getTimestamp
+     * @covers WindowsAzure\Table\Models\Entity::setTimestamp
+     * @covers WindowsAzure\Table\Models\Entity::getTimestamp
      */
     public function testSetTimestamp()
     {
@@ -132,9 +132,9 @@ class EntityTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Entity::setProperties
-     * @covers WindowsAzure\Services\Table\Models\Entity::getProperties
-     * @covers WindowsAzure\Services\Table\Models\Entity::_validateProperties
+     * @covers WindowsAzure\Table\Models\Entity::setProperties
+     * @covers WindowsAzure\Table\Models\Entity::getProperties
+     * @covers WindowsAzure\Table\Models\Entity::_validateProperties
      */
     public function testSetProperties()
     {
@@ -150,8 +150,8 @@ class EntityTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Entity::getProperty
-     * @covers WindowsAzure\Services\Table\Models\Entity::setProperty
+     * @covers WindowsAzure\Table\Models\Entity::getProperty
+     * @covers WindowsAzure\Table\Models\Entity::setProperty
      */
     public function testSetProperty()
     {
@@ -168,7 +168,7 @@ class EntityTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Entity::addProperty
+     * @covers WindowsAzure\Table\Models\Entity::addProperty
      */
     public function testAddProperty()
     {
@@ -189,7 +189,7 @@ class EntityTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Entity::isValid
+     * @covers WindowsAzure\Table\Models\Entity::isValid
      */
     public function testIsValid()
     {
@@ -206,7 +206,7 @@ class EntityTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Entity::isValid
+     * @covers WindowsAzure\Table\Models\Entity::isValid
      */
     public function testIsValidWithInvalid()
     {
@@ -221,7 +221,7 @@ class EntityTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Entity::isValid
+     * @covers WindowsAzure\Table\Models\Entity::isValid
      */
     public function testIsValidWithEmptyPartitionKey()
     {

tests/unit/WindowsAzure/Table/Models/Filters/BinaryFilterTest.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models\Filters
+ * @package   Tests\Unit\WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table\Models\Filters;
-use WindowsAzure\Services\Table\Models\Filters\BinaryFilter;
+namespace Tests\Unit\WindowsAzure\Table\Models\Filters;
+use WindowsAzure\Table\Models\Filters\BinaryFilter;
 
 /**
  * Unit tests for class BinaryFilter
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models\Filters
+ * @package   Tests\Unit\WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -39,8 +39,8 @@ use WindowsAzure\Services\Table\Models\Filters\BinaryFilter;
 class BinaryFilterTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\BinaryFilter::__construct
-     * @covers WindowsAzure\Services\Table\Models\Filters\BinaryFilter::getOperator
+     * @covers WindowsAzure\Table\Models\Filters\BinaryFilter::__construct
+     * @covers WindowsAzure\Table\Models\Filters\BinaryFilter::getOperator
      */
     public function testGetOperator()
     {
@@ -53,8 +53,8 @@ class BinaryFilterTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\BinaryFilter::__construct
-     * @covers WindowsAzure\Services\Table\Models\Filters\BinaryFilter::getLeft
+     * @covers WindowsAzure\Table\Models\Filters\BinaryFilter::__construct
+     * @covers WindowsAzure\Table\Models\Filters\BinaryFilter::getLeft
      */
     public function testGetLeft()
     {
@@ -67,8 +67,8 @@ class BinaryFilterTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\BinaryFilter::__construct
-     * @covers WindowsAzure\Services\Table\Models\Filters\BinaryFilter::getRight
+     * @covers WindowsAzure\Table\Models\Filters\BinaryFilter::__construct
+     * @covers WindowsAzure\Table\Models\Filters\BinaryFilter::getRight
      */
     public function testGetRight()
     {

tests/unit/WindowsAzure/Table/Models/Filters/ConstantFilterTest.php

@@ -15,22 +15,22 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models\Filters
+ * @package   Tests\Unit\WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table\Models\Filters;
-use WindowsAzure\Services\Table\Models\Filters\ConstantFilter;
-use WindowsAzure\Services\Table\Models\EdmType;
+namespace Tests\Unit\WindowsAzure\Table\Models\Filters;
+use WindowsAzure\Table\Models\Filters\ConstantFilter;
+use WindowsAzure\Table\Models\EdmType;
 
 /**
  * Unit tests for class ConstantFilter
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models\Filters
+ * @package   Tests\Unit\WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -40,8 +40,8 @@ use WindowsAzure\Services\Table\Models\EdmType;
 class ConstantFilterTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\ConstantFilter::__construct
-     * @covers WindowsAzure\Services\Table\Models\Filters\ConstantFilter::getValue
+     * @covers WindowsAzure\Table\Models\Filters\ConstantFilter::__construct
+     * @covers WindowsAzure\Table\Models\Filters\ConstantFilter::getValue
      */
     public function testGetValue()
     {
@@ -54,8 +54,8 @@ class ConstantFilterTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\ConstantFilter::__construct
-     * @covers WindowsAzure\Services\Table\Models\Filters\ConstantFilter::getEdmType
+     * @covers WindowsAzure\Table\Models\Filters\ConstantFilter::__construct
+     * @covers WindowsAzure\Table\Models\Filters\ConstantFilter::getEdmType
      */
     public function testGetEdmType()
     {

tests/unit/WindowsAzure/Table/Models/Filters/FilterTest.php

@@ -15,22 +15,22 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models\Filters
+ * @package   Tests\Unit\WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table\Models\Filters;
-use WindowsAzure\Services\Table\Models\Filters\Filter;
-use WindowsAzure\Services\Table\Models\EdmType;
+namespace Tests\Unit\WindowsAzure\Table\Models\Filters;
+use WindowsAzure\Table\Models\Filters\Filter;
+use WindowsAzure\Table\Models\EdmType;
 
 /**
  * Unit tests for class Filter
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models\Filters
+ * @package   Tests\Unit\WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -40,9 +40,9 @@ use WindowsAzure\Services\Table\Models\EdmType;
 class FilterTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyAnd
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyPropertyName
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyQueryString
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyAnd
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyPropertyName
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyQueryString
      */
     public function testApplyAnd()
     {
@@ -59,8 +59,8 @@ class FilterTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyNot
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyConstant
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyNot
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyConstant
      */
     public function testApplyNot()
     {
@@ -75,9 +75,9 @@ class FilterTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyOr
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyPropertyName
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyQueryString
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyOr
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyPropertyName
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyQueryString
      */
     public function testApplyOr()
     {
@@ -94,9 +94,9 @@ class FilterTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyEq
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyPropertyName
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyQueryString
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyEq
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyPropertyName
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyQueryString
      */
     public function testApplyEq()
     {
@@ -113,9 +113,9 @@ class FilterTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyNe
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyPropertyName
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyQueryString
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyNe
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyPropertyName
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyQueryString
      */
     public function testApplyNe()
     {
@@ -132,9 +132,9 @@ class FilterTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyGe
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyPropertyName
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyQueryString
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyGe
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyPropertyName
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyQueryString
      */
     public function testApplyGe()
     {
@@ -151,9 +151,9 @@ class FilterTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyGt
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyPropertyName
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyQueryString
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyGt
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyPropertyName
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyQueryString
      */
     public function testApplyGt()
     {
@@ -170,9 +170,9 @@ class FilterTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyLt
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyPropertyName
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyQueryString
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyLt
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyPropertyName
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyQueryString
      */
     public function testApplyLt()
     {
@@ -189,9 +189,9 @@ class FilterTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyLe
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyPropertyName
-     * @covers WindowsAzure\Services\Table\Models\Filters\Filter::applyQueryString
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyLe
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyPropertyName
+     * @covers WindowsAzure\Table\Models\Filters\Filter::applyQueryString
      */
     public function testApplyLe()
     {

tests/unit/WindowsAzure/Table/Models/Filters/PropertyNameFilterTest.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models\Filters
+ * @package   Tests\Unit\WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table\Models\Filters;
-use WindowsAzure\Services\Table\Models\Filters\PropertyNameFilter;
+namespace Tests\Unit\WindowsAzure\Table\Models\Filters;
+use WindowsAzure\Table\Models\Filters\PropertyNameFilter;
 
 /**
  * Unit tests for class PropertyNameFilter
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models\Filters
+ * @package   Tests\Unit\WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -39,8 +39,8 @@ use WindowsAzure\Services\Table\Models\Filters\PropertyNameFilter;
 class PropertyNameFilterTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\PropertyNameFilter::__construct
-     * @covers WindowsAzure\Services\Table\Models\Filters\PropertyNameFilter::getPropertyName
+     * @covers WindowsAzure\Table\Models\Filters\PropertyNameFilter::__construct
+     * @covers WindowsAzure\Table\Models\Filters\PropertyNameFilter::getPropertyName
      */
     public function testGetPropertyName()
     {

tests/unit/WindowsAzure/Table/Models/Filters/QueryStringFilterTest.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models\Filters
+ * @package   Tests\Unit\WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table\Models\Filters;
-use WindowsAzure\Services\Table\Models\Filters\QueryStringFilter;
+namespace Tests\Unit\WindowsAzure\Table\Models\Filters;
+use WindowsAzure\Table\Models\Filters\QueryStringFilter;
 
 /**
  * Unit tests for class QueryStringFilter
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models\Filters
+ * @package   Tests\Unit\WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -39,8 +39,8 @@ use WindowsAzure\Services\Table\Models\Filters\QueryStringFilter;
 class QueryStringFilterTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\QueryStringFilter::__construct
-     * @covers WindowsAzure\Services\Table\Models\Filters\QueryStringFilter::getQueryString
+     * @covers WindowsAzure\Table\Models\Filters\QueryStringFilter::__construct
+     * @covers WindowsAzure\Table\Models\Filters\QueryStringFilter::getQueryString
      */
     public function testGetQueryString()
     {

tests/unit/WindowsAzure/Table/Models/Filters/UnaryFilterTest.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models\Filters
+ * @package   Tests\Unit\WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table\Models\Filters;
-use WindowsAzure\Services\Table\Models\Filters\UnaryFilter;
+namespace Tests\Unit\WindowsAzure\Table\Models\Filters;
+use WindowsAzure\Table\Models\Filters\UnaryFilter;
 
 /**
  * Unit tests for class UnaryFilter
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models\Filters
+ * @package   Tests\Unit\WindowsAzure\Table\Models\Filters
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -39,8 +39,8 @@ use WindowsAzure\Services\Table\Models\Filters\UnaryFilter;
 class UnaryFilterTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\UnaryFilter::__construct
-     * @covers WindowsAzure\Services\Table\Models\Filters\UnaryFilter::getOperator
+     * @covers WindowsAzure\Table\Models\Filters\UnaryFilter::__construct
+     * @covers WindowsAzure\Table\Models\Filters\UnaryFilter::getOperator
      */
     public function testGetOperator()
     {
@@ -53,8 +53,8 @@ class UnaryFilterTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Filters\UnaryFilter::__construct
-     * @covers WindowsAzure\Services\Table\Models\Filters\UnaryFilter::getOperand
+     * @covers WindowsAzure\Table\Models\Filters\UnaryFilter::__construct
+     * @covers WindowsAzure\Table\Models\Filters\UnaryFilter::getOperand
      */
     public function testGetOperand()
     {

tests/unit/WindowsAzure/Table/Models/GetEntityResultTest.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\GetEntityResult;
-use WindowsAzure\Services\Table\Models\Entity;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\GetEntityResult;
+use WindowsAzure\Table\Models\Entity;
 
 /**
  * Unit tests for class GetEntityResult
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -39,8 +39,8 @@ use WindowsAzure\Services\Table\Models\Entity;
 class GetEntityResultTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\GetEntityResult::setEntity
-     * @covers WindowsAzure\Services\Table\Models\GetEntityResult::getEntity
+     * @covers WindowsAzure\Table\Models\GetEntityResult::setEntity
+     * @covers WindowsAzure\Table\Models\GetEntityResult::getEntity
      */
     public function testSetEntity()
     {

tests/unit/WindowsAzure/Table/Models/GetTableResultTest.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\GetTableResult;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\GetTableResult;
 
 /**
  * Unit tests for class GetTableResult
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -38,8 +38,8 @@ use WindowsAzure\Services\Table\Models\GetTableResult;
 class GetTableResultTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\GetTableResult::setName
-     * @covers WindowsAzure\Services\Table\Models\GetTableResult::getName
+     * @covers WindowsAzure\Table\Models\GetTableResult::setName
+     * @covers WindowsAzure\Table\Models\GetTableResult::getName
      */
     public function testSetName()
     {

tests/unit/WindowsAzure/Table/Models/InsertEntityResultTest.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\InsertEntityResult;
-use WindowsAzure\Services\Table\Models\Entity;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\InsertEntityResult;
+use WindowsAzure\Table\Models\Entity;
 
 /**
  * Unit tests for class InsertEntityResult
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -39,8 +39,8 @@ use WindowsAzure\Services\Table\Models\Entity;
 class InsertEntityResultTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\InsertEntityResult::setEntity
-     * @covers WindowsAzure\Services\Table\Models\InsertEntityResult::getEntity
+     * @covers WindowsAzure\Table\Models\InsertEntityResult::setEntity
+     * @covers WindowsAzure\Table\Models\InsertEntityResult::getEntity
      */
     public function testSetEntity()
     {

tests/unit/WindowsAzure/Table/Models/PropertyTest.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\Property;
-use WindowsAzure\Services\Table\Models\EdmType;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\Property;
+use WindowsAzure\Table\Models\EdmType;
 
 /**
  * Unit tests for class Property
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -39,8 +39,8 @@ use WindowsAzure\Services\Table\Models\EdmType;
 class PropertyTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\Property::setEdmType
-     * @covers WindowsAzure\Services\Table\Models\Property::getEdmType
+     * @covers WindowsAzure\Table\Models\Property::setEdmType
+     * @covers WindowsAzure\Table\Models\Property::getEdmType
      */
     public function testSetEdmType()
     {
@@ -56,8 +56,8 @@ class PropertyTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Property::setValue
-     * @covers WindowsAzure\Services\Table\Models\Property::getValue
+     * @covers WindowsAzure\Table\Models\Property::setValue
+     * @covers WindowsAzure\Table\Models\Property::getValue
      */
     public function testSetValue()
     {

tests/unit/WindowsAzure/Table/Models/QueryEntitiesOptionsTest.php

@@ -15,23 +15,23 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\QueryEntitiesOptions;
-use WindowsAzure\Services\Table\Models\Query;
-use WindowsAzure\Services\Table\Models\Filters\Filter;
-use WindowsAzure\Services\Table\Models\EdmType;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\QueryEntitiesOptions;
+use WindowsAzure\Table\Models\Query;
+use WindowsAzure\Table\Models\Filters\Filter;
+use WindowsAzure\Table\Models\EdmType;
 
 /**
  * Unit tests for class QueryEntitiesOptions
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -41,9 +41,9 @@ use WindowsAzure\Services\Table\Models\EdmType;
 class QueryEntitiesOptionsTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesOptions::setQuery
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesOptions::getQuery
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesOptions::__construct
+     * @covers WindowsAzure\Table\Models\QueryEntitiesOptions::setQuery
+     * @covers WindowsAzure\Table\Models\QueryEntitiesOptions::getQuery
+     * @covers WindowsAzure\Table\Models\QueryEntitiesOptions::__construct
      */
     public function testSetQuery()
     {
@@ -59,8 +59,8 @@ class QueryEntitiesOptionsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesOptions::setNextPartitionKey
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesOptions::getNextPartitionKey
+     * @covers WindowsAzure\Table\Models\QueryEntitiesOptions::setNextPartitionKey
+     * @covers WindowsAzure\Table\Models\QueryEntitiesOptions::getNextPartitionKey
      */
     public function testSetNextPartitionKey()
     {
@@ -76,8 +76,8 @@ class QueryEntitiesOptionsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesOptions::setNextRowKey
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesOptions::getNextRowKey
+     * @covers WindowsAzure\Table\Models\QueryEntitiesOptions::setNextRowKey
+     * @covers WindowsAzure\Table\Models\QueryEntitiesOptions::getNextRowKey
      */
     public function testSetNextRowKey()
     {
@@ -93,8 +93,8 @@ class QueryEntitiesOptionsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesOptions::setSelectFields
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesOptions::getSelectFields
+     * @covers WindowsAzure\Table\Models\QueryEntitiesOptions::setSelectFields
+     * @covers WindowsAzure\Table\Models\QueryEntitiesOptions::getSelectFields
      */
     public function testSetSelectFields()
     {
@@ -110,8 +110,8 @@ class QueryEntitiesOptionsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesOptions::setTop
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesOptions::getTop
+     * @covers WindowsAzure\Table\Models\QueryEntitiesOptions::setTop
+     * @covers WindowsAzure\Table\Models\QueryEntitiesOptions::getTop
      */
     public function testSetTop()
     {
@@ -127,8 +127,8 @@ class QueryEntitiesOptionsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesOptions::setFilter
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesOptions::getFilter
+     * @covers WindowsAzure\Table\Models\QueryEntitiesOptions::setFilter
+     * @covers WindowsAzure\Table\Models\QueryEntitiesOptions::getFilter
      */
     public function testSetFilter()
     {
@@ -144,8 +144,8 @@ class QueryEntitiesOptionsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesOptions::addSelectField
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesOptions::getSelectFields
+     * @covers WindowsAzure\Table\Models\QueryEntitiesOptions::addSelectField
+     * @covers WindowsAzure\Table\Models\QueryEntitiesOptions::getSelectFields
      */
     public function testAddSelectField()
     {

tests/unit/WindowsAzure/Table/Models/QueryEntitiesResultTest.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\QueryEntitiesResult;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\QueryEntitiesResult;
 
 /**
  * Unit tests for class QueryEntitiesResult
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -38,7 +38,7 @@ use WindowsAzure\Services\Table\Models\QueryEntitiesResult;
 class QueryEntitiesResultTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesResult::create
+     * @covers WindowsAzure\Table\Models\QueryEntitiesResult::create
      */
     public function testCreate()
     {
@@ -52,8 +52,8 @@ class QueryEntitiesResultTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesResult::setNextPartitionKey
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesResult::getNextPartitionKey
+     * @covers WindowsAzure\Table\Models\QueryEntitiesResult::setNextPartitionKey
+     * @covers WindowsAzure\Table\Models\QueryEntitiesResult::getNextPartitionKey
      */
     public function testSetNextPartitionKey()
     {
@@ -69,8 +69,8 @@ class QueryEntitiesResultTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesResult::setNextRowKey
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesResult::getNextRowKey
+     * @covers WindowsAzure\Table\Models\QueryEntitiesResult::setNextRowKey
+     * @covers WindowsAzure\Table\Models\QueryEntitiesResult::getNextRowKey
      */
     public function testSetNextRowKey()
     {
@@ -86,8 +86,8 @@ class QueryEntitiesResultTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesResult::setEntities
-     * @covers WindowsAzure\Services\Table\Models\QueryEntitiesResult::getEntities
+     * @covers WindowsAzure\Table\Models\QueryEntitiesResult::setEntities
+     * @covers WindowsAzure\Table\Models\QueryEntitiesResult::getEntities
      */
     public function testSetEntities()
     {

tests/unit/WindowsAzure/Table/Models/QueryTablesOptionsTest.php

@@ -15,24 +15,24 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\QueryTablesOptions;
-use WindowsAzure\Services\Table\Models\Query;
-use WindowsAzure\Services\Table\Models\Filters\Filter;
-use WindowsAzure\Services\Table\Models\EdmType;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\QueryTablesOptions;
+use WindowsAzure\Table\Models\Query;
+use WindowsAzure\Table\Models\Filters\Filter;
+use WindowsAzure\Table\Models\EdmType;
 
 /**
  * Unit tests for class QueryTablesOptions
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -42,8 +42,8 @@ use WindowsAzure\Services\Table\Models\EdmType;
 class QueryTablesOptionsTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesOptions::setNextTableName
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesOptions::getNextTableName
+     * @covers WindowsAzure\Table\Models\QueryTablesOptions::setNextTableName
+     * @covers WindowsAzure\Table\Models\QueryTablesOptions::getNextTableName
      */
     public function testSetNextTableName()
     {
@@ -59,8 +59,8 @@ class QueryTablesOptionsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesOptions::setPrefix
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesOptions::getPrefix
+     * @covers WindowsAzure\Table\Models\QueryTablesOptions::setPrefix
+     * @covers WindowsAzure\Table\Models\QueryTablesOptions::getPrefix
      */
     public function testSetPrefix()
     {
@@ -76,9 +76,9 @@ class QueryTablesOptionsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesOptions::setTop
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesOptions::getTop
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesOptions::__construct
+     * @covers WindowsAzure\Table\Models\QueryTablesOptions::setTop
+     * @covers WindowsAzure\Table\Models\QueryTablesOptions::getTop
+     * @covers WindowsAzure\Table\Models\QueryTablesOptions::__construct
      */
     public function testSetTop()
     {
@@ -94,7 +94,7 @@ class QueryTablesOptionsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesOptions::getQuery
+     * @covers WindowsAzure\Table\Models\QueryTablesOptions::getQuery
      */
     public function testGetQuery()
     {
@@ -110,8 +110,8 @@ class QueryTablesOptionsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesOptions::setFilter
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesOptions::getFilter
+     * @covers WindowsAzure\Table\Models\QueryTablesOptions::setFilter
+     * @covers WindowsAzure\Table\Models\QueryTablesOptions::getFilter
      */
     public function testSetFilter()
     {

tests/unit/WindowsAzure/Table/Models/QueryTablesResultTest.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\QueryTablesResult;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\QueryTablesResult;
 
 /**
  * Unit tests for class QueryTablesResult
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -39,8 +39,8 @@ use WindowsAzure\Services\Table\Models\QueryTablesResult;
 class QueryTablesResultTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesResult::setNextTableName
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesResult::getNextTableName
+     * @covers WindowsAzure\Table\Models\QueryTablesResult::setNextTableName
+     * @covers WindowsAzure\Table\Models\QueryTablesResult::getNextTableName
      */
     public function testSetNextTableName()
     {
@@ -56,8 +56,8 @@ class QueryTablesResultTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesResult::setTables
-     * @covers WindowsAzure\Services\Table\Models\QueryTablesResult::getTables
+     * @covers WindowsAzure\Table\Models\QueryTablesResult::setTables
+     * @covers WindowsAzure\Table\Models\QueryTablesResult::getTables
      */
     public function testSetTables()
     {

tests/unit/WindowsAzure/Table/Models/QueryTest.php

@@ -15,23 +15,23 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\Query;
-use WindowsAzure\Services\Table\Models\Filters\Filter;
-use WindowsAzure\Services\Table\Models\EdmType;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\Query;
+use WindowsAzure\Table\Models\Filters\Filter;
+use WindowsAzure\Table\Models\EdmType;
 
 /**
  * Unit tests for class Query
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -41,8 +41,8 @@ use WindowsAzure\Services\Table\Models\EdmType;
 class QueryTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\Query::setSelectFields
-     * @covers WindowsAzure\Services\Table\Models\Query::getSelectFields
+     * @covers WindowsAzure\Table\Models\Query::setSelectFields
+     * @covers WindowsAzure\Table\Models\Query::getSelectFields
      */
     public function testSetSelectFields()
     {
@@ -58,8 +58,8 @@ class QueryTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Query::setTop
-     * @covers WindowsAzure\Services\Table\Models\Query::getTop
+     * @covers WindowsAzure\Table\Models\Query::setTop
+     * @covers WindowsAzure\Table\Models\Query::getTop
      */
     public function testSetTop()
     {
@@ -75,8 +75,8 @@ class QueryTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Query::setFilter
-     * @covers WindowsAzure\Services\Table\Models\Query::getFilter
+     * @covers WindowsAzure\Table\Models\Query::setFilter
+     * @covers WindowsAzure\Table\Models\Query::getFilter
      */
     public function testSetFilter()
     {
@@ -92,8 +92,8 @@ class QueryTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\Query::addSelectField
-     * @covers WindowsAzure\Services\Table\Models\Query::getSelectFields
+     * @covers WindowsAzure\Table\Models\Query::addSelectField
+     * @covers WindowsAzure\Table\Models\Query::getSelectFields
      */
     public function testAddSelectField()
     {

tests/unit/WindowsAzure/Table/Models/TableServiceOptionsTest.php

@@ -15,21 +15,21 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\TableServiceOptions;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\TableServiceOptions;
 
 /**
  * Unit tests for class TableServiceOptions
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -39,7 +39,7 @@ use WindowsAzure\Services\Table\Models\TableServiceOptions;
 class TableServiceOptionsTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\TableServiceOptions::setTimeout
+     * @covers WindowsAzure\Table\Models\TableServiceOptions::setTimeout
      */
     public function testSetTimeout()
     {
@@ -55,7 +55,7 @@ class TableServiceOptionsTest extends \PHPUnit_Framework_TestCase
     }
     
     /**
-     * @covers WindowsAzure\Services\Table\Models\TableServiceOptions::getTimeout
+     * @covers WindowsAzure\Table\Models\TableServiceOptions::getTimeout
      */
     public function testGetTimeout()
     {

tests/unit/WindowsAzure/Table/Models/UpdateEntityResultTest.php

@@ -15,20 +15,20 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
-namespace Tests\Unit\WindowsAzure\Services\Table\Models;
-use WindowsAzure\Services\Table\Models\UpdateEntityResult;
+namespace Tests\Unit\WindowsAzure\Table\Models;
+use WindowsAzure\Table\Models\UpdateEntityResult;
 
 /**
  * Unit tests for class UpdateEntityResult
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table\Models
+ * @package   Tests\Unit\WindowsAzure\Table\Models
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -38,8 +38,8 @@ use WindowsAzure\Services\Table\Models\UpdateEntityResult;
 class UpdateEntityResultTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\Models\UpdateEntityResult::setEtag
-     * @covers WindowsAzure\Services\Table\Models\UpdateEntityResult::getEtag
+     * @covers WindowsAzure\Table\Models\UpdateEntityResult::setEtag
+     * @covers WindowsAzure\Table\Models\UpdateEntityResult::getEtag
      */
     public function testSetEtag()
     {

tests/unit/WindowsAzure/Table/TableServiceTest.php

@@ -15,24 +15,24 @@
  * PHP version 5
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table
+ * @package   Tests\Unit\WindowsAzure\Table
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  * @link      http://pear.php.net/package/azure-sdk-for-php
  */
 
-namespace Tests\Unit\WindowsAzure\Services\Table;
-use WindowsAzure\Services\Table\TableService;
+namespace Tests\Unit\WindowsAzure\Table;
+use WindowsAzure\Table\TableService;
 use WindowsAzure\Common\Configuration;
 use Tests\Framework\TestResources;
-use WindowsAzure\Services\Table\TableSettings;
+use WindowsAzure\Table\TableSettings;
 
 /**
  * Unit tests for class TableService
  *
  * @category  Microsoft
- * @package   Tests\Unit\WindowsAzure\Services\Table
+ * @package   Tests\Unit\WindowsAzure\Table
  * @author    Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
  * @copyright 2012 Microsoft Corporation
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
@@ -42,7 +42,7 @@ use WindowsAzure\Services\Table\TableSettings;
 class TableServiceTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers WindowsAzure\Services\Table\TableService::create
+     * @covers WindowsAzure\Table\TableService::create
      */
     public function testCreateWithConfig()
     {
@@ -57,7 +57,7 @@ class TableServiceTest extends \PHPUnit_Framework_TestCase
         $tableWrapper = TableService::create($config);
         
         // Assert
-        $this->assertInstanceOf('WindowsAzure\Services\Table\ITable', $tableWrapper);
+        $this->assertInstanceOf('WindowsAzure\Table\Internal\ITable', $tableWrapper);
     }
 }