Merge pull request #27 from SimonFrings/tests

Clean up test suite, add .gitattributes to exclude dev files from exports and run tests on PHP 7.4 and simplify test matrix

Author: clue

.gitattributes

@@ -0,0 +1,6 @@
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/examples/ export-ignore
+/phpunit.xml.dist export-ignore
+/tests/ export-ignore

.travis.yml

@@ -1,22 +1,23 @@
 language: php
 
-php:
-# - 5.3 # requires old distro, see below
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7
-  - hhvm # ignore errors, see below
-
 # lock distro so new future defaults will not break the build
 dist: trusty
 
 matrix:
   include:
     - php: 5.3
       dist: precise
+    - php: 5.4
+    - php: 5.5
+    - php: 5.6
+    - php: 7.0
+    - php: 7.1
+    - php: 7.2
+    - php: 7.3
+    - php: 7.4
+    - php: hhvm-3.18
   allow_failures:
-    - php: hhvm
+    - php: hhvm-3.18
 
 sudo: false
 

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",
@@ -21,6 +24,6 @@
         "react/promise-timer": "^1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0 || ^4.8"
+        "phpunit/phpunit": "^9.0 || ^5.0 || ^4.8"
     }
 }

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>

tests/ConnectionManagerDelayTest.php

@@ -1,15 +1,19 @@
 <?php
 
+namespace ConnectionManager\Tests\Extra;
 
 use ConnectionManager\Extra\ConnectionManagerDelay;
 
 class ConnectionManagerDelayTest extends TestCase
 {
     private $loop;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpLoop()
     {
-        $this->loop = React\EventLoop\Factory::create();
+        $this->loop = \React\EventLoop\Factory::create();
     }
 
     public function testDelayTenth()

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');

tests/ConnectionManagerRepeatTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace ConnectionManager\Tests\Extra;
+
 use ConnectionManager\Extra\ConnectionManagerRepeat;
 use ConnectionManager\Extra\ConnectionManagerReject;
 use React\Promise;
@@ -31,11 +33,9 @@ public function testTwoTriesWillStartTwoConnectionAttempts()
         $this->assertPromiseReject($promise);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testInvalidRepetitions()
     {
+        $this->setExpectedException("InvalidArgumentException");
         $wont = new ConnectionManagerReject();
         $cm = new ConnectionManagerRepeat($wont, -3);
     }

tests/ConnectionManagerSwappableTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace ConnectionManager\Tests\Extra;
+
 use ConnectionManager\Extra\ConnectionManagerSwappable;
 use ConnectionManager\Extra\ConnectionManagerReject;
 

tests/ConnectionManagerTimeoutTest.php

@@ -1,18 +1,22 @@
 <?php
 
-use ConnectionManager\Extra\ConnectionManagerReject;
+namespace ConnectionManager\Tests\Extra;
 
-use ConnectionManager\Extra\ConnectionManagerDelay;
+use ConnectionManager\Extra\ConnectionManagerReject;
 use ConnectionManager\Extra\ConnectionManagerTimeout;
+use React\Promise\Deferred;
 use React\Promise\Promise;
 
 class ConnectionManagerTimeoutTest extends TestCase
 {
     private $loop;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpLoop()
     {
-        $this->loop = React\EventLoop\Factory::create();
+        $this->loop = \React\EventLoop\Factory::create();
     }
 
     public function testTimeoutOkay()
@@ -27,12 +31,13 @@ public function testTimeoutOkay()
         $promise->then($this->expectCallableOnce(), $this->expectCallableNever());
     }
 
-    public function testTimeoutExpire()
+    public function testTimeoutWillRejectPromiseWhenConnectorExceedsTimeLimit()
     {
-        $will = $this->createConnectionManagerMock(true);
-        $wont = new ConnectionManagerDelay($will, 0.2, $this->loop);
+        $connectionPromise = new Promise(function(){});
+        $connector = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
+        $connector->expects($this->once())->method('connect')->willReturn($connectionPromise);
 
-        $cm = new ConnectionManagerTimeout($wont, 0.1, $this->loop);
+        $cm = new ConnectionManagerTimeout($connector, 0.1, $this->loop);
 
         $promise = $cm->connect('www.google.com:80');
         $this->assertInstanceOf('React\Promise\PromiseInterface', $promise);
@@ -41,6 +46,25 @@ public function testTimeoutExpire()
         $promise->then($this->expectCallableNever(), $this->expectCallableOnce());
     }
 
+    public function testTimeoutWillEndConnectiontWhenConnectorResolvesAfterTimeoutFired()
+    {
+        $connectionDeferred = new Deferred();
+        $connector = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
+        $connector->expects($this->once())->method('connect')->willReturn($connectionDeferred->promise());
+
+        $cm = new ConnectionManagerTimeout($connector, 0.1, $this->loop);
+
+        $promise = $cm->connect('www.google.com:80');
+        $this->assertInstanceOf('React\Promise\PromiseInterface', $promise);
+
+        $this->loop->run();
+        $promise->then($this->expectCallableNever(), $this->expectCallableOnce());
+
+        $connection = $this->getMockBuilder('React\Socket\ConnectionInterface')->getMock();
+        $connection->expects($this->once())->method('end');
+        $connectionDeferred->resolve($connection);
+    }
+
     public function testTimeoutAbort()
     {
         $wont = new ConnectionManagerReject();

tests/Multiple/ConnectionManagerConcurrentTest.php

@@ -1,15 +1,16 @@
 <?php
 
+namespace ConnectionManager\Tests\Extra\Multiple;
+
 use ConnectionManager\Extra\Multiple\ConnectionManagerConcurrent;
 use React\Promise;
+use ConnectionManager\Tests\Extra\TestCase;
 
 class ConnectionManagerConcurrentTest extends TestCase
 {
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testEmptyListsThrows()
     {
+        $this->setExpectedException("InvalidArgumentException");
         new ConnectionManagerConcurrent(array());
     }