ci: improve reliability of tests

.github/workflows/isolated-tests.yml

@@ -61,6 +61,10 @@ jobs:
           extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, intl
           coverage: pcov
 
+      - name: Setup Redis
+        if: ${{ matrix.os != 'windows-latest' && matrix.package.name == 'kv-store' }}
+        uses: supercharge/[email protected]
+
       - name: Install PHPUnit
         run: composer global require phpunit/phpunit:^12.2.3
 

packages/cryptography/tests/Encryption/EncryptionTest.php

@@ -62,7 +62,7 @@ public function test_time_protection(): void
         $this->assertSame('important data', $encrypter->decrypt($encrypted));
         $elapsed = microtime(true) - $start;
 
-        $this->assertEqualsToMoreOrLess(0.3, $elapsed, margin: 0.015);
+        $this->assertEqualsToMoreOrLess(0.3, $elapsed, margin: 0.020, windowsMargin: 0.025);
     }
 
     public function test_wrong_key(): void

packages/cryptography/tests/HasMoreIntegerAssertions.php

@@ -6,8 +6,12 @@
 
 trait HasMoreIntegerAssertions
 {
-    private function assertEqualsToMoreOrLess(int|float $expected, int|float $actual, int|float $margin): void
+    private function assertEqualsToMoreOrLess(int|float $expected, int|float $actual, int|float $margin, null|int|float $windowsMargin = null): void
     {
+        if ($windowsMargin && PHP_OS_FAMILY === 'Windows') {
+            $margin = $windowsMargin;
+        }
+
         try {
             $this->assertGreaterThanOrEqual($expected - $margin, $actual);
             $this->assertLessThanOrEqual($expected + $margin, $actual);

packages/cryptography/tests/Signing/SignerTest.php

@@ -166,7 +166,7 @@ public function test_time_protection(): void
         $this->assertTrue($signer->verify($data, $signature));
         $elapsed = microtime(true) - $start;
 
-        $this->assertEqualsToMoreOrLess(0.3, $elapsed, margin: 0.015);
+        $this->assertEqualsToMoreOrLess(0.3, $elapsed, margin: 0.015, windowsMargin: 0.025);
     }
 
     public function test_time_protection_with_mock_clock(): void

packages/cryptography/tests/TimelockTest.php

@@ -31,7 +31,7 @@ public function test_locks_for_duration(): void
 
         $elapsed = microtime(true) - $start;
 
-        $this->assertEqualsToMoreOrLess(0.1, $elapsed, margin: 0.015);
+        $this->assertEqualsToMoreOrLess(0.1, $elapsed, margin: 0.015, windowsMargin: 0.025);
     }
 
     public function test_return_early(): void
@@ -63,7 +63,7 @@ public function test_throws_exception_after_delay(): void
             );
         } catch (\RuntimeException) {
             $elapsed = microtime(true) - $start;
-            $this->assertEqualsToMoreOrLess(0.1, $elapsed, margin: 0.015);
+            $this->assertEqualsToMoreOrLess(0.1, $elapsed, margin: 0.015, windowsMargin: 0.025);
         }
     }
 

packages/kv-store/composer.json

