wip

timacdonald · Oct 12, 2023 · 7fb050c · 7fb050c
1 parent 4591dfe
commit 7fb050c
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 180 deletions.
diff --git a/tests/Feature/FeatureTest.php b/tests/Feature/FeatureTest.php
@@ -31,7 +31,7 @@ public function testItCanPaginate(): void
         }
         Route::get('test-route', fn () => UserResource::collection(BasicModel::paginate(2)));
 
-        $response = $this->withoutExceptionHandling()->getJson('test-route');
+        $response = $this->getJson('test-route');
 
         $response->assertOk();
         $response->assertExactJson([

diff --git a/tests/Feature/ResourceIdentificationTest.php b/tests/Feature/ResourceIdentificationTest.php
@@ -117,7 +117,7 @@ public function testItThrowsWhenUnableToAutomaticallyResolveTheIdOfANonObject():
         $this->expectException(ResourceIdentificationException::class);
         $this->expectExceptionMessage('Unable to resolve resource object id for [array].');
 
-        $this->withoutExceptionHandling()->getJson('test-route');
+        $this->getJson('test-route');
     }
 
     public function testItThrowsWhenUnableToAutomaticallyResolveTheIdOfAnObject(): void
@@ -128,7 +128,7 @@ public function testItThrowsWhenUnableToAutomaticallyResolveTheIdOfAnObject(): v
         $this->expectException(ResourceIdentificationException::class);
         $this->expectExceptionMessage('Unable to resolve resource object id for [stdClass].');
 
-        $this->withoutExceptionHandling()->getJson('test-route');
+        $this->getJson('test-route');
     }
 
     public function testItThrowsWhenUnableToAutomaticallyResolveTheTypeOfANonObject(): void
@@ -144,7 +144,7 @@ public function toId($request): string
         $this->expectException(ResourceIdentificationException::class);
         $this->expectExceptionMessage('Unable to resolve resource object type for [array].');
 
-        $this->withoutExceptionHandling()->getJson('test-route');
+        $this->getJson('test-route');
     }
 
     public function testItThrowsWhenUnableToAutomaticallyResolveTypeOfAnObject(): void

diff --git a/tests/Performance/FieldsTest.php b/tests/Performance/FieldsTest.php
diff --git a/tests/Performance/IncludesTest.php b/tests/Performance/IncludesTest.php
diff --git a/tests/Performance/RequestRelationshipsTest.php b/tests/Performance/RequestRelationshipsTest.php
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -15,19 +15,22 @@
 
 class TestCase extends BaseTestCase
 {
-    public static $latestResponse;
-
     public const JSON_API_SCHEMA_URL = 'http://jsonapi.org/schema';
 
     public function setUp(): void
     {
         parent::setUp();
 
-        JsonApiResource::resolveServerImplementationNormally();
-
         $this->withoutExceptionHandling();
     }
 
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        JsonApiResource::resolveServerImplementationNormally();
+    }
+
     protected function assertValidJsonApi(TestResponse|string|array $data): void
     {
         if ($data instanceof TestResponse) {
@@ -40,7 +43,12 @@ protected function assertValidJsonApi(TestResponse|string|array $data): void
 
         $data = json_decode(json_encode($data));
 
-        $result = $this->jsonApiValidator()->validate($data, self::JSON_API_SCHEMA_URL);
+        $result = tap(new Validator, function ($validator) {
+            $validator->resolver()->registerFile(
+                self::JSON_API_SCHEMA_URL,
+                $this->localSchemaPath(self::JSON_API_SCHEMA_URL)
+            );
+        })->validate($data, self::JSON_API_SCHEMA_URL);
 
         if ($result->isValid()) {
             $this->assertTrue($result->isValid());
@@ -54,18 +62,6 @@ protected function assertValidJsonApi(TestResponse|string|array $data): void
         );
     }
 
-    private function jsonApiValidator(): Validator
-    {
-        $validator = new Validator();
-
-        $validator->resolver()->registerFile(
-            self::JSON_API_SCHEMA_URL,
-            $this->localSchemaPath(self::JSON_API_SCHEMA_URL)
-        );
-
-        return $validator;
-    }
-
     private function localSchemaPath(string $url): string
     {
         $schema = __DIR__.'/../schema.json';

diff --git a/...t/ResourceIdentificationExceptionTest.php → ...s/ResourceIdentificationExceptionTest.php b/...t/ResourceIdentificationExceptionTest.php → ...s/ResourceIdentificationExceptionTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit;
+namespace Tests\Unit\Exceptions;
 
 use PHPUnit\Framework\TestCase;
 use TiMacDonald\JsonApi\Exceptions\ResourceIdentificationException;
@@ -20,7 +20,7 @@ public function testItHandlesScalarsForId(): void
     public function testItHandlesObjectsForId(): void
     {
         $this->expectException(ResourceIdentificationException::class);
-        $this->expectExceptionMessage('Unable to resolve resource object id for [Tests\Unit\MyTestClass].');
+        $this->expectExceptionMessage('Unable to resolve resource object id for [Tests\Unit\Exceptions\MyTestClass].');
 
         throw ResourceIdentificationException::attemptingToDetermineIdFor(new MyTestClass());
     }
@@ -36,7 +36,7 @@ public function testItHandlesScalarsForType(): void
     public function testItHandlesObjectsForType(): void
     {
         $this->expectException(ResourceIdentificationException::class);
-        $this->expectExceptionMessage('Unable to resolve resource object type for [Tests\Unit\MyTestClass].');
+        $this->expectExceptionMessage('Unable to resolve resource object type for [Tests\Unit\Exceptions\MyTestClass].');
 
         throw ResourceIdentificationException::attemptingToDetermineTypeFor(new MyTestClass());
     }

diff --git a/...Unit/UnknownRelationshipExceptionTest.php → ...ions/UnknownRelationshipExceptionTest.php b/...Unit/UnknownRelationshipExceptionTest.php → ...ions/UnknownRelationshipExceptionTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit;
+namespace Tests\Unit\Exceptions;
 
 use PHPUnit\Framework\TestCase;
 use stdClass;

diff --git a/tests/Unit/FieldsTest.php → tests/Unit/Support/FieldsTest.php b/tests/Unit/FieldsTest.php → tests/Unit/Support/FieldsTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit;
+namespace Tests\Unit\Support;
 
 use Illuminate\Foundation\Application;
 use Illuminate\Http\Request;

diff --git a/tests/Unit/IncludesTest.php → tests/Unit/Support/IncludesTest.php b/tests/Unit/IncludesTest.php → tests/Unit/Support/IncludesTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\Unit;
+namespace Tests\Unit\Support;
 
 use Illuminate\Foundation\Application;
 use Illuminate\Http\Request;