Merge pull request #156 from SimonFrings/tests

jsor · web-flow · commit c459d2e9458a · 2020-11-25T17:19:55.000+01:00
Update PHPUnit configuration schema for PHPUnit 9.3 and minor clean up and remove already covered test
diff --git a/.gitattributes b/.gitattributes
@@ -3,4 +3,5 @@
 /.travis.yml export-ignore
 /examples export-ignore
 /phpunit.xml.dist export-ignore
+/phpunit.xml.legacy export-ignore
 /tests export-ignore
diff --git a/.travis.yml b/.travis.yml
@@ -29,8 +29,9 @@ jobs:
     - os: osx
 
 install:
-  - composer install --no-interaction
+  - composer install
 
 script:
-  - vendor/bin/phpunit --coverage-text
+  - if [[ "$TRAVIS_PHP_VERSION" > "7.2" ]]; then vendor/bin/phpunit --coverage-text; fi
+  - if [[ "$TRAVIS_PHP_VERSION" < "7.3" ]]; then vendor/bin/phpunit --coverage-text -c phpunit.xml.legacy; fi
   - time php examples/91-benchmark-throughput.php
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
         "evenement/evenement": "^3.0 || ^2.0 || ^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0 || ^5.7 || ^4.8.35",
+        "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
         "clue/stream-filter": "~1.2"
     },
     "autoload": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="vendor/autoload.php" colors="true">
+<!-- PHPUnit configuration file with new format for PHPUnit 9.3+ -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         cacheResult="false">
     <testsuites>
         <testsuite name="React Test Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>./src/</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 </phpunit>
diff --git a/phpunit.xml.legacy b/phpunit.xml.legacy
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- PHPUnit configuration file with old format for PHPUnit 9.2 or older -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true">
+    <testsuites>
+        <testsuite name="React Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory>./src/</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -6,16 +6,6 @@
 
 class TestCase extends BaseTestCase
 {
-    protected function expectCallableExactly($amount)
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->exactly($amount))
-            ->method('__invoke');
-
-        return $mock;
-    }
-
     protected function expectCallableOnce()
     {
         $mock = $this->createCallableMock();
@@ -61,7 +51,7 @@ protected function createCallableMock()
     public function setExpectedException($exception, $exceptionMessage = '', $exceptionCode = null)
     {
         if (method_exists($this, 'expectException')) {
-            // PHPUnit 5+
+            // PHPUnit 5.2+
             $this->expectException($exception);
             if ($exceptionMessage !== '') {
                 $this->expectExceptionMessage($exceptionMessage);
@@ -70,7 +60,7 @@ public function setExpectedException($exception, $exceptionMessage = '', $except
                 $this->expectExceptionCode($exceptionCode);
             }
         } else {
-            // legacy PHPUnit 4
+            // legacy PHPUnit 4 - PHPUnit 5.1
             parent::setExpectedException($exception, $exceptionMessage, $exceptionCode);
         }
     }
diff --git a/tests/UtilTest.php b/tests/UtilTest.php
@@ -265,9 +265,4 @@ private function createLoopMock()
     {
         return $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
     }
-
-    private function notEqualTo($value)
-    {
-        return new \PHPUnit_Framework_Constraint_Not($value);
-    }
 }
diff --git a/tests/WritableResourceStreamTest.php b/tests/WritableResourceStreamTest.php
@@ -461,33 +461,6 @@ public function testWritingToClosedWritableResourceStreamShouldNotWriteToStream(
         $this->assertSame('', $filterBuffer);
     }
 
-    /**
-     * @covers React\Stream\WritableResourceStream::handleWrite
-     */
-    public function testErrorWhenStreamResourceIsInvalid()
-    {
-        $stream = fopen('php://temp', 'r+');
-        $loop = $this->createWriteableLoopMock();
-
-        $error = null;
-
-        $buffer = new WritableResourceStream($stream, $loop);
-        $buffer->on('error', function ($message) use (&$error) {
-            $error = $message;
-        });
-
-        // invalidate stream resource
-        fclose($stream);
-
-        $buffer->write('Attempting to write to bad stream');
-
-        $this->assertInstanceOf('Exception', $error);
-
-        // the error messages differ between PHP versions, let's just check substrings
-        $this->assertContainsString('Unable to write to stream: ', $error->getMessage());
-        $this->assertContainsStringIgnoringCase(' Not a valid stream resource', $error->getMessage());
-    }
-
     public function testWritingToClosedStream()
     {
         if ('Darwin' === PHP_OS) {

Original file line number	Diff line number	Diff line change
`@@ -6,16 +6,6 @@`
`6`	`6`
`7`	`7`	`class TestCase extends BaseTestCase`
`8`	`8`	`{`
`9`		`- protected function expectCallableExactly($amount)`
`10`		`- {`
`11`		`- $mock = $this->createCallableMock();`
`12`		`- $mock`
`13`		`- ->expects($this->exactly($amount))`
`14`		`- ->method('__invoke');`
`15`		`-`
`16`		`- return $mock;`
`17`		`- }`
`18`		`-`
`19`	`9`	`protected function expectCallableOnce()`
`20`	`10`	`{`
`21`	`11`	`$mock = $this->createCallableMock();`
`@@ -61,7 +51,7 @@ protected function createCallableMock()`
`61`	`51`	`public function setExpectedException($exception, $exceptionMessage = '', $exceptionCode = null)`
`62`	`52`	`{`
`63`	`53`	`if (method_exists($this, 'expectException')) {`
`64`		`- // PHPUnit 5+`
	`54`	`+ // PHPUnit 5.2+`
`65`	`55`	`$this->expectException($exception);`
`66`	`56`	`if ($exceptionMessage !== '') {`
`67`	`57`	`$this->expectExceptionMessage($exceptionMessage);`
`@@ -70,7 +60,7 @@ public function setExpectedException($exception, $exceptionMessage = '', $except`
`70`	`60`	`$this->expectExceptionCode($exceptionCode);`
`71`	`61`	`}`
`72`	`62`	`} else {`
`73`		`- // legacy PHPUnit 4`
	`63`	`+ // legacy PHPUnit 4 - PHPUnit 5.1`
`74`	`64`	`parent::setExpectedException($exception, $exceptionMessage, $exceptionCode);`
`75`	`65`	`}`
`76`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -265,9 +265,4 @@ private function createLoopMock()`
`265`	`265`	`{`
`266`	`266`	`return $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();`
`267`	`267`	`}`
`268`		`-`
`269`		`- private function notEqualTo($value)`
`270`		`- {`
`271`		`- return new \PHPUnit_Framework_Constraint_Not($value);`
`272`		`- }`
`273`	`268`	`}`