Refactor namespace for integration tests

haphan · haphan · commit 20812c240ee3 · 2016-06-23T21:43:19.000+08:00
diff --git a/tests/integration/BlockStorage/v2/CoreTest.php b/tests/integration/BlockStorage/v2/CoreTest.php
@@ -5,7 +5,7 @@
 use OpenStack\BlockStorage\v2\Models\Snapshot;
 use OpenStack\BlockStorage\v2\Models\Volume;
 use OpenStack\BlockStorage\v2\Models\VolumeType;
-use OpenCloud\Integration\TestCase;
+use OpenStack\Integration\TestCase;
 use OpenStack\Integration\Utils;
 
 class CoreTest extends TestCase
diff --git a/tests/integration/CommonUtils.php b/tests/integration/CommonUtils.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenCloud\Integration;
+namespace OpenStack\Integration;
 
 use GuzzleHttp\Client;
 
diff --git a/tests/integration/Compute/v2/CoreTest.php b/tests/integration/Compute/v2/CoreTest.php
@@ -9,7 +9,7 @@
 use OpenStack\Compute\v2\Models\Keypair;
 use OpenStack\Compute\v2\Models\Limit;
 use OpenStack\Compute\v2\Models\Server;
-use OpenCloud\Integration\TestCase;
+use OpenStack\Integration\TestCase;
 use OpenStack\Integration\Utils;
 use OpenStack\Networking\v2\Models\Network;
 use OpenStack\Networking\v2\Models\Subnet;
diff --git a/tests/integration/DefaultLogger.php b/tests/integration/DefaultLogger.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenCloud\Integration;
+namespace OpenStack\Integration;
 
 use Psr\Log\AbstractLogger;
 
diff --git a/tests/integration/Identity/v2/CoreTest.php b/tests/integration/Identity/v2/CoreTest.php
@@ -2,7 +2,7 @@
 
 namespace OpenStack\integration\Identity\v2;
 
