From 78e0f0b7c2927e7d16706bc8dd8cf35a106b6043 Mon Sep 17 00:00:00 2001
From: adamgsoc2013 <adamgsoc2013@gmail.com>
Date: Wed, 8 May 2013 00:24:37 +0800
Subject: [PATCH 1/2] add more container test case

---
 .../PMA_Node_Table_Container_test.php         | 37 +++++++++++++++++++
 .../PMA_Node_Trigger_Container_test.php       | 37 +++++++++++++++++++
 .../PMA_Node_View_Container_test.php          | 37 +++++++++++++++++++
 3 files changed, 111 insertions(+)
 create mode 100644 test/classes/navigation/PMA_Node_Table_Container_test.php
 create mode 100644 test/classes/navigation/PMA_Node_Trigger_Container_test.php
 create mode 100644 test/classes/navigation/PMA_Node_View_Container_test.php

diff --git a/test/classes/navigation/PMA_Node_Table_Container_test.php b/test/classes/navigation/PMA_Node_Table_Container_test.php
new file mode 100644
index 0000000000..125b300191
--- /dev/null
+++ b/test/classes/navigation/PMA_Node_Table_Container_test.php
@@ -0,0 +1,37 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for NodeFactory class and Node_Column class
+ *
+ * @package PhpMyAdmin-test
+ */
+
+require_once 'libraries/navigation/NodeFactory.class.php';
+require_once 'libraries/Util.class.php';
+require_once 'libraries/Theme.class.php';
+
+
+class Node_Table_Container_Test extends PHPUnit_Framework_TestCase
+{
+    public function setup()
+    {
+        $GLOBALS['server'] = 0;
+        $GLOBALS['token'] = 'token';
+        $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
+    }
+
+    public function testConstructor()
+    {
+        $parent = PMA_NodeFactory::getInstance('Node_Table_Container');
+        $this->assertArrayHasKey(
+            'text',
+            $parent->links
+        );
+        $this->assertContains(
+            'sql.php',
+            $parent->links['text']
+        );
+        $this->assertEquals('tables', $parent->real_name);
+    }
+}
+?>
diff --git a/test/classes/navigation/PMA_Node_Trigger_Container_test.php b/test/classes/navigation/PMA_Node_Trigger_Container_test.php
new file mode 100644
index 0000000000..a6c3705e37
--- /dev/null
+++ b/test/classes/navigation/PMA_Node_Trigger_Container_test.php
@@ -0,0 +1,37 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for NodeFactory class and Node_Column class
+ *
+ * @package PhpMyAdmin-test
+ */
+
+require_once 'libraries/navigation/NodeFactory.class.php';
+require_once 'libraries/Util.class.php';
+require_once 'libraries/Theme.class.php';
+
+
+class Node_Trigger_Container_Test extends PHPUnit_Framework_TestCase
+{
+    public function setup()
+    {
+        $GLOBALS['server'] = 0;
+        $GLOBALS['token'] = 'token';
+        $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
+    }
+
+    public function testConstructor()
+    {
+        $parent = PMA_NodeFactory::getInstance('Node_Trigger_Container');
+        $this->assertArrayHasKey(
+            'text',
+            $parent->links
+        );
+        $this->assertContains(
+            'db_triggers.php',
+            $parent->links['text']
+        );
+        $this->assertEquals('triggers', $parent->real_name);
+    }
+}
+?>
diff --git a/test/classes/navigation/PMA_Node_View_Container_test.php b/test/classes/navigation/PMA_Node_View_Container_test.php
new file mode 100644
index 0000000000..dc881ba7e9
--- /dev/null
+++ b/test/classes/navigation/PMA_Node_View_Container_test.php
@@ -0,0 +1,37 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for NodeFactory class and Node_Column class
+ *
+ * @package PhpMyAdmin-test
+ */
+
+require_once 'libraries/navigation/NodeFactory.class.php';
+require_once 'libraries/Util.class.php';
+require_once 'libraries/Theme.class.php';
+
+
+class Node_View_Container_Test extends PHPUnit_Framework_TestCase
+{
+    public function setup()
+    {
+        $GLOBALS['server'] = 0;
+        $GLOBALS['token'] = 'token';
+        $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
+    }
+
+    public function testConstructor()
+    {
+        $parent = PMA_NodeFactory::getInstance('Node_View_Container');
+        $this->assertArrayHasKey(
+            'text',
+            $parent->links
+        );
+        $this->assertContains(
+            'sql.php',
+            $parent->links['text']
+        );
+        $this->assertEquals('views', $parent->real_name);
+    }
+}
+?>

From ed95a1cd742a9eee1786fe430191db1720ee5e67 Mon Sep 17 00:00:00 2001
From: adamgsoc2013 <adamgsoc2013@gmail.com>
Date: Wed, 8 May 2013 09:41:47 +0800
Subject: [PATCH 2/2] change to the right url for container

---
 test/classes/navigation/PMA_Node_Table_Container_test.php | 2 +-
 test/classes/navigation/PMA_Node_View_Container_test.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/classes/navigation/PMA_Node_Table_Container_test.php b/test/classes/navigation/PMA_Node_Table_Container_test.php
index 125b300191..2f29e9fdca 100644
--- a/test/classes/navigation/PMA_Node_Table_Container_test.php
+++ b/test/classes/navigation/PMA_Node_Table_Container_test.php
@@ -28,7 +28,7 @@ class Node_Table_Container_Test extends PHPUnit_Framework_TestCase
             $parent->links
         );
         $this->assertContains(
-            'sql.php',
+            'db_structure.php',
             $parent->links['text']
         );
         $this->assertEquals('tables', $parent->real_name);
diff --git a/test/classes/navigation/PMA_Node_View_Container_test.php b/test/classes/navigation/PMA_Node_View_Container_test.php
index dc881ba7e9..165262c8d6 100644
--- a/test/classes/navigation/PMA_Node_View_Container_test.php
+++ b/test/classes/navigation/PMA_Node_View_Container_test.php
@@ -28,7 +28,7 @@ class Node_View_Container_Test extends PHPUnit_Framework_TestCase
             $parent->links
         );
         $this->assertContains(
-            'sql.php',
+            'db_structure.php',
             $parent->links['text']
         );
         $this->assertEquals('views', $parent->real_name);