opencultureconsulting
/
kitodo-presentation
mirror of https://github.com/kitodo/kitodo-presentation.git
2
0
Fork 0
Code Issues Releases Activity

Merge branch 'master' into pr-fix-testcase-search

This commit is contained in:
Sebastian Meyer 2022-08-04 19:06:04 +02:00 committed by GitHub
parent caac513dbb e703d75a52
commit 0e53142abd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/tests.yml vendored
View File

@ -2,7 +2,9 @@ name: Run the tests
on:
push:
branches: [master, dev-extbase-fluid, dev-testing]
branches: [master]
pull_request:
branches: [master]
jobs:
test:

4
Tests/Functional/Common/HelperTest.php
View File

@ -73,7 +73,7 @@ class HelperTest extends FunctionalTestCase
{
// NOTE: This only tests in BE mode
$GLOBALS['LANG'] = LanguageService::create('default');
$this->initLanguageService('default');
$this->assertEquals('German', Helper::getLanguageName('de')); // ISO 639-1
$this->assertEquals('German', Helper::getLanguageName('ger')); // ISO 639-2
$this->assertEquals('abcde', Helper::getLanguageName('abcde')); // doesn't match ISO code regex
@ -88,7 +88,7 @@ class HelperTest extends FunctionalTestCase
{
// NOTE: This only tests in BE mode
$GLOBALS['LANG'] = LanguageService::create('de');
$this->initLanguageService('de');
$this->assertEquals('Deutsch', Helper::getLanguageName('de')); // ISO 639-1
$this->assertEquals('Deutsch', Helper::getLanguageName('ger')); // ISO 639-2
$this->assertEquals('abcde', Helper::getLanguageName('abcde')); // doesn't match ISO code regex

16
Tests/Functional/FunctionalTestCase.php
View File

@ -5,8 +5,10 @@ namespace Kitodo\Dlf\Tests\Functional;
use GuzzleHttp\Client as HttpClient;
use Kitodo\Dlf\Common\Solr;
use Symfony\Component\Yaml\Yaml;
use TYPO3\CMS\Core\Localization\LanguageService;
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\Typo3QuerySettings;
@ -174,6 +176,20 @@ class FunctionalTestCase extends \TYPO3\TestingFramework\Core\Functional\Functio
$solr->service->update($updateQuery);
}
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'];
$this->assertEquals(9, $typo3MajorVersion);
$lang = new LanguageService();
$lang->init($locale);
$GLOBALS['LANG'] = $lang;
}
}
/**
* Assert that $sub is recursively contained within $super.
*/