From dfdc06d04875ab7a9f6fa20050aa6407902b3b23 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Wed, 15 Feb 2017 16:40:18 -0500 Subject: [PATCH] Rename test base class --- tests/API/CacheTraitTest.php | 4 ++-- .../Transformer/AnimeListTransformerTest.php | 6 +++--- .../Kitsu/Transformer/AnimeTransformerTest.php | 6 +++--- .../Transformer/MangaListTransformerTest.php | 6 +++--- .../Kitsu/Transformer/MangaTransformerTest.php | 6 +++--- tests/AnimeClientTest.php | 2 +- ...ent_TestCase.php => AnimeClientTestCase.php} | 4 ++-- tests/Command/BaseCommandTest.php | 4 ++-- tests/ControllerTest.php | 2 +- tests/DispatcherTest.php | 2 +- tests/Helper/MenuHelperTest.php | 2 +- tests/MenuGeneratorTest.php | 2 +- tests/RequirementsTest.php | 2 +- tests/RoutingBaseTest.php | 2 +- tests/UrlGeneratorTest.php | 2 +- tests/UtilTest.php | 2 +- tests/bootstrap.php | 2 +- tests/mocks.php | 17 +++++++---------- 18 files changed, 35 insertions(+), 38 deletions(-) rename tests/{AnimeClient_TestCase.php => AnimeClientTestCase.php} (97%) diff --git a/tests/API/CacheTraitTest.php b/tests/API/CacheTraitTest.php index ca247442..5e953413 100644 --- a/tests/API/CacheTraitTest.php +++ b/tests/API/CacheTraitTest.php @@ -17,9 +17,9 @@ namespace Aviat\AnimeClient\Tests\API; use Aviat\AnimeClient\API\CacheTrait; -use Aviat\AnimeClient\Tests\AnimeClient_TestCase; +use Aviat\AnimeClient\Tests\AnimeClientTestCase; -class CacheTraitTest extends AnimeClient_TestCase { +class CacheTraitTest extends AnimeClientTestCase { public function setUp() { parent::setUp(); diff --git a/tests/API/Kitsu/Transformer/AnimeListTransformerTest.php b/tests/API/Kitsu/Transformer/AnimeListTransformerTest.php index 65bb5f1e..712ccc74 100644 --- a/tests/API/Kitsu/Transformer/AnimeListTransformerTest.php +++ b/tests/API/Kitsu/Transformer/AnimeListTransformerTest.php @@ -17,16 +17,16 @@ namespace Aviat\AnimeClient\Tests\API\Kitsu\Transformer; use Aviat\AnimeClient\API\Kitsu\Transformer\AnimeListTransformer; -use Aviat\AnimeClient\Tests\AnimeClient_TestCase; +use Aviat\AnimeClient\Tests\AnimeClientTestCase; use Aviat\Ion\Friend; use Aviat\Ion\Json; -class AnimeListTransformerTest extends AnimeClient_TestCase { +class AnimeListTransformerTest extends AnimeClientTestCase { public function setUp() { parent::setUp(); - $this->dir = AnimeClient_TestCase::TEST_DATA_DIR . '/Kitsu'; + $this->dir = AnimeClientTestCase::TEST_DATA_DIR . '/Kitsu'; $this->beforeTransform = Json::decodeFile("{$this->dir}/animeListItemBeforeTransform.json"); $this->afterTransform = Json::decodeFile("{$this->dir}/animeListItemAfterTransform.json"); diff --git a/tests/API/Kitsu/Transformer/AnimeTransformerTest.php b/tests/API/Kitsu/Transformer/AnimeTransformerTest.php index be90d345..d3ab1cf1 100644 --- a/tests/API/Kitsu/Transformer/AnimeTransformerTest.php +++ b/tests/API/Kitsu/Transformer/AnimeTransformerTest.php @@ -17,16 +17,16 @@ namespace Aviat\AnimeClient\Tests\API\Kitsu\Transformer; use Aviat\AnimeClient\API\Kitsu\Transformer\AnimeTransformer; -use Aviat\AnimeClient\Tests\AnimeClient_TestCase; +use Aviat\AnimeClient\Tests\AnimeClientTestCase; use Aviat\Ion\Friend; use Aviat\Ion\Json; -class AnimeTransformerTest extends AnimeClient_TestCase { +class AnimeTransformerTest extends AnimeClientTestCase { public function setUp() { parent::setUp(); - $this->dir = AnimeClient_TestCase::TEST_DATA_DIR . '/Kitsu'; + $this->dir = AnimeClientTestCase::TEST_DATA_DIR . '/Kitsu'; $this->beforeTransform = Json::decodeFile("{$this->dir}/animeBeforeTransform.json"); $this->afterTransform = Json::decodeFile("{$this->dir}/animeAfterTransform.json"); diff --git a/tests/API/Kitsu/Transformer/MangaListTransformerTest.php b/tests/API/Kitsu/Transformer/MangaListTransformerTest.php index da7847ac..7a9c9546 100644 --- a/tests/API/Kitsu/Transformer/MangaListTransformerTest.php +++ b/tests/API/Kitsu/Transformer/MangaListTransformerTest.php @@ -18,15 +18,15 @@ namespace Aviat\AnimeClient\Tests\API\Kitsu\Transformer; use Aviat\AnimeClient\API\JsonAPI; use Aviat\AnimeClient\API\Kitsu\Transformer\MangaListTransformer; -use Aviat\AnimeClient\Tests\AnimeClient_TestCase; +use Aviat\AnimeClient\Tests\AnimeClientTestCase; use Aviat\Ion\Json; -class MangaListTransformerTest extends AnimeClient_TestCase { +class MangaListTransformerTest extends AnimeClientTestCase { public function setUp() { parent::setUp(); - $this->dir = AnimeClient_TestCase::TEST_DATA_DIR . '/Kitsu'; + $this->dir = AnimeClientTestCase::TEST_DATA_DIR . '/Kitsu'; $rawBefore = Json::decodeFile("{$this->dir}/mangaListBeforeTransform.json"); $this->beforeTransform = JsonAPI::inlineRawIncludes($rawBefore, 'manga'); diff --git a/tests/API/Kitsu/Transformer/MangaTransformerTest.php b/tests/API/Kitsu/Transformer/MangaTransformerTest.php index 7ddcadea..fda3648c 100644 --- a/tests/API/Kitsu/Transformer/MangaTransformerTest.php +++ b/tests/API/Kitsu/Transformer/MangaTransformerTest.php @@ -18,15 +18,15 @@ namespace Aviat\AnimeClient\Tests\API\Kitsu\Transformer; use Aviat\AnimeClient\API\JsonAPI; use Aviat\AnimeClient\API\Kitsu\Transformer\MangaTransformer; -use Aviat\AnimeClient\Tests\AnimeClient_TestCase; +use Aviat\AnimeClient\Tests\AnimeClientTestCase; use Aviat\Ion\Json; -class MangaTransformerTest extends AnimeClient_TestCase { +class MangaTransformerTest extends AnimeClientTestCase { public function setUp() { parent::setUp(); - $this->dir = AnimeClient_TestCase::TEST_DATA_DIR . '/Kitsu'; + $this->dir = AnimeClientTestCase::TEST_DATA_DIR . '/Kitsu'; $data = Json::decodeFile("{$this->dir}/mangaBeforeTransform.json"); $baseData = $data['data'][0]['attributes']; diff --git a/tests/AnimeClientTest.php b/tests/AnimeClientTest.php index a62c1791..da4b1e68 100644 --- a/tests/AnimeClientTest.php +++ b/tests/AnimeClientTest.php @@ -2,7 +2,7 @@ namespace Aviat\AnimeClient\Tests; -class AnimeClientTest extends AnimeClient_TestCase { +class AnimeClientTest extends AnimeClientTestCase { /** * Basic sanity test for _dir function */ diff --git a/tests/AnimeClient_TestCase.php b/tests/AnimeClientTestCase.php similarity index 97% rename from tests/AnimeClient_TestCase.php rename to tests/AnimeClientTestCase.php index 3bd39053..3009714a 100644 --- a/tests/AnimeClient_TestCase.php +++ b/tests/AnimeClientTestCase.php @@ -20,7 +20,7 @@ define('TEST_VIEW_DIR', __DIR__ . '/test_views'); /** * Base class for TestCases */ -class AnimeClient_TestCase extends TestCase { +class AnimeClientTestCase extends TestCase { // Test directory constants const ROOT_DIR = ROOT_DIR; const SRC_DIR = SRC_DIR; @@ -160,4 +160,4 @@ class AnimeClient_TestCase extends TestCase { return Json::decode($rawData); } } -// End of AnimeClient_TestCase.php \ No newline at end of file +// End of AnimeClientTestCase.php \ No newline at end of file diff --git a/tests/Command/BaseCommandTest.php b/tests/Command/BaseCommandTest.php index e6cc9d0e..f70c1a58 100644 --- a/tests/Command/BaseCommandTest.php +++ b/tests/Command/BaseCommandTest.php @@ -17,11 +17,11 @@ namespace Aviat\AnimeClient\Tests\Command; use Aviat\AnimeClient\Command\BaseCommand; -use Aviat\AnimeClient\Tests\AnimeClient_TestCase; +use Aviat\AnimeClient\Tests\AnimeClientTestCase; use Aviat\Ion\Friend; use ConsoleKit\Console; -class BaseCommandTest extends AnimeClient_TestCase { +class BaseCommandTest extends AnimeClientTestCase { public function setUp() { $this->base = new BaseCommand(new Console()); diff --git a/tests/ControllerTest.php b/tests/ControllerTest.php index 477ab812..37b09abe 100644 --- a/tests/ControllerTest.php +++ b/tests/ControllerTest.php @@ -11,7 +11,7 @@ use Aviat\AnimeClient\Controller\{ Manga as MangaController }; -class ControllerTest extends AnimeClient_TestCase { +class ControllerTest extends AnimeClientTestCase { public function setUp() { diff --git a/tests/DispatcherTest.php b/tests/DispatcherTest.php index 54884117..f52f6d1e 100644 --- a/tests/DispatcherTest.php +++ b/tests/DispatcherTest.php @@ -9,7 +9,7 @@ use Monolog\Handler\TestHandler; use Monolog\Logger; -class DispatcherTest extends AnimeClient_TestCase { +class DispatcherTest extends AnimeClientTestCase { protected $container; protected $router; diff --git a/tests/Helper/MenuHelperTest.php b/tests/Helper/MenuHelperTest.php index 578746c6..7226e989 100644 --- a/tests/Helper/MenuHelperTest.php +++ b/tests/Helper/MenuHelperTest.php @@ -18,7 +18,7 @@ namespace Aviat\AnimeClient\Tests; use Aviat\AnimeClient\Helper\Menu as MenuHelper; -class MenuHelperTest extends AnimeClient_TestCase { +class MenuHelperTest extends AnimeClientTestCase { public function setUp() { diff --git a/tests/MenuGeneratorTest.php b/tests/MenuGeneratorTest.php index 003404b2..53ed0636 100644 --- a/tests/MenuGeneratorTest.php +++ b/tests/MenuGeneratorTest.php @@ -5,7 +5,7 @@ namespace Aviat\AnimeClient\Tests; use Aviat\AnimeClient\MenuGenerator; use Aviat\Ion\Friend; -class MenuGeneratorTest extends AnimeClient_TestCase { +class MenuGeneratorTest extends AnimeClientTestCase { protected $generator; protected $friend; diff --git a/tests/RequirementsTest.php b/tests/RequirementsTest.php index 620fde17..28f0ff5c 100644 --- a/tests/RequirementsTest.php +++ b/tests/RequirementsTest.php @@ -4,7 +4,7 @@ namespace Aviat\AnimeClient\Tests; use PDO; -class RequirementsTest extends AnimeClient_TestCase { +class RequirementsTest extends AnimeClientTestCase { public function testPHPVersion() { diff --git a/tests/RoutingBaseTest.php b/tests/RoutingBaseTest.php index 0ebd85aa..19f7d7bd 100644 --- a/tests/RoutingBaseTest.php +++ b/tests/RoutingBaseTest.php @@ -4,7 +4,7 @@ namespace Aviat\AnimeClient\Tests; use Aviat\AnimeClient\RoutingBase; -class RoutingBaseTest extends AnimeClient_TestCase { +class RoutingBaseTest extends AnimeClientTestCase { public function setUp() { diff --git a/tests/UrlGeneratorTest.php b/tests/UrlGeneratorTest.php index 4a77a096..33470985 100644 --- a/tests/UrlGeneratorTest.php +++ b/tests/UrlGeneratorTest.php @@ -5,7 +5,7 @@ namespace Aviat\AnimeClient\Tests; use Aviat\AnimeClient\UrlGenerator; use Aviat\Ion\Config; -class UrlGeneratorTest extends AnimeClient_TestCase { +class UrlGeneratorTest extends AnimeClientTestCase { public function assetUrlProvider() { diff --git a/tests/UtilTest.php b/tests/UtilTest.php index a9e30d88..061dcf73 100644 --- a/tests/UtilTest.php +++ b/tests/UtilTest.php @@ -4,7 +4,7 @@ namespace Aviat\AnimeClient\Tests; use Aviat\AnimeClient\Util; -class UtilTest extends AnimeClient_TestCase { +class UtilTest extends AnimeClientTestCase { public function setUp() { diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 9267755f..ec05319b 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -30,7 +30,7 @@ function _dir() // Autoloading // ----------------------------------------------------------------------------- -require _dir(__DIR__, 'AnimeClient_TestCase.php'); +require _dir(__DIR__, 'AnimeClientTestCase.php'); require _dir(__DIR__, '../vendor/autoload.php'); // ----------------------------------------------------------------------------- diff --git a/tests/mocks.php b/tests/mocks.php index b53cbc5e..eb37c55b 100644 --- a/tests/mocks.php +++ b/tests/mocks.php @@ -3,18 +3,15 @@ * All the mock classes that extend the classes they are used to test */ -use Aviat\AnimeClient\Model\Anime as AnimeModel; -use Aviat\AnimeClient\Model\API as BaseApiModel; -use Aviat\AnimeClient\Model\Manga as MangaModel; -use Aviat\Ion\Enum; -use Aviat\Ion\Friend; -use Aviat\Ion\Json; +use Aviat\AnimeClient\Model\{ + Anime as AnimeModel, + API as BaseApiModel, + Manga as MangaModel +}; +use Aviat\Ion\{Enum, Friend, Json}; use Aviat\Ion\Transformer\AbstractTransformer; use Aviat\Ion\View; -use Aviat\Ion\View\HtmlView; -use Aviat\Ion\View\HttpView; -use Aviat\Ion\View\JsonView; - +use Aviat\Ion\View\{HtmlView, HttpView, JsonView}; // ----------------------------------------------------------------------------- // Mock the default error handler