Merge pull request #559 from patchlevel/add-dbal-tests

Add more DoctrineDbalStore tests
patchlevel · Mar 28, 2024 · 2eb51a6 · 2eb51a6
2 parents 1fd21cb + 300b010
commit 2eb51a6
Show file tree

Hide file tree

Showing 14 changed files with 978 additions and 44 deletions.
diff --git a/.github/workflows/mutation-tests-diff.yml b/.github/workflows/mutation-tests-diff.yml
@@ -39,4 +39,4 @@ jobs:
                   dependency-versions: ${{ matrix.dependencies }}
 
             - name: "Infection"
-              run: "vendor/bin/roave-infection-static-analysis-plugin --git-diff-lines --git-diff-base=origin/$GITHUB_BASE_REF --ignore-msi-with-no-mutations --only-covered --min-msi=80 --min-covered-msi=95"
+              run: "vendor/bin/roave-infection-static-analysis-plugin --threads=max --git-diff-lines --git-diff-base=origin/$GITHUB_BASE_REF --ignore-msi-with-no-mutations --only-covered --min-msi=80 --min-covered-msi=95"
diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml
@@ -41,6 +41,6 @@ jobs:
                 dependency-versions: ${{ matrix.dependencies }}
 
             - name: "Infection"
-              run: "vendor/bin/roave-infection-static-analysis-plugin"
+              run: "vendor/bin/roave-infection-static-analysis-plugin --threads=max"
               env:
                   STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
diff --git a/Makefile b/Makefile
@@ -49,7 +49,7 @@ phpunit-unit: vendor                                             				## run phpu
 
 .PHONY: infection
 infection: vendor                                                               ## run infection
-	vendor/bin/infection
+	php -d memory_limit=312M vendor/bin/roave-infection-static-analysis-plugin --threads=max
 
 .PHONY: deptrac
 deptrac: vendor-tools                                                           ## run deptrac

diff --git a/baseline.xml b/baseline.xml
@@ -286,6 +286,21 @@
       <code><![CDATA[ProfileVisited&ProfileCreated $event]]></code>
     </ReservedWord>
   </file>
+  <file src="tests/Unit/Store/DoctrineDbalStoreTest.php">
+    <DeprecatedMethod>
+      <code><![CDATA[addMethods]]></code>
+    </DeprecatedMethod>
+    <InternalMethod>
+      <code><![CDATA[new DefaultSelectSQLBuilder($abstractPlatform->reveal(), 'FOR UPDATE', 'SKIP LOCKED')]]></code>
+      <code><![CDATA[new DefaultSelectSQLBuilder($abstractPlatform->reveal(), 'FOR UPDATE', 'SKIP LOCKED')]]></code>
+      <code><![CDATA[new DefaultSelectSQLBuilder($abstractPlatform->reveal(), 'FOR UPDATE', 'SKIP LOCKED')]]></code>
+      <code><![CDATA[new DefaultSelectSQLBuilder($abstractPlatform->reveal(), 'FOR UPDATE', 'SKIP LOCKED')]]></code>
+      <code><![CDATA[new DefaultSelectSQLBuilder($abstractPlatform->reveal(), 'FOR UPDATE', 'SKIP LOCKED')]]></code>
+      <code><![CDATA[new DefaultSelectSQLBuilder($abstractPlatform->reveal(), 'FOR UPDATE', 'SKIP LOCKED')]]></code>
+      <code><![CDATA[new DefaultSelectSQLBuilder($abstractPlatform->reveal(), 'FOR UPDATE', 'SKIP LOCKED')]]></code>
+      <code><![CDATA[new DefaultSelectSQLBuilder($abstractPlatform->reveal(), 'FOR UPDATE', 'SKIP LOCKED')]]></code>
+    </InternalMethod>
+  </file>
   <file src="tests/Unit/Subscription/Engine/DefaultSubscriptionEngineTest.php">
     <PossiblyUndefinedArrayOffset>
       <code><![CDATA[$update1]]></code>

diff --git a/infection.json.dist b/infection.json.dist
@@ -7,13 +7,13 @@
   "logs": {
     "text": "infection.log",
     "stryker": {
-      "report": "2.0.x"
+      "report": "3.0.x"
     }
   },
   "mutators": {
     "@default": true
   },
-  "minMsi": 55,
-  "minCoveredMsi": 90,
+  "minMsi": 62,
+  "minCoveredMsi": 92,
   "testFrameworkOptions": "--testsuite=unit"
 }
diff --git a/src/Store/DoctrineDbalStore.php b/src/Store/DoctrineDbalStore.php
@@ -214,14 +214,7 @@ function (Connection $connection) use ($messages): void {
                         continue;
                     }
 
-                    $query = sprintf(
-                        "INSERT INTO %s (%s) VALUES\n(%s)",
-                        $this->storeTableName,
-                        implode(', ', $columns),
-                        implode("),\n(", $placeholders),
-                    );
-
-                    $connection->executeStatement($query, $parameters, $types);
+                    $this->executeSave($columns, $placeholders, $parameters, $types, $connection);
 
                     $parameters = [];
                     $placeholders = [];
@@ -234,18 +227,7 @@ function (Connection $connection) use ($messages): void {
                     return;
                 }
 
-                $query = sprintf(
-                    "INSERT INTO %s (%s) VALUES\n(%s)",
-                    $this->storeTableName,
-                    implode(', ', $columns),
-                    implode("),\n(", $placeholders),
-                );
-
-                try {
-                    $connection->executeStatement($query, $parameters, $types);
-                } catch (UniqueConstraintViolationException $e) {
-                    throw new UniqueConstraintViolation($e);
-                }
+                $this->executeSave($columns, $placeholders, $parameters, $types, $connection);
             },
         );
     }
