Clean up test suite

SimonFrings · SimonFrings · commit 44a9a64e027a · 2020-06-09T12:43:27.000+02:00
diff --git a/composer.json b/composer.json
@@ -13,6 +13,9 @@
     "autoload": {
         "psr-4": { "Clue\\React\\Term\\": "src/" }
     },
+    "autoload-dev": {
+        "psr-4": { "Clue\\Tests\\React\\Term\\": "tests/" }
+    },
     "require": {
         "php": ">=5.3",
         "react/stream": "^1.0 || ^0.7"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="tests/bootstrap.php"
-         colors="true"
->
+<phpunit bootstrap="vendor/autoload.php" colors="true">
     <testsuites>
-        <testsuite>
+        <testsuite name="Term Test Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
diff --git a/tests/ControlCodeParserTest.php b/tests/ControlCodeParserTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Term;
+
 use Clue\React\Term\ControlCodeParser;
 use React\Stream\ThroughStream;
 
diff --git a/tests/FunctionalControlCodeParserTest.php b/tests/FunctionalControlCodeParserTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Term;
+
 use Clue\React\Term\ControlCodeParser;
 use React\EventLoop\Factory;
 use React\Stream\ReadableResourceStream;
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,10 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../vendor/autoload.php';
+namespace Clue\Tests\React\Term;
 
-error_reporting(-1);
-
-class TestCase extends PHPUnit\Framework\TestCase
+class TestCase extends \PHPUnit\Framework\TestCase
 {
     protected function expectCallableNever()
     {
@@ -53,14 +51,6 @@ protected function expectCallableOnceParameter($type)
      */
     protected function createCallableMock()
     {
-        return $this->getMockBuilder('CallableStub')->getMock();
+        return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
     }
 }
-
-class CallableStub
-{
-    public function __invoke()
-    {
-    }
-}
-

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-require_once __DIR__ . '/../vendor/autoload.php';`
	`3`	`+namespace Clue\Tests\React\Term;`
`4`	`4`
`5`		`-error_reporting(-1);`
`6`		`-`
`7`		`-class TestCase extends PHPUnit\Framework\TestCase`
	`5`	`+class TestCase extends \PHPUnit\Framework\TestCase`
`8`	`6`	`{`
`9`	`7`	`protected function expectCallableNever()`
`10`	`8`	`{`
`@@ -53,14 +51,6 @@ protected function expectCallableOnceParameter($type)`
`53`	`51`	`*/`
`54`	`52`	`protected function createCallableMock()`
`55`	`53`	`{`
`56`		`- return $this->getMockBuilder('CallableStub')->getMock();`
	`54`	`+ return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();`
`57`	`55`	`}`
`58`	`56`	`}`
`59`		`-`
`60`		`-class CallableStub`
`61`		`-{`
`62`		`- public function __invoke()`
`63`		`- {`
`64`		`- }`
`65`		`-}`
`66`		`-`