From 6a8276a8558432ed192594c6ef7e55604e101d6e Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Mon, 23 Dec 2013 08:07:47 +0100 Subject: [PATCH] Update unit tests. Signed-off-by: Hugues Peccatte --- test/libraries/PMA_SetupIndex_test.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/test/libraries/PMA_SetupIndex_test.php b/test/libraries/PMA_SetupIndex_test.php index 727354e9be..7718d930f4 100644 --- a/test/libraries/PMA_SetupIndex_test.php +++ b/test/libraries/PMA_SetupIndex_test.php @@ -385,11 +385,11 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase } /** - * Test for PMA_performConfigChecks + * Test for ServerConfigChecks::performConfigChecks * * @return void */ - public function testPMAPerformConfigChecks() + public function testServerConfigChecksPerformConfigChecks() { $GLOBALS['cfg']['AvailableCharsets'] = array(); @@ -457,7 +457,8 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase $errorArrayKeys[] = 'ZipDump_export'; } - PMA_performConfigChecks(); + $configChecker = new ServerConfigChecks($GLOBALS['ConfigFile']); + $configChecker->performConfigChecks(); foreach ($noticeArrayKeys as $noticeKey) { $this->assertArrayHasKey( @@ -499,7 +500,9 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase $_SESSION[$sessionID]['BZipDump'] = false; $_SESSION[$sessionID]['ZipDump'] = false; - PMA_performConfigChecks(); + $configChecker = new ServerConfigChecks($GLOBALS['ConfigFile']); + $configChecker->performConfigChecks(); + $this->assertArrayHasKey( 'blowfish_secret_created', $_SESSION['messages']['notice'] @@ -527,12 +530,14 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase 'auth_type' => 'cookie' ) ); - PMA_performConfigChecks(); + + $configChecker = new ServerConfigChecks($GLOBALS['ConfigFile']); + $configChecker->performConfigChecks(); + $this->assertArrayHasKey( 'blowfish_warnings2', $_SESSION['messages']['error'] ); - } } ?>