From ebafe8d8f9c207362eba8778fe075d4ee4cdfabe Mon Sep 17 00:00:00 2001 From: Martin Georgiev Date: Tue, 1 Jan 2019 18:07:37 +0200 Subject: [PATCH] Use specific methods in PHPUnit tests --- tests/MethodTest.php | 6 +++--- tests/NamedParameters/BaseUriParameterTest.php | 2 +- tests/ParseTest.php | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/MethodTest.php b/tests/MethodTest.php index 900b6d11..ed14aa58 100644 --- a/tests/MethodTest.php +++ b/tests/MethodTest.php @@ -50,7 +50,7 @@ public function shouldGetNullForResponseIfNoneIsExists() $method = Method::createFromArray('get', [], $apiDefinition); $this->assertSame([], $method->getResponses()); - $this->assertSame(null, $method->getResponse(200)); + $this->assertNull($method->getResponse(200)); } /** @@ -62,7 +62,7 @@ public function shouldGetNullForResponseIfNotAnArrayIsPassed() $method = Method::createFromArray('get', ['responses' => 'invalid'], $apiDefinition); $this->assertSame([], $method->getResponses()); - $this->assertSame(null, $method->getResponse(200)); + $this->assertNull($method->getResponse(200)); } /** @@ -96,7 +96,7 @@ public function shouldGetValidResponsesIfPassedExpectedValues() $responses = $method->getResponses(); $this->assertInstanceOf(Response::class, array_values($responses)[0]); $this->assertInstanceOf(Response::class, $method->getResponse(200)); - $this->assertSame(null, $method->getResponse(400)); + $this->assertNull($method->getResponse(400)); $this->assertSame('A dummy method', $method->getDescription()); $this->assertSame('A dummy response', array_values($responses)[0]->getDescription()); diff --git a/tests/NamedParameters/BaseUriParameterTest.php b/tests/NamedParameters/BaseUriParameterTest.php index 3f633a94..97431e73 100644 --- a/tests/NamedParameters/BaseUriParameterTest.php +++ b/tests/NamedParameters/BaseUriParameterTest.php @@ -71,7 +71,7 @@ public function shouldCorrectlyParseBaseUriParameters() $resource = $apiDef->getResourceByUri('/users'); $baseUriParameters = $resource->getBaseUriParameters(); - $this->assertEquals(1, count($baseUriParameters)); + $this->assertCount(1, $baseUriParameters); $this->assertEquals('apiDomain', array_keys($baseUriParameters)[0]); $this->assertEquals('string', $baseUriParameters['apiDomain']->getType()); $this->assertEquals(['api'], $baseUriParameters['apiDomain']->getEnum()); diff --git a/tests/ParseTest.php b/tests/ParseTest.php index b4bcfe61..9ad71d5b 100644 --- a/tests/ParseTest.php +++ b/tests/ParseTest.php @@ -773,7 +773,7 @@ public function shouldCorrectlyHandleQueryParameters() $method = $resource->getMethod('get'); $queryParameters = $method->getQueryParameters(); - $this->assertEquals(3, count($queryParameters)); + $this->assertCount(3, $queryParameters); $this->assertEquals('integer', $queryParameters['page']->getType()); $this->assertEquals('Current Page', $queryParameters['page']->getDisplayName()); @@ -851,7 +851,7 @@ public function shouldParseSecuritySchemes() $securitySchemes = $method->getSecuritySchemes(); - $this->assertEquals(2, count($securitySchemes)); + $this->assertCount(2, $securitySchemes); $this->assertInstanceOf(SecurityScheme::class, $securitySchemes['oauth_1_0']); $this->assertInstanceOf(SecurityScheme::class, $securitySchemes['oauth_2_0']); @@ -887,7 +887,7 @@ public function shouldAddHeadersOfSecuritySchemes() $method = $resource->getMethod('get'); $headers = $method->getHeaders(); - $this->assertEquals(1, count($headers)); + $this->assertCount(1, $headers); $this->assertInstanceOf(NamedParameter::class, $headers['Authorization']); } @@ -1033,7 +1033,7 @@ public function shouldMergeMethodSecurityScheme() $resource = $apiDefinition->getResourceByUri('/users'); $method = $resource->getMethod('get'); $headers = $method->getHeaders(); - $this->assertFalse(empty($headers['Authorization'])); + $this->assertNotEmpty($headers['Authorization']); } /**