diff --git a/composer.json b/composer.json index 44193e00..afd54a59 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,6 @@ "Ibexa\\Bundle\\Solr\\": "src/bundle/", "Ibexa\\Contracts\\Solr\\": "src/contracts/", "Ibexa\\Tests\\Solr\\SetupFactory\\": "tests/lib/SetupFactory/", - "Ibexa\\Tests\\Integration\\Solr\\": "tests/integration/", "EzSystems\\EzPlatformSolrSearchEngine\\": "src/lib/", "EzSystems\\EzPlatformSolrSearchEngineBundle\\": "src/bundle/", "EzSystems\\EzPlatformSolrSearchEngine\\Tests\\SetupFactory\\": "tests/lib/SetupFactory/" diff --git a/tests/integration/IbexaTestKernel.php b/src/contracts/Test/IbexaSolrTestKernel.php similarity index 83% rename from tests/integration/IbexaTestKernel.php rename to src/contracts/Test/IbexaSolrTestKernel.php index 6c505e52..6c05ab83 100644 --- a/tests/integration/IbexaTestKernel.php +++ b/src/contracts/Test/IbexaSolrTestKernel.php @@ -6,16 +6,22 @@ */ declare(strict_types=1); -namespace Ibexa\Tests\Integration\Solr; +namespace Ibexa\Contracts\Solr\Test; use Ibexa\Bundle\Solr\IbexaSolrBundle; use Ibexa\Contracts\Core\Search\Handler; use Ibexa\Contracts\Core\Test\IbexaTestKernel as BaseIbexaTestKernel; use Ibexa\Solr\Handler as SolrHandler; +use Ibexa\Solr\Test\SolrTestContainerBuilder; use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; -final class IbexaTestKernel extends BaseIbexaTestKernel +/** + * @internal + * + * Exposed in contracts to be able to run tests from ibexa/core. + */ +final class IbexaSolrTestKernel extends BaseIbexaTestKernel { public function registerBundles(): iterable { diff --git a/tests/integration/SolrTestContainerBuilder.php b/src/lib/Test/SolrTestContainerBuilder.php similarity index 98% rename from tests/integration/SolrTestContainerBuilder.php rename to src/lib/Test/SolrTestContainerBuilder.php index c57d8f97..33166d52 100644 --- a/tests/integration/SolrTestContainerBuilder.php +++ b/src/lib/Test/SolrTestContainerBuilder.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -namespace Ibexa\Tests\Integration\Solr; +namespace Ibexa\Solr\Test; use Ibexa\Tests\Integration\Core\Repository\SearchServiceTranslationLanguageFallbackTest; use RuntimeException; diff --git a/tests/lib/SetupFactory/LegacySetupFactory.php b/tests/lib/SetupFactory/LegacySetupFactory.php index 8fc1d93b..cece8115 100644 --- a/tests/lib/SetupFactory/LegacySetupFactory.php +++ b/tests/lib/SetupFactory/LegacySetupFactory.php @@ -18,7 +18,7 @@ use Ibexa\Solr\Container\Compiler; use Ibexa\Solr\Gateway\UpdateSerializerInterface; use Ibexa\Solr\Handler as SolrSearchHandler; -use Ibexa\Tests\Integration\Solr\SolrTestContainerBuilder; +use Ibexa\Solr\Test\SolrTestContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\HttpClient\HttpClient;