[Tests] Moved IbexaSolrTestKernel to src/contracts

ibexa · Nov 9, 2023 · c80530b · c80530b
1 parent 4f3ec53
commit c80530b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git 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 → src/contracts/Test/IbexaSolrTestKernel.php b/tests/integration/IbexaTestKernel.php → 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/.../integration/SolrTestContainerBuilder.php → src/lib/Test/SolrTestContainerBuilder.php b/.../integration/SolrTestContainerBuilder.php → 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;
@@ -31,8 +31,8 @@ public function loadSolrSettings(ContainerBuilder $containerBuilder): void
     {
         $containerBuilder->setParameter('test.ibexa.solr.host', getenv('SOLR_HOST') ?: 'localhost');
 
-        $settingsPath = dirname(__DIR__, 2) . '/src/lib/Resources/config/container/';
-        $testSettingsPath = dirname(__DIR__) . '/lib/Resources/config/';
+        $settingsPath = dirname(__DIR__) . '/Resources/config/container/';
+        $testSettingsPath = dirname(__DIR__, 3) . '/tests/lib/Resources/config/';
 
         $solrLoader = new YamlFileLoader($containerBuilder, new FileLocator($settingsPath));
         $solrLoader->load('solr.yml');

diff --git 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;