Move test suite helpers to test folders to avoid autoloading in non-t…

…esting context
neos · Aug 29, 2023 · b3e6431 · b3e6431
1 parent 373d253
commit b3e6431
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Bootstrap/FeatureContext.php b/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Bootstrap/FeatureContext.php
@@ -21,9 +21,9 @@
 use Neos\Behat\Tests\Behat\FlowContextTrait;
 use Neos\ContentGraph\DoctrineDbalAdapter\Tests\Behavior\Features\Bootstrap\ProjectionIntegrityViolationDetectionTrait;
 use Neos\ContentRepository\BehavioralTests\Tests\Functional\BehatTestHelper;
-use Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\CRBehavioralTestsSubjectProvider;
-use Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\GherkinPyStringNodeBasedNodeTypeManagerFactory;
-use Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\GherkinTableNodeBasedContentDimensionSourceFactory;
+use Neos\ContentRepository\BehavioralTests\Tests\Behavior\Helpers\CRBehavioralTestsSubjectProvider;
+use Neos\ContentRepository\BehavioralTests\Tests\Behavior\Helpers\GherkinPyStringNodeBasedNodeTypeManagerFactory;
+use Neos\ContentRepository\BehavioralTests\Tests\Behavior\Helpers\GherkinTableNodeBasedContentDimensionSourceFactory;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\Factory\ContentRepositoryId;
 use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface;

diff --git a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Bootstrap/FeatureContext.php b/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Bootstrap/FeatureContext.php
@@ -24,9 +24,9 @@
 use Neos\ContentRepository\BehavioralTests\ProjectionRaceConditionTester\Dto\TraceEntryType;
 use Neos\ContentRepository\BehavioralTests\ProjectionRaceConditionTester\RedisInterleavingLogger;
 use Neos\ContentRepository\BehavioralTests\Tests\Functional\BehatTestHelper;
-use Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\CRBehavioralTestsSubjectProvider;
-use Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\GherkinPyStringNodeBasedNodeTypeManagerFactory;
-use Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\GherkinTableNodeBasedContentDimensionSourceFactory;
+use Neos\ContentRepository\BehavioralTests\Tests\Behavior\Helpers\CRBehavioralTestsSubjectProvider;
+use Neos\ContentRepository\BehavioralTests\Tests\Behavior\Helpers\GherkinPyStringNodeBasedNodeTypeManagerFactory;
+use Neos\ContentRepository\BehavioralTests\Tests\Behavior\Helpers\GherkinTableNodeBasedContentDimensionSourceFactory;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\Factory\ContentRepositoryId;
 use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface;

diff --git a/...vior/CRBehavioralTestsSubjectProvider.php → ...pers/CRBehavioralTestsSubjectProvider.php b/...vior/CRBehavioralTestsSubjectProvider.php → ...pers/CRBehavioralTestsSubjectProvider.php
@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\ContentRepository\BehavioralTests\TestSuite\Behavior;
+namespace Neos\ContentRepository\BehavioralTests\Tests\Behavior\Helpers;
 
 use Behat\Gherkin\Node\PyStringNode;
 use Behat\Gherkin\Node\TableNode;

diff --git a/...s/TestSuite/Behavior/FakeClockFactory.php → ...sts/Behavior/Helpers/FakeClockFactory.php b/...s/TestSuite/Behavior/FakeClockFactory.php → ...sts/Behavior/Helpers/FakeClockFactory.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\ContentRepository\BehavioralTests\TestSuite\Behavior;
+namespace Neos\ContentRepository\BehavioralTests\Tests\Behavior\Helpers;
 
 use Neos\ContentRepository\Core\Factory\ContentRepositoryId;
 use Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\Helpers\FakeClock;

diff --git a/...te/Behavior/FakeUserIdProviderFactory.php → ...ior/Helpers/FakeUserIdProviderFactory.php b/...te/Behavior/FakeUserIdProviderFactory.php → ...ior/Helpers/FakeUserIdProviderFactory.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\ContentRepository\BehavioralTests\TestSuite\Behavior;
+namespace Neos\ContentRepository\BehavioralTests\Tests\Behavior\Helpers;
 
 use Neos\ContentRepository\Core\Factory\ContentRepositoryId;
 use Neos\ContentRepository\Core\SharedModel\User\UserIdProviderInterface;

