Move tests to the Fhaculty\Graph\Tests namespace

composer.json

@@ -2,11 +2,24 @@
     "name": "clue/graph",
     "type": "library",
     "description": "A mathematical graph/network library written in PHP",
-    "keywords": ["graph", "network", "mathematical", "vertex", "edge"],
+    "keywords": [
+        "graph",
+        "network",
+        "mathematical",
+        "vertex",
+        "edge"
+    ],
     "homepage": "https://github.com/clue/graph",
     "license": "MIT",
     "autoload": {
-        "psr-4": {"Fhaculty\\Graph\\": "src/"}
+        "psr-4": {
+            "Fhaculty\\Graph\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Fhaculty\\Graph\\Tests\\": "tests/"
+        }
     },
     "require": {
         "php": ">=5.3.0"

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"
          convertWarningsToExceptions="true"
@@ -15,4 +15,4 @@
             <directory>./src/</directory>
         </whitelist>
     </filter>
-</phpunit>
+</phpunit>

tests/Attribute/AbstractAttributeAwareTest.php

@@ -1,6 +1,10 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Attribute;
+
 use Fhaculty\Graph\Attribute\AttributeAware;
+use Fhaculty\Graph\Tests\TestCase;
+
 abstract class AbstractAttributeAwareTest extends TestCase
 {
     abstract protected function createAttributeAware();

tests/Attribute/AttributeBagContainerTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Attribute;
+
 use Fhaculty\Graph\Attribute\AttributeBagContainer;
 
 class AttributeBagContainerTest extends AbstractAttributeAwareTest

tests/Attribute/AttributeBagNamespacedTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Attribute;
+
 use Fhaculty\Graph\Graph;
 use Fhaculty\Graph\Attribute\AttributeBagNamespaced;
 use Fhaculty\Graph\Attribute\AttributeAware;

tests/Attribute/AttributeBagReferenceTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Attribute;
+
 use Fhaculty\Graph\Attribute\AttributeBagReference;
 
 class AttributeBagReferenceTest extends AbstractAttributeAwareTest

tests/Edge/EdgeAttributesTest.php

@@ -1,11 +1,13 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Edge;
+
 use Fhaculty\Graph\Graph;
 use Fhaculty\Graph\Edge\Base as Edge;
+use Fhaculty\Graph\Tests\TestCase;
 
 class EdgeAttributesTest extends TestCase
 {
-
     /**
      *
      * @var Edge

tests/Edge/EdgeBaseTest.php

@@ -1,11 +1,13 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Edge;
+
 use Fhaculty\Graph\Graph;
 use Fhaculty\Graph\Edge\Base as Edge;
+use Fhaculty\Graph\Tests\Attribute\AbstractAttributeAwareTest;
 
 abstract class EdgeBaseTest extends AbstractAttributeAwareTest
 {
-
     protected $graph;
     protected $v1;
     protected $v2;

tests/Edge/EdgeDirectedTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Edge;
+
 class EdgeDirectedTest extends EdgeBaseTest
 {
     protected function createEdge()

tests/Edge/EdgeUndirectedTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Edge;
+
 class EdgeUndirectedTest extends EdgeBaseTest
 {
     protected function createEdge()

tests/Exception/NegativeCycleExceptionTest.php

@@ -1,5 +1,8 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Exception;
+
+use Fhaculty\Graph\Tests\TestCase;
 use Fhaculty\Graph\Walk;
 use Fhaculty\Graph\Exception\NegativeCycleException;
 

tests/GraphTest.php

@@ -1,6 +1,9 @@
 <?php
 
+namespace Fhaculty\Graph\Tests;
+
 use Fhaculty\Graph\Exception\RuntimeException;
+use Fhaculty\Graph\Tests\Attribute\AbstractAttributeAwareTest;
 use Fhaculty\Graph\Vertex;
 use Fhaculty\Graph\Exception\OverflowException;
 use Fhaculty\Graph\Exception\InvalidArgumentException;

tests/Set/BaseVerticesTest.php

@@ -1,7 +1,10 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Set;
+
 use Fhaculty\Graph\Exception\OutOfBoundsException;
 use Fhaculty\Graph\Graph;
+use Fhaculty\Graph\Tests\TestCase;
 use Fhaculty\Graph\Vertex;
 use Fhaculty\Graph\Set\Vertices;
 

tests/Set/EdgesTest.php

@@ -1,7 +1,10 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Set;
+
 use Fhaculty\Graph\Exception\OutOfBoundsException;
 use Fhaculty\Graph\Graph;
+use Fhaculty\Graph\Tests\TestCase;
 use Fhaculty\Graph\Vertex;
 use Fhaculty\Graph\Edge\Base as Edge;
 use Fhaculty\Graph\Set\Edges;

tests/Set/VerticesMapTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Set;
+
 use Fhaculty\Graph\Set\VerticesMap;
 
 class VerticesMapTest extends BaseVerticesTest

tests/Set/VerticesTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Set;
+
 use Fhaculty\Graph\Set\Vertices;
 use Fhaculty\Graph\Graph;
 use Fhaculty\Graph\Exception\InvalidArgumentException;

tests/bootstrap.php → tests/TestCase.php

@@ -1,12 +1,13 @@
 <?php
 
+namespace Fhaculty\Graph\Tests;
+
 use Fhaculty\Graph\Edge\Directed;
 use Fhaculty\Graph\Edge\Base as Edge;
 use Fhaculty\Graph\Graph;
 use Fhaculty\Graph\Vertex;
 use Fhaculty\Graph\Set\Vertices;
-
-(include_once __DIR__ . '/../vendor/autoload.php') OR die(PHP_EOL . 'ERROR: composer autoloader not found, run "composer install" or see README for instructions' . PHP_EOL);
+use PHPUnit_Framework_TestCase;
 
 class TestCase extends PHPUnit_Framework_TestCase
 {

tests/VertexTest.php

@@ -1,6 +1,9 @@
 <?php
 
+namespace Fhaculty\Graph\Tests;
+
 use Fhaculty\Graph\Graph;
+use Fhaculty\Graph\Tests\Attribute\AbstractAttributeAwareTest;
 use Fhaculty\Graph\Vertex;
 
 class VertexTest extends AbstractAttributeAwareTest

tests/WalkTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Fhaculty\Graph\Tests;
+
 use Fhaculty\Graph\Graph;
 use Fhaculty\Graph\Walk;
 use Fhaculty\Graph\Algorithm\Property\WalkProperty;