Add test namespaces and simplify test bootstrap logic

composer.json

@@ -11,7 +11,14 @@
         }
     ],
     "autoload": {
-        "psr-4": {"React\\Datagram\\": "src"}
+        "psr-4": {
+            "React\\Datagram\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "React\\Tests\\Datagram\\": "tests"
+        }
     },
     "require": {
         "php": ">=5.3",

phpunit.xml.dist

@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit colors="true" bootstrap="./tests/bootstrap.php">
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         bootstrap="vendor/autoload.php"
+>
     <testsuites>
         <testsuite name="Datagram Test Suite">
             <directory>./tests/</directory>

tests/FactoryTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace React\Tests\Datagram;
+
 use React\Datagram\Socket;
 use React\Datagram\Factory;
 use Clue\React\Block;
@@ -13,7 +15,7 @@ class FactoryTest extends TestCase
 
     public function setUp()
     {
-        $this->loop = React\EventLoop\Factory::create();
+        $this->loop = \React\EventLoop\Factory::create();
         $this->resolver = $this->createResolverMock();
         $this->factory = new Factory($this->loop, $this->resolver);
     }

tests/SocketTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace React\Tests\Datagram;
+
 use React\Datagram\Socket;
 use Clue\React\Block;
 
@@ -10,8 +12,8 @@ class SocketTest extends TestCase
 
     public function setUp()
     {
-        $this->loop = React\EventLoop\Factory::create();
-        $this->factory = new React\Datagram\Factory($this->loop, $this->createResolverMock());
+        $this->loop = \React\EventLoop\Factory::create();
+        $this->factory = new \React\Datagram\Factory($this->loop, $this->createResolverMock());
     }
 
     public function testCreateClientCloseWillNotBlock()

tests/bootstrap.php → tests/TestCase.php

@@ -1,8 +1,8 @@
 <?php
 
-require __DIR__ . '/../vendor/autoload.php';
+namespace React\Tests\Datagram;
 
-abstract class TestCase extends PHPUnit_Framework_TestCase
+abstract class TestCase extends \PHPUnit_Framework_TestCase
 {
     protected function expectCallableOnce()
     {
@@ -26,18 +26,11 @@ protected function expectCallableNever()
 
     protected function createCallableMock()
     {
-        return $this->getMockBuilder('CallableStub')->getMock();
+        return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
     }
 
     protected function createResolverMock()
     {
         return $this->getMockBuilder('React\Dns\Resolver\ResolverInterface')->getMock();
     }
 }
-
-class CallableStub
-{
-    public function __invoke()
-    {
-    }
-}