From c9e4adf2ae332ecae2fef02efc0f8de17d446572 Mon Sep 17 00:00:00 2001
From: adamgsoc2013 <adamgsoc2013@gmail.com>
Date: Sat, 11 May 2013 11:36:18 +0800
Subject: [PATCH 1/2] add test case for Index::getColumn and PMA_Index_Column

---
 test/classes/PMA_Index_test.php | 48 +++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/test/classes/PMA_Index_test.php b/test/classes/PMA_Index_test.php
index 153264ec86..bd0f2a6e3a 100644
--- a/test/classes/PMA_Index_test.php
+++ b/test/classes/PMA_Index_test.php
@@ -35,6 +35,14 @@ class PMA_Index_Test extends PHPUnit_Framework_TestCase
         $this->_params['Index_comment'] = "PMA_Index_comment";
         $this->_params['Non_unique'] = "PMA_Non_unique";
         $this->_params['Packed'] = "PMA_Packed";
+        
+        //test add columns
+        $column1 = array("Column_name"=>"column1","Seq_in_index"=>"index1");
+        $column2 = array("Column_name"=>"column2","Seq_in_index"=>"index2");
+        $column3 = array("Column_name"=>"column3","Seq_in_index"=>"index3");
+        $this->_params['columns'][] = $column1;
+        $this->_params['columns'][] = $column2;
+        $this->_params['columns'][] = $column3;
     }
 
     /**
@@ -66,4 +74,44 @@ class PMA_Index_Test extends PHPUnit_Framework_TestCase
             $index->getNonUnique()
         );
     }
+    
+    /**
+     * Test for add Columns
+     *
+     * @return void
+     */
+    public function testAddColumns()
+    {
+        $index = new PMA_Index();
+        $index->addColumns($this->_params['columns']);       
+        $this->assertTrue($this->hasColumn("column1"));       
+        $this->assertTrue($this->hasColumn("column2"));       
+        $this->assertTrue($this->hasColumn("column3"));
+        $this->assertEquals(
+            3,
+            $this->getColumnCount()
+        );
+    }
+        
+    /**
+     * Test for PMA_Index_Column
+     *
+     * @return void
+     */
+    public function testPMA_Index_Column()
+    {
+        $index = new PMA_Index();
+        $index->addColumns($this->_params['columns']);
+        
+        $index_columns = $this->getColumns();
+        $index_column = $index_columns['column1'];
+        $this->assertEquals(
+            'column1',
+            $index_column->getName()
+        );
+        $this->assertEquals(
+            'index1',
+            $index_column->getSeqInIndex()
+        );
+    }
 }

From 74180c0ffc1aed44aee4809c4855aa0b2af7e869 Mon Sep 17 00:00:00 2001
From: adamgsoc2013 <adamgsoc2013@gmail.com>
Date: Sat, 11 May 2013 11:45:01 +0800
Subject: [PATCH 2/2] fix the undefined index, it is the function of PMA_Index

---
 test/classes/PMA_Index_test.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/classes/PMA_Index_test.php b/test/classes/PMA_Index_test.php
index bd0f2a6e3a..3a683453db 100644
--- a/test/classes/PMA_Index_test.php
+++ b/test/classes/PMA_Index_test.php
@@ -84,12 +84,12 @@ class PMA_Index_Test extends PHPUnit_Framework_TestCase
     {
         $index = new PMA_Index();
         $index->addColumns($this->_params['columns']);       
-        $this->assertTrue($this->hasColumn("column1"));       
-        $this->assertTrue($this->hasColumn("column2"));       
-        $this->assertTrue($this->hasColumn("column3"));
+        $this->assertTrue($index->hasColumn("column1"));       
+        $this->assertTrue($index->hasColumn("column2"));       
+        $this->assertTrue($index->hasColumn("column3"));
         $this->assertEquals(
             3,
-            $this->getColumnCount()
+            $index->getColumnCount()
         );
     }
         
@@ -103,7 +103,7 @@ class PMA_Index_Test extends PHPUnit_Framework_TestCase
         $index = new PMA_Index();
         $index->addColumns($this->_params['columns']);
         
-        $index_columns = $this->getColumns();
+        $index_columns = $index->getColumns();
         $index_column = $index_columns['column1'];
         $this->assertEquals(
             'column1',