Merge pull request #12 from SimonFrings/tests

TestsClean 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,24 +1,23 @@
 language: php
 
-php:
-# - 5.3 # requires old distro, see below
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - hhvm # ignore errors, see below
-
-# lock distro so future defaults will not break the build
+# 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": { "Clue\\React\\Mdns\\": "src/" }
     },
+    "autoload-dev": {
+        "psr-4": { "Clue\\Tests\\React\\Mdns\\": "tests/" }
+    },
     "require": {
         "php": ">=5.3",
         "clue/multicast-react": "^1.0 || ^0.2",
@@ -21,6 +24,6 @@
         "react/promise": "^2.1 || ^1.2.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0 || ^5.7 || ^4.8.35"
+        "phpunit/phpunit": "^9.0 || ^6.0 || ^5.7 || ^4.8.35"
     }
 }

phpunit.xml.dist

@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="tests/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
->
+<phpunit bootstrap="vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite name="mDNS React Test Suite">
             <directory>./tests/</directory>

tests/FactoryTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Mdns;
+
 use Clue\React\Mdns\Factory;
 
 class FactoryTest extends TestCase

tests/MulticastExecutorTest.php

@@ -1,65 +1,64 @@
 <?php
 
+namespace Clue\Tests\React\Mdns;
+
 use Clue\React\Mdns\MulticastExecutor;
 use Clue\React\Mdns\Factory;
 use React\Dns\Query\Query;
 
 class MulticastExecutorTest extends TestCase
 {
-    private $nameserver;
-    private $loop;
-    private $parser;
-    private $dumper;
-    private $sockets;
-
-    public function setUp()
-    {
-        $this->nameserver = Factory::DNS;
-        $this->loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
-        $this->parser = $this->getMockBuilder('React\Dns\Protocol\Parser')->getMock();
-        $this->dumper = $this->getMockBuilder('React\Dns\Protocol\BinaryDumper')->getMock();
-        $this->sockets = $this->getMockBuilder('Clue\React\Multicast\Factory')->disableOriginalConstructor()->getMock();
-    }
-
     public function testQueryWillReturnPromise()
     {
-        $executor = new MulticastExecutor($this->loop, $this->parser, $this->dumper, 5, $this->sockets);
+        $nameserver = Factory::DNS;
+        $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
+        $parser = $this->getMockBuilder('React\Dns\Protocol\Parser')->getMock();
+        $dumper = $this->getMockBuilder('React\Dns\Protocol\BinaryDumper')->getMock();
+        $sockets = $this->getMockBuilder('Clue\React\Multicast\Factory')->disableOriginalConstructor()->getMock();
+
+        $executor = new MulticastExecutor($loop, $parser, $dumper, 5, $sockets);
 
         $socket = $this->getMockBuilder('React\Datagram\SocketInterface')->getMock();
 
-        $this->dumper->expects($this->once())->method('toBinary')->will($this->returnValue('message'));
-        $this->sockets->expects($this->once())->method('createSender')->will($this->returnValue($socket));
+        $dumper->expects($this->once())->method('toBinary')->will($this->returnValue('message'));
+        $sockets->expects($this->once())->method('createSender')->will($this->returnValue($socket));
 
-        $socket->expects($this->once())->method('send')->with($this->equalTo('message'), $this->equalTo($this->nameserver));
+        $socket->expects($this->once())->method('send')->with($this->equalTo('message'), $this->equalTo($nameserver));
 
         $query = new Query('name', 'type', 'class', time());
 
-        $ret = $executor->query($this->nameserver, $query);
+        $ret = $executor->query($nameserver, $query);
         $this->assertInstanceOf('React\Promise\PromiseInterface', $ret);
     }
 
     public function testCancellingPromiseWillCloseSocketAndReject()
     {
-        $executor = new MulticastExecutor($this->loop, $this->parser, $this->dumper, 5, $this->sockets);
+        $nameserver = Factory::DNS;
+        $loop = $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();
+        $parser = $this->getMockBuilder('React\Dns\Protocol\Parser')->getMock();
+        $dumper = $this->getMockBuilder('React\Dns\Protocol\BinaryDumper')->getMock();
+        $sockets = $this->getMockBuilder('Clue\React\Multicast\Factory')->disableOriginalConstructor()->getMock();
+
+        $executor = new MulticastExecutor($loop, $parser, $dumper, 5, $sockets);
 
         $socket = $this->getMockBuilder('React\Datagram\SocketInterface')->getMock();
         $socket->expects($this->once())->method('close');
-        $socket->expects($this->once())->method('send')->with($this->equalTo('message'), $this->equalTo($this->nameserver));
-        $this->sockets->expects($this->once())->method('createSender')->will($this->returnValue($socket));
+        $socket->expects($this->once())->method('send')->with($this->equalTo('message'), $this->equalTo($nameserver));
+        $sockets->expects($this->once())->method('createSender')->will($this->returnValue($socket));
 
         // prefer newer EventLoop 1.0/0.5+ TimerInterface or fall back to legacy namespace
         $timer = $this->getMockBuilder(
             interface_exists('React\EventLoop\TimerInterface') ? 'React\EventLoop\TimerInterface' : 'React\EventLoop\Timer\TimerInterface'
         )->getMock();
 
-        $this->loop->expects($this->once())->method('addTimer')->willReturn($timer);
-        $this->loop->expects($this->once())->method('cancelTimer')->with($timer);
+        $loop->expects($this->once())->method('addTimer')->willReturn($timer);
+        $loop->expects($this->once())->method('cancelTimer')->with($timer);
 
-        $this->dumper->expects($this->once())->method('toBinary')->will($this->returnValue('message'));
+        $dumper->expects($this->once())->method('toBinary')->will($this->returnValue('message'));
 
         $query = new Query('name', 'type', 'class', time());
 
-        $ret = $executor->query($this->nameserver, $query);
+        $ret = $executor->query($nameserver, $query);
         $this->assertInstanceOf('React\Promise\CancellablePromiseInterface', $ret);
 
         $ret->cancel();

tests/bootstrap.php renamed to tests/TestCase.php

@@ -1,10 +1,8 @@
 <?php
 
-require __DIR__ . '/../vendor/autoload.php';
+namespace Clue\Tests\React\Mdns;
 
-error_reporting(-1);
-
-class TestCase extends PHPUnit\Framework\TestCase
+class TestCase extends \PHPUnit\Framework\TestCase
 {
     protected function expectCallableOnce()
     {