Merge pull request #445 from heiglandreas/updateToPHPUnit6+

Adapt tests to work with PHPUnit > 5
joindin · Feb 11, 2019 · 0f70ae5 · 0f70ae5
2 parents 078d380 + 0969710
commit 0f70ae5
Show file tree

Hide file tree

Showing 18 changed files with 55 additions and 22 deletions.
diff --git a/tests/controllers/EventHostsControllerTest.php b/tests/controllers/EventHostsControllerTest.php
@@ -3,8 +3,9 @@
 namespace JoindinTest\Controller;
 
 use Mockery as M;
+use PHPUnit\Framework\TestCase;
 
-class EventHostsControllerTest extends \PHPUnit_Framework_TestCase
+class EventHostsControllerTest extends TestCase
 {
     /**
      * @expectedException \Exception

diff --git a/tests/controllers/TalkBase.php b/tests/controllers/TalkBase.php
@@ -11,8 +11,9 @@
 use TalkMapper;
 use TalkModel;
 use UserMapper;
+use PHPUnit\Framework\TestCase;
 
-class TalkBase extends PHPUnit_Framework_TestCase
+class TalkBase extends TestCase
 {
     protected function createTalkMapper(mockPDO $db, Request $request, $expetcedCalls = 1)
     {

diff --git a/tests/controllers/TokenControllerTest.php b/tests/controllers/TokenControllerTest.php
@@ -2,7 +2,9 @@
 
 namespace JoindinTest\Controller;
 
-class TokenControllerTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class TokenControllerTest extends TestCase
 {
     private $request;
 

diff --git a/tests/controllers/UsersControllerTest.php b/tests/controllers/UsersControllerTest.php
@@ -2,7 +2,9 @@
 
 namespace JoindinTest\Controller;
 
-class UsersControllerTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class UsersControllerTest extends TestCase
 {
 
     /**

diff --git a/tests/inc/HeaderTest.php b/tests/inc/HeaderTest.php
@@ -10,9 +10,11 @@
 
 namespace JoindinTest\Inc;
 
+use PHPUnit\Framework\TestCase;
+
 require_once __DIR__ . '/../../src/inc/Header.php';
 
-class HeaderTest extends \PHPUnit_Framework_TestCase
+class HeaderTest extends TestCase
 {
 
     public function testParseParamsWithEmbededSeparator()

diff --git a/tests/inc/RequestTest.php b/tests/inc/RequestTest.php
@@ -1,9 +1,11 @@
 <?php
 namespace JoindinTest\Inc;
 
+use PHPUnit\Framework\TestCase;
+
 require_once __DIR__ . '/../../src/inc/Request.php';
 
-class RequestTest extends \PHPUnit_Framework_TestCase
+class RequestTest extends TestCase
 {
     /**
      * Make sure we have everything we need - in this case the config

diff --git a/tests/inc/TalkCommentEmailServiceTest.php b/tests/inc/TalkCommentEmailServiceTest.php
@@ -3,10 +3,12 @@
 namespace JoindinTest\Inc;
 
 use TalkModel;
+use TalkCommentEmailService;
+use PHPUnit\Framework\TestCase;
 
 require_once __DIR__.'/../../src/services/TalkCommentEmailService.php';
 
-class TalkCommentEmailServiceTest extends \PHPUnit_Framework_Testcase
+class TalkCommentEmailServiceTest extends Testcase
 {
 
     protected $config = [
@@ -33,7 +35,7 @@ public function createService()
         $talk       = new TalkModel(["talk_title" => "sample talk"]);
         $comment    = ["comments" => [["comment" => "test comment", "rating" => 3]]];
 
-        $service = new \TalkCommentEmailService($this->config, $recipients, $talk, $comment);
+        $service = new TalkCommentEmailService($this->config, $recipients, $talk, $comment);
         $this->assertInstanceOf('TalkCommentEmailService', $service);
     }
 
@@ -50,7 +52,7 @@ public function createServiceWithEmailRedirect()
         $talk                     = new TalkModel(["talk_title" => "sample talk"]);
         $comment                  = ["comments" => [["comment" => "test comment", "rating" => 3]]];
 
-        $service = new \TalkCommentEmailService($config, $recipients, $talk, $comment);
+        $service = new TalkCommentEmailService($config, $recipients, $talk, $comment);
         $this->assertEquals(["[email protected]"], $service->getRecipients());
     }
 
@@ -65,7 +67,7 @@ public function templateReplacements()
         $talk       = new TalkModel(["talk_title" => "sample talk"]);
         $comment    = ["comments" => [["comment" => "test comment", "rating" => 3]]];
 
-        $service               = new \TalkCommentEmailService($this->config, $recipients, $talk, $comment);
+        $service               = new TalkCommentEmailService($this->config, $recipients, $talk, $comment);
         $service->templatePath = __DIR__.'/../../src/views/emails/';
 
         $template     = "testTemplate.md";
@@ -94,7 +96,7 @@ public function markdownTransform()
         $talk       = new TalkModel(["talk_title" => "sample talk"]);
         $comment    = ["comments" => [["comment" => "test comment", "rating" => 3]]];
 
-        $service = new \TalkCommentEmailService($this->config, $recipients, $talk, $comment);
+        $service = new TalkCommentEmailService($this->config, $recipients, $talk, $comment);
 
         $html = $service->markdownToHtml($markdown);
         $this->assertEquals(

diff --git a/tests/models/ApiMapperTest.php b/tests/models/ApiMapperTest.php
@@ -1,10 +1,12 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
+
 require_once __DIR__ . '/TestApiMapper.php';
 /**
  *
  */
-class ApiMapperTest extends PHPUnit_Framework_TestCase
+class ApiMapperTest extends TestCase
 {
     public function setup()
     {

diff --git a/tests/models/EventHostMapperTest.php b/tests/models/EventHostMapperTest.php
@@ -1,6 +1,8 @@
 <?php
 
-class EventHostMapperTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class EventHostMapperTest extends TestCase
 {
     public function testThatAddingHostToEventCallsExpectedInsert()
     {

diff --git a/tests/models/OauthModelTest.php b/tests/models/OauthModelTest.php
@@ -1,6 +1,8 @@
 <?php
 
-class OauthModelTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class OauthModelTest extends TestCase
 {
     public function setup()
     {

diff --git a/tests/models/TalkMapperTest.php b/tests/models/TalkMapperTest.php
@@ -6,8 +6,9 @@
 use PHPUnit_Framework_TestCase;
 use Request;
 use TalkMapper;
+use PHPUnit\Framework\TestCase;
 
-class TalkMapperTest extends PHPUnit_Framework_TestCase
+class TalkMapperTest extends TestCase
 {
     public function testMediaTypesAreAddedCorrectly()
     {

diff --git a/tests/routers/ApiRouterTest.php b/tests/routers/ApiRouterTest.php
@@ -1,13 +1,15 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
+
 require_once __DIR__ . '/../../src/inc/Request.php';
 
 /**
  * A class to test ApiRouter
  *
  * @covers ApiRouter
  */
-class ApiRouterTest extends PHPUnit_Framework_TestCase
+class ApiRouterTest extends TestCase
 {
 
     /**

diff --git a/tests/routers/DefaultRouterTest.php b/tests/routers/DefaultRouterTest.php
@@ -1,13 +1,15 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
+
 require_once __DIR__ . '/../../src/inc/Request.php';
 
 /**
  * A class to test DefaultRouter
  *
  * @covers DefaultRouter
  */
-class DefaultRouterTest extends PHPUnit_Framework_TestCase
+class DefaultRouterTest extends TestCase
 {
 
     /**

diff --git a/tests/routers/RouteTest.php b/tests/routers/RouteTest.php
@@ -1,11 +1,13 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * Class to test Route
  *
  * @covers Route
  */
-class RouteTest extends PHPUnit_Framework_TestCase
+class RouteTest extends TestCase
 {
 
     /**

diff --git a/tests/routers/RouterTest.php b/tests/routers/RouterTest.php
@@ -1,13 +1,15 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
+
 require_once __DIR__ . '/../../src/inc/Request.php';
 
 /**
  * A class to test DefaultRouter
  *
  * @covers BaseRouter
  */
-class RouterTest extends PHPUnit_Framework_TestCase
+class RouterTest extends TestCase
 {
 
     /**

diff --git a/tests/routers/VersionedRouterTest.php b/tests/routers/VersionedRouterTest.php
@@ -1,13 +1,15 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
+
 require_once __DIR__ . '/../../src/inc/Request.php';
 
 /**
  * A class to test VersionedRouter
  *
  * @covers VersionedRouter
  */
-class VersionedRouterTest extends PHPUnit_Framework_TestCase
+class VersionedRouterTest extends TestCase
 {
 
     /**

diff --git a/tests/views/ApiViewTest.php b/tests/views/ApiViewTest.php
@@ -1,9 +1,11 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * @covers ApiView
  */
-class ApiViewTest extends PHPUnit_Framework_TestCase
+class ApiViewTest extends TestCase
 {
     /**
      * @runInSeparateProcess

diff --git a/tests/views/JsonViewTest.php b/tests/views/JsonViewTest.php
@@ -1,9 +1,11 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * @covers JsonView
  */
-class JsonViewTest extends PHPUnit_Framework_TestCase
+class JsonViewTest extends TestCase
 {
 
     /**