build/phpunit.xml

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

phpunit.xml

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

tests/Model/AnimeModelTest.php

@@ -9,7 +9,7 @@ class AnimeModelTest extends AnimeClient_TestCase {
 	{
 		parent::setUp();
 		$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()
@@ -50,7 +50,8 @@ class AnimeModelTest extends AnimeClient_TestCase {
 		], "[]");
 		$this->animeModel->__set('client', $client);
 
-		$this->setExpectedException('\RuntimeException');
+		$this->expectException('RuntimeException');
+
 		$this->animeModel->search('');
 	}
 }

tests/Model/MangaModelTest.php

@@ -14,7 +14,7 @@ class MangaModelTest extends AnimeClient_TestCase {
 		parent::setUp();
 		$this->container->setInstance('util', new MockUtil($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()

tests/Transformer/AnimeListTransformerTest.php

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

tests/Transformer/MangaListTransformerTest.php

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

tests/Transformer/MangaListsZipperTest.php

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

tests/UtilTest.php

@@ -1,8 +1,10 @@
 <?php
 
+namespace Aviat\AnimeClient\Tests;
+
 use Aviat\AnimeClient\Util;
 
-class UtilTest extends AnimeClient_TestCase {
+class UtilTest extends \AnimeClient_TestCase {
 
 	public function setUp()
 	{