Refactored test methods

Author: shudd3r

tests/AppHandlerIntegrationTest.php

@@ -21,25 +21,25 @@
 
 class AppHandlerIntegrationTest extends TestCase
 {
-    public function testInstantiation()
+    public function test_Instantiation()
     {
         $this->assertInstanceOf(AppHandler::class, $this->app());
     }
 
-    public function testConfig_ReturnsSetupEntry()
+    public function test_Config_ReturnsSetupEntry()
     {
         $app = $this->app();
         $this->assertInstanceOf(Container\Setup\Entry::class, $app->config('test'));
     }
 
-    public function testRoutingContainerIntegration()
+    public function test_RoutingContainerIntegration()
     {
         $app      = $this->app(['test' => new Container\Records\Record\ValueRecord('Hello World!')]);
         $response = $app->handle(new Doubles\FakeServerRequest());
         $this->assertSame('//example.com/foo/bar: Hello World!', (string) $response->getBody());
     }
 
-    public function testRepeatedHandleCallsWithMiddlewareProcessing_ReturnsEqualResponse()
+    public function test_RepeatedHandleCalls_WithMiddlewareProcessing_ReturnEqualResponse()
     {
         $app      = $this->middlewareContextsApp();
         $request  = new Doubles\FakeServerRequest('GET', Doubles\FakeUri::fromString('/test'));
@@ -50,13 +50,13 @@ public function testRepeatedHandleCallsWithMiddlewareProcessing_ReturnsEqualResp
         $this->assertEquals($response, $app->handle($request));
     }
 
-    public function testInstanceWithDefinedInternalContainerId_ThrowsException()
+    public function test_InstanceWithDefinedInternalContainerId_ThrowsException()
     {
         $this->expectException(Container\Setup\Exception\OverwriteRuleException::class);
         $this->app([AppHandler::ROUTER_ID => new Container\Records\Record\ValueRecord('Hello World!')]);
     }
 
-    public function testFallbackNotFoundRoute()
+    public function test_FallbackNotFoundRoute()
     {
         $app = $this->app();
         $app->routeFound       = false;
@@ -67,7 +67,7 @@ public function testFallbackNotFoundRoute()
         $this->assertSame($app->notFoundResponse, $response);
     }
 
-    public function testShutdownRegisteredOnProduction()
+    public function test_ShutdownRegistered_OnProduction()
     {
         Fixtures\ShutdownState::reset();
         Fixtures\ShutdownState::$override = true;
@@ -80,7 +80,7 @@ public function testShutdownRegisteredOnProduction()
         $this->assertTrue(Fixtures\ShutdownState::$outputBufferCleared);
     }
 
-    public function testShutdownNotRegisteredOnDevelopment()
+    public function test_ShutdownNotRegistered_OnDevelopment()
     {
         Fixtures\ShutdownState::reset();
         Fixtures\ShutdownState::$override = true;
@@ -90,20 +90,19 @@ public function testShutdownNotRegisteredOnDevelopment()
         $this->assertFalse(is_callable(Fixtures\ShutdownState::$callback));
     }
 
-    private function app(array $records = [], bool $secure = false): Doubles\MockedAppHandler
+    private function app(array $records = []): Doubles\MockedAppHandler
     {
-        $setup = $secure ? new Container\Setup\Build\ValidatedBuild($records) : new Container\Setup\Build($records);
-        return new Doubles\MockedAppHandler($setup);
+        return new Doubles\MockedAppHandler(new Container\Setup\Build($records));
     }
 
     private function middlewareContextsApp(): Doubles\MockedAppHandler
     {
         $app = $this->app();
         $app->config('test')->value('MAIN');
         $app->middleware('one')->value(new Doubles\FakeMiddleware('outerContext'));
-        $app->middleware('two')->callback(function ($c) {
-            return new Doubles\FakeMiddleware($c->get('one')->inContext ? 'innerContext' : '--- error ---');
-        });
+        $app->middleware('two')->callback(
+            fn ($c) => new Doubles\FakeMiddleware($c->get('one')->inContext ? 'innerContext' : '--- error ---')
+        );
 
         return $app;
     }

tests/ServerProcessTest.php

@@ -20,25 +20,25 @@
 
 class ServerProcessTest extends TestCase
 {
-    public function testInstantiation()
+    public function test_Instantiation()
     {
         $this->assertInstanceOf(ServerProcess::class, $this->server());
     }
 
-    public function testResponseBodyIsEmitted()
+    public function test_ResponseBody_IsEmitted()
     {
         $server = $this->server(new Doubles\FakeResponse('Hello World!'));
         $this->assertSame('Hello World!', $this->emit($server));
     }
 
-    public function testResponseBodyExceedingOutputBufferIsEmitted()
+    public function test_ResponseBodyExceedingOutputBuffer_IsEmitted()
     {
         $response = new Doubles\FakeResponse('Hello World');
         $server   = $this->server($response, 3);
         $this->assertSame('Hello World', $this->emit($server));
     }
 
-    public function testSendResponseWhenHeadersAlreadySent_ThrowsException()
+    public function test_SendResponse_WhenHeadersAlreadySent_ThrowsException()
     {
         $server = $this->server();
 
@@ -47,7 +47,7 @@ public function testSendResponseWhenHeadersAlreadySent_ThrowsException()
         $this->emit($server);
     }
 
-    public function testHeadersAreEmitted()
+    public function test_Headers_AreEmitted()
     {
         $response = new Doubles\FakeResponse();
 
@@ -70,7 +70,7 @@ public function testHeadersAreEmitted()
         $this->assertSame($expected, Fixtures\HeadersState::$headers);
     }
 
-    public function testHeadersSetOutsideServerInstanceAreIgnored()
+    public function test_HeadersSetOutsideServerInstance_AreIgnored()
     {
         $response = new Doubles\FakeResponse();
         $server   = $this->server($response);
@@ -94,9 +94,7 @@ public function testHeadersSetOutsideServerInstanceAreIgnored()
     private function server(?Doubles\FakeResponse $response = null, int $buffer = 0): ServerProcess
     {
         Fixtures\HeadersState::reset();
-        $requestHandler = new Doubles\FakeRequestHandler(function () use ($response) {
-            return $response ?: new Doubles\FakeResponse();
-        });
+        $requestHandler = new Doubles\FakeRequestHandler(fn () => $response ?: new Doubles\FakeResponse());
         return new ServerProcess($requestHandler, $buffer);
     }