TASK: Adjusts TestSuite to be synchronous

This change was partially ported from neos/neos-development-collection#4988 Following things have been adjusted: - Removal of the step: The graph projection is fully up to date - remove lastCommandOrEventResult - Removal of the step: The documenturipath projection is up to date - Use injected Connection in tests instead of DoctrineDbalClient (this will be fully refactored in #4988)
neos · May 17, 2024 · 43a05fb · 43a05fb
1 parent c170835
commit 43a05fb
Show file tree

Hide file tree

Showing 19 changed files with 45 additions and 53 deletions.
diff --git a/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php b/Classes/Behavior/Features/Bootstrap/CRTestSuiteRuntimeVariables.php
@@ -14,7 +14,6 @@
 
 namespace Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap;
 
-use Neos\ContentRepository\Core\CommandHandler\CommandResult;
 use Neos\ContentRepository\Core\ContentGraphFinder;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
@@ -48,8 +47,6 @@ trait CRTestSuiteRuntimeVariables
 
     protected ?NodeAggregateId $currentRootNodeAggregateId = null;
 
-    protected ?CommandResult $lastCommandOrEventResult = null;
-
     protected ?\Exception $lastCommandException = null;
 
     protected ?Node $currentNode = null;

diff --git a/Classes/Behavior/Features/Bootstrap/CRTestSuiteTrait.php b/Classes/Behavior/Features/Bootstrap/CRTestSuiteTrait.php
@@ -49,7 +49,6 @@
 use Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\Features\WorkspaceCreation;
 use Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\Features\WorkspaceDiscarding;
 use Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\Features\WorkspacePublishing;
-use Neos\ContentRepositoryRegistry\Factory\ProjectionCatchUpTrigger\CatchUpTriggerWithSynchronousOption;
 use Neos\EventStore\EventStoreInterface;
 use PHPUnit\Framework\Assert;
 
@@ -85,13 +84,6 @@ trait CRTestSuiteTrait
     use WorkspaceDiscarding;
     use WorkspacePublishing;
 
-    protected function setupCRTestSuiteTrait(): void
-    {
-        if (getenv('CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION')) {
-            CatchUpTriggerWithSynchronousOption::enableSynchronicityForSpeedingUpTesting();
-        }
-    }
-
     /**
      * @BeforeScenario
      * @throws \Exception
@@ -139,18 +131,6 @@ protected function readPayloadTable(TableNode $payloadTable): array
         return $eventPayload;
     }
 
-    /**
-     * @When /^the graph projection is fully up to date$/
-     */
-    public function theGraphProjectionIsFullyUpToDate(): void
-    {
-        if ($this->lastCommandOrEventResult === null) {
-            throw new \RuntimeException('lastCommandOrEventResult not filled; so I cannot block!');
-        }
-        $this->lastCommandOrEventResult->block();
-        $this->lastCommandOrEventResult = null;
-    }
-
     /**
      * @Then /^workspace "([^"]*)" points to another content stream than workspace "([^"]*)"$/
      */
@@ -304,7 +284,6 @@ public function iPruneUnusedContentStreams(): void
         /** @var ContentStreamPruner $contentStreamPruner */
         $contentStreamPruner = $this->getContentRepositoryService(new ContentStreamPrunerFactory());
         $contentStreamPruner->prune();