@@ -288,8 +270,7 @@ public function configureSchema(Schema $schema, Connection $connection): void
         $table = $schema->createTable($this->storeTableName);
 
         $table->addColumn('id', Types::BIGINT)
-            ->setAutoincrement(true)
-            ->setNotnull(true);
+            ->setAutoincrement(true);
         $table->addColumn('aggregate', Types::STRING)
             ->setLength(255)
             ->setNotnull(true);
@@ -390,4 +371,26 @@ private function createTriggerFunctionName(): string
 
         return sprintf('%1$s.notify_%2$s', $tableConfig[0], $tableConfig[1]);
     }
+
+    /**
+     * @param array<string>               $columns
+     * @param array<string>               $placeholders
+     * @param list<mixed>                 $parameters
+     * @param array<0|positive-int, Type> $types
+     */
+    private function executeSave(array $columns, array $placeholders, array $parameters, array $types, Connection $connection): void
+    {
+        $query = sprintf(
+            "INSERT INTO %s (%s) VALUES\n(%s)",
+            $this->storeTableName,
+            implode(', ', $columns),
+            implode("),\n(", $placeholders),
+        );
+
+        try {
+            $connection->executeStatement($query, $parameters, $types);
+        } catch (UniqueConstraintViolationException $e) {
+            throw new UniqueConstraintViolation($e);
+        }
+    }
 }
diff --git a/tests/Integration/BasicImplementation/Header/BazHeader.php b/tests/Integration/BasicImplementation/Header/BazHeader.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Integration\BasicImplementation\Header;
+namespace Patchlevel\EventSourcing\Tests\Integration\BasicImplementation\Header;
 
 use Patchlevel\EventSourcing\Attribute\Header;
 

diff --git a/tests/Integration/BasicImplementation/Header/FooHeader.php b/tests/Integration/BasicImplementation/Header/FooHeader.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Integration\BasicImplementation\Header;
+namespace Patchlevel\EventSourcing\Tests\Integration\BasicImplementation\Header;
 
 use Patchlevel\EventSourcing\Attribute\Header;
 

diff --git a/tests/Integration/BasicImplementation/MessageDecorator/FooMessageDecorator.php b/tests/Integration/BasicImplementation/MessageDecorator/FooMessageDecorator.php
@@ -4,10 +4,10 @@
 
 namespace Patchlevel\EventSourcing\Tests\Integration\BasicImplementation\MessageDecorator;
 
-use Integration\BasicImplementation\Header\BazHeader;
-use Integration\BasicImplementation\Header\FooHeader;
 use Patchlevel\EventSourcing\Message\Message;
 use Patchlevel\EventSourcing\Repository\MessageDecorator\MessageDecorator;
+use Patchlevel\EventSourcing\Tests\Integration\BasicImplementation\Header\BazHeader;
+use Patchlevel\EventSourcing\Tests\Integration\BasicImplementation\Header\FooHeader;
 
 final class FooMessageDecorator implements MessageDecorator
 {

diff --git a/tests/Unit/Fixture/Header/BazHeader.php b/tests/Unit/Fixture/Header/BazHeader.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchlevel\EventSourcing\Tests\Unit\Fixture\Header;
+
+use Patchlevel\EventSourcing\Attribute\Header;
+
+/** @psalm-immutable */
+#[Header('baz')]
+final class BazHeader
+{
+    public function __construct(
+        public readonly string $data,
+    ) {
+    }
+}
diff --git a/tests/Unit/Fixture/Header/FooHeader.php b/tests/Unit/Fixture/Header/FooHeader.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchlevel\EventSourcing\Tests\Unit\Fixture\Header;
+
+use Patchlevel\EventSourcing\Attribute\Header;
+
+/** @psalm-immutable */
+#[Header('foo')]
+final class FooHeader
+{
+    public function __construct(
+        public readonly string $data,
+    ) {
+    }
+}
diff --git a/tests/Unit/Fixture/ProfileEmailChanged.php b/tests/Unit/Fixture/ProfileEmailChanged.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchlevel\EventSourcing\Tests\Unit\Fixture;
+
+use Patchlevel\EventSourcing\Attribute\Event;
+use Patchlevel\EventSourcing\Serializer\Normalizer\IdNormalizer;
+
+#[Event('profile_email_changed')]
+final class ProfileEmailChanged
+{
+    public function __construct(
+        #[IdNormalizer]
+        public ProfileId $profileId,
+        #[EmailNormalizer]
+        public Email $email,
+    ) {
+    }
+}
diff --git a/tests/Unit/Store/ArrayStreamTest.php b/tests/Unit/Store/ArrayStreamTest.php
@@ -161,4 +161,29 @@ public function testClose(): void
         $stream->close();
         $stream->index();
     }
+
+    public function testPositionEmpty(): void
+    {
+        $stream = new ArrayStream([]);
+        $position = $stream->position();
+
+        self::assertNull($position);
+    }
+
+    public function testPosition(): void
+    {
+        $message = Message::create(
+            new ProfileCreated(
+                ProfileId::fromString('foo'),
+                Email::fromString('[email protected]'),
+            ),
+        );
+
+        $messages = [$message];
+
+        $stream = new ArrayStream($messages);
+        $position = $stream->position();
+
+        self::assertSame(0, $position);
+    }
 }