Browse Source

ZF-8809
- Fixed WindowsAzure tests to not require TestConfiguration.php.dist

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

ralph 16 years ago
parent
commit
41d1ad725e

+ 10 - 8
tests/Zend/Service/WindowsAzure/BlobStorageSharedAccessTest.php

@@ -20,23 +20,25 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_BlobStorageSharedAccessTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
-/** Zend_Service_WindowsAzure_Storage_Blob */
+/**
+ * @see Zend_Service_WindowsAzure_Storage_Blob 
+ */
 require_once 'Zend/Service/WindowsAzure/Storage/Blob.php';
 
-/** Zend_Service_WindowsAzure_Credentials_SharedAccessSignature */
+/**
+ * @see Zend_Service_WindowsAzure_Credentials_SharedAccessSignature 
+ */
 require_once 'Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php';
 
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_BlobStorageSharedAccessTest::main');
+}
+
 /**
  * @category   Zend
  * @package    Zend_Service_WindowsAzure

+ 7 - 6
tests/Zend/Service/WindowsAzure/BlobStorageTest.php

@@ -20,20 +20,21 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_BlobStorageTest::main');
-}
 
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
-/** Zend_Service_WindowsAzure_Storage_Blob */
+/**
+ * @see Zend_Service_WindowsAzure_Storage_Blob 
+ */
 require_once 'Zend/Service/WindowsAzure/Storage/Blob.php';
 
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_BlobStorageTest::main');
+}
+
 /**
  * @category   Zend
  * @package    Zend_Service_WindowsAzure

+ 7 - 7
tests/Zend/Service/WindowsAzure/BlobStreamTest.php

@@ -20,20 +20,20 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_BlobStreamTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
-/** Zend_Service_WindowsAzure_Storage_Blob */
+/**
+ * @see Zend_Service_WindowsAzure_Storage_Blob 
+ */
 require_once 'Zend/Service/WindowsAzure/Storage/Blob.php';
 
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_BlobStreamTest::main');
+}
+
 /**
  * @category   Zend
  * @package    Zend_Service_WindowsAzure

+ 8 - 7
tests/Zend/Service/WindowsAzure/Credentials/SharedAccessSignatureTest.php

@@ -20,20 +20,21 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_SharedAccessSignatureCredentialsTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
-/** Zend_Service_WindowsAzure_Credentials_SharedAccessSignature */
+/**
+ * @see Zend_Service_WindowsAzure_Credentials_SharedAccessSignature 
+ */
 require_once 'Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php';
 
+
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_SharedAccessSignatureCredentialsTest::main');
+}
+
 /**
  * @category   Zend
  * @package    Zend_Service_WindowsAzure

+ 7 - 7
tests/Zend/Service/WindowsAzure/Credentials/SharedKeyLiteTest.php

@@ -20,20 +20,20 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_SharedKeyLiteCredentialsTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
-/** Zend_Service_WindowsAzure_Credentials_SharedKeyLite */
+/**
+ * @see Zend_Service_WindowsAzure_Credentials_SharedKeyLite 
+ */
 require_once 'Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php';
 
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_SharedKeyLiteCredentialsTest::main');
+}
+
 /**
  * @category   Zend
  * @package    Zend_Service_WindowsAzure

+ 4 - 6
tests/Zend/Service/WindowsAzure/Credentials/SharedKeyTest.php

@@ -20,16 +20,14 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_SharedKeyCredentialsTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
+
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_SharedKeyCredentialsTest::main');
+}
 
 /** Zend_Service_WindowsAzure_Credentials_SharedKey */
 require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php';

+ 8 - 7
tests/Zend/Service/WindowsAzure/DynamicTableEntityTest.php

