Tests: Moved ServiceProvider::setExpects to TestCase

2 files changed, 37 insertions, 29 deletions

diff --git a/tests/Unit/ServiceProviderTest.php b/tests/Unit/ServiceProviderTest.php
index 149e28f8..ee5e3151 100644
--- a/tests/Unit/ServiceProviderTest.php
+++ b/tests/Unit/ServiceProviderTest.php
@@ -3,8 +3,6 @@
 namespace Engelsystem\Test\Unit;
 
 use Engelsystem\Application;
-use PHPUnit\Framework\MockObject\Matcher\InvokedRecorder;
-use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 abstract class ServiceProviderTest extends TestCase
@@ -20,31 +18,4 @@ abstract class ServiceProviderTest extends TestCase
             ->setMethods($methods)
             ->getMock();
     }
-
-    /**
-     * @param MockObject      $object
-     * @param string          $method
-     * @param array           $arguments
-     * @param mixed           $return
-     * @param InvokedRecorder $times
-     */
-    protected function setExpects($object, $method, $arguments = null, $return = null, $times = null)
-    {
-        if (is_null($times)) {
-            $times = $this->once();
-        }
-
-        $invocation = $object->expects($times)
-            ->method($method);
-
-        if (is_null($arguments)) {
-            $invocation->withAnyParameters();
-        } else {
-            call_user_func_array([$invocation, 'with'], $arguments);
-        }
-
-        if (!is_null($return)) {
-            $invocation->willReturn($return);
-        }
-    }
 }
diff --git a/tests/Unit/TestCase.php b/tests/Unit/TestCase.php
new file mode 100644
index 00000000..117fba88
--- /dev/null
+++ b/tests/Unit/TestCase.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Engelsystem\Test\Unit;
+
+use PHPUnit\Framework\MockObject\Matcher\InvokedRecorder;
+use PHPUnit\Framework\TestCase as PHPUnitTestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+abstract class TestCase extends PHPUnitTestCase
+{
+    /**
+     * @param MockObject      $object
+     * @param string          $method
+     * @param array           $arguments
+     * @param mixed           $return
+     * @param InvokedRecorder $times
+     */
+    protected function setExpects($object, $method, $arguments = null, $return = null, $times = null)
+    {
+        if (is_null($times)) {
+            $times = $this->once();
+        }
+
+        $invocation = $object->expects($times)
+            ->method($method);
+
+        if (is_null($arguments)) {
+            $invocation->withAnyParameters();
+        } else {
+            call_user_func_array([$invocation, 'with'], $arguments);
+        }
+
+        if (!is_null($return)) {
+            $invocation->willReturn($return);
+        }
+    }
+}