-use OpenCloud\Integration\TestCase;
+use OpenStack\Integration\TestCase;
 
 class CoreTest extends TestCase
 {
diff --git a/tests/integration/Identity/v3/CoreTest.php b/tests/integration/Identity/v3/CoreTest.php
@@ -3,7 +3,7 @@
 namespace OpenStack\integration\Identity\v3;
 
 use OpenStack\Identity\v3\Models;
-use OpenCloud\Integration\TestCase;
+use OpenStack\Integration\TestCase;
 use OpenStack\Integration\Utils;
 
 class CoreTest extends TestCase
diff --git a/tests/integration/Images/v2/CoreTest.php b/tests/integration/Images/v2/CoreTest.php
@@ -4,7 +4,7 @@
 
 use OpenStack\Images\v2\Models\Image;
 use OpenStack\Images\v2\Models\Member;
-use OpenCloud\Integration\TestCase;
+use OpenStack\Integration\TestCase;
 
 class CoreTest extends TestCase
 {
diff --git a/tests/integration/Networking/v2/CoreTest.php b/tests/integration/Networking/v2/CoreTest.php
@@ -5,7 +5,7 @@
 use OpenStack\Networking\v2\Models\Network;
 use OpenStack\Networking\v2\Models\Port;
 use OpenStack\Networking\v2\Models\Subnet;
-use OpenCloud\Integration\TestCase;
+use OpenStack\Integration\TestCase;
 
 class CoreTest extends TestCase
 {
diff --git a/tests/integration/Networking/v2/Layer3Test.php b/tests/integration/Networking/v2/Layer3Test.php
@@ -3,7 +3,7 @@
 namespace OpenStack\Integration\Networking\v2;
 
 use Guzzle\Tests\Service\Mock\Command\Sub\Sub;
-use OpenCloud\Integration\TestCase;
+use OpenStack\Integration\TestCase;
 use OpenStack\Networking\v2\Extensions\Layer3\Models\FloatingIp;
 use OpenStack\Networking\v2\Models\Network;
 use OpenStack\Networking\v2\Models\Port;
diff --git a/tests/integration/Networking/v2/SecGroupTest.php b/tests/integration/Networking/v2/SecGroupTest.php
@@ -2,7 +2,7 @@
 
 namespace OpenStack\Integration\Networking\v2;
 
-use OpenCloud\Integration\TestCase;
+use OpenStack\Integration\TestCase;
 
 class SecGroupTest extends TestCase
 {
diff --git a/tests/integration/ObjectStore/v1/CoreTest.php b/tests/integration/ObjectStore/v1/CoreTest.php
@@ -2,7 +2,7 @@
 
 namespace OpenStack\integration\ObjectStore\v1;
 
-use OpenCloud\Integration\TestCase;
+use OpenStack\Integration\TestCase;
 use OpenStack\Integration\Utils;
 use Psr\Http\Message\StreamInterface;
 
diff --git a/tests/integration/Runner.php b/tests/integration/Runner.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenCloud\Integration;
+namespace OpenStack\Integration;
 
 class Runner
 {
diff --git a/tests/integration/SampleManager.php b/tests/integration/SampleManager.php
@@ -2,7 +2,7 @@
 
 namespace OpenStack\integration;
 
-use OpenCloud\Integration\SampleManagerInterface;
+use OpenStack\Integration\SampleManagerInterface;
 
 class SampleManager implements SampleManagerInterface
 {
@@ -49,7 +49,7 @@ protected function getConnectionTemplate()
     {
         if ($this->verbosity === 1) {
             $subst = <<<'EOL'
-use OpenCloud\Integration\DefaultLogger;
+use OpenStack\Integration\DefaultLogger;
 use OpenStack\Integration\Utils;
 use GuzzleHttp\MessageFormatter;
 
@@ -62,7 +62,7 @@ protected function getConnectionTemplate()
 EOL;
         } elseif ($this->verbosity === 2) {
             $subst = <<<'EOL'
-use OpenCloud\Integration\DefaultLogger;
+use OpenStack\Integration\DefaultLogger;
 use OpenStack\Integration\Utils;
 use GuzzleHttp\MessageFormatter;
 
diff --git a/tests/integration/SampleManagerInterface.php b/tests/integration/SampleManagerInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenCloud\Integration;
+namespace OpenStack\Integration;
 
 interface SampleManagerInterface
 {
diff --git a/tests/integration/TestCase.php b/tests/integration/TestCase.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace OpenCloud\Integration;
+namespace OpenStack\Integration;
 
-use OpenCloud\Common\Resource\Deletable;
+use OpenStack\Common\Resource\Deletable;
 use Psr\Log\LoggerInterface;
 
 abstract class TestCase extends \PHPUnit_Framework_TestCase implements TestInterface
diff --git a/tests/integration/TestInterface.php b/tests/integration/TestInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenCloud\Integration;
+namespace OpenStack\Integration;
 
 use Psr\Log\LoggerInterface;
 
diff --git a/tests/integration/Utils.php b/tests/integration/Utils.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace OpenStack\integration;
+namespace OpenStack\Integration;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\HandlerStack;
 use OpenStack\Identity\v2\Service;
-use OpenCloud\Common\Transport\Utils as TransportUtils;
+use OpenStack\Common\Transport\Utils as TransportUtils;
 use OpenStack\OpenStack;
 
-class Utils extends \OpenCloud\Integration\Utils
+class Utils extends CommonUtils
 {
     public static function getOpenStack(): OpenStack
     {
diff --git a/tests/integration/run.php b/tests/integration/run.php
@@ -6,5 +6,5 @@
 
 $sampleDir = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'samples';
 
-$runner = new \OpenCloud\Integration\Runner($sampleDir, __DIR__, 'OpenStack\\Integration');
+$runner = new \OpenStack\Integration\Runner($sampleDir, __DIR__, 'OpenStack\\Integration');
 $runner->runServices();

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace OpenStack\integration\Identity\v2;`
`4`	`4`
`5`		`-use OpenCloud\Integration\TestCase;`
	`5`	`+use OpenStack\Integration\TestCase;`
`6`	`6`
`7`	`7`	`class CoreTest extends TestCase`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use OpenStack\Images\v2\Models\Image;`
`6`	`6`	`use OpenStack\Images\v2\Models\Member;`
`7`		`-use OpenCloud\Integration\TestCase;`
	`7`	`+use OpenStack\Integration\TestCase;`
`8`	`8`
`9`	`9`	`class CoreTest extends TestCase`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use OpenStack\Networking\v2\Models\Network;`
`6`	`6`	`use OpenStack\Networking\v2\Models\Port;`
`7`	`7`	`use OpenStack\Networking\v2\Models\Subnet;`
`8`		`-use OpenCloud\Integration\TestCase;`
	`8`	`+use OpenStack\Integration\TestCase;`
`9`	`9`
`10`	`10`	`class CoreTest extends TestCase`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace OpenStack\Integration\Networking\v2;`
`4`	`4`
`5`		`-use OpenCloud\Integration\TestCase;`
	`5`	`+use OpenStack\Integration\TestCase;`
`6`	`6`
`7`	`7`	`class SecGroupTest extends TestCase`
`8`	`8`	`{`