Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

3 files changed, 139 insertions, 0 deletions

diff --git a/test/classes/PMA_Footer_test.php b/test/classes/PMA_Footer_test.php
index 3b64f7314d..a1c83cdbb7 100644
--- a/test/classes/PMA_Footer_test.php
+++ b/test/classes/PMA_Footer_test.php
@@ -133,6 +133,30 @@ class PMA_Footer_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * Test for _removeRecursion
+     *
+     * @return void
+     */
+    public function testRemoveRecursion()
+    {
+        $object = (object) array();
+        $object->child = (object) array();
+        $object->child->parent = $object;
+
+        $this->_callPrivateFunction(
+            '_removeRecursion',
+            array(
+                &$object
+            )
+        );
+
+        $this->assertEquals(
+            '{"child":{"parent":"***RECURSION***"}}',
+            json_encode($object)
+        );
+    }
+
+    /**
      * Test for _getSelfLink
      *
      * @return void
diff --git a/test/classes/PMA_Util_test.php b/test/classes/PMA_Util_test.php
index ee8edbf2f4..20c851d23d 100644
--- a/test/classes/PMA_Util_test.php
+++ b/test/classes/PMA_Util_test.php
@@ -172,4 +172,33 @@ class PMA_Util_Test extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * Test for isForeignKeyCheck
+     *
+     * @return void
+     */
+    public function testIsForeignKeyCheck()
+    {
+        $GLOBALS['cfg']['DBG'] = array();
+        $GLOBALS['cfg']['DBG']['sql'] = false;
+
+        $GLOBALS['cfg']['DefaultForeignKeyChecks'] = 'enable';
+        $this->assertEquals(
+            true,
+            PMA_Util::isForeignKeyCheck()
+        );
+
+        $GLOBALS['cfg']['DefaultForeignKeyChecks'] = 'disable';
+        $this->assertEquals(
+            false,
+            PMA_Util::isForeignKeyCheck()
+        );
+
+        $GLOBALS['cfg']['DefaultForeignKeyChecks'] = 'default';
+        $this->assertEquals(
+            true,
+            PMA_Util::isForeignKeyCheck()
+        );
+    }
+
 }
diff --git a/test/classes/navigation/PMA_Node_Database_test.php b/test/classes/navigation/PMA_Node_Database_test.php
index 834fb1faf0..023be85d62 100644
--- a/test/classes/navigation/PMA_Node_Database_test.php
+++ b/test/classes/navigation/PMA_Node_Database_test.php
@@ -28,6 +28,10 @@ class Node_Database_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['server'] = 0;
         $GLOBALS['cfg']['DefaultTabDatabase'] = 'structure';
         $GLOBALS['cfg']['MaxNavigationItems'] = 250;
+        $GLOBALS['cfg']['Server'] = array();
+        $GLOBALS['cfg']['Server']['DisableIS'] = true;
+        $GLOBALS['cfg']['DBG'] = array();
+        $GLOBALS['cfg']['DBG']['sql'] = false;
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
@@ -49,5 +53,87 @@ class Node_Database_Test extends PHPUnit_Framework_TestCase
         );
         $this->assertContains('database', $parent->classes);
     }
+
+    /**
+     * Test for getPresence
+     *
+     * @return void
+     */
+    public function testGetPresence()
+    {
+        $parent = PMA_NodeFactory::getInstance('Node_Database');
+        $this->assertEquals(
+            2,
+            $parent->getPresence('tables')
+        );
+        $this->assertEquals(
+            0,
+            $parent->getPresence('views')
+        );
+        $this->assertEquals(
+            1,
+            $parent->getPresence('functions')
+        );
+        $this->assertEquals(
+            0,
+            $parent->getPresence('procedures')
+        );
+        $this->assertEquals(
+            0,
+            $parent->getPresence('events')
+        );
+    }
+
+    /**
+     * Test for getData
+     *
+     * @return void
+     */
+    public function testGetData()
+    {
+        $parent = PMA_NodeFactory::getInstance('Node_Database');
+
+        $tables = $parent->getData('tables', 0);
+        $this->assertContains(
+            'test1',
+            $tables
+        );
+        $this->assertContains(
+            'test2',
+            $tables
+        );
+
+        $views = $parent->getData('views', 0);
+        $this->assertEmpty($views);
+
+        $functions = $parent->getData('functions', 0);
+        $this->assertContains(
+            'testFunction',
+            $functions
+        );
+        $this->assertEquals(
+            1,
+            count($functions)
+        );
+
+        $this->assertEmpty($parent->getData('procedures', 0));
+        $this->assertEmpty($parent->getData('events', 0));
+    }
+
+    /**
+     * Test for setHiddenCount and getHiddenCount
+     *
+     * @return void
+     */
+    public function testHiddenCount()
+    {
+        $parent = PMA_NodeFactory::getInstance('Node_Database');
+
+        $parent->setHiddenCount(3);
+        $this->assertEquals(
+            3,
+            $parent->getHiddenCount()
+        );
+    }
 }
 ?>