[MAINTENANCE] Minor improvements in test classes (#1159)

Co-authored-by: Sebastian Meyer <[email protected]>
kitodo · Feb 27, 2024 · 9ec30de · 9ec30de
1 parent 117266e
commit 9ec30de
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 18 deletions.
diff --git a/Tests/Functional/Common/SolrSearchQueryTest.php b/Tests/Functional/Common/SolrSearchQueryTest.php
@@ -17,7 +17,6 @@
 use Kitodo\Dlf\Domain\Repository\DocumentRepository;
 use Kitodo\Dlf\Domain\Repository\SolrCoreRepository;
 use Kitodo\Dlf\Tests\Functional\FunctionalTestCase;
-use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
 
 class SolrSearchQueryTest extends FunctionalTestCase
 {
@@ -66,7 +65,6 @@ protected function setUpData($databaseFixtures): void
  foreach ($databaseFixtures as $filePath) {
  $this->importCSVDataSet($filePath);
  }
- $this->persistenceManager = $this->objectManager->get(PersistenceManager::class);
  $this->initializeRepository(DocumentRepository::class, 0);
  }
 

diff --git a/Tests/Functional/Common/SolrSearchTest.php b/Tests/Functional/Common/SolrSearchTest.php
@@ -17,7 +17,6 @@
 use Kitodo\Dlf\Domain\Repository\DocumentRepository;
 use Kitodo\Dlf\Domain\Repository\SolrCoreRepository;
 use Kitodo\Dlf\Tests\Functional\FunctionalTestCase;
-use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
 
 class SolrSearchTest extends FunctionalTestCase
 {
@@ -78,7 +77,6 @@ protected function setUpData($databaseFixtures): void
  foreach ($databaseFixtures as $filePath) {
  $this->importCSVDataSet($filePath);
  }
- $this->persistenceManager = $this->objectManager->get(PersistenceManager::class);
  $this->initializeRepository(DocumentRepository::class, 0);
  }
 

diff --git a/Tests/Functional/Common/SolrTest.php b/Tests/Functional/Common/SolrTest.php
@@ -16,7 +16,6 @@
 use Kitodo\Dlf\Domain\Repository\DocumentRepository;
 use Kitodo\Dlf\Domain\Repository\SolrCoreRepository;
 use Kitodo\Dlf\Tests\Functional\FunctionalTestCase;
-use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
 
 class SolrTest extends FunctionalTestCase
 {
@@ -90,7 +89,6 @@ protected function setUpData($databaseFixtures): void
  foreach ($databaseFixtures as $filePath) {
  $this->importCSVDataSet($filePath);
  }
- $this->persistenceManager = $this->objectManager->get(PersistenceManager::class);
  $this->initializeRepository(DocumentRepository::class, 0);
  }
 

diff --git a/Tests/Functional/FunctionalTestCase.php b/Tests/Functional/FunctionalTestCase.php
@@ -15,10 +15,9 @@
 use GuzzleHttp\Client as HttpClient;
 use Kitodo\Dlf\Common\Solr\Solr;
 use Symfony\Component\Yaml\Yaml;
-use TYPO3\CMS\Core\Localization\LanguageService;
+use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 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;
@@ -203,16 +202,7 @@ protected function importSolrDocuments(Solr $solr, string $path)
 
  protected function initLanguageService(string $locale)
  {
- if (class_exists(\TYPO3\CMS\Core\Localization\LanguageServiceFactory::class)) {
- $GLOBALS['LANG'] = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Localization\LanguageServiceFactory::class)->create($locale);
- } else {
- $typo3MajorVersion = VersionNumberUtility::convertVersionStringToArray(VersionNumberUtility::getCurrentTypo3Version())['version_main'];
- self::assertEquals(9, $typo3MajorVersion);
-
- $lang = new LanguageService();
- $lang->init($locale);
- $GLOBALS['LANG'] = $lang;
- }
+ $GLOBALS['LANG'] = GeneralUtility::makeInstance(LanguageServiceFactory::class)->create($locale);
  }
 
  /**