Run tests on PHPUnit 9

Author: SimonFrings

composer.json

@@ -21,6 +21,6 @@
         "react/promise-timer": "^1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0 || ^4.8"
+        "phpunit/phpunit": "^9.0 || ^5.0 || ^4.8"
     }
 }

tests/ConnectionManagerDelayTest.php

@@ -7,7 +7,10 @@ class ConnectionManagerDelayTest extends TestCase
 {
     private $loop;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpLoop()
     {
         $this->loop = React\EventLoop\Factory::create();
     }

tests/ConnectionManagerRepeatTest.php

@@ -31,11 +31,9 @@ public function testTwoTriesWillStartTwoConnectionAttempts()
         $this->assertPromiseReject($promise);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testInvalidRepetitions()
     {
+        $this->setExpectedException("InvalidArgumentException");
         $wont = new ConnectionManagerReject();
         $cm = new ConnectionManagerRepeat($wont, -3);
     }

tests/ConnectionManagerTimeoutTest.php

@@ -9,7 +9,10 @@ class ConnectionManagerTimeoutTest extends TestCase
 {
     private $loop;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpLoop()
     {
         $this->loop = React\EventLoop\Factory::create();
     }

tests/Multiple/ConnectionManagerConcurrentTest.php

@@ -5,11 +5,9 @@
 
 class ConnectionManagerConcurrentTest extends TestCase
 {
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testEmptyListsThrows()
     {
+        $this->setExpectedException("InvalidArgumentException");
         new ConnectionManagerConcurrent(array());
     }
 

tests/Multiple/ConnectionManagerConsecutiveTest.php

@@ -6,11 +6,9 @@
 
 class ConnectionManagerConsecutiveTest extends TestCase
 {
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testEmptyListThrows()
     {
+        $this->setExpectedException("InvalidArgumentException");
         new ConnectionManagerConsecutive(array());
     }
 

tests/Multiple/ConnectionManagerRandomTest.php

@@ -6,11 +6,9 @@
 
 class ConnectionManagerRandomTest extends TestCase
 {
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testEmptyListThrows()
     {
+        $this->setExpectedException("InvalidArgumentException");
         new ConnectionManagerRandom(array());
     }
 

tests/Multiple/ConnectionManagerSelectiveTest.php

@@ -21,11 +21,10 @@ public function testInvalidUriWillAlwaysReject()
         $this->assertPromiseReject($promise);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testInvalidConnectorThrowsException()
     {
+
+        $this->setExpectedException("InvalidArgumentException");
         new ConnectionManagerSelective(array(
             'example.com' => false
         ));
@@ -69,14 +68,13 @@ public function provideInvalidMatcher()
 
     /**
      * @dataProvider provideInvalidMatcher
-     * @expectedException InvalidArgumentException
      *
      * @param string $matcher
      */
     public function testInvalidMatcherThrowsException($matcher)
     {
         $connector = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
-
+        $this->setExpectedException("InvalidArgumentException");
         new ConnectionManagerSelective(array(
             $matcher => $connector
         ));

tests/TestCase.php

@@ -0,0 +1,102 @@
+<?php
+
+namespace ConnectionManager\Tests\Extra;
+
+use React\Promise\Deferred;
+
+class TestCase extends \PHPUnit\Framework\TestCase
+{
+    protected function expectCallableOnce()
+    {
+        $mock = $this->createCallableMock();
+        $mock
+            ->expects($this->once())
+            ->method('__invoke');
+
+        return $mock;
+    }
+
+    protected function expectCallableNever()
+    {
+        $mock = $this->createCallableMock();
+        $mock
+            ->expects($this->never())
+            ->method('__invoke');
+
+        return $mock;
+    }
+
+    protected function expectCallableOnceParameter($type)
+    {
+        $mock = $this->createCallableMock();
+        $mock
+            ->expects($this->once())
+            ->method('__invoke')
+            ->with($this->isInstanceOf($type));
+
+        return $mock;
+    }
+
+    protected function expectCallableOnceValue($type)
+    {
+        $mock = $this->createCallableMock();
+        $mock
+            ->expects($this->once())
+            ->method('__invoke')
+            ->with($this->isInstanceOf($type));
+
+        return $mock;
+    }
+
+    /**
+     * @link https://github.com/reactphp/react/blob/master/tests/React/Tests/Socket/TestCase.php (taken from reactphp/react)
+     */
+    protected function createCallableMock()
+    {
+        return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
+    }
+
+    protected function createConnectionManagerMock($ret)
+    {
+        $mock = $this->getMockBuilder('React\Socket\ConnectorInterface')
+            ->getMock();
+
+        $deferred = new Deferred();
+        $deferred->resolve($ret);
+
+        $mock
+            ->expects($this->any())
+            ->method('connect')
+            ->will($this->returnValue($deferred->promise()));
+
+        return $mock;
+    }
+
+    protected function assertPromiseResolve($promise)
+    {
+        $this->assertInstanceOf('React\Promise\PromiseInterface', $promise);
+
+        $promise->then($this->expectCallableOnce(), $this->expectCallableNever());
+    }
+
+    protected function assertPromiseReject($promise)
+    {
+        $this->assertInstanceOf('React\Promise\PromiseInterface', $promise);
+
+        $promise->then($this->expectCallableNever(), $this->expectCallableOnce());
+    }
+
+    public function setExpectedException($exception, $message = '', $code = 0)
+    {
+        if (method_exists($this, 'expectException')) {
+            $this->expectException($exception);
+            if ($message !== '') {
+                $this->expectExceptionMessage($message);
+            }
+            $this->expectExceptionCode($code);
+        } else {
+            parent::setExpectedException($exception, $message, $code);
+        }
+    }
+
+}

tests/bootstrap.php

@@ -4,7 +4,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-class TestCase extends PHPUnit_Framework_TestCase
+class TestCase extends PHPUnit\Framework\TestCase
 {
     protected function expectCallableOnce()
     {