From 75ddf6fa9c087ee4726dc569d21633d172737b53 Mon Sep 17 00:00:00 2001 From: PJ Dietz Date: Sun, 10 May 2015 20:55:14 -0400 Subject: [PATCH] Remove extra assertions in Message tests --- .../unit/Message/HeaderCollectionTest.php | 11 +++-- test/tests/unit/Message/MessageTest.php | 10 ++--- test/tests/unit/Message/RequestTest.php | 6 +-- test/tests/unit/Message/ResponseTest.php | 6 +-- test/tests/unit/Message/ServerRequestTest.php | 42 ++++++++++++------- test/tests/unit/Message/StreamTest.php | 1 - 6 files changed, 39 insertions(+), 37 deletions(-) diff --git a/test/tests/unit/Message/HeaderCollectionTest.php b/test/tests/unit/Message/HeaderCollectionTest.php index 0f1080b..3ab986a 100644 --- a/test/tests/unit/Message/HeaderCollectionTest.php +++ b/test/tests/unit/Message/HeaderCollectionTest.php @@ -53,8 +53,7 @@ class HeaderCollectionTest extends \PHPUnit_Framework_TestCase $collection["SET-COOKIE"] = "dog=Bear"; $headers = $collection["set-cookie"]; - $this->assertContains("cat=Molly", $headers); - $this->assertContains("dog=Bear", $headers); + $this->assertEquals(2, count(array_intersect($headers, ["cat=Molly", "dog=Bear"]))); } /** @@ -80,8 +79,7 @@ class HeaderCollectionTest extends \PHPUnit_Framework_TestCase $clone = clone $collection; unset($clone["Set-Cookie"]); - $this->assertTrue(isset($collection["set-cookie"])); - $this->assertFalse(isset($clone["set-cookie"])); + $this->assertTrue(isset($collection["set-cookie"]) && !isset($clone["set-cookie"])); } /** @@ -107,8 +105,9 @@ class HeaderCollectionTest extends \PHPUnit_Framework_TestCase } $expected = ["Content-type", "Set-Cookie"]; - $this->assertEquals(0, count(array_diff($expected, $headers))); - $this->assertEquals(0, count(array_diff($headers, $expected))); + + $countUnmatched = count(array_diff($expected, $headers)) + count(array_diff($headers, $expected)); + $this->assertEquals(0, $countUnmatched); } /** diff --git a/test/tests/unit/Message/MessageTest.php b/test/tests/unit/Message/MessageTest.php index 2e4b0b4..f07b0ac 100644 --- a/test/tests/unit/Message/MessageTest.php +++ b/test/tests/unit/Message/MessageTest.php @@ -49,8 +49,7 @@ class MessageTest extends \PHPUnit_Framework_TestCase $message1 = $this->getMockForAbstractClass('\WellRESTed\Message\Message'); $message1 = $message1->withHeader("Content-type", "text/plain"); $message2 = $message1->withHeader("Content-type", "application/json"); - $this->assertEquals(["text/plain"], $message1->getHeader("Content-type")); - $this->assertEquals(["application/json"], $message2->getHeader("Content-type")); + $this->assertNotEquals($message1->getHeader("Content-type"), $message2->getHeader("Content-type")); } // ------------------------------------------------------------------------ @@ -149,8 +148,7 @@ class MessageTest extends \PHPUnit_Framework_TestCase $message = $message->withAddedHeader("Set-Cookie", ["cat=Molly"]); $message = $message->withAddedHeader("Set-Cookie", ["dog=Bear"]); $cookies = $message->getHeader("Set-Cookie"); - $this->assertContains("cat=Molly", $cookies); - $this->assertContains("dog=Bear", $cookies); + $this->assertTrue(in_array("cat=Molly", $cookies) && in_array("dog=Bear", $cookies)); } /** @@ -249,8 +247,8 @@ class MessageTest extends \PHPUnit_Framework_TestCase } $expected = ["Content-type", "Set-Cookie"]; - $this->assertEquals(0, count(array_diff($expected, $headers))); - $this->assertEquals(0, count(array_diff($headers, $expected))); + $countUnmatched = count(array_diff($expected, $headers)) + count(array_diff($headers, $expected)); + $this->assertEquals(0, $countUnmatched); } /** diff --git a/test/tests/unit/Message/RequestTest.php b/test/tests/unit/Message/RequestTest.php index f23ccf0..8d19d8d 100644 --- a/test/tests/unit/Message/RequestTest.php +++ b/test/tests/unit/Message/RequestTest.php @@ -208,11 +208,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase $request2 = $request1->withUri($uri2); $request2 = $request2->withHeader("Accept", "text/plain"); - $this->assertEquals($uri1, $request1->getUri()); - $this->assertEquals(["application/json"], $request1->getHeader("Accept")); - - $this->assertEquals($uri2, $request2->getUri()); - $this->assertEquals(["text/plain"], $request2->getHeader("Accept")); + $this->assertNotEquals($request1->getHeader("Accept"), $request2->getHeader("Accept")); } /** diff --git a/test/tests/unit/Message/ResponseTest.php b/test/tests/unit/Message/ResponseTest.php index 26e4072..3bf5138 100644 --- a/test/tests/unit/Message/ResponseTest.php +++ b/test/tests/unit/Message/ResponseTest.php @@ -132,10 +132,6 @@ class ResponseTest extends \PHPUnit_Framework_TestCase $response2 = $response1->withStatus(404); $response2 = $response2->withHeader("Content-type", "text/plain"); - $this->assertEquals(200, $response1->getStatusCode()); - $this->assertEquals(["application/json"], $response1->getHeader("Content-type")); - - $this->assertEquals(404, $response2->getStatusCode()); - $this->assertEquals(["text/plain"], $response2->getHeader("Content-type")); + $this->assertNotEquals($response1->getStatusCode(), $response2->getHeader("Content-type")); } } diff --git a/test/tests/unit/Message/ServerRequestTest.php b/test/tests/unit/Message/ServerRequestTest.php index 7219c7f..a9522b1 100644 --- a/test/tests/unit/Message/ServerRequestTest.php +++ b/test/tests/unit/Message/ServerRequestTest.php @@ -436,8 +436,7 @@ class ServerRequestTest extends \PHPUnit_Framework_TestCase $request2 = $request1->withCookieParams([ "cat" => "Oscar" ]); - $this->assertEquals("Molly", $request1->getCookieParams()["cat"]); - $this->assertEquals("Oscar", $request2->getCookieParams()["cat"]); + $this->assertNotEquals($request1->getCookieParams()["cat"], $request2->getCookieParams()["cat"]); } // ------------------------------------------------------------------------ @@ -462,8 +461,7 @@ class ServerRequestTest extends \PHPUnit_Framework_TestCase $request2 = $request1->withQueryParams([ "guinea_pig" => "Clyde" ]); - $this->assertEquals("Claude", $request1->getQueryParams()["guinea_pig"]); - $this->assertEquals("Clyde", $request2->getQueryParams()["guinea_pig"]); + $this->assertNotEquals($request1->getQueryParams()["guinea_pig"], $request2->getQueryParams()["guinea_pig"]); } // ------------------------------------------------------------------------ @@ -646,8 +644,7 @@ class ServerRequestTest extends \PHPUnit_Framework_TestCase ]); $body2 = $request2->getParsedBody(); - $this->assertEquals("Bear", $body1["dog"]); - $this->assertEquals("Clyde", $body2["guinea_pig"]); + $this->assertNotSame($body1, $body2); } /** @@ -681,8 +678,11 @@ class ServerRequestTest extends \PHPUnit_Framework_TestCase $request1 = new ServerRequest(); $request1 = $request1->withParsedBody($body); $request2 = $request1->withHeader("X-extra", "hello world"); - $this->assertEquals($request1->getParsedBody(), $request2->getParsedBody()); - $this->assertNotSame($request1->getParsedBody(), $request2->getParsedBody()); + + $this->assertTrue( + $request1->getParsedBody() == $request2->getParsedBody() + && $request1->getParsedBody() !== $request2->getParsedBody() + ); } // ------------------------------------------------------------------------ @@ -705,9 +705,11 @@ class ServerRequestTest extends \PHPUnit_Framework_TestCase $request = new ServerRequest(); $request = $request->withAttribute("cat", "Molly"); $request = $request->withAttribute("dog", "Bear"); - $attributes = $request->getAttributes(); - $this->assertEquals("Molly", $attributes["cat"]); - $this->assertEquals("Bear", $attributes["dog"]); + $expected = [ + "cat" => "Molly", + "dog" => "Bear" + ]; + $this->assertEquals($expected, $request->getAttributes()); } /** @@ -738,14 +740,27 @@ class ServerRequestTest extends \PHPUnit_Framework_TestCase $request = new ServerRequest(); $request = $request->withAttribute("cat", "Molly"); $request = $request->withAttribute("dog", "Bear"); - $this->assertEquals("Molly", $request->getAttribute("cat")); - $this->assertEquals("Bear", $request->getAttribute("dog")); + $expected = [ + "cat" => "Molly", + "dog" => "Bear" + ]; + $this->assertEquals($expected, $request->getAttributes()); } /** * @covers ::withoutAttribute */ public function testWithoutAttributeCreatesNewInstance() + { + $request = new ServerRequest(); + $request = $request->withAttribute("cat", "Molly"); + $this->assertNotEquals($request, $request->withoutAttribute("cat")); + } + + /** + * @covers ::withoutAttribute + */ + public function testWithoutAttributeRemovesAttribute() { $request = new ServerRequest(); $request = $request->withAttribute("cat", "Molly"); @@ -763,6 +778,5 @@ class ServerRequestTest extends \PHPUnit_Framework_TestCase $request = $request->withAttribute("dog", "Bear"); $request = $request->withoutAttribute("cat"); $this->assertEquals("Bear", $request->getAttribute("dog")); - $this->assertEquals("Oscar", $request->getAttribute("cat", "Oscar")); } } diff --git a/test/tests/unit/Message/StreamTest.php b/test/tests/unit/Message/StreamTest.php index a966d81..827c34e 100644 --- a/test/tests/unit/Message/StreamTest.php +++ b/test/tests/unit/Message/StreamTest.php @@ -126,7 +126,6 @@ class StreamTest extends \PHPUnit_Framework_TestCase { $stream = new Stream($this->resource); $stream->rewind(); - $this->assertFalse($stream->eof()); $stream->getContents(); $this->assertTrue($stream->eof()); }