Create solr core and db solrCore for each test

Tests/Fixtures/Controller/documents.solr.json

@@ -9,7 +9,7 @@
 		"sid": "LOG_0000",
 		"toplevel": true,
 		"type": "manuscript",
-		"type_faceting": "manuscript",
+		"type_faceting": ["manuscript"],
 		"title": "10 Keyboard pieces - Go. S. 658",
 		"record_id": "oai:de:slub-dresden:db:id-476251419",
 		"purl": "http://digital.slub-dresden.de/id476251419",
@@ -43,7 +43,7 @@
 		"sid": "LOG_0001",
 		"toplevel": false,
 		"type": "other",
-		"type_faceting": "other",
+		"type_faceting": ["other"],
 		"title": "Beigefügte Quellenbeschreibung",
 		"location": "https://digital.slub-dresden.de/data/kitodo/10Kepi_476251419/10Kepi_476251419_mets.xml",
 		"collection": [
@@ -72,7 +72,7 @@
 		"sid": "LOG_0002",
 		"toplevel": false,
 		"type": "other",
-		"type_faceting": "other",
+		"type_faceting": ["other"],
 		"title": "Beigefügtes Inhaltsverzeichnis",
 		"location": "https://digital.slub-dresden.de/data/kitodo/10Kepi_476251419/10Kepi_476251419_mets.xml",
 		"collection": [],

Tests/Functional/Api/OaiPmhTest.php

@@ -62,7 +62,7 @@ protected function setUpOaiSolr()
         static $solr = null;
 
         if ($solr === null) {
-            $coreName = Solr::createCore();
+            $coreName = Solr::createCore('OaiCore');
             $solr = Solr::getInstance($coreName);
 
             $this->importSolrDocuments($solr, __DIR__ . '/../../Fixtures/Common/documents_1.solr.json');

Tests/Functional/Common/SolrSearchQueryTest.php

@@ -73,15 +73,10 @@ protected function setUpSolr($uid, $storagePid, $solrFixtures)
     {
         $this->solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, $storagePid);
 
-        // Setup Solr only once for all tests in this suite
-        static $solr = null;
-
-        if ($solr === null) {
-            $coreName = Solr::createCore();
-            $solr = Solr::getInstance($coreName);
-            foreach ($solrFixtures as $filePath) {
-                $this->importSolrDocuments($solr, $filePath);
-            }
+        $coreName = Solr::createCore('solrSearchQueryTest');
+        $solr = Solr::getInstance($coreName);
+        foreach ($solrFixtures as $filePath) {
+            $this->importSolrDocuments($solr, $filePath);
         }
 
         $coreModel = $this->solrCoreRepository->findByUid($uid);

Tests/Functional/Common/SolrSearchTest.php

@@ -86,15 +86,10 @@ protected function setUpSolr($uid, $storagePid, $solrFixtures)
     {
         $this->solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, $storagePid);
 
-        // Setup Solr only once for all tests in this suite
-        static $solr = null;
-
-        if ($solr === null) {
-            $coreName = Solr::createCore();
-            $solr = Solr::getInstance($coreName);
-            foreach ($solrFixtures as $filePath) {
-                $this->importSolrDocuments($solr, $filePath);
-            }
+        $coreName = Solr::createCore('solrSearchTest');
+        $solr = Solr::getInstance($coreName);
+        foreach ($solrFixtures as $filePath) {
+            $this->importSolrDocuments($solr, $filePath);
         }
 
         $coreModel = $this->solrCoreRepository->findByUid($uid);

Tests/Functional/Common/SolrTest.php

@@ -66,10 +66,10 @@ public function canEscapeQueryKeepField()
      */
     public function canGetNextCoreNumber()
     {
-        $this->assertEquals(5, Solr::getNextCoreNumber());
-        $this->assertEquals(5, Solr::getNextCoreNumber());
+        $this->assertEquals(2, Solr::getNextCoreNumber());
+        $this->assertEquals(2, Solr::getNextCoreNumber());
         Solr::createCore();
-        $this->assertEquals(6, Solr::getNextCoreNumber());
+        $this->assertEquals(3, Solr::getNextCoreNumber());
     }
 
     /**
@@ -98,15 +98,10 @@ protected function setUpSolr($uid, $storagePid, $solrFixtures)
     {
         $this->solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, $storagePid);
 
-        // Setup Solr only once for all tests in this suite
-        static $solr = null;
-
-        if ($solr === null) {
-            $coreName = Solr::createCore();
-            $solr = Solr::getInstance($coreName);
-            foreach ($solrFixtures as $filePath) {
-                $this->importSolrDocuments($solr, $filePath);
-            }
+        $coreName = Solr::createCore('SolrTestCore');
+        $solr = Solr::getInstance($coreName);
+        foreach ($solrFixtures as $filePath) {
+            $this->importSolrDocuments($solr, $filePath);
         }
 
         $coreModel = $this->solrCoreRepository->findByUid($uid);

Tests/Functional/Controller/AbstractControllerTest.php

@@ -14,6 +14,7 @@
 
 use Kitodo\Dlf\Common\Solr\Solr;
 use Kitodo\Dlf\Controller\AbstractController;
+use Kitodo\Dlf\Domain\Model\SolrCore;
 use Kitodo\Dlf\Domain\Repository\DocumentRepository;
 use Kitodo\Dlf\Domain\Repository\SolrCoreRepository;
 use Kitodo\Dlf\Tests\Functional\FunctionalTestCase;
@@ -26,22 +27,31 @@
 
 abstract class AbstractControllerTest extends FunctionalTestCase
 {
+    public $currentSolrUid = 1;
+
+    public $currentCoreName = '';
 
     protected function setUpData($databaseFixtures): void
     {
         foreach ($databaseFixtures as $filePath) {
             $this->importCSVDataSet($filePath);
         }
         $this->persistenceManager = $this->objectManager->get(PersistenceManager::class);
-        $this->initializeRepository(DocumentRepository::class, 0);
+        $documentRepository = $this->initializeRepository(DocumentRepository::class, 0);
+
+        $allFixtureDocuments = $documentRepository->findAll();
+        foreach ($allFixtureDocuments as $document) {
+            $document->setSolrCore($this->currentSolrUid);
+            $documentRepository->update($document);
+        }
+        $this->persistenceManager->persistAll();
     }
 
-    protected function setUpSolr($uid, $storagePid, $solrFixtures)
+    protected function setUpSolr($uid, $storagePid, $solrFixtures, $name = '')
     {
         $this->solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, $storagePid);
 
-        // Setup Solr only once for all tests in this suite
-        static $solr = null;
+        $solr = null;
 
         if ($solr === null) {
             $coreName = Solr::createCore();
@@ -51,10 +61,13 @@ protected function setUpSolr($uid, $storagePid, $solrFixtures)
             }
         }
 
-        $coreModel = $this->solrCoreRepository->findByUid($uid);
-        $coreModel->setIndexName($solr->core);
-        $this->solrCoreRepository->update($coreModel);
+        $coreModel = new SolrCore();
+        $coreModel->setIndexName($coreName);
+        $this->solrCoreRepository->add($coreModel);
         $this->persistenceManager->persistAll();
+        $this->currentSolrUid = $coreModel->getUid();
+        $this->currentCoreName = $coreName;
+
     }
 
     protected function setUpRequest($actionName, $arguments = []): Request

Tests/Functional/Controller/CalendarControllerTest.php

@@ -36,7 +36,7 @@ public function setUp(): void
      */
     public function canCalendarAction()
     {
-        $settings = ['solrcore' => 4];
+        $settings = ['solrcore' => $this->currentSolrUid];
         $templateHtml = '<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">
             calendarData:<f:for each="{calendarData}" as="month">
                 <f:for each="{month.week}" as="week"><f:for each="{week}" as="day"><f:if condition="{day.issues}">
@@ -89,7 +89,7 @@ public function canMainAction()
      */
     public function canYearsAction()
     {
-        $settings = ['solrcore' => 4];
+        $settings = ['solrcore' => $this->currentSolrUid];
         $templateHtml = '<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">
             documentId: {documentId}
             allYearDocTitle: {allYearDocTitle}

Tests/Functional/Controller/CollectionControllerTest.php

@@ -39,7 +39,7 @@ public function setUp(): void
     public function canListAction()
     {
         $settings = [
-            'solrcore' => 4,
+            'solrcore' => $this->currentSolrUid,
             'collections' => '1',
             'dont_show_single' => 'some_value',
             'randomize' => ''
@@ -62,7 +62,7 @@ public function canListAction()
     public function canListActionForwardToShow()
     {
         $settings = [
-            'solrcore' => 4,
+            'solrcore' => $this->currentSolrUid,
             'collections' => '1',
             'randomize' => ''
         ];
@@ -80,7 +80,7 @@ public function canListActionForwardToShow()
     public function canShowAction()
     {
         $settings = [
-            'solrcore' => 4,
+            'solrcore' => $this->currentSolrUid,
             'collections' => '1',
             'dont_show_single' => 'some_value',
             'randomize' => ''
@@ -104,7 +104,7 @@ public function canShowAction()
     public function canShowSortedAction()
     {
         $settings = [
-            'solrcore' => 4,
+            'solrcore' => $this->currentSolrUid,
             'collections' => '1',
             'dont_show_single' => 'some_value',
             'randomize' => ''

Tests/Functional/Controller/FeedsControllerTest.php

@@ -36,7 +36,7 @@ public function canMainAction()
     {
         $GLOBALS['LANG'] = LanguageService::create('default');
         $settings = [
-            'solrcore' => 4,
+            'solrcore' => $this->currentSolrUid,
             'collections' => '1',
             'limit' => 1
         ];

Tests/Functional/Controller/ListViewControllerTest.php

@@ -44,17 +44,16 @@ public function canMainAction(): void
             ]
         ];
         $settings = [
-            'solrcore' => 4,
+            'solrcore' => $this->currentSolrUid,
             'storagePid' => 2,
             'dont_show_single' => 'some_value',
             'randomize' => ''
         ];
         $templateHtml = '<html xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers">
                 <f:spaceless>
                 uniqueId-length: <v:count.bytes>{viewData.uniqueId}</v:count.bytes>
-                page: {viewData.requestData.page}
+                page: {page}
                 double: {viewData.requestData.double}
-                widgetPage: {widgetPage.currentPage}
                 lastSearch.query: {lastSearch.query}
                 numResults: {numResults}
                 </f:spaceless>

Tests/Functional/Controller/MetadataControllerTest.php

@@ -34,7 +34,7 @@ public function setUp(): void
     public function canMainAction()
     {
         $settings = [
-            'solrcore' => 4,
+            'solrcore' => $this->currentSolrUid,
             'storagePid' => 0
         ];
         $templateHtml = '<html>

Tests/Functional/Controller/NavigationControllerTest.php

@@ -43,7 +43,7 @@ public function canMainAction()
                 numPages: {numPages}
                 pageOptions:<f:for each="{pageOptions}" as="entry">{entry},</f:for>
             </html>';
-        $controller = $this->setUpController(NavigationController::class, ['solrcore' => 4], $templateHtml);
+        $controller = $this->setUpController(NavigationController::class, ['solrcore' => $this->currentSolrUid], $templateHtml);
         $request = $this->setUpRequest('main');
         $response = $this->getResponse();
         $GLOBALS['TSFE']->fe_user = new FrontendUserAuthentication();
@@ -69,7 +69,7 @@ public function canPageSelectAction()
         $pageSelectForm->setPage(2);
         $pageSelectForm->setDouble(false);
 
-        $controller = $this->setUpController(NavigationController::class, ['solrcore' => 4], '');
+        $controller = $this->setUpController(NavigationController::class, ['solrcore' => $this->currentSolrUid], '');
         $request = $this->setUpRequest('pageSelect', ['pageSelectForm' => $pageSelectForm]);
         $response = $this->getResponse();
 

Tests/Functional/Controller/PageViewControllerTest.php

@@ -45,7 +45,7 @@ public function canMainAction()
                     {image.mimetype}</f:for>
                 viewerConfiguration:{viewerConfiguration}
             </html>';
-        $controller = $this->setUpController(PageViewController::class, ['solrcore' => 4], $templateHtml);
+        $controller = $this->setUpController(PageViewController::class, ['solrcore' => $this->currentSolrUid], $templateHtml);
         $request = $this->setUpRequest('main');
         $response = $this->getResponse();
 

Tests/Functional/Controller/SearchControllerTest.php

@@ -31,8 +31,8 @@ class SearchControllerTest extends AbstractControllerTest
     public function setUp(): void
     {
         parent::setUp();
-        $this->setUpData(self::$databaseFixtures);
         $this->setUpSolr(4, 0, self::$solrFixtures);
+        $this->setUpData(self::$databaseFixtures);
     }
 
     /**
@@ -52,7 +52,7 @@ public function canMainAction()
             ]
         ];
         $settings = [
-            'solrcore' => 4,
+            'solrcore' => $this->currentSolrUid,
             'extendedFields' => 'field1,field2,field3',
             'extendedSlotCount' => 1
         ];
@@ -94,7 +94,7 @@ public function canMakeFacetsMenuArray()
             'query' => '*'
         ];
         $settings = [
-            'solrcore' => 4,
+            'solrcore' => $this->currentSolrUid,
             'storagePid' => 0,
             'facets' => 'type',
             'facetCollections' => '1'

Tests/Functional/Controller/StatisticsControllerTest.php

@@ -36,7 +36,7 @@ public function canMainAction()
         $GLOBALS['LANG'] = LanguageService::create('default');
 
         $settings = [
-            'solrcore' => 4,
+            'solrcore' => $this->currentSolrUid,
             'collections' => '1',
             'storagePid' => '0',
             'description' => 'There are ###TITLES### and ###VOLUMES###.'

Tests/Functional/Controller/ToolboxControllerTest.php

@@ -139,7 +139,7 @@ public function canMainAction()
             'double' => 1
         ];
         $settings = [
-            'solrcore' => 4,
+            'solrcore' => $this->currentSolrUid,
             'library' => 1,
             'tools' => 'tx_dlf_annotationtool',
             'limit' => 1
@@ -197,7 +197,7 @@ public function canSearchindocumenttool()
             'page' => 1
         ];
         $settings = [
-            'solrcore' => 4,
+            'solrcore' => $this->currentSolrUid,
             'tools' => 'tx_dlf_searchindocumenttool',
             'queryInputName' => 'queryInputName',
             'startInputName' => 'startInputName',