diff --git a/tests/src/Functional/JsonApiFunctionalTest.php b/tests/src/Functional/JsonApiFunctionalTest.php index 410c5a8..d4946c3 100644 --- a/tests/src/Functional/JsonApiFunctionalTest.php +++ b/tests/src/Functional/JsonApiFunctionalTest.php @@ -766,53 +766,4 @@ class JsonApiFunctionalTest extends BrowserTestBase { } } - public function testResponseValidation() { - // Expose the protected RequestHandler::validateResponse() method. - $class = new \ReflectionClass('Drupal\jsonapi\Controller\RequestHandler'); - $validate_response = $class->getMethod('validateResponse'); - $validate_response->setAccessible(TRUE); - - // Test validation failure: no "type" in "data". - $json = <<<'EOD' -{ - "data": { - "id": "4f342419-e668-4b76-9f87-7ce20c436169", - "attributes": { - "nid": "1", - "uuid": "4f342419-e668-4b76-9f87-7ce20c436169" - } - } -} -EOD; - $response = new ResourceResponse(); - $response->setContent($json); - if ($validate_response->invoke(NULL, $response)) { - $this->fail('Response validation failed to flag an invalid response.'); - } - - // Test validation success. - $json = <<<'EOD' -{ - "data": { - "type": "node--article", - "id": "4f342419-e668-4b76-9f87-7ce20c436169", - "attributes": { - "nid": "1", - "uuid": "4f342419-e668-4b76-9f87-7ce20c436169" - } - } -} -EOD; - $response->setContent($json); - if (!$validate_response->invoke(NULL, $response)) { - $this->fail('Response validation flagged a valid response.'); - } - - // Test validation of an empty response passes. - $response = new ResourceResponse(); - if (!$validate_response->invoke(NULL, $response)) { - $this->fail('Response validation flagged a valid empty response.'); - } - } - } diff --git a/tests/src/Kernel/Controller/RequestHandlerTest.php b/tests/src/Kernel/Controller/RequestHandlerTest.php new file mode 100644 index 0000000..b8135f1 --- /dev/null +++ b/tests/src/Kernel/Controller/RequestHandlerTest.php @@ -0,0 +1,76 @@ +getMethod('validateResponse'); + $validate_response->setAccessible(TRUE); + + // Test validation failure: no "type" in "data". + $json = <<<'EOD' +{ + "data": { + "id": "4f342419-e668-4b76-9f87-7ce20c436169", + "attributes": { + "nid": "1", + "uuid": "4f342419-e668-4b76-9f87-7ce20c436169" + } + } +} +EOD; + $response = new ResourceResponse(); + $response->setContent($json); + if ($validate_response->invoke(NULL, $response)) { + $this->assertFalse(TRUE, 'Response validation failed to flag an invalid response.'); + } + + // Test validation success. + $json = <<<'EOD' +{ + "data": { + "type": "node--article", + "id": "4f342419-e668-4b76-9f87-7ce20c436169", + "attributes": { + "nid": "1", + "uuid": "4f342419-e668-4b76-9f87-7ce20c436169" + } + } +} +EOD; + $response->setContent($json); + if (!$validate_response->invoke(NULL, $response)) { + $this->assertFalse(TRUE, 'Response validation flagged a valid response.'); + } + + // Test validation of an empty response passes. + $response = new ResourceResponse(); + if (!$validate_response->invoke(NULL, $response)) { + $this->assertFalse(TRUE, 'Response validation flagged a valid empty response.'); + } + } + + +} \ No newline at end of file