Common test helpers moved to base TestCase

Author: clue

composer.json

@@ -12,6 +12,9 @@
     "autoload": {
         "psr-4": { "React\\Dns\\": "src" }
     },
+    "autoload-dev": {
+        "psr-4": { "React\\Tests\\Dns\\": "tests" }
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "0.4-dev"

tests/FunctionalResolverTest.php

@@ -2,11 +2,12 @@
 
 namespace React\Tests\Dns;
 
+use React\Tests\Dns\TestCase;
 use React\EventLoop\Factory as LoopFactory;
 use React\Dns\Resolver\Resolver;
 use React\Dns\Resolver\Factory;
 
-class FunctionalTest extends \PHPUnit_Framework_TestCase
+class FunctionalTest extends TestCase
 {
     public function setUp()
     {
@@ -31,29 +32,4 @@ public function testResolveInvalidRejects()
 
         $this->loop->run();
     }
-
-    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 createCallableMock()
-    {
-        return $this->getMock('React\Tests\Dns\CallableStub');
-    }
 }

tests/Query/CachedExecutorTest.php

@@ -2,13 +2,14 @@
 
 namespace React\Tests\Dns\Query;
 
+use React\Tests\Dns\TestCase;
 use React\Dns\Query\CachedExecutor;
 use React\Dns\Query\Query;
 use React\Dns\Model\Message;
 use React\Dns\Model\Record;
 use React\Promise;
 
-class CachedExecutorTest extends \PHPUnit_Framework_TestCase
+class CachedExecutorTest extends TestCase
 {
     /**
      * @covers React\Dns\Query\CachedExecutor
@@ -87,21 +88,6 @@ private function callQueryCallbackWithAddress($address)
         });
     }
 
-    protected function expectCallableOnce()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke');
-
-        return $mock;
-    }
-
-    protected function createCallableMock()
-    {
-        return $this->getMock('React\Tests\Socket\Stub\CallableStub');
-    }
-
     private function createExecutorMock()
     {
         return $this->getMock('React\Dns\Query\ExecutorInterface');

tests/Query/RetryExecutorTest.php

@@ -2,14 +2,15 @@
 
 namespace React\Tests\Dns\Query;
 
+use React\Tests\Dns\TestCase;
 use React\Dns\Query\RetryExecutor;
 use React\Dns\Query\Query;
 use React\Dns\Model\Message;
 use React\Dns\Query\TimeoutException;
 use React\Dns\Model\Record;
 use React\Promise;
 
-class RetryExecutorTest extends \PHPUnit_Framework_TestCase
+class RetryExecutorTest extends TestCase
 {
     /**
     * @covers React\Dns\Query\RetryExecutor

tests/Resolver/FactoryTest.php

@@ -3,8 +3,9 @@
 namespace React\Tests\Dns\Resolver;
 
 use React\Dns\Resolver\Factory;
+use React\Tests\Dns\TestCase;
 
-class FactoryTest extends \PHPUnit_Framework_TestCase
+class FactoryTest extends TestCase
 {
     /** @test */
     public function createShouldCreateResolver()

tests/bootstrap.php

@@ -1,7 +1,60 @@
 <?php
 
-$loader = @include __DIR__ . '/../vendor/autoload.php';
-if (!$loader) {
-    $loader = require __DIR__ . '/../../../../vendor/autoload.php';
+namespace React\Tests\Dns;
+
+use React\Promise\Deferred;
+
+require __DIR__ . '/../vendor/autoload.php';
+
+class TestCase extends \PHPUnit_Framework_TestCase
+{
+    protected function expectCallableOnce()
+    {
+        $mock = $this->createCallableMock();
+        $mock
+            ->expects($this->once())
+            ->method('__invoke');
+
+        return $mock;
+    }
+
+    protected function expectCallableOnceWith($value)
+    {
+        $mock = $this->createCallableMock();
+        $mock
+            ->expects($this->once())
+            ->method('__invoke')
+            ->with($this->equalTo($value));
+
+        return $mock;
+    }
+
+    protected function expectCallableNever()
+    {
+        $mock = $this->createCallableMock();
+        $mock
+            ->expects($this->never())
+            ->method('__invoke');
+
+        return $mock;
+    }
+
+    protected function createCallableMock()
+    {
+        return $this->getMock('React\Tests\Dns\CallableStub');
+    }
+
+    protected function createPromiseResolved($value = null)
+    {
+        $deferred = new Deferred();
+        $deferred->resolve($value);
+        return $deferred->promise();
+    }
+
+    protected function createPromiseRejected($value = null)
+    {
+        $deferred = new Deferred();
+        $deferred->reject($value);
+        return $deferred->promise();
+    }
 }
-$loader->addPsr4('React\\Tests\\Dns\\', __DIR__);