@@ -20,20 +20,21 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_DynamicTableEntityTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
-/** Zend_Service_WindowsAzure_Storage_DynamicTableEntity */
+/**
+ * @see Zend_Service_WindowsAzure_Storage_DynamicTableEntity 
+ */
 require_once 'Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php';
 
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_DynamicTableEntityTest::main');
+}
+
+
 /**
  * @category   Zend
  * @package    Zend_Service_WindowsAzure

+ 7 - 7
tests/Zend/Service/WindowsAzure/QueueStorageTest.php

@@ -20,20 +20,20 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_QueueStorageTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
-/** Zend_Service_WindowsAzure_Storage_Queue */
+/**
+ * @see Zend_Service_WindowsAzure_Storage_Queue 
+ */
 require_once 'Zend/Service/WindowsAzure/Storage/Queue.php';
 
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_QueueStorageTest::main');
+}
+
 /**
  * @category   Zend
  * @package    Zend_Service_WindowsAzure

+ 7 - 7
tests/Zend/Service/WindowsAzure/RetryPolicyTest.php

@@ -20,20 +20,20 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_RetryPolicyTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
-/** Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract */
+/**
+ * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
+ */
 require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
 
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_RetryPolicyTest::main');
+}
+
 /**
  * @category   Zend
  * @package    Zend_Service_WindowsAzure

+ 10 - 8
tests/Zend/Service/WindowsAzure/SessionHandlerTest.php

@@ -20,23 +20,25 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_SessionHandlerTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
-/** Zend_Service_WindowsAzure_SessionHandler */
+/**
+ * @see Zend_Service_WindowsAzure_SessionHandler 
+ */
 require_once 'Zend/Service/WindowsAzure/SessionHandler.php';
 
-/** Zend_Service_WindowsAzure_Storage_Table */
+/**
+ * @see Zend_Service_WindowsAzure_Storage_Table 
+ */
 require_once 'Zend/Service/WindowsAzure/Storage/Table.php';
 
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_SessionHandlerTest::main');
+}
+
 /**
  * @category   Zend
  * @package    Zend_Service_WindowsAzure

+ 7 - 7
tests/Zend/Service/WindowsAzure/StorageTest.php

@@ -20,20 +20,20 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_StorageTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
-/** Zend_Service_WindowsAzure_Storage */
+/**
+ * @see Zend_Service_WindowsAzure_Storage
+ */
 require_once 'Zend/Service/WindowsAzure/Storage.php';
 
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_StorageTest::main');
+}
+
 /**
  * @category   Zend
  * @package    Zend_Service_WindowsAzure

+ 7 - 7
tests/Zend/Service/WindowsAzure/TableEntityQueryTest.php

@@ -20,20 +20,20 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_TableEntityQueryTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
-/** Zend_Service_WindowsAzure_Storage_TableEntityQuery */
+/**
+ * @see Zend_Service_WindowsAzure_Storage_TableEntityQuery
+ */
 require_once 'Zend/Service/WindowsAzure/Storage/TableEntityQuery.php';
 
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_TableEntityQueryTest::main');
+}
+
 /**
  * @category   Zend
  * @package    Zend_Service_WindowsAzure

+ 7 - 7
tests/Zend/Service/WindowsAzure/TableEntityTest.php

@@ -20,20 +20,20 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_TableEntityTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
-/** Zend_Service_WindowsAzure_Storage_TableEntity */
+/**
+ * @see Zend_Service_WindowsAzure_Storage_TableEntity 
+ */
 require_once 'Zend/Service/WindowsAzure/Storage/TableEntity.php';
 
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_TableEntityTest::main');
+}
+
 /**
  * @category   Zend
  * @package    Zend_Service_WindowsAzure

+ 7 - 7
tests/Zend/Service/WindowsAzure/TableStorageTest.php

@@ -20,20 +20,20 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_TableStorageTest::main');
-}
-
 /**
  * Test helpers
  */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
-require_once dirname(__FILE__) . '/../../../TestConfiguration.php.dist';
-require_once 'PHPUnit/Framework/TestCase.php';
 
-/** Zend_Service_WindowsAzure_Storage_Table */
+/**
+ * @see Zend_Service_WindowsAzure_Storage_Table 
+ */
 require_once 'Zend/Service/WindowsAzure/Storage/Table.php';
 
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Zend_Service_WindowsAzure_TableStorageTest::main');
+}
+
 /**
  * @category   Zend
  * @package    Zend_Service_WindowsAzure