🚿 test cleanup

Author: codemasher

tests/Psr15/PriorityQueueRequestHandlerTest.php

@@ -12,9 +12,9 @@
 
 namespace chillerlan\HTTPTest\Psr15;
 
-use chillerlan\HTTP\{Psr15\QueueRunner, Psr17, Psr7};
-use chillerlan\HTTP\Psr15\PriorityQueueRequestHandler;
+use chillerlan\HTTP\Psr17;
 use chillerlan\HTTP\Psr15\Middleware\{MiddlewareException, PriorityMiddleware};
+use chillerlan\HTTP\Psr15\PriorityQueueRequestHandler;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\{ResponseInterface, ServerRequestInterface};
 use Psr\Http\Server\{MiddlewareInterface, RequestHandlerInterface};

tests/Psr17/FactoryHelpersTest.php

@@ -13,7 +13,7 @@
 namespace chillerlan\HTTPTest\Psr17;
 
 use chillerlan\HTTP\Psr17;
-use chillerlan\HTTP\Psr7\{UploadedFile, Uri, UriExtended};
+use chillerlan\HTTP\Psr7\{UploadedFile, UriExtended};
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\StreamInterface;

tests/Psr7/MessageHelpersTest.php

@@ -12,9 +12,9 @@
 
 namespace chillerlan\HTTPTest\Psr7;
 
-use chillerlan\HTTP\{Psr7, Psr7\Request, Psr7\Response, Psr17};
+use chillerlan\HTTP\{Psr17, Psr7, Psr7\Request, Psr7\Response};
 use PHPUnit\Framework\TestCase;
