Move tests to the Fhaculty\Graph\Tests namespace.

tomzx · tomzx · commit aa3d5be58927 · 2016-07-07T16:09:43.000-04:00
Update composer.json to use autoload-dev to autoload the new Fhaculty\Graph\Tests namespace.
Rename bootstrap.php to TestCase.php and remove the unnecessary include_once.
Update phpunit.xml.dist to use vendor/autoload.php instead of tests/bootstrap.php.
diff --git a/composer.json b/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"
diff --git a/phpunit.xml.dist b/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>
diff --git a/tests/Attribute/AbstractAttributeAwareTest.php b/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();
diff --git a/tests/Attribute/AttributeBagContainerTest.php b/tests/Attribute/AttributeBagContainerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Attribute;
+
 use Fhaculty\Graph\Attribute\AttributeBagContainer;
 
 class AttributeBagContainerTest extends AbstractAttributeAwareTest
diff --git a/tests/Attribute/AttributeBagNamespacedTest.php b/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;
diff --git a/tests/Attribute/AttributeBagReferenceTest.php b/tests/Attribute/AttributeBagReferenceTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Attribute;
+
 use Fhaculty\Graph\Attribute\AttributeBagReference;
 
 class AttributeBagReferenceTest extends AbstractAttributeAwareTest
diff --git a/tests/Edge/EdgeAttributesTest.php b/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
diff --git a/tests/Edge/EdgeBaseTest.php b/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;
diff --git a/tests/Edge/EdgeDirectedTest.php b/tests/Edge/EdgeDirectedTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Edge;
+
 class EdgeDirectedTest extends EdgeBaseTest
 {
     protected function createEdge()
diff --git a/tests/Edge/EdgeUndirectedTest.php b/tests/Edge/EdgeUndirectedTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Edge;
+
 class EdgeUndirectedTest extends EdgeBaseTest
 {
     protected function createEdge()
diff --git a/tests/Exception/NegativeCycleExceptionTest.php b/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;
 
diff --git a/tests/GraphTest.php b/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;
diff --git a/tests/Set/BaseVerticesTest.php b/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;
 
diff --git a/tests/Set/EdgesTest.php b/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;
diff --git a/tests/Set/VerticesMapTest.php b/tests/Set/VerticesMapTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Fhaculty\Graph\Tests\Set;
+
 use Fhaculty\Graph\Set\VerticesMap;
 
 class VerticesMapTest extends BaseVerticesTest
diff --git a/tests/Set/VerticesTest.php b/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;
diff --git a/tests/TestCase.php b/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
 {
diff --git a/tests/VertexTest.php b/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
diff --git a/tests/WalkTest.php b/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;

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,13 @@`
`1`	`1`	`<?php`
`2`	`2`
	`3`	`+namespace Fhaculty\Graph\Tests\Edge;`
	`4`	`+`
`3`	`5`	`use Fhaculty\Graph\Graph;`
`4`	`6`	`use Fhaculty\Graph\Edge\Base as Edge;`
	`7`	`+use Fhaculty\Graph\Tests\TestCase;`
`5`	`8`
`6`	`9`	`class EdgeAttributesTest extends TestCase`
`7`	`10`	`{`
`8`		`-`
`9`	`11`	`/**`
`10`	`12`	`*`
`11`	`13`	`* @var Edge`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
	`3`	`+namespace Fhaculty\Graph\Tests\Edge;`
	`4`	`+`
`3`	`5`	`class EdgeDirectedTest extends EdgeBaseTest`
`4`	`6`	`{`
`5`	`7`	`protected function createEdge()`