From b1feab22c465d399e3d86024faaf0b5310573468 Mon Sep 17 00:00:00 2001 From: Art4 Date: Tue, 29 Aug 2023 16:54:01 +0200 Subject: [PATCH] increase code coverage --- src/Psr/StringBasedStream.php | 4 --- tests/Psr/Request/WithAddedHeaderTest.php | 2 ++ tests/Psr/Request/WithHeaderTest.php | 3 +++ tests/Psr/Request/WithMethodAndUriTest.php | 12 +-------- tests/Psr/Request/WithRequestTargetTest.php | 11 +------- tests/Psr/Request/WithUriTest.php | 10 ++++++++ tests/Psr/Request/WithoutHeaderTest.php | 2 ++ .../CreateFromStringTest.php | 12 +-------- .../Psr/StringBasedStream/GetMetadataTest.php | 12 --------- tests/Psr/StringBasedStream/GetSizeTest.php | 25 +++++++++++++++++++ .../Psr/StringBasedStream/__ToStringTest.php | 25 +++++++++++++++++++ 11 files changed, 70 insertions(+), 48 deletions(-) create mode 100644 tests/Psr/StringBasedStream/GetSizeTest.php create mode 100644 tests/Psr/StringBasedStream/__ToStringTest.php diff --git a/src/Psr/StringBasedStream.php b/src/Psr/StringBasedStream.php index f550218..7a82356 100644 --- a/src/Psr/StringBasedStream.php +++ b/src/Psr/StringBasedStream.php @@ -235,10 +235,6 @@ public function getContents(): string */ public function getMetadata(?string $key = null) { - if (func_num_args() > 0 && !is_string($key)) { - throw InvalidArgument::create(1, '$key', 'string', gettype($key)); - } - if (is_string($key)) { return null; } diff --git a/tests/Psr/Request/WithAddedHeaderTest.php b/tests/Psr/Request/WithAddedHeaderTest.php index 8fadee6..981b71a 100644 --- a/tests/Psr/Request/WithAddedHeaderTest.php +++ b/tests/Psr/Request/WithAddedHeaderTest.php @@ -107,6 +107,7 @@ public function testWithAddedHeaderWithoutValueAsStringInArrayThrowsInvalidArgum * Tests changing the header when using withAddedHeader(). * * @covers \Art4\Requests\Psr\Request::withAddedHeader + * @covers \Art4\Requests\Psr\Request::updateHeader * * @return void */ @@ -125,6 +126,7 @@ public function testWithAddedHeaderChangesTheHeaders() * Tests changing the header when using withAddedHeader(). * * @covers \Art4\Requests\Psr\Request::withAddedHeader + * @covers \Art4\Requests\Psr\Request::updateHeader * * @return void */ diff --git a/tests/Psr/Request/WithHeaderTest.php b/tests/Psr/Request/WithHeaderTest.php index 0b15be8..44def88 100644 --- a/tests/Psr/Request/WithHeaderTest.php +++ b/tests/Psr/Request/WithHeaderTest.php @@ -17,6 +17,7 @@ final class WithHeaderTest extends TestCase * Tests changing the header when using withHeader(). * * @covers \Art4\Requests\Psr\Request::withHeader + * @covers \Art4\Requests\Psr\Request::updateHeader * * @return void */ @@ -107,6 +108,7 @@ public function testWithHeaderWithoutValueAsStringInArrayThrowsInvalidArgumentEx * Tests changing the header when using withHeader(). * * @covers \Art4\Requests\Psr\Request::withHeader + * @covers \Art4\Requests\Psr\Request::updateHeader * * @return void */ @@ -125,6 +127,7 @@ public function testWithHeaderChangesTheHeaders() * Tests changing the header when using withHeader(). * * @covers \Art4\Requests\Psr\Request::withHeader + * @covers \Art4\Requests\Psr\Request::updateHeader * * @return void */ diff --git a/tests/Psr/Request/WithMethodAndUriTest.php b/tests/Psr/Request/WithMethodAndUriTest.php index 465572f..1ddc4e0 100644 --- a/tests/Psr/Request/WithMethodAndUriTest.php +++ b/tests/Psr/Request/WithMethodAndUriTest.php @@ -7,7 +7,6 @@ use Art4\Requests\Psr\Request; use Psr\Http\Message\RequestInterface; use Psr\Http\Message\UriInterface; -use WpOrg\Requests\Exception\InvalidArgument; use Yoast\PHPUnitPolyfills\TestCases\TestCase; use Art4\Requests\Tests\TypeProviderHelper; @@ -17,6 +16,7 @@ final class WithMethodAndUriTest extends TestCase * Tests receiving a Request instance when using withMethodAndUri(). * * @covers \Art4\Requests\Psr\Request::withMethodAndUri + * @covers \Art4\Requests\Psr\Request::__construct * * @return void */ @@ -30,16 +30,6 @@ public function testWithMethodAndUriReturnsRequest() ); } - /** - * Data Provider. - * - * @return array - */ - public function dataInvalidTypeNotString() - { - return TypeProviderHelper::getAllExcept(TypeProviderHelper::GROUP_STRING); - } - /** * Tests receiving a Request instance when using withMethodAndUri(). * diff --git a/tests/Psr/Request/WithRequestTargetTest.php b/tests/Psr/Request/WithRequestTargetTest.php index 3fec5a0..24c0236 100644 --- a/tests/Psr/Request/WithRequestTargetTest.php +++ b/tests/Psr/Request/WithRequestTargetTest.php @@ -41,22 +41,13 @@ public function testWithRequestTargetReturnsNewInstance() $this->assertNotSame($request, $request->withRequestTarget('/')); } - /** - * Data Provider. - * - * @return array - */ - public function dataInvalidTypeNotString() - { - return TypeProviderHelper::getAllExcept(TypeProviderHelper::GROUP_STRING); - } - /** * Tests changing the request-target when using withRequestTarget(). * * @dataProvider dataValidRequestTarget * * @covers \Art4\Requests\Psr\Request::withRequestTarget + * @covers \Art4\Requests\Psr\Request::getRequestTarget * * @param string $input * @param string $expected diff --git a/tests/Psr/Request/WithUriTest.php b/tests/Psr/Request/WithUriTest.php index 1d15535..48c74a0 100644 --- a/tests/Psr/Request/WithUriTest.php +++ b/tests/Psr/Request/WithUriTest.php @@ -47,6 +47,8 @@ public function testWithUriReturnsNewInstance() * Tests changing the uri when using withUri(). * * @covers \Art4\Requests\Psr\Request::withUri + * @covers \Art4\Requests\Psr\Request::setUri + * @covers \Art4\Requests\Psr\Request::updateHeader * * @return void */ @@ -66,6 +68,8 @@ public function testWithUriChangesTheUri() * Tests changing the uri when using withUri(). * * @covers \Art4\Requests\Psr\Request::withUri + * @covers \Art4\Requests\Psr\Request::setUri + * @covers \Art4\Requests\Psr\Request::updateHeader * * @return void */ @@ -88,6 +92,8 @@ public function testWithUriChangesTheHostHeader() * Tests changing the uri when using withUri(). * * @covers \Art4\Requests\Psr\Request::withUri + * @covers \Art4\Requests\Psr\Request::setUri + * @covers \Art4\Requests\Psr\Request::updateHeader * * @return void */ @@ -111,6 +117,8 @@ public function testWithUriChangesTheHostHeaderToFirstPlace() * Tests changing the uri when using withUri(). * * @covers \Art4\Requests\Psr\Request::withUri + * @covers \Art4\Requests\Psr\Request::setUri + * @covers \Art4\Requests\Psr\Request::updateHeader * * @return void */ @@ -135,6 +143,8 @@ public function testWithUriWithoutHostDoNotChangeTheHostHeader() * @dataProvider dataPreserveHost * * @covers \Art4\Requests\Psr\Request::withUri + * @covers \Art4\Requests\Psr\Request::setUri + * @covers \Art4\Requests\Psr\Request::updateHeader * * @param array $expectedHeaders * diff --git a/tests/Psr/Request/WithoutHeaderTest.php b/tests/Psr/Request/WithoutHeaderTest.php index bf52809..2245e06 100644 --- a/tests/Psr/Request/WithoutHeaderTest.php +++ b/tests/Psr/Request/WithoutHeaderTest.php @@ -55,6 +55,7 @@ public function dataInvalidTypeNotString() * Tests removing the header when using withoutHeader(). * * @covers \Art4\Requests\Psr\Request::withoutHeader + * @covers \Art4\Requests\Psr\Request::updateHeader * * @return void */ @@ -74,6 +75,7 @@ public function testWithoutHeaderChangesTheHeaders() * Tests removing the header when using withoutHeader(). * * @covers \Art4\Requests\Psr\Request::withoutHeader + * @covers \Art4\Requests\Psr\Request::updateHeader * * @return void */ diff --git a/tests/Psr/StringBasedStream/CreateFromStringTest.php b/tests/Psr/StringBasedStream/CreateFromStringTest.php index 66e1a6d..d8bb4f3 100644 --- a/tests/Psr/StringBasedStream/CreateFromStringTest.php +++ b/tests/Psr/StringBasedStream/CreateFromStringTest.php @@ -5,7 +5,6 @@ namespace Art4\Requests\Tests\Psr\StringBasedStream; use Psr\Http\Message\StreamInterface; -use WpOrg\Requests\Exception\InvalidArgument; use Art4\Requests\Psr\StringBasedStream; use Yoast\PHPUnitPolyfills\TestCases\TestCase; use Art4\Requests\Tests\TypeProviderHelper; @@ -16,6 +15,7 @@ final class CreateFromStringTest extends TestCase * Tests receiving the stream when using createFromString(). * * @covers \Art4\Requests\Psr\StringBasedStream::createFromString + * @covers \Art4\Requests\Psr\StringBasedStream::__construct * * @return void */ @@ -26,14 +26,4 @@ public function testCreateFromStringReturnsStream() StringBasedStream::createFromString('') ); } - - /** - * Data Provider. - * - * @return array - */ - public function dataInvalidTypeNotString() - { - return TypeProviderHelper::getAllExcept(TypeProviderHelper::GROUP_STRING); - } } diff --git a/tests/Psr/StringBasedStream/GetMetadataTest.php b/tests/Psr/StringBasedStream/GetMetadataTest.php index 7463b2c..bc1b5dc 100644 --- a/tests/Psr/StringBasedStream/GetMetadataTest.php +++ b/tests/Psr/StringBasedStream/GetMetadataTest.php @@ -4,10 +4,8 @@ namespace Art4\Requests\Tests\Psr\StringBasedStream; -use InvalidArgumentException; use Art4\Requests\Psr\StringBasedStream; use Yoast\PHPUnitPolyfills\TestCases\TestCase; -use Art4\Requests\Tests\TypeProviderHelper; final class GetMetadataTest extends TestCase { @@ -38,14 +36,4 @@ public function testGetMetadataWithKeyReturnsNull() $this->assertNull($stream->getMetadata('key')); } - - /** - * Data Provider. - * - * @return array - */ - public function dataInvalidTypeNotString() - { - return TypeProviderHelper::getAllExcept(TypeProviderHelper::GROUP_STRING); - } } diff --git a/tests/Psr/StringBasedStream/GetSizeTest.php b/tests/Psr/StringBasedStream/GetSizeTest.php new file mode 100644 index 0000000..50073f5 --- /dev/null +++ b/tests/Psr/StringBasedStream/GetSizeTest.php @@ -0,0 +1,25 @@ +assertSame(12, $stream->getSize()); + } +} diff --git a/tests/Psr/StringBasedStream/__ToStringTest.php b/tests/Psr/StringBasedStream/__ToStringTest.php new file mode 100644 index 0000000..266b3ab --- /dev/null +++ b/tests/Psr/StringBasedStream/__ToStringTest.php @@ -0,0 +1,25 @@ +assertSame('full content', $stream->__toString()); + } +}