Clean up test suite

clue · Jun 15, 2020 · a28e520 · a28e520
1 parent 2f23fcc
commit a28e520
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 103 deletions.
diff --git a/composer.json b/composer.json
@@ -13,6 +13,9 @@
     "autoload": {
         "psr-4": { "ConnectionManager\\Extra\\": "src" }
     },
+    "autoload-dev": {
+        "psr-4": { "ConnectionManager\\Tests\\Extra\\": "tests/" }
+    },
     "require": {
         "php": ">=5.3",
         "react/socket": "^1.0 || ^0.8 || ^0.7",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="tests/bootstrap.php" colors="true">
+<phpunit bootstrap="vendor/autoload.php" colors="true">
     <testsuites>
-        <testsuite>
+        <testsuite name="Connection-Manager-Extra Test Suite">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>

diff --git a/tests/ConnectionManagerDelayTest.php b/tests/ConnectionManagerDelayTest.php
@@ -1,5 +1,6 @@
 <?php
 
+namespace ConnectionManager\Tests\Extra;
 
 use ConnectionManager\Extra\ConnectionManagerDelay;
 
@@ -12,7 +13,7 @@ class ConnectionManagerDelayTest extends TestCase
      */
     public function setUpLoop()
     {
-        $this->loop = React\EventLoop\Factory::create();
+        $this->loop = \React\EventLoop\Factory::create();
     }
 
     public function testDelayTenth()

diff --git a/tests/ConnectionManagerRejectTest.php b/tests/ConnectionManagerRejectTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace ConnectionManager\Tests\Extra;
+
 use ConnectionManager\Extra\ConnectionManagerReject;
 
 class ConnectionManagerRejectTest extends TestCase
@@ -20,7 +22,7 @@ public function testRejectWithCustomMessage()
         $promise = $cm->connect('www.google.com:80');
 
         $text = null;
-        $promise->then($this->expectCallableNever(), function (Exception $e) use (&$text) {
+        $promise->then($this->expectCallableNever(), function (\Exception $e) use (&$text) {
             $text = $e->getMessage();
         });
 
@@ -30,7 +32,7 @@ public function testRejectWithCustomMessage()
     public function testRejectThrowsCustomException()
     {
         $cm = new ConnectionManagerReject(function ($uri) {
-            throw new RuntimeException('Blocked ' . $uri);
+            throw new \RuntimeException('Blocked ' . $uri);
         });
 
         $promise = $cm->connect('www.google.com:80');
@@ -47,7 +49,7 @@ public function testRejectThrowsCustomException()
     public function testRejectReturnsCustomException()
     {
         $cm = new ConnectionManagerReject(function ($uri) {
-            return new RuntimeException('Blocked ' . $uri);
+            return new \RuntimeException('Blocked ' . $uri);
         });
 
         $promise = $cm->connect('www.google.com:80');

diff --git a/tests/ConnectionManagerRepeatTest.php b/tests/ConnectionManagerRepeatTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace ConnectionManager\Tests\Extra;
+
 use ConnectionManager\Extra\ConnectionManagerRepeat;
 use ConnectionManager\Extra\ConnectionManagerReject;
 use React\Promise;

diff --git a/tests/ConnectionManagerSwappableTest.php b/tests/ConnectionManagerSwappableTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace ConnectionManager\Tests\Extra;
+
 use ConnectionManager\Extra\ConnectionManagerSwappable;
 use ConnectionManager\Extra\ConnectionManagerReject;
 

diff --git a/tests/ConnectionManagerTimeoutTest.php b/tests/ConnectionManagerTimeoutTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace ConnectionManager\Tests\Extra;
+
 use ConnectionManager\Extra\ConnectionManagerReject;
 use ConnectionManager\Extra\ConnectionManagerTimeout;
 use React\Promise\Deferred;
@@ -14,7 +16,7 @@ class ConnectionManagerTimeoutTest extends TestCase
      */
     public function setUpLoop()
     {
-        $this->loop = React\EventLoop\Factory::create();
+        $this->loop = \React\EventLoop\Factory::create();
     }
 
     public function testTimeoutOkay()

diff --git a/tests/Multiple/ConnectionManagerConcurrentTest.php b/tests/Multiple/ConnectionManagerConcurrentTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace ConnectionManager\Tests\Extra\Multiple;
+
 use ConnectionManager\Extra\Multiple\ConnectionManagerConcurrent;
 use React\Promise;
+use ConnectionManager\Tests\Extra\TestCase;
 
 class ConnectionManagerConcurrentTest extends TestCase
 {

diff --git a/tests/Multiple/ConnectionManagerConsecutiveTest.php b/tests/Multiple/ConnectionManagerConsecutiveTest.php
@@ -1,8 +1,11 @@
 <?php
 
+namespace ConnectionManager\Tests\Extra\Multiple;
+
 use ConnectionManager\Extra\Multiple\ConnectionManagerConsecutive;
 use ConnectionManager\Extra\ConnectionManagerReject;
 use React\Promise;
+use ConnectionManager\Tests\Extra\TestCase;
 
 class ConnectionManagerConsecutiveTest extends TestCase
 {

diff --git a/tests/Multiple/ConnectionManagerRandomTest.php b/tests/Multiple/ConnectionManagerRandomTest.php
@@ -1,8 +1,11 @@
 <?php
 
+namespace ConnectionManager\Tests\Extra\Multiple;
+
 use ConnectionManager\Extra\Multiple\ConnectionManagerRandom;
 use ConnectionManager\Extra\ConnectionManagerReject;
 use React\Promise;
+use ConnectionManager\Tests\Extra\TestCase;
 
 class ConnectionManagerRandomTest extends TestCase
 {

diff --git a/tests/Multiple/ConnectionManagerSelectiveTest.php b/tests/Multiple/ConnectionManagerSelectiveTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace ConnectionManager\Tests\Extra\Multiple;
+
 use ConnectionManager\Extra\Multiple\ConnectionManagerSelective;
 use ConnectionManager\Extra\ConnectionManagerReject;
+use ConnectionManager\Tests\Extra\TestCase;
 
 class ConnectionManagerSelectiveTest extends TestCase
 {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -98,5 +98,4 @@ public function setExpectedException($exception, $message = '', $code = 0)
             parent::setExpectedException($exception, $message, $code);
         }
     }
-
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-Original file line number
+Diff line change
@@ Expand Up @@
                 parent::setExpectedException($exception, $message, $code);
             }
         }
     }