update test for ServerRequest::getParsedBody to respect thrown InvalidArgumentException, update test for Stream::_toString to use a better read-only stream which works (#14)

Author: danopz

src/ServerRequestIntegrationTest.php

@@ -90,24 +90,52 @@ public function testGetUploadedFiles()
         $this->assertEquals($file, $files[0]);
     }
 
-    public function testGetParsedBody()
+    /**
+     * @dataProvider validParsedBodyParams
+     */
+    public function testGetParsedBody($value)
     {
         if (isset($this->skippedTests[__FUNCTION__])) {
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
 
-        $data = [
-            4711,
-            null,
-            new \stdClass(),
-            ['foo' => 'bar', 'baz'],
+        $new = $this->serverRequest->withParsedBody($value);
+        $this->assertNull($this->serverRequest->getParsedBody(), 'withParsedBody MUST be immutable');
+        $this->assertEquals($value, $new->getParsedBody());
+    }
+
+    public function validParsedBodyParams()
+    {
+        return [
+            [null],
+            [new \stdClass()],
+            [['foo' => 'bar', 'baz']],
         ];
+    }
 
-        foreach ($data as $item) {
-            $new = $this->serverRequest->withParsedBody($item);
-            $this->assertNull($this->serverRequest->getParsedBody(), 'withParsedBody MUST be immutable');
-            $this->assertEquals($item, $new->getParsedBody());
+    /**
+     * @dataProvider invalidParsedBodyParams
+     * @expectedException \InvalidArgumentException
+     */
+    public function testGetParsedBodyInvalid($value)
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
+
+        $new = $this->serverRequest->withParsedBody($value);
+        $this->assertNull($this->serverRequest->getParsedBody(), 'withParsedBody MUST be immutable');
+        $this->assertEquals($value, $new->getParsedBody());
+    }
+
+    public function invalidParsedBodyParams()
+    {
+        return [
+            [4711],
+            [47.11],
+            ['foobar'],
+            [true],
+        ];
     }
 
     public function testGetAttributes()
@@ -117,7 +145,9 @@ public function testGetAttributes()
         }
 
         $new = $this->serverRequest->withAttribute('foo', 'bar');
-        $this->assertNull($this->serverRequest->getAttributes(), 'withAttribute MUST be immutable');
+        $oldAttributes = $this->serverRequest->getAttributes();
+        $this->assertInternalType('array', $oldAttributes, 'getAttributes MUST return an array');
+        $this->assertEmpty($oldAttributes, 'withAttribute MUST be immutable');
         $this->assertEquals(['foo' => 'bar'], $new->getAttributes());
 
         $new = $new->withAttribute('baz', 'biz');

src/StreamIntegrationTest.php

@@ -27,13 +27,12 @@ public function testToStringReadOnlyStreams()
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
 
-        $url = 'https://raw.githubusercontent.com/php-http/multipart-stream-builder/master/tests/Resources/httplug.png';
-        $resource = fopen($url, 'r');
+        $resource = fopen(__FILE__, 'r');
         $stream = $this->createStream($resource);
 
         // Make sure this does not throw exception
         $content = (string) $stream;
-        $this->assertTrue(!empty($content), 'You MUST be able to convert a read only stream to string');
+        $this->assertNotEmpty($content, 'You MUST be able to convert a read only stream to string');
     }
 
     public function testToStringRewindStreamBeforeToString()