Skip to content

Commit

Permalink
[TASK] Fix Integration tests for TYPO3 12
Browse files Browse the repository at this point in the history 
Removed phpspec/prophecy-phpunit and adapted the tests.
  • Loading branch information
@dkd-kaehm
dkd-kaehm committed Aug 15, 2023
1 parent b3474a6 commit 3830729
Show file tree
Hide file tree
Showing 23 changed files with 343 additions and 467 deletions.
4 changes: 0 additions & 4 deletions Classes/Controller/Backend/PreviewController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,6 @@ protected function getConfiguredTikaService(): AbstractService
return ServiceFactory::getConfiguredTika();
}

/**
* @return ResourceFactory
* @noinspection PhpIncompatibleReturnTypeInspection
*/
protected function getFileResourceFactory(): ResourceFactory
{
return GeneralUtility::makeInstance(ResourceFactory::class);
Expand Down
124 changes: 68 additions & 56 deletions Classes/Controller/Backend/SolrModule/TikaControlPanelModuleController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,22 @@
namespace ApacheSolrForTypo3\Tika\Controller\Backend\SolrModule;

use ApacheSolrForTypo3\Solr\Controller\Backend\Search\AbstractModuleController;
use ApacheSolrForTypo3\Solr\Domain\Site\Exception\UnexpectedTYPO3SiteInitializationException;
use ApacheSolrForTypo3\Tika\Service\Tika\AbstractService;
use ApacheSolrForTypo3\Tika\Service\Tika\AppService;
use ApacheSolrForTypo3\Tika\Service\Tika\ServerService;
use ApacheSolrForTypo3\Tika\Service\Tika\ServiceFactory;
use ApacheSolrForTypo3\Tika\Service\Tika\SolrCellService;
use ApacheSolrForTypo3\Tika\Util;
use Doctrine\DBAL\Exception as DBALException;
use Psr\Http\Client\ClientExceptionInterface;
use Psr\Http\Message\ResponseInterface;
use Throwable;
use TYPO3\CMS\Backend\Template\ModuleTemplate;
use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;
use TYPO3\CMS\Core\Http\RedirectResponse;
use TYPO3\CMS\Core\Messaging\AbstractMessage;
use TYPO3\CMS\Core\Type\ContextualFeedbackSeverity;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3Fluid\Fluid\View\ViewInterface;

Expand All @@ -40,24 +44,14 @@
*/
class TikaControlPanelModuleController extends AbstractModuleController
{
/**
* Tika configuration
*
* @var array
*/
protected array $tikaConfiguration = [];

/**
* @var AbstractService|AppService|ServerService|SolrCellService
*/
protected $tikaService;
protected AbstractService|AppService|ServerService|SolrCellService $tikaService;

/**
* Can be used in the test context to mock a {@link view}.
*
* Purpose: PhpUnit
*
* @param ViewInterface $view
*/
public function overwriteView(ViewInterface $view): void
{
Expand All @@ -68,24 +62,25 @@ public function overwriteView(ViewInterface $view): void
* Can be used in the test context to mock a {@link moduleTemplate}.
*
* Purpose: PhpUnit
*
* @param ModuleTemplate $moduleTemplate
*/
public function overwriteModuleTemplate(ModuleTemplate $moduleTemplate): void
{
$this->moduleTemplate = $moduleTemplate;
}

/**
* @param AbstractService $tikaService
*/
public function setTikaService(AbstractService $tikaService): void
{
$this->tikaService = $tikaService;
}

/**
* Initializes resources commonly needed for several actions.
*
* @throws DBALException
* @throws ExtensionConfigurationExtensionNotConfiguredException
* @throws ExtensionConfigurationPathDoesNotExistException
* @throws UnexpectedTYPO3SiteInitializationException
*
* @noinspection PhpUnused
*/
protected function initializeAction(): void
Expand All @@ -96,9 +91,6 @@ protected function initializeAction(): void
$this->tikaService = ServiceFactory::getTika($this->tikaConfiguration['extractor'] ?? '');
}

/**
* @param array $tikaConfiguration
*/
public function setTikaConfiguration(array $tikaConfiguration): void
{
$this->tikaConfiguration = $tikaConfiguration;
Expand All @@ -107,8 +99,8 @@ public function setTikaConfiguration(array $tikaConfiguration): void
/**
* Index action
*
* @return ResponseInterface
* @throws ClientExceptionInterface
* @throws Throwable
*/
public function indexAction(): ResponseInterface
{
Expand All @@ -118,20 +110,40 @@ public function indexAction(): ResponseInterface
ucfirst($this->tikaConfiguration['extractor'] ?? '')
);

if ($this->tikaConfiguration['extractor'] === 'server') {
$this->checkTikaServerConnection();

$this->view->assign(
'server',
[
'jarAvailable' => $this->isTikaServerJarAvailable(),
'isRunning' => $this->isTikaServerRunning(),
'isControllable' => $this->isTikaServerControllable(),
'pid' => $this->getTikaServerPid(),
'version' => $this->getTikaServerVersion(),
]
);
switch ($this->tikaConfiguration['extractor']) {
case 'server':
$this->view->assign(
'server',
[
'isConnected' => $this->isConnectedToTikaServer(),
'jarAvailable' => $this->isTikaServerJarAvailable(),
'isRunning' => $this->isTikaServerRunning(),
'isControllable' => $this->isTikaServerControllable(),
'pid' => $this->getTikaServerPid(),
'version' => $this->getTikaServerVersion(),
]
);
break;
case 'solr':
$this->view->assign(
'solr',
[
'isConnected' => $this->isConnectedToTikaServer(),
'version' => $this->getTikaServerVersion(),
]
);
break;
case 'jar':
$this->view->assign(
'jar',
[
'version' => $this->getTikaServerVersion(),
]
);
break;
default:
}

return $this->getModuleTemplateResponse();
}

Expand All @@ -141,15 +153,14 @@ public function indexAction(): ResponseInterface
*/
public function startServerAction(): ResponseInterface
{
$this->tikaService->/** @scrutinizer ignore-call */startServer();
$this->tikaService->startServer();

// give it some time to start
sleep(2);

if ($this->tikaService->/** @scrutinizer ignore-call */isServerRunning()) {
if ($this->tikaService->isServerRunning()) {
$this->addFlashMessage(
'Tika server started.',
AbstractMessage::OK
);
}

Expand All @@ -162,15 +173,15 @@ public function startServerAction(): ResponseInterface
*/
public function stopServerAction(): ResponseInterface
{
$this->tikaService->/** @scrutinizer ignore-call */ stopServer();
$this->tikaService->stopServer();

// give it some time to stop
sleep(2);

if (!$this->tikaService->/** @scrutinizer ignore-call */ isServerRunning()) {
if (!$this->tikaService->isServerRunning()) {
$this->addFlashMessage(
'',
'Tika server stopped.',
AbstractMessage::OK
);
}

Expand All @@ -181,12 +192,10 @@ public function stopServerAction(): ResponseInterface
* Gets the Tika server version
*
* @return string Tika server version string
* @throws ClientExceptionInterface
* @throws Throwable
*/
protected function getTikaServerVersion(): string
{
return $this->tikaService->getTikaVersion();
return $this->tikaService->getTikaVersionString();
}

/**
Expand All @@ -196,7 +205,7 @@ protected function getTikaServerVersion(): string
*/
protected function isTikaServerRunning(): bool
{
return $this->tikaService->/** @scrutinizer ignore-call */ isServerRunning();
return $this->tikaService->isServerRunning();
}

/**
Expand All @@ -207,7 +216,7 @@ protected function isTikaServerRunning(): bool
*/
protected function getTikaServerPid(): ?int
{
return $this->tikaService->/** @scrutinizer ignore-call */getServerPid();
return $this->tikaService->getServerPid();
}

/**
Expand Down Expand Up @@ -263,21 +272,24 @@ protected function isTikaServerControllable(): bool
/**
* Checks whether the configured Tika server can be reached and provides a
* flash message according to the result of the check.
*
* @throws ClientExceptionInterface
* @throws Throwable
*/
protected function checkTikaServerConnection(): void
protected function isConnectedToTikaServer(): bool
{
if ($this->tikaService->/** @scrutinizer ignore-call */ping()) {
$this->addFlashMessage(
'Tika host contacted at: ' . $this->tikaService->/** @scrutinizer ignore-call */getTikaServerUrl(),
'Your Apache Tika server has been contacted.',
AbstractMessage::OK
);
} else {
if ($this->tikaService->ping()) {
$this->addFlashMessage(
'Could not connect to Tika at: ' . $this->tikaService->/** @scrutinizer ignore-call */getTikaServerUrl(),
'Unable to contact Apache Tika server.',
AbstractMessage::ERROR
'Tika host contacted at: ' . $this->tikaService->getTikaServerUrl(),
'Your Apache Tika ' . $this->tikaService->getTikaVersion() . ' server has been contacted.',
);
return true;
}
$this->addFlashMessage(
'Could not connect to Tika at: ' . $this->tikaService->getTikaServerUrl(),
'Unable to contact Apache Tika server.',
ContextualFeedbackSeverity::ERROR
);
return false;
}
}
Loading

0 comments on commit 3830729

Please sign in to comment.