From 8827212cae2eab4c2c95efdb7eddd1609426faaa Mon Sep 17 00:00:00 2001 From: Robin Lawinsky Date: Mon, 15 Apr 2019 12:37:26 +0200 Subject: [PATCH] BUGFIX: LoggerTest Class Namespaces BUGFIX: Functional MysqlLockTest --- Classes/SqlGenerator/SqlGeneratorInterface.php | 11 +++++++++++ Tests/Functional/Logger/LoggerTest.php | 4 ++-- .../Utility/Lock/MySqlLockTestSecondInstance.php | 8 +++++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Classes/SqlGenerator/SqlGeneratorInterface.php b/Classes/SqlGenerator/SqlGeneratorInterface.php index 676b5c60..a9c9687c 100644 --- a/Classes/SqlGenerator/SqlGeneratorInterface.php +++ b/Classes/SqlGenerator/SqlGeneratorInterface.php @@ -35,6 +35,17 @@ */ interface Tx_PtExtbase_SqlGenerator_SqlGeneratorInterface { + /** + * @const TEMP_PREFIX + */ + const TEMP_PREFIX = 'zzzz_temp_'; + + /** + * @const BACKUP_PREFIX + */ + const BACKUP_PREFIX = 'zzzz_bck_'; + + /** * @abstract * @return array of single SQL commands diff --git a/Tests/Functional/Logger/LoggerTest.php b/Tests/Functional/Logger/LoggerTest.php index 078a723d..87ddd3cf 100644 --- a/Tests/Functional/Logger/LoggerTest.php +++ b/Tests/Functional/Logger/LoggerTest.php @@ -212,7 +212,7 @@ public function tearDown() public function logInfoWithoutFurtherParameter() { $this->logger->info('test'); - $this->assertLogFileContains('component="Tx.PtExtbase.Logger.Logger": test'); + $this->assertLogFileContains('component="PunktDe.PtExtbase.Logger.Logger": test'); $this->assertLogFileContains('[INFO]'); } @@ -254,7 +254,7 @@ public function logException() } $this->assertLogFileContains('[CRITICAL]'); - $this->assertLogFileContains('component="Tx.PtExtbase.Logger.Logger": Uncaught exception: This is a Test Exception - See also:'); + $this->assertLogFileContains('component="PunktDe.PtExtbase.Logger.Logger": Uncaught exception: This is a Test Exception - See also:'); $this->assertCount(1, Tx_PtExtbase_Utility_Files::readDirectoryRecursively($this->logExceptionsPath)); } diff --git a/Tests/Functional/Utility/Lock/MySqlLockTestSecondInstance.php b/Tests/Functional/Utility/Lock/MySqlLockTestSecondInstance.php index 7237b564..caeb7d1c 100755 --- a/Tests/Functional/Utility/Lock/MySqlLockTestSecondInstance.php +++ b/Tests/Functional/Utility/Lock/MySqlLockTestSecondInstance.php @@ -41,12 +41,14 @@ class MySqlLockTestSecondInstance protected function connect($context) { + require_once __DIR__ .'/../../../../Classes/SqlGenerator/SqlGeneratorInterface.php'; + // Load system specific configuration for Apache mode $GLOBALS['TYPO3_CONF_VARS'] = require(__DIR__ . '/../../../../../../LocalConfiguration.php'); - $dpppConfiguration = __DIR__ . '/../../../../../../configurations/' . $context . '/AdditionalConfiguration.php'; + $localConfiguration = __DIR__ . '/../../../../../../configurations/' . $context . '/AdditionalConfiguration.php'; - if (file_exists($dpppConfiguration)) { - @include($dpppConfiguration); + if (file_exists($localConfiguration)) { + @include($localConfiguration); } $credentials = $GLOBALS['TYPO3_CONF_VARS']['DB'];