Refactored CheckRequest and CheckResponse traits

WIP Controller\Output
Restructuring the tests (one test per trait)

4 files changed, 53 insertions, 50 deletions

diff --git a/tests/support/RouteActionController.php b/tests/support/RouteActionController.php
new file mode 100644
index 0000000..66625a9
--- /dev/null
+++ b/tests/support/RouteActionController.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Jasny\Controller;
+
+use Jasny\Controller;
+
+/**
+ * Class for testing 'RouteAction' trait
+ */
+class RouteActionController extends Controller
+{
+    use Controller\RouteAction;
+}
diff --git a/tests/support/SessionController.php b/tests/support/SessionController.php
new file mode 100644
index 0000000..6758419
--- /dev/null
+++ b/tests/support/SessionController.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Jasny\Controller;
+
+use Jasny\Controller;
+
+/**
+ * Class for testing 'Session' trait
+ */
+abstract class SessionController extends Controller
+{
+    use Controller\Session;
+}
diff --git a/tests/support/TestController.php b/tests/support/TestController.php
deleted file mode 100644
index e0bdb7b..0000000
--- a/tests/support/TestController.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-use Jasny\Controller;
-use Jasny\Controller\RouteAction;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-
-/**
- * Class for testing 'RouteAction' trait
- */
-class TestController extends Controller
-{
-    use RouteAction;
-
-    /**
-     * Test action for executing router
-     *
-     * @param mixed $param1
-     * @param mixed $param2
-     * @return ResponseInterface
-     */
-    public function testRunAction($param1, $param2 = 'defaultValue')
-    {
-        $response = $this->getResponse();
-
-        $response->actionCalled = true;
-        $response->param1 = $param1;
-        $response->param2 = $param2;
-
-        return $response;
-    }
-
-    /**
-     * Test action for executing router
-     *
-     * @param mixed $param1
-     * @param mixed $param2
-     * @return ResponseInterface
-     */
-    public function defaultAction($param1, $param2 = 'defaultValue')
-    {
-        $response = $this->getResponse();
-
-        $response->defaultActionCalled = true;
-        $response->param1 = $param1;
-        $response->param2 = $param2;
-
-        return $response;
-    }
-}
diff --git a/tests/support/TestHelper.php b/tests/support/TestHelper.php
new file mode 100644
index 0000000..01347f4
--- /dev/null
+++ b/tests/support/TestHelper.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Jasny\Controller;
+
+use Jasny\Controller;
+
+/**
+ * Additional test methods
+ */
+trait TestHelper
+{
+    /**
+     * Get mock for controller
+     *
+     * @param array $methods  Methods to mock
+     * @return Controller|\PHPUnit_Framework_MockObject_MockObject
+     */
+    public function getController($methods = [])
+    {
+        $builder = $this->getMockBuilder(Controller::class)->disableOriginalConstructor();
+        if ($methods) {
+            $builder->setMethods($methods);
+        }
+
+        return $builder->getMockForAbstractClass();
+    }
+}