Clean up test suite

SimonFrings · SimonFrings · commit 39031e408123 · 2020-06-01T11:03:02.000+02:00
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
         "psr-4": { "Clue\\React\\HttpProxy\\": "src/" }
     },
     "autoload-dev": {
-        "psr-4": { "Tests\\Clue\\React\\HttpProxy\\": "tests/" }
+        "psr-4": { "Clue\\Tests\\React\\HttpProxy\\": "tests/" }
     },
     "require": {
         "php": ">=5.3",
diff --git a/tests/AbstractTestCase.php b/tests/AbstractTestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Clue\React\HttpProxy;
+namespace Clue\Tests\React\HttpProxy;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-abstract class AbstractTestCase extends PHPUnit_Framework_TestCase
+abstract class AbstractTestCase extends \PHPUnit\Framework\TestCase
 {
     protected function expectCallableNever()
     {
@@ -52,14 +52,7 @@ protected function expectCallableOnceWithException($class, $message, $code)
      */
     protected function createCallableMock()
     {
-        return $this->getMockBuilder('Tests\\Clue\\React\\HttpProxy\\CallableStub')->getMock();
-    }
-}
-
-class CallableStub
-{
-    public function __invoke()
-    {
+        return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
     }
 }
 
diff --git a/tests/FunctionalTest.php b/tests/FunctionalTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Clue\React\HttpProxy;
+namespace Clue\Tests\React\HttpProxy;
 
 use React\EventLoop\Factory;
 use Clue\React\HttpProxy\ProxyConnector;
diff --git a/tests/ProxyConnectorTest.php b/tests/ProxyConnectorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Clue\React\HttpProxy;
+namespace Clue\Tests\React\HttpProxy;
 
 use Clue\React\HttpProxy\ProxyConnector;
 use React\Promise\Promise;

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Tests\Clue\React\HttpProxy;`
	`3`	`+namespace Clue\Tests\React\HttpProxy;`
`4`	`4`
`5`		`-use PHPUnit_Framework_TestCase;`
	`5`	`+use PHPUnit\Framework\TestCase;`
`6`	`6`
`7`		`-abstract class AbstractTestCase extends PHPUnit_Framework_TestCase`
	`7`	`+abstract class AbstractTestCase extends \PHPUnit\Framework\TestCase`
`8`	`8`	`{`
`9`	`9`	`protected function expectCallableNever()`
`10`	`10`	`{`
`@@ -52,14 +52,7 @@ protected function expectCallableOnceWithException($class, $message, $code)`
`52`	`52`	`*/`
`53`	`53`	`protected function createCallableMock()`
`54`	`54`	`{`
`55`		`- return $this->getMockBuilder('Tests\\Clue\\React\\HttpProxy\\CallableStub')->getMock();`
`56`		`- }`
`57`		`-}`
`58`		`-`
`59`		`-class CallableStub`
`60`		`-{`
`61`		`- public function __invoke()`
`62`		`- {`
	`55`	`+ return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();`
`63`	`56`	`}`
`64`	`57`	`}`
`65`	`58`