Merge pull request #11 from clue-labs/tests

Simplify test bootstrapping logic via Composer

Author: WyriHaximus

composer.json

@@ -14,6 +14,9 @@
         "psr-4": { "React\\Promise\\Stream\\" : "src/" },
         "files": [ "src/functions_include.php" ]
     },
+    "autoload-dev": {
+        "psr-4": { "React\\Tests\\Promise\\Stream\\": "tests/" }
+    },
     "require": {
         "php": ">=5.3",
         "react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4 || ^0.3",

phpunit.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="tests/bootstrap.php"
+<phpunit bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"

tests/AllTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace React\Tests\Promise\Stream;
+
 use React\Promise\Stream;
 use React\Stream\ThroughStream;
 

tests/BufferTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace React\Tests\Promise\Stream;
+
 use Clue\React\Block;
 use React\EventLoop\Factory;
 use React\Promise\Stream;

tests/CallableStub.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace React\Tests\Promise\Stream;
+
+class CallableStub
+{
+    public function __invoke()
+    {
+    }
+}

tests/FirstTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace React\Tests\Promise\Stream;
+
 use React\Promise\Stream;
 use React\Stream\ThroughStream;
 

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

@@ -1,8 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../vendor/autoload.php';
+namespace React\Tests\Promise\Stream;
 
-class TestCase extends PHPUnit_Framework_TestCase
+class TestCase extends \PHPUnit_Framework_TestCase
 {
     protected function expectCallableOnce()
     {
@@ -51,7 +51,7 @@ protected function expectCallableNever()
      */
     protected function createCallableMock()
     {
-        return $this->getMock('CallableStub');
+        return $this->getMock('React\Tests\Promise\Stream\CallableStub');
     }
 
     protected function expectPromiseResolve($promise)
@@ -81,11 +81,3 @@ protected function expectPromiseReject($promise)
         return $promise;
     }
 }
-
-class CallableStub
-{
-    public function __invoke()
-    {
-    }
-}
-

tests/UnwrapReadableTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace React\Tests\Promise\Stream;
+
 use Clue\React\Block;
 use React\EventLoop\Factory;
 use React\Promise;

tests/UnwrapWritableTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace React\Tests\Promise\Stream;
+
 use Clue\React\Block;
 use React\EventLoop\Factory;
 use React\Promise;