Move persistence manager to FunctionalTestCase class

Author: beatrycze-volk

Tests/Functional/Api/OaiPmhTest.php

@@ -10,8 +10,6 @@
 use Phpoaipmh\Endpoint;
 use Phpoaipmh\Exception\OaipmhException;
 use SimpleXMLElement;
-use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class OaiPmhTest extends FunctionalTestCase
 {
@@ -34,11 +32,6 @@ class OaiPmhTest extends FunctionalTestCase
     /** @var string */
     protected $oaiUrlNoStoragePid;
 
-    /**
-     * @var PersistenceManager
-     */
-    protected $persistenceManager;
-
     /**
      * @var SolrCoreRepository
      */
@@ -58,7 +51,6 @@ public function setUp(): void
         $this->importDataSet(__DIR__ . '/../../Fixtures/OaiPmh/pages.xml');
         $this->importCSVDataSet(__DIR__ . '/../../Fixtures/OaiPmh/solrcores.csv');
 
-        $this->persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
         $this->solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, 20000);
 
         $this->setUpOaiSolr();

Tests/Functional/Common/SolrIndexingTest.php

@@ -12,13 +12,9 @@
 use Kitodo\Dlf\Tests\Functional\FunctionalTestCase;
 use TYPO3\CMS\Core\Core\Bootstrap;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
 
 class SolrIndexingTest extends FunctionalTestCase
 {
-    /** @var PersistenceManager */
-    protected $persistenceManager;
-
     /** @var CollectionRepository */
     protected $collectionRepository;
 
@@ -35,8 +31,6 @@ public function setUp(): void
         // Needed for Indexer::add, which uses the language service
         Bootstrap::initializeLanguageObject();
 
-        $this->persistenceManager = $this->objectManager->get(PersistenceManager::class);
-
         $this->collectionRepository = $this->initializeRepository(CollectionRepository::class, 20000);
         $this->documentRepository = $this->initializeRepository(DocumentRepository::class, 20000);
         $this->solrCoreRepository = $this->initializeRepository(SolrCoreRepository::class, 20000);

Tests/Functional/FunctionalTestCase.php

@@ -10,6 +10,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
+use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
 use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
 
 /**
@@ -60,9 +61,16 @@ class FunctionalTestCase extends \TYPO3\TestingFramework\Core\Functional\Functio
      */
     protected $disableJsonWrappedResponse = false;
 
-    /** @var ObjectManager */
+    /**
+     * @var ObjectManager
+     */
     protected $objectManager;
 
+    /**
+     * @var PersistenceManager
+     */
+    protected $persistenceManager;
+
     /**
      * @var string
      */
@@ -91,6 +99,7 @@ public function setUp(): void
         parent::setUp();
 
         $this->objectManager = GeneralUtility::makeInstance(ObjectManager::class);
+        $this->persistenceManager = GeneralUtility::makeInstance(PersistenceManager::class);
 
         $this->baseUrl = 'http://web:8000/public/typo3temp/var/tests/functional-' . $this->identifier . '/';
         $this->httpClient = new HttpClient([

Tests/Functional/Repository/TokenRepositoryTest.php

@@ -13,7 +13,6 @@
 
 use Kitodo\Dlf\Domain\Repository\TokenRepository;
 use Kitodo\Dlf\Tests\Functional\FunctionalTestCase;
-use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
 
 class TokenRepositoryTest extends FunctionalTestCase
 {
@@ -22,17 +21,10 @@ class TokenRepositoryTest extends FunctionalTestCase
      */
     protected $tokenRepository;
 
-    /**
-     * @var PersistenceManager
-     */
-    protected $persistenceManager;
-
     public function setUp(): void
     {
         parent::setUp();
 
-        $this->persistenceManager = $this->objectManager->get(PersistenceManager::class);
-
         $this->tokenRepository = $this->initializeRepository(
             TokenRepository::class,
             20000