Version 5.1 - All the GraphQL #32

Closed
timw4mail wants to merge 1160 commits from develop into master
20 changed files with 92 additions and 89 deletions
Showing only changes of commit 4607d146a4 - Show all commits

View File

@ -13,7 +13,7 @@
</filter> </filter>
<testsuites> <testsuites>
<testsuite name="AnimeClient"> <testsuite name="AnimeClient">
<directory>../tests/AnimeClient</directory> <directory>../tests</directory>
</testsuite> </testsuite>
</testsuites> </testsuites>
<logging> <logging>

View File

@ -12,7 +12,7 @@
</filter> </filter>
<testsuites> <testsuites>
<testsuite name="AnimeClient"> <testsuite name="AnimeClient">
<directory>tests/AnimeClient</directory> <directory>tests</directory>
</testsuite> </testsuite>
</testsuites> </testsuites>
<php> <php>

View File

@ -9,7 +9,7 @@ class AnimeModelTest extends AnimeClient_TestCase {
{ {
parent::setUp(); parent::setUp();
$this->animeModel = new Friend(new TestAnimeModel($this->container)); $this->animeModel = new Friend(new TestAnimeModel($this->container));
$this->mockDir = __DIR__ . '/../../test_data/anime_list/search_mocks'; $this->mockDir = __DIR__ . '/../test_data/anime_list/search_mocks';
} }
public function dataSearch() public function dataSearch()
@ -50,7 +50,8 @@ class AnimeModelTest extends AnimeClient_TestCase {
], "[]"); ], "[]");
$this->animeModel->__set('client', $client); $this->animeModel->__set('client', $client);
$this->setExpectedException('\RuntimeException'); $this->expectException('RuntimeException');
$this->animeModel->search(''); $this->animeModel->search('');
} }
} }

View File

@ -14,7 +14,7 @@ class MangaModelTest extends AnimeClient_TestCase {
parent::setUp(); parent::setUp();
$this->container->setInstance('util', new MockUtil($this->container)); $this->container->setInstance('util', new MockUtil($this->container));
$this->model = new Friend(new TestMangaModel($this->container)); $this->model = new Friend(new TestMangaModel($this->container));
$this->mockDir = __DIR__ . '/../../test_data/manga_list'; $this->mockDir = __DIR__ . '/../test_data/manga_list';
} }
public function testZipperLists() public function testZipperLists()

View File

@ -9,8 +9,8 @@ class AnimeListTransformerTest extends AnimeClient_TestCase {
public function setUp() public function setUp()
{ {
parent::setUp(); parent::setUp();
$this->start_file = __DIR__ . '/../../../test_data/anime_list/anime-completed.json'; $this->start_file = __DIR__ . '/../test_data/anime_list/anime-completed.json';
$this->res_file = __DIR__ . '/../../../test_data/anime_list/anime-completed-transformed.json'; $this->res_file = __DIR__ . '/../test_data/anime_list/anime-completed-transformed.json';
$this->transformer = new AnimeListTransformer(); $this->transformer = new AnimeListTransformer();
$this->transformerFriend = new Friend($this->transformer); $this->transformerFriend = new Friend($this->transformer);
} }

View File

@ -8,8 +8,8 @@ class MangaListTransformerTest extends AnimeClient_TestCase {
public function setUp() public function setUp()
{ {
parent::setUp(); parent::setUp();
$this->start_file = __DIR__ . '/../../../test_data/manga_list/manga-zippered.json'; $this->start_file = __DIR__ . '/../test_data/manga_list/manga-zippered.json';
$this->res_file = __DIR__ . '/../../../test_data/manga_list/manga-transformed.json'; $this->res_file = __DIR__ . '/../test_data/manga_list/manga-transformed.json';
$this->transformer = new MangaListTransformer(); $this->transformer = new MangaListTransformer();
} }

View File

@ -10,8 +10,8 @@ class MangaListsZipperTest extends AnimeClient_TestCase {
public function setUp() public function setUp()
{ {
$this->start_file = __DIR__ . '/../../../test_data/manga_list/manga.json'; $this->start_file = __DIR__ . '/../test_data/manga_list/manga.json';
$this->res_file = __DIR__ . '/../../../test_data/manga_list/manga-zippered.json'; $this->res_file = __DIR__ . '/../test_data/manga_list/manga-zippered.json';
$json = Json::decodeFile($this->start_file); $json = Json::decodeFile($this->start_file);
$this->mangaListsZipper = new MangaListsZipper($json); $this->mangaListsZipper = new MangaListsZipper($json);

View File

@ -1,78 +1,80 @@
<?php <?php
use Aviat\AnimeClient\Util; namespace Aviat\AnimeClient\Tests;
class UtilTest extends AnimeClient_TestCase { use Aviat\AnimeClient\Util;
public function setUp() class UtilTest extends \AnimeClient_TestCase {
{
parent::setUp(); public function setUp()
$this->util = new Util($this->container); {
} parent::setUp();
$this->util = new Util($this->container);
public function testIsSelected() }
{
// Failure to match public function testIsSelected()
$this->assertEquals('', Util::is_selected('foo', 'bar')); {
// Failure to match
// Matches $this->assertEquals('', Util::is_selected('foo', 'bar'));
$this->assertEquals('selected', Util::is_selected('foo', 'foo'));
} // Matches
$this->assertEquals('selected', Util::is_selected('foo', 'foo'));
public function testIsNotSelected() }
{
// Failure to match public function testIsNotSelected()
$this->assertEquals('selected', Util::is_not_selected('foo', 'bar')); {
// Failure to match
// Matches $this->assertEquals('selected', Util::is_not_selected('foo', 'bar'));
$this->assertEquals('', Util::is_not_selected('foo', 'foo'));
} // Matches
$this->assertEquals('', Util::is_not_selected('foo', 'foo'));
public function dataIsViewPage() }
{
return [ public function dataIsViewPage()
[ {
'uri' => '/anime/update', return [
'expected' => FALSE [
], 'uri' => '/anime/update',
[ 'expected' => FALSE
'uri' => '/anime/watching', ],
'expected' => TRUE [
], 'uri' => '/anime/watching',
[ 'expected' => TRUE
'uri' => '/manga/reading', ],
'expected' => TRUE [
], 'uri' => '/manga/reading',
[ 'expected' => TRUE
'uri' => '/manga/update', ],
'expected' => FALSE [
] 'uri' => '/manga/update',
]; 'expected' => FALSE
} ]
];
/** }
* @dataProvider dataIsViewPage
*/ /**
public function testIsViewPage($uri, $expected) * @dataProvider dataIsViewPage
{ */
$this->setSuperGlobals([ public function testIsViewPage($uri, $expected)
'_SERVER' => [ {
'REQUEST_URI' => $uri $this->setSuperGlobals([
] '_SERVER' => [
]); 'REQUEST_URI' => $uri
$this->assertEquals($expected, $this->util->is_view_page()); ]
} ]);
$this->assertEquals($expected, $this->util->is_view_page());
/** }
* @dataProvider dataIsViewPage
*/ /**
public function testIsFormPage($uri, $expected) * @dataProvider dataIsViewPage
{ */
$this->setSuperGlobals([ public function testIsFormPage($uri, $expected)
'_SERVER' => [ {
'REQUEST_URI' => $uri $this->setSuperGlobals([
] '_SERVER' => [
]); 'REQUEST_URI' => $uri
$this->assertEquals(!$expected, $this->util->is_form_page()); ]
} ]);
} $this->assertEquals(!$expected, $this->util->is_form_page());
}
}