fixed some oversights from #48

test/RequestFactoryTest.php

@@ -16,7 +16,7 @@ final class RequestFactoryTest extends RequestFactoryTestCase
     protected function createRequestFactory()
     {
         if (!defined('REQUEST_FACTORY') || !class_exists(REQUEST_FACTORY)) {
-            self::markTestSkipped('Request factory class name not provided');
+            self::markTestSkipped('REQUEST_FACTORY class name not provided');
         }
 
         return new (REQUEST_FACTORY);
@@ -27,8 +27,8 @@ final class RequestFactoryTest extends RequestFactoryTestCase
      */
     protected function createUri($uri)
     {
-        if (!defined('URI_FACTORY')) {
-            self::markTestSkipped('URI factory class name not provided');
+        if (!defined('URI_FACTORY') || !class_exists(URI_FACTORY)) {
+            self::markTestSkipped('URI_FACTORY class name not provided');
         }
 
         return (new (URI_FACTORY))->createUri($uri);

test/ResponseFactoryTest.php

@@ -16,7 +16,7 @@ final class ResponseFactoryTest extends ResponseFactoryTestCase
     protected function createResponseFactory()
     {
         if (!defined('RESPONSE_FACTORY') || !class_exists(RESPONSE_FACTORY)) {
-            self::markTestSkipped('Response factory class name not provided');
+            self::markTestSkipped('RESPONSE_FACTORY class name not provided');
         }
 
         return new (RESPONSE_FACTORY);

test/ResponseFactoryTestCase.php

@@ -33,10 +33,10 @@ abstract class ResponseFactoryTestCase extends TestCase
     public static function dataCodes()
     {
         return [
-            '200' => [200],
-            '301' => [301],
-            '404' => [404],
-            '500' => [500],
+            'HTTP/200' => [200],
+            'HTTP/301' => [301],
+            'HTTP/404' => [404],
+            'HTTP/500' => [500],
         ];
     }
 

test/ServerRequestFactoryTest.php

@@ -16,7 +16,7 @@ final class ServerRequestFactoryTest extends ServerRequestFactoryTestCase
     protected function createServerRequestFactory()
     {
         if (!defined('SERVER_REQUEST_FACTORY') || !class_exists(SERVER_REQUEST_FACTORY)) {
-            self::markTestSkipped('Server Request factory class name not provided');
+            self::markTestSkipped('SERVER_REQUEST_FACTORY class name not provided');
         }
 
         return new (SERVER_REQUEST_FACTORY);
@@ -27,8 +27,8 @@ final class ServerRequestFactoryTest extends ServerRequestFactoryTestCase
      */
     protected function createUri($uri)
     {
-        if (!defined('URI_FACTORY')) {
-            self::markTestSkipped('URI factory class name not provided');
+        if (!defined('URI_FACTORY') || !class_exists(URI_FACTORY)) {
+            self::markTestSkipped('URI_FACTORY class name not provided');
         }
 
         return (new (URI_FACTORY))->createUri($uri);

test/StreamFactoryTest.php

@@ -16,7 +16,7 @@ final class StreamFactoryTest extends StreamFactoryTestCase
     protected function createStreamFactory()
     {
         if (!defined('STREAM_FACTORY') || !class_exists(STREAM_FACTORY)) {
-            self::markTestSkipped('Stream factory class name not provided');
+            self::markTestSkipped('STREAM_FACTORY class name not provided');
         }
 
         return new (STREAM_FACTORY);

test/UploadedFileFactoryTest.php

@@ -16,7 +16,7 @@ final class UploadedFileFactoryTest extends UploadedFileFactoryTestCase
     protected function createUploadedFileFactory()
     {
         if (!defined('UPLOADED_FILE_FACTORY') || !class_exists(UPLOADED_FILE_FACTORY)) {
-            self::markTestSkipped('Uploaded File factory class name not provided');
+            self::markTestSkipped('UPLOADED_FILE_FACTORY class name not provided');
         }
 
         return new (UPLOADED_FILE_FACTORY);
@@ -24,8 +24,8 @@ final class UploadedFileFactoryTest extends UploadedFileFactoryTestCase
 
     protected function createStream($content)
     {
-        if (!defined('STREAM_FACTORY')) {
-            self::markTestSkipped('STREAM factory class name not provided');
+        if (!defined('STREAM_FACTORY') || !class_exists(STREAM_FACTORY)) {
+            self::markTestSkipped('STREAM_FACTORY class name not provided');
         }
 
         return (new (STREAM_FACTORY))->createStream($content);

test/UriFactoryTest.php

@@ -16,7 +16,7 @@ final class UriFactoryTest extends UriFactoryTestCase
     protected function createUriFactory()
     {
         if (!defined('URI_FACTORY') || !class_exists(URI_FACTORY)) {
-            self::markTestSkipped('URI factory class name not provided');
+            self::markTestSkipped('URI_FACTORY class name not provided');
         }
 
         return new (URI_FACTORY);