Clean up test suite

clue · May 28, 2020 · 9575f97 · 9575f97
1 parent 7b95cd4
commit 9575f97
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -22,5 +22,8 @@
     },
     "autoload": {
         "psr-4": { "Clue\\React\\Zenity\\": "src/" }
+    },
+    "autoload-dev": {
+        "psr-4": { "Clue\\Tests\\React\\Zenity\\": "tests/" }
     }
 }
diff --git a/phpunit.xml.dist b/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="Zenity React Test Suite">
             <directory>./tests/</directory>

diff --git a/tests/Dialog/AbstractDialogTest.php b/tests/Dialog/AbstractDialogTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use Clue\React\Zenity\Dialog\AbstractDialog;
+use Clue\Tests\React\Zenity\TestCase;
 
 abstract class AbstractDialogTest extends TestCase
 {

diff --git a/tests/FunctionalLauncherTest.php b/tests/FunctionalLauncherTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Zenity;
+
 use Clue\React\Block;
 use Clue\React\Zenity\Launcher;
 use Clue\React\Zenity\Zen\BaseZen;

diff --git a/tests/bootstrap.php → tests/TestCase.php b/tests/bootstrap.php → tests/TestCase.php
@@ -1,8 +1,10 @@
 <?php
 
-require_once __DIR__ . '/../vendor/autoload.php';
+namespace Clue\Tests\React\Zenity;
 
-class TestCase extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase as BaseTestCase;
+
+class TestCase extends BaseTestCase
 {
     protected function expectCallableOnce()
     {
@@ -42,7 +44,7 @@ protected function expectCallableNever()
      */
     protected function createCallableMock()
     {
-        return $this->getMockBuilder('CallableStub')->getMock();
+        return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
     }
 
     protected function expectPromiseResolve($promise)
@@ -63,11 +65,3 @@ protected function expectPromiseReject($promise)
         return $promise;
     }
 }
-
-class CallableStub
-{
-    public function __invoke()
-    {
-    }
-}
-
diff --git a/tests/Zen/BaseZenTest.php b/tests/Zen/BaseZenTest.php
@@ -3,6 +3,7 @@
 use Clue\React\Zenity\Zen\BaseZen;
 use React\EventLoop\Factory;
 use React\ChildProcess\Process;
+use Clue\Tests\React\Zenity\TestCase;
 
 abstract class BaseZenTest extends TestCase
 {

diff --git a/tests/Zen/FunctionalBaseZenTest.php b/tests/Zen/FunctionalBaseZenTest.php
@@ -4,6 +4,7 @@
 use Clue\React\Zenity\Zen\BaseZen;
 use React\EventLoop\Factory;
 use React\ChildProcess\Process;
+use Clue\Tests\React\Zenity\TestCase;
 
 class FunctionalBaseZenTest extends TestCase
 {