@@ -6,6 +6,7 @@
     "require": {
         "php": "^8.4",
         "tempest/support": "dev-main",
+        "tempest/datetime": "dev-main",
         "tempest/event-bus": "dev-main"
     },
     "require-dev": {

packages/kv-store/tests/PhpRedisClientTest.php

@@ -2,22 +2,22 @@
 
 namespace Tempest\KeyValue\Tests;
 
+use PHPUnit\Framework\Attributes\PostCondition;
+use PHPUnit\Framework\Attributes\PreCondition;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\TestCase;
 use Tempest\KeyValue\Redis\Config\RedisConfig;
 use Tempest\KeyValue\Redis\PhpRedisClient;
+use Throwable;
 
+#[RequiresPhpExtension('redis')]
 final class PhpRedisClientTest extends TestCase
 {
     private PhpRedisClient $redis;
 
-    protected function setUp(): void
+    #[PreCondition]
+    protected function configure(): void
     {
-        parent::setUp();
-
-        if (! extension_loaded('redis') || ! class_exists(\Redis::class)) {
-            $this->markTestSkipped('The `redis` extension is not loaded.');
-        }
-
         $this->redis = new PhpRedisClient(
             client: new \Redis(),
             config: new RedisConfig(
@@ -29,18 +29,18 @@
 
         try {
             $this->redis->connect();
-        } catch (\Throwable) {
+        } catch (Throwable) {
             $this->markTestSkipped('Could not connect to Redis.');
         }
     }
 
-    protected function tearDown(): void
+    #[PostCondition]
+    protected function cleanup(): void
     {
         try {
             $this->redis->flush();
-        } finally {
-            parent::tearDown();
+        } catch (Throwable) {
         }
     }
 
     public function test_basic(): void

packages/kv-store/tests/PredisClientTest.php

@@ -2,19 +2,20 @@
 
 namespace Tempest\KeyValue\Tests;
 
+use PHPUnit\Framework\Attributes\PostCondition;
+use PHPUnit\Framework\Attributes\PreCondition;
 use PHPUnit\Framework\TestCase;
 use Predis;
-use Tempest\KeyValue\Redis\PhpRedisClient;
 use Tempest\KeyValue\Redis\PredisClient;
+use Throwable;
 
 final class PredisClientTest extends TestCase
 {
     private PredisClient $redis;
 
-    protected function setUp(): void
+    #[PreCondition]
+    protected function configure(): void
     {
-        parent::setUp();
-
         if (! class_exists(Predis\Client::class)) {
             $this->markTestSkipped('The `predis/predis` package is not installed.');
         }
@@ -34,18 +35,18 @@
 
         try {
             $this->redis->connect();
-        } catch (\Throwable) {
+        } catch (Throwable) {
             $this->markTestSkipped('Could not connect to Redis.');
         }
     }
 
-    protected function tearDown(): void
+    #[PostCondition]
+    protected function cleanup(): void
     {
         try {
             $this->redis->flush();
-        } finally {
-            parent::tearDown();
+        } catch (Throwable) {
         }
     }
 
     public function test_basic(): void

packages/support/tests/Filesystem/UnixFunctionsTest.php

@@ -2,6 +2,8 @@
 
 namespace Tempest\Support\Tests\Filesystem;
 
+use PHPUnit\Framework\Attributes\PostCondition;
+use PHPUnit\Framework\Attributes\PreCondition;
 use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\TestCase;
 use Tempest\Support\Filesystem;
@@ -17,22 +19,24 @@ final class UnixFunctionsTest extends TestCase
 {
     private string $fixtures = __DIR__ . '/Fixtures';
 
-    protected function setUp(): void
+    #[PreCondition]
+    protected function configure(): void
     {
-        parent::setUp();
-
         if (PHP_OS_FAMILY === 'Windows') {
-            $this->markTestSkipped('Irrelevant on Windows.');
+            $this->markTestSkipped('This test is only for Unix-like systems.');
         }
 
         Filesystem\ensure_directory_empty($this->fixtures);
 
         $this->assertTrue(is_dir($this->fixtures));
     }
 
-    protected function tearDown(): void
+    #[PostCondition]
+    protected function cleanup(): void
     {
-        parent::tearDown();
+        if (PHP_OS_FAMILY === 'Windows') {
+            return;
+        }
 
         Filesystem\delete_directory($this->fixtures);
 

tests/Integration/KeyValue/RedisTest.php

@@ -2,19 +2,21 @@
 
 namespace Tests\Tempest\Integration\KeyValue;
 
+use PHPUnit\Framework\Attributes\PostCondition;
+use PHPUnit\Framework\Attributes\PreCondition;
 use Tempest\KeyValue\Redis\Config\RedisConfig;
 use Tempest\KeyValue\Redis\Redis;
 use Tempest\KeyValue\Redis\RedisCommandExecuted;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
+use Throwable;
 
 final class RedisTest extends FrameworkIntegrationTestCase
 {
     private Redis $redis;
 
-    protected function setUp(): void
+    #[PreCondition]
+    protected function configure(): void
     {
-        parent::setUp();
-
         $this->eventBus->preventEventHandling();
 
         $this->container->config(new RedisConfig(
@@ -32,13 +34,13 @@
         }
     }
 
-    protected function tearDown(): void
+    #[PostCondition]
+    protected function cleanup(): void
     {
         try {
             $this->redis->flush();
-        } finally {
-            parent::tearDown();
+        } catch (Throwable) {
         }
     }
 
     public function test_command_is_dispatched(): void

tests/Integration/Mapper/PsrRequestToRequestMapperTest.php

@@ -99,23 +99,18 @@ public function test_files(): void
 
     public function test_body_field_in_body(): void
     {
-        $psrRequest = $this->http->makePsrRequest(
-            '/',
-            Method::POST,
-            body: [
-                'body' => 'text',
-            ],
+        $request = new PsrRequestToGenericRequestMapper($this->encrypter)->map(
+            from: $this->http->makePsrRequest(
+                uri: '/',
+                body: [
+                    'body' => 'text',
+                ],
+            ),
+            to: GenericRequest::class,
         );
 
-        $mapper = new PsrRequestToGenericRequestMapper();
-
-        $request = $mapper->map($psrRequest, GenericRequest::class);
-
-        $this->assertSame(
-            [
-                'body' => 'text',
-            ],
-            $request->body,
-        );
+        $this->assertSame([
+            'body' => 'text',
+        ], $request->body);
     }
 }