diff --git a/...StringNodeBasedNodeTypeManagerFactory.php → ...StringNodeBasedNodeTypeManagerFactory.php b/...StringNodeBasedNodeTypeManagerFactory.php → ...StringNodeBasedNodeTypeManagerFactory.php
@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\ContentRepository\BehavioralTests\TestSuite\Behavior;
+namespace Neos\ContentRepository\BehavioralTests\Tests\Behavior\Helpers;
 
 use Behat\Gherkin\Node\PyStringNode;
 use Neos\ContentRepository\Core\Factory\ContentRepositoryId;

diff --git a/...odeBasedContentDimensionSourceFactory.php → ...odeBasedContentDimensionSourceFactory.php b/...odeBasedContentDimensionSourceFactory.php → ...odeBasedContentDimensionSourceFactory.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\ContentRepository\BehavioralTests\TestSuite\Behavior;
+namespace Neos\ContentRepository\BehavioralTests\Tests\Behavior\Helpers;
 
 use Behat\Gherkin\Node\TableNode;
 use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface;

diff --git a/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php b/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php
@@ -26,7 +26,7 @@
 use Neos\ContentRepository\LegacyNodeMigration\NodeDataToEventsProcessor;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
-use Neos\ContentRepositoryRegistry\TestSuite\Behavior\CRRegistrySubjectProvider;
+use Neos\ContentRepositoryRegistry\Tests\Behavior\CRRegistrySubjectProvider;
 use Neos\Flow\Property\PropertyMapper;
 use Neos\Flow\ResourceManagement\PersistentResource;
 use PHPUnit\Framework\Assert;

diff --git a/...te/Behavior/CRRegistrySubjectProvider.php → ...ts/Behavior/CRRegistrySubjectProvider.php b/...te/Behavior/CRRegistrySubjectProvider.php → ...ts/Behavior/CRRegistrySubjectProvider.php
@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\ContentRepositoryRegistry\TestSuite\Behavior;
+namespace Neos\ContentRepositoryRegistry\Tests\Behavior;
 
 use Doctrine\DBAL\Connection;
 use Neos\Behat\Tests\Behat\FlowContextTrait;
@@ -24,7 +24,7 @@
 use Neos\ContentRepositoryRegistry\Exception\ContentRepositoryNotFoundException;
 use Neos\EventStore\EventStoreInterface;
 
-require_once(__DIR__ . '/../../../../../Application/Neos.Behat/Tests/Behat/FlowContextTrait.php');
+require_once(__DIR__ . '/../../../../Application/Neos.Behat/Tests/Behat/FlowContextTrait.php');
 
 /**
  * The node creation trait for behavioral tests

diff --git a/Neos.Neos/Tests/Behavior/Features/Bootstrap/FeatureContext.php b/Neos.Neos/Tests/Behavior/Features/Bootstrap/FeatureContext.php
@@ -18,9 +18,9 @@
 use Behat\Mink\Exception\ElementNotFoundException;
 use Behat\MinkExtension\Context\MinkContext;
 use Neos\Behat\Tests\Behat\FlowContextTrait;
-use Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\CRBehavioralTestsSubjectProvider;
-use Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\GherkinPyStringNodeBasedNodeTypeManagerFactory;
-use Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\GherkinTableNodeBasedContentDimensionSourceFactory;
+use Neos\ContentRepository\BehavioralTests\Tests\Behavior\Helpers\CRBehavioralTestsSubjectProvider;
+use Neos\ContentRepository\BehavioralTests\Tests\Behavior\Helpers\GherkinPyStringNodeBasedNodeTypeManagerFactory;
+use Neos\ContentRepository\BehavioralTests\Tests\Behavior\Helpers\GherkinTableNodeBasedContentDimensionSourceFactory;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\Factory\ContentRepositoryId;
 use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface;