From 2b69375a5622551f1a7f7d5dfe04d9d06ac890f3 Mon Sep 17 00:00:00 2001
From: adamgsoc2013 <adamgsoc2013@gmail.com>
Date: Mon, 13 May 2013 20:58:50 +0800
Subject: [PATCH 1/2] add more test case for PMA_Index

---
 test/classes/PMA_Index_test.php | 49 ++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/test/classes/PMA_Index_test.php b/test/classes/PMA_Index_test.php
index 3a683453db..7ed5bd1868 100644
--- a/test/classes/PMA_Index_test.php
+++ b/test/classes/PMA_Index_test.php
@@ -37,9 +37,18 @@ class PMA_Index_Test extends PHPUnit_Framework_TestCase
         $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");
+        $column1 = array("Column_name"=>"column1","Seq_in_index"=>"index1",
+                         "Collation"=>"Collation1","Cardinality"=>"Cardinality1",
+                         "Null"=>"null1"
+                        );
+        $column2 = array("Column_name"=>"column2","Seq_in_index"=>"index2",
+                         "Collation"=>"Collation2","Cardinality"=>"Cardinality2",
+                         "Null"=>"null2"
+                        );
+        $column3 = array("Column_name"=>"column3","Seq_in_index"=>"index3",
+                         "Collation"=>"Collation3","Cardinality"=>"Cardinality3",
+                         "Null"=>"null3"
+                        );
         $this->_params['columns'][] = $column1;
         $this->_params['columns'][] = $column2;
         $this->_params['columns'][] = $column3;
@@ -73,6 +82,15 @@ class PMA_Index_Test extends PHPUnit_Framework_TestCase
             'PMA_Non_unique',
             $index->getNonUnique()
         );
+        $this->assertEquals(
+            'PMA_Comment\nPMA_Index_comment',
+            $index->getComments()
+        );
+        $this->assertEquals(
+            'INDEX',
+            $index->getChoice()
+        );
+        
     }
     
     /**
@@ -92,7 +110,22 @@ class PMA_Index_Test extends PHPUnit_Framework_TestCase
             $index->getColumnCount()
         );
     }
-        
+ 
+    /**
+     * Test for get Name & set Name
+     *
+     * @return void
+     */
+    public function testName()
+    {
+        $index = new PMA_Index();
+        $index->setName('PMA_name');
+        $this->assertEquals(
+            'PMA_name',
+            $index->getName()
+        );
+    }
+       
     /**
      * Test for PMA_Index_Column
      *
@@ -113,5 +146,13 @@ class PMA_Index_Test extends PHPUnit_Framework_TestCase
             'index1',
             $index_column->getSeqInIndex()
         );
+        $this->assertEquals(
+            'Collation1',
+            $index_column->getCollation()
+        );
+        $this->assertEquals(
+            'Cardinality1',
+            $index_column->getCardinality()
+        );
     }
 }

From 607b9cbc8d6380fbc0e2e254d6073f8931ae8c25 Mon Sep 17 00:00:00 2001
From: adamgsoc2013 <adamgsoc2013@gmail.com>
Date: Mon, 13 May 2013 21:08:36 +0800
Subject: [PATCH 2/2] fix the assert failure, which is caused by '/n'

---
 test/classes/PMA_Index_test.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/classes/PMA_Index_test.php b/test/classes/PMA_Index_test.php
index 7ed5bd1868..fd50b56ca3 100644
--- a/test/classes/PMA_Index_test.php
+++ b/test/classes/PMA_Index_test.php
@@ -82,8 +82,12 @@ class PMA_Index_Test extends PHPUnit_Framework_TestCase
             'PMA_Non_unique',
             $index->getNonUnique()
         );
-        $this->assertEquals(
-            'PMA_Comment\nPMA_Index_comment',
+        $this->assertContains(
+            'PMA_Comment',
+            $index->getComments()
+        );
+        $this->assertContains(
+            'PMA_Index_comment',
             $index->getComments()
         );
         $this->assertEquals(