-        $this->lastCommandOrEventResult = $contentStreamPruner->getLastCommandResult();
     }
 
     /**

diff --git a/Classes/Behavior/Features/Bootstrap/Features/ContentStreamClosing.php b/Classes/Behavior/Features/Bootstrap/Features/ContentStreamClosing.php
@@ -37,7 +37,7 @@ public function theCommandCloseContentStreamIsExecutedWithPayload(TableNode $pay
         $commandArguments = $this->readPayloadTable($payloadTable);
         $command = CloseContentStream::create(ContentStreamId::fromString($commandArguments['contentStreamId']));
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**

diff --git a/Classes/Behavior/Features/Bootstrap/Features/ContentStreamForking.php b/Classes/Behavior/Features/Bootstrap/Features/ContentStreamForking.php
@@ -41,7 +41,7 @@ public function theCommandForkContentStreamIsExecutedWithPayload(TableNode $payl
             ContentStreamId::fromString($commandArguments['sourceContentStreamId']),
         );
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**

diff --git a/Classes/Behavior/Features/Bootstrap/Features/NodeCopying.php b/Classes/Behavior/Features/Bootstrap/Features/NodeCopying.php
@@ -67,6 +67,6 @@ public function theCommandCopyNodesRecursivelyIsExecutedCopyingTheCurrentNodeAgg
         );
         $command = $command->withNodeAggregateIdMapping(NodeAggregateIdMapping::fromArray($commandArguments['nodeAggregateIdMapping']));
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 }
diff --git a/Classes/Behavior/Features/Bootstrap/Features/NodeCreation.php b/Classes/Behavior/Features/Bootstrap/Features/NodeCreation.php
@@ -69,7 +69,7 @@ public function theCommandCreateRootNodeAggregateWithNodeIsExecutedWithPayload(T
             $command = $command->withTetheredDescendantNodeAggregateIds(NodeAggregateIdsByNodePaths::fromArray($commandArguments['tetheredDescendantNodeAggregateIds']));
         }
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
         $this->currentRootNodeAggregateId = $nodeAggregateId;
     }
 
@@ -121,7 +121,7 @@ public function theCommandUpdateRootNodeAggregateDimensionsIsExecutedWithPayload
             $nodeAggregateId,
         );
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
         $this->currentRootNodeAggregateId = $nodeAggregateId;
     }
 
@@ -158,7 +158,7 @@ public function theCommandCreateNodeAggregateWithNodeIsExecutedWithPayload(Table
         if (isset($commandArguments['tetheredDescendantNodeAggregateIds'])) {
             $command = $command->withTetheredDescendantNodeAggregateIds(NodeAggregateIdsByNodePaths::fromArray($commandArguments['tetheredDescendantNodeAggregateIds']));
         }
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**
@@ -208,8 +208,7 @@ public function theFollowingCreateNodeAggregateWithNodeCommandsAreExecuted(Table
             if (isset($row['tetheredDescendantNodeAggregateIds'])) {
                 $command = $command->withTetheredDescendantNodeAggregateIds(NodeAggregateIdsByNodePaths::fromJsonString($row['tetheredDescendantNodeAggregateIds']));
             }
-            $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
-            $this->theGraphProjectionIsFullyUpToDate();
+            $this->currentContentRepository->handle($command);
         }
     }
 
@@ -254,7 +253,7 @@ public function theCommandCreateNodeAggregateWithNodeAndSerializedPropertiesIsEx
         if (isset($commandArguments['tetheredDescendantNodeAggregateIds'])) {
             $command = $command->withTetheredDescendantNodeAggregateIds(NodeAggregateIdsByNodePaths::fromArray($commandArguments['tetheredDescendantNodeAggregateIds']));
         }
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**

diff --git a/Classes/Behavior/Features/Bootstrap/Features/NodeDisabling.php b/Classes/Behavior/Features/Bootstrap/Features/NodeDisabling.php
@@ -57,7 +57,7 @@ public function theCommandDisableNodeAggregateIsExecutedWithPayload(TableNode $p
             NodeVariantSelectionStrategy::from($commandArguments['nodeVariantSelectionStrategy']),
         );
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**
@@ -95,7 +95,7 @@ public function theCommandEnableNodeAggregateIsExecutedWithPayload(TableNode $pa
             NodeVariantSelectionStrategy::from($commandArguments['nodeVariantSelectionStrategy']),
         );
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**

diff --git a/Classes/Behavior/Features/Bootstrap/Features/NodeModification.php b/Classes/Behavior/Features/Bootstrap/Features/NodeModification.php
@@ -61,7 +61,7 @@ public function theCommandSetPropertiesIsExecutedWithPayload(TableNode $payloadT
             $this->deserializeProperties($commandArguments['propertyValues']),
         );
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**

diff --git a/Classes/Behavior/Features/Bootstrap/Features/NodeMove.php b/Classes/Behavior/Features/Bootstrap/Features/NodeMove.php
@@ -73,7 +73,7 @@ public function theCommandMoveNodeIsExecutedWithPayload(TableNode $payloadTable)
             $newSucceedingSiblingNodeAggregateId,
         );
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**

diff --git a/Classes/Behavior/Features/Bootstrap/Features/NodeReferencing.php b/Classes/Behavior/Features/Bootstrap/Features/NodeReferencing.php
@@ -75,7 +75,7 @@ public function theCommandSetNodeReferencesIsExecutedWithPayload(TableNode $payl
             $references,
         );
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**

diff --git a/Classes/Behavior/Features/Bootstrap/Features/NodeRemoval.php b/Classes/Behavior/Features/Bootstrap/Features/NodeRemoval.php
@@ -61,7 +61,7 @@ public function theCommandRemoveNodeAggregateIsExecutedWithPayload(TableNode $pa
             $command = $command->withRemovalAttachmentPoint(NodeAggregateId::fromString($commandArguments['removalAttachmentPoint']));
         }
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**

diff --git a/Classes/Behavior/Features/Bootstrap/Features/NodeRenaming.php b/Classes/Behavior/Features/Bootstrap/Features/NodeRenaming.php
@@ -47,7 +47,7 @@ public function theCommandChangeNodeAggregateNameIsExecutedWithPayload(TableNode
             NodeName::fromString($commandArguments['newNodeName']),
         );
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**

diff --git a/Classes/Behavior/Features/Bootstrap/Features/NodeTypeChange.php b/Classes/Behavior/Features/Bootstrap/Features/NodeTypeChange.php
@@ -53,7 +53,7 @@ public function theCommandChangeNodeAggregateTypeIsExecutedWithPayload(TableNode
             $command = $command->withTetheredDescendantNodeAggregateIds(NodeAggregateIdsByNodePaths::fromArray($commandArguments['tetheredDescendantNodeAggregateIds']));
         }
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**

diff --git a/Classes/Behavior/Features/Bootstrap/Features/NodeVariation.php b/Classes/Behavior/Features/Bootstrap/Features/NodeVariation.php
@@ -51,7 +51,7 @@ public function theCommandCreateNodeVariantIsExecutedWithPayload(TableNode $payl
             OriginDimensionSpacePoint::fromArray($commandArguments['sourceOrigin']),
             OriginDimensionSpacePoint::fromArray($commandArguments['targetOrigin']),
         );
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**

diff --git a/Classes/Behavior/Features/Bootstrap/Features/SubtreeTagging.php b/Classes/Behavior/Features/Bootstrap/Features/SubtreeTagging.php
@@ -61,7 +61,7 @@ public function theCommandTagSubtreeIsExecutedWithPayload(TableNode $payloadTabl
             SubtreeTag::fromString($commandArguments['tag']),
         );
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**
@@ -132,7 +132,7 @@ public function theCommandUntagSubtreeIsExecutedWithPayload(TableNode $payloadTa
             SubtreeTag::fromString($commandArguments['tag']),
         );
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**

diff --git a/Classes/Behavior/Features/Bootstrap/Features/WorkspaceCreation.php b/Classes/Behavior/Features/Bootstrap/Features/WorkspaceCreation.php
@@ -15,6 +15,7 @@
 namespace Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\Features;
 
 use Behat\Gherkin\Node\TableNode;
+use Neos\ContentRepository\Core\Feature\ContentStreamCreation\Command\CreateContentStream;
 use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName;
 use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateRootWorkspace;
 use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateWorkspace;
@@ -39,6 +40,22 @@ abstract protected function readPayloadTable(TableNode $payloadTable): array;
 
     abstract protected function publishEvent(string $eventType, StreamName $streamName, array $eventPayload): void;
 
+    /**
+     * @When /^the command CreateContentStream is executed with payload:$/
+     * @param TableNode $payloadTable
+     * @throws \Exception
+     */
+    public function theCommandCreateContentStreamIsExecutedWithPayload(TableNode $payloadTable)
+    {
+        $commandArguments = $this->readPayloadTable($payloadTable);
+
+        $command = CreateContentStream::create(
+            ContentStreamId::fromString($commandArguments['contentStreamId']),
+        );
+
+        $this->currentContentRepository->handle($command);
+    }
+
     /**
      * @When /^the command CreateRootWorkspace is executed with payload:$/
      * @param TableNode $payloadTable
@@ -55,7 +72,7 @@ public function theCommandCreateRootWorkspaceIsExecutedWithPayload(TableNode $pa
             ContentStreamId::fromString($commandArguments['newContentStreamId'])
         );
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
     /**
      * @Given /^the event RootWorkspaceWasCreated was published with payload:$/
@@ -88,7 +105,7 @@ public function theCommandCreateWorkspaceIsExecutedWithPayload(TableNode $payloa
             isset($commandArguments['workspaceOwner']) ? UserId::fromString($commandArguments['workspaceOwner']) : null
         );
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
 
@@ -110,7 +127,7 @@ public function theCommandRebaseWorkspaceIsExecutedWithPayload(TableNode $payloa
             $command = $command->withErrorHandlingStrategy(RebaseErrorHandlingStrategy::from($commandArguments['rebaseErrorHandlingStrategy']));
         }
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**

diff --git a/Classes/Behavior/Features/Bootstrap/Features/WorkspaceDiscarding.php b/Classes/Behavior/Features/Bootstrap/Features/WorkspaceDiscarding.php
@@ -46,7 +46,7 @@ public function theCommandDiscardWorkspaceIsExecuted(TableNode $payloadTable): v
             $command = $command->withNewContentStreamId(ContentStreamId::fromString($commandArguments['newContentStreamId']));
         }
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
 
@@ -67,7 +67,7 @@ public function theCommandDiscardIndividualNodesFromWorkspaceIsExecuted(TableNod
             $command = $command->withNewContentStreamId(ContentStreamId::fromString($commandArguments['newContentStreamId']));
         }
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
 

diff --git a/Classes/Behavior/Features/Bootstrap/Features/WorkspacePublishing.php b/Classes/Behavior/Features/Bootstrap/Features/WorkspacePublishing.php
@@ -53,7 +53,7 @@ public function theCommandPublishIndividualNodesFromWorkspaceIsExecuted(TableNod
             $command = $command->withContentStreamIdForRemainingPart(ContentStreamId::fromString($commandArguments['contentStreamIdForRemainingPart']));
         }
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**
@@ -85,7 +85,7 @@ public function theCommandPublishWorkspaceIsExecuted(TableNode $payloadTable): v
             );
         }
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**

diff --git a/Classes/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php b/Classes/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php
@@ -81,7 +81,7 @@ public function theCommandIsExecutedWithPayload(string $shortCommandName, TableN
 
         $command = $commandClassName::fromArray($commandArguments);
 
-        $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+        $this->currentContentRepository->handle($command);
     }
 
     /**
@@ -140,7 +140,7 @@ protected function publishEvent(string $eventType, StreamName $streamName, array
             ->getValue($eventPersister);
         $event = $eventNormalizer->denormalize($artificiallyConstructedEvent);
 
-        $this->lastCommandOrEventResult = $eventPersister->publishEvents(new EventsToPublish(
+        $eventPersister->publishEvents(new EventsToPublish(
             $streamName,
             Events::with($event),
             ExpectedVersion::ANY()
-Original file line number
+Diff line change
@@ Expand Up @@
                 ContentStreamId::fromString($commandArguments['sourceContentStreamId']),
             );
-            $this->lastCommandOrEventResult = $this->currentContentRepository->handle($command);
+            $this->currentContentRepository->handle($command);
         }
         /**
@@ Expand Down @@