Reorganize Tests

2020-08-15 10:11:06 -04:00 · 2020-08-15 10:11:06 -04:00 · 79d23e37a4
parent 5ba8771e93
commit 79d23e37a4
32 changed files with 23 additions and 16 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -4,10 +4,12 @@
 /.php_cs*           export-ignore
 /.travis.yml        export-ignore
 /composer.lock      export-ignore
+/coverage           export-ignore
 /docker             export-ignore
-/docker-compose.yml export-ignore
+/docker-compose*    export-ignore
 /docs               export-ignore
-/test               export-ignore
-/phpunit.xml.dist   export-ignore
-/psalm.xnk          export-ignore
+/tests              export-ignore
+/phpunit.xml*       export-ignore
+/psalm.xml          export-ignore
 /public             export-ignore
+/vendor             export-ignore
--- a/.gitignore
+++ b/.gitignore
@ -27,3 +27,4 @@ notes
 # Local overrides
 .env
 docker-compose.override.yml
+phpunit.xml
--- a/.php_cs.dist
+++ b/.php_cs.dist
@ -3,7 +3,7 @@
 $finder = PhpCsFixer\Finder::create()
    ->files()
    ->in(__DIR__ . '/src')
-    ->in(__DIR__ . '/test');
+    ->in(__DIR__ . '/tests');

 return PhpCsFixer\Config::create()
    ->setFinder($finder)
--- a/composer.json
+++ b/composer.json
@ -30,9 +30,8 @@
    },
    "autoload-dev": {
        "psr-4": {
-            "WellRESTed\\": "test/tests/unit/",
-            "WellRESTed\\Test\\": "test/src/",
-            "WellRESTed\\Test\\Integration\\": "test/tests/integration/"
+            "WellRESTed\\": "tests",
+            "WellRESTed\\Test\\": "tests"
        }
    }
 }
--- a/docker/nginx/site.conf
+++ b/docker/nginx/site.conf
@ -13,6 +13,11 @@ server {
    try_files $uri $uri/ /index.php?$args;
  }

+  # Generated Code Coverage Report
+  location /coverage {
+    alias /usr/local/src/wellrested/coverage;
+  }
+
  # Generated Documentation
  location /docs {
    alias /usr/local/src/wellrested/docs/build/html;
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@ -14,15 +14,12 @@
 			<directory suffix=".php">./src</directory>
 		</include>
 		<report>
-			<html outputDirectory="./public/coverage"/>
+			<html outputDirectory="./coverage"/>
 		</report>
 	</coverage>
 	<testsuites>
 		<testsuite name="unit">
-			<directory>./test/tests/unit</directory>
-		</testsuite>
-		<testsuite name="integration">
-			<directory>./test/tests/integration</directory>
+			<directory>./tests</directory>
 		</testsuite>
 	</testsuites>
 	<logging/>
--- a/test/tests/unit/Dispatching/DispatchStackTest.php
+++ b/test/tests/unit/Dispatching/DispatchStackTest.php
--- a/test/tests/unit/Dispatching/DispatcherTest.php
+++ b/test/tests/unit/Dispatching/DispatcherTest.php
--- a/test/src/Doubles/MiddlewareMock.php
+++ b/test/src/Doubles/MiddlewareMock.php
--- a/test/src/Doubles/NextMock.php
+++ b/test/src/Doubles/NextMock.php
--- a/test/tests/unit/Message/HeaderCollectionTest.php
+++ b/test/tests/unit/Message/HeaderCollectionTest.php
--- a/test/tests/unit/Message/MessageTest.php
+++ b/test/tests/unit/Message/MessageTest.php
--- a/test/tests/unit/Message/NullStreamTest.php
+++ b/test/tests/unit/Message/NullStreamTest.php
--- a/test/tests/unit/Message/RequestTest.php
+++ b/test/tests/unit/Message/RequestTest.php
--- a/test/tests/unit/Message/ResponseTest.php
+++ b/test/tests/unit/Message/ResponseTest.php
--- a/test/tests/unit/Message/ServerRequestMarshallerTest.php
+++ b/test/tests/unit/Message/ServerRequestMarshallerTest.php
--- a/test/tests/unit/Message/ServerRequestTest.php
+++ b/test/tests/unit/Message/ServerRequestTest.php
--- a/test/tests/unit/Message/StreamTest.php
+++ b/test/tests/unit/Message/StreamTest.php
--- a/test/tests/unit/Message/UploadedFileTest.php
+++ b/test/tests/unit/Message/UploadedFileTest.php
--- a/test/tests/unit/Message/UriTest.php
+++ b/test/tests/unit/Message/UriTest.php
--- a/test/tests/unit/Routing/Route/MethodMapTest.php
+++ b/test/tests/unit/Routing/Route/MethodMapTest.php
--- a/test/tests/unit/Routing/Route/PrefixRouteTest.php
+++ b/test/tests/unit/Routing/Route/PrefixRouteTest.php
--- a/test/tests/unit/Routing/Route/RegexRouteTest.php
+++ b/test/tests/unit/Routing/Route/RegexRouteTest.php
--- a/test/tests/unit/Routing/Route/RouteFactoryTest.php
+++ b/test/tests/unit/Routing/Route/RouteFactoryTest.php
--- a/test/tests/unit/Routing/Route/RouteTest.php
+++ b/test/tests/unit/Routing/Route/RouteTest.php
--- a/test/tests/unit/Routing/Route/StaticRouteTest.php
+++ b/test/tests/unit/Routing/Route/StaticRouteTest.php
--- a/test/tests/unit/Routing/Route/TemplateRouteTest.php
+++ b/test/tests/unit/Routing/Route/TemplateRouteTest.php
--- a/test/tests/unit/Routing/RouterTest.php
+++ b/test/tests/unit/Routing/RouterTest.php
--- a/test/tests/integration/RoutingTest.php
+++ b/test/tests/integration/RoutingTest.php
@ -1,6 +1,6 @@
 <?php

-namespace WellRESTed\Test\Integration;
+namespace WellRESTed\Routing;

 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@ -13,7 +13,10 @@ use WellRESTed\Server;
 use WellRESTed\Test\TestCase;
 use WellRESTed\Transmission\TransmitterInterface;

-/** @coversNothing */
+/**
+ * Integration test for Routing components
+ * @coversNothing
+ */
 class RoutingTest extends TestCase
 {
    /** @var Server */
--- a/test/tests/unit/ServerTest.php
+++ b/test/tests/unit/ServerTest.php
--- a/test/src/TestCase.php
+++ b/test/src/TestCase.php
--- a/test/tests/unit/Transmission/TransmitterTest.php
+++ b/test/tests/unit/Transmission/TransmitterTest.php