-use Psr\Http\Message\{MessageInterface, ResponseInterface};
+use Psr\Http\Message\{MessageInterface};
 
 class MessageHelpersTest extends TestCase{
 

tests/Psr7/RequestTest.php

@@ -15,24 +15,14 @@
 namespace chillerlan\HTTPTest\Psr7;
 
 use chillerlan\HTTP\Psr7\{Request, Uri};
-use chillerlan\HTTP\Psr17\RequestFactory;
 use InvalidArgumentException;
 use Psr\Http\Message\StreamInterface;
 use PHPUnit\Framework\TestCase;
 
 class RequestTest extends TestCase{
 
-	/**
-	 * @var \chillerlan\HTTP\Psr17\RequestFactory
-	 */
-	protected $requestFactory;
-
-	protected function setUp():void{
-		$this->requestFactory = new RequestFactory;
-	}
-
 	public function testRequestUriMayBeString(){
-		$this->assertEquals('/', $this->requestFactory->createRequest($this->requestFactory::METHOD_GET, '/')->getUri()); // RequestFactory coverage
+		$this->assertEquals('/', (new Request(Request::METHOD_GET, '/'))->getUri());
 	}
 
 	public function testRequestUriMayBeUri(){

tests/Psr7/ResponseTest.php

@@ -15,29 +15,14 @@
 namespace chillerlan\HTTPTest\Psr7;
 
 use chillerlan\HTTP\Psr7\Response;
-use chillerlan\HTTP\Psr17\{StreamFactory, ResponseFactory};
+use chillerlan\HTTP\Psr17;
 use Psr\Http\Message\StreamInterface;
 use PHPUnit\Framework\TestCase;
 
 class ResponseTest extends TestCase{
 
-	/**
-	 * @var \chillerlan\HTTP\Psr17\ResponseFactory
-	 */
-	protected $responseFactory;
-
-	/**
-	 * @var \chillerlan\HTTP\Psr17\StreamFactory
-	 */
-	protected $streamFactory;
-
-	protected function setUp():void{
-		$this->responseFactory = new ResponseFactory;
-		$this->streamFactory   = new StreamFactory;
-	}
-
 	public function testDefaultConstructor(){
-		$r = $this->responseFactory->createResponse();
+		$r = new Response;
 
 		$this->assertSame(200, $r->getStatusCode());
 		$this->assertSame('1.1', $r->getProtocolVersion());
@@ -48,7 +33,7 @@ public function testDefaultConstructor(){
 	}
 
 	public function testCanConstructWithStatusCode(){
-		$r = $this->responseFactory->createResponse(404);
+		$r = new Response(404);
 
 		$this->assertSame(404, $r->getStatusCode());
 		$this->assertSame('Not Found', $r->getReasonPhrase());
@@ -148,8 +133,7 @@ public function testSameInstanceWhenSameProtocol(){
 	}
 
 	public function testWithBody(){
-		$b = $this->streamFactory->createStream('0');
-		$r = (new Response)->withBody($b);
+		$r = (new Response)->withBody(Psr17\create_stream('0'));
 		$this->assertInstanceOf(StreamInterface::class, $r->getBody());
 		$this->assertSame('0', (string) $r->getBody());
 	}

tests/Psr7/ServerRequestTest.php

@@ -14,8 +14,7 @@
 
 namespace chillerlan\HTTPTest\Psr7;
 
-use chillerlan\HTTP\Psr7\{ServerRequest, UploadedFile, Uri};
-use chillerlan\HTTP\Psr17;
+use chillerlan\HTTP\Psr7\{ServerRequest, UploadedFile};
 use chillerlan\HTTP\Psr17\ServerRequestFactory;
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;

tests/Psr7/StreamTest.php

@@ -16,11 +16,9 @@
 
 use chillerlan\HTTP\Psr7\Stream;
 use chillerlan\HTTP\Psr17\StreamFactory;
-use Exception;
-use InvalidArgumentException;
 use Psr\Http\Message\StreamInterface;
 use PHPUnit\Framework\TestCase;
-use RuntimeException;
+use Exception, InvalidArgumentException, RuntimeException;
 
 class StreamTest extends TestCase{
 

tests/Psr7/UploadedFileTest.php

@@ -14,9 +14,9 @@
 
 namespace chillerlan\HTTPTest\Psr7;
 
+use chillerlan\HTTP\Psr17;
 use chillerlan\HTTP\Psr7;
 use chillerlan\HTTP\Psr7\UploadedFile;
-use chillerlan\HTTP\Psr17\{StreamFactory, UploadedFileFactory};
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 
@@ -27,20 +27,8 @@ class UploadedFileTest extends TestCase{
 	 */
 	protected $cleanup;
 
-	/**
-	 * @var \chillerlan\HTTP\Psr17\UploadedFileFactory
-	 */
-	protected $uploadedFileFactory;
-
-	/**
-	 * @var \chillerlan\HTTP\Psr17\StreamFactory
-	 */
-	protected $streamFactory;
-
 	protected function setUp():void{
 		$this->cleanup = [];
-		$this->uploadedFileFactory = new UploadedFileFactory;
-		$this->streamFactory       = new StreamFactory;
 	}
 
 	protected function tearDown():void{
@@ -93,8 +81,8 @@ public function testRaisesExceptionOnInvalidErrorStatus(int $status){
 	}
 
 	public function testGetStreamReturnsOriginalStreamObject(){
-		$stream = $this->streamFactory->createStream('');
-		$upload = $this->uploadedFileFactory->createUploadedFile($stream, 0, UPLOAD_ERR_OK); // coverage
+		$stream = Psr17\create_stream('');
+		$upload = new UploadedFile($stream, 0, UPLOAD_ERR_OK);
 
 		$this->assertSame($stream, $upload->getStream());
 	}
@@ -108,7 +96,7 @@ public function testGetStreamReturnsWrappedPhpStream(){
 	}
 
 	public function testSuccessful(){
-		$stream = $this->streamFactory->createStream('Foo bar!');
+		$stream = Psr17\create_stream('Foo bar!');
 		$upload = new UploadedFile($stream, $stream->getSize(), UPLOAD_ERR_OK, 'filename.txt', 'text/plain');
 
 		$this->assertEquals($stream->getSize(), $upload->getSize());
@@ -123,7 +111,7 @@ public function testSuccessful(){
 	}
 
 	public function testMoveCannotBeCalledMoreThanOnce(){
-		$stream = $this->streamFactory->createStream('Foo bar!');
+		$stream = Psr17\create_stream('Foo bar!');
 		$upload = new UploadedFile($stream, 0, UPLOAD_ERR_OK);
 
 		$this->cleanup[] = $to = tempnam(sys_get_temp_dir(), 'diac');
@@ -136,7 +124,7 @@ public function testMoveCannotBeCalledMoreThanOnce(){
 	}
 
 	public function testCannotRetrieveStreamAfterMove(){
-		$stream = $this->streamFactory->createStream('Foo bar!');
+		$stream = Psr17\create_stream('Foo bar!');
 		$upload = new UploadedFile($stream, 0, UPLOAD_ERR_OK);
 
 		$this->cleanup[] = $to = tempnam(sys_get_temp_dir(), 'diac');