From b587d7cd3d4feaeb1cb0439eefb6887bdbeef860 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 10 Oct 2014 07:18:11 +0530 Subject: [PATCH] Fix more failing tests Signed-off-by: Madhura Jayaratne --- test/classes/navigation/PMA_Node_test.php | 22 ++-------------------- test/libraries/PMA_structure_test.php | 1 + 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/test/classes/navigation/PMA_Node_test.php b/test/classes/navigation/PMA_Node_test.php index bc7b35876e..bf65308adf 100644 --- a/test/classes/navigation/PMA_Node_test.php +++ b/test/classes/navigation/PMA_Node_test.php @@ -385,16 +385,7 @@ class Node_Test extends PHPUnit_Framework_TestCase */ public function testGetPresenceWithEnabledIS() { - if (! isset($GLOBALS['cfg'])) { - $GLOBALS['cfg'] = array(); - } - if (! isset($GLOBALS['cfg']['Servers'])) { - $GLOBALS['cfg']['Servers'] = array(); - } - if (! isset($GLOBALS['cfg']['Servers'][0])) { - $GLOBALS['cfg']['Servers'][0] = array(); - } - $GLOBALS['cfg']['Servers'][0]['DisableIS'] = false; + $GLOBALS['cfg']['Server']['DisableIS'] = false; $GLOBALS['cfg']['NavigationTreeDbSeparator'] = '_'; $query = "select COUNT(*) "; @@ -427,16 +418,7 @@ class Node_Test extends PHPUnit_Framework_TestCase */ public function testGetPresenceWithDisabledIS() { - if (! isset($GLOBALS['cfg'])) { - $GLOBALS['cfg'] = array(); - } - if (! isset($GLOBALS['cfg']['Servers'])) { - $GLOBALS['cfg']['Servers'] = array(); - } - if (! isset($GLOBALS['cfg']['Servers'][0])) { - $GLOBALS['cfg']['Servers'][0] = array(); - } - $GLOBALS['cfg']['Servers'][0]['DisableIS'] = true; + $GLOBALS['cfg']['Server']['DisableIS'] = true; $node = PMA_NodeFactory::getInstance(); diff --git a/test/libraries/PMA_structure_test.php b/test/libraries/PMA_structure_test.php index 2206d5a73f..a44613577d 100644 --- a/test/libraries/PMA_structure_test.php +++ b/test/libraries/PMA_structure_test.php @@ -52,6 +52,7 @@ class PMA_Structure_Test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['ShowSQL'] = true; $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons'; $GLOBALS['cfg']['LimitChars'] = 100; + $GLOBALS['cfg']['Server']['DisableIS'] = false; $GLOBALS['table'] = "table"; $GLOBALS['pmaThemeImage'] = 'image';