From 248c13014d41e894e2b8308dc9a706a29f91f433 Mon Sep 17 00:00:00 2001 From: adamgsoc2013 Date: Wed, 10 Jul 2013 20:09:09 +0800 Subject: [PATCH 1/3] include the data file, so that it can be covered by PHPUnit --- test/libraries/PMA_SQL_parser_data_test.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/libraries/PMA_SQL_parser_data_test.php b/test/libraries/PMA_SQL_parser_data_test.php index 01f6dc2fcc..96abfdbb7e 100644 --- a/test/libraries/PMA_SQL_parser_data_test.php +++ b/test/libraries/PMA_SQL_parser_data_test.php @@ -26,6 +26,18 @@ class PMA_SQLParser_Data_Test extends PHPUnit_Framework_TestCase $this->_assertSorted($GLOBALS[$name]); } + public function testPMA_SQPdata() + { + //so that sqlparser.data.php can be covered by PHPUnit + include 'libraries/sqlparser.data.php'; + + $this->_assertSorted($PMA_SQPdata_function_name); + $this->_assertSorted($PMA_SQPdata_column_attrib); + $this->_assertSorted($PMA_SQPdata_reserved_word); + $this->_assertSorted($PMA_SQPdata_forbidden_word); + $this->_assertSorted($PMA_SQPdata_column_type); + } + public function testPMA_SQPdata_function_name() { $this->_assertParserData('PMA_SQPdata_function_name'); From 772d3e000576926b4f78cab4c81af5731e3165a4 Mon Sep 17 00:00:00 2001 From: adamgsoc2013 Date: Sun, 14 Jul 2013 21:27:27 +0800 Subject: [PATCH 2/3] add PMA_SQL_Parse_Data_Mock, so that sqlparser.data.php can be covered by PHPUnit --- test/libraries/PMA_SQL_parser_data_test.php | 30 +++++++++++++++------ 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/test/libraries/PMA_SQL_parser_data_test.php b/test/libraries/PMA_SQL_parser_data_test.php index 96abfdbb7e..a10ee81fe2 100644 --- a/test/libraries/PMA_SQL_parser_data_test.php +++ b/test/libraries/PMA_SQL_parser_data_test.php @@ -28,14 +28,12 @@ class PMA_SQLParser_Data_Test extends PHPUnit_Framework_TestCase public function testPMA_SQPdata() { - //so that sqlparser.data.php can be covered by PHPUnit - include 'libraries/sqlparser.data.php'; - - $this->_assertSorted($PMA_SQPdata_function_name); - $this->_assertSorted($PMA_SQPdata_column_attrib); - $this->_assertSorted($PMA_SQPdata_reserved_word); - $this->_assertSorted($PMA_SQPdata_forbidden_word); - $this->_assertSorted($PMA_SQPdata_column_type); + $data = PMA_SQL_Parse_Data_Mock::getDataArray(); + $this->_assertSorted($data['PMA_SQPdata_function_name']); + $this->_assertSorted($data['PMA_SQPdata_column_attrib']); + $this->_assertSorted($data['PMA_SQPdata_reserved_word']); + $this->_assertSorted($data['PMA_SQPdata_forbidden_word']); + $this->_assertSorted($data['PMA_SQPdata_column_type']); } public function testPMA_SQPdata_function_name() @@ -64,4 +62,20 @@ class PMA_SQLParser_Data_Test extends PHPUnit_Framework_TestCase } } + +class PMA_SQL_Parse_Data_Mock +{ + public static function getDataArray(){ + //so that sqlparser.data.php can be covered by PHPUnit + include 'libraries/sqlparser.data.php'; + return array( + 'PMA_SQPdata_function_name' => $PMA_SQPdata_function_name, + 'PMA_SQPdata_column_attrib' => $PMA_SQPdata_column_attrib, + 'PMA_SQPdata_reserved_word' => $PMA_SQPdata_reserved_word, + 'PMA_SQPdata_forbidden_word' => $PMA_SQPdata_forbidden_word, + 'PMA_SQPdata_column_type' => $PMA_SQPdata_column_type, + ); + } +} + ?> From 43f0653f507ff461f24fdc58d54e759087901c1b Mon Sep 17 00:00:00 2001 From: adamgsoc2013 Date: Sun, 14 Jul 2013 22:13:39 +0800 Subject: [PATCH 3/3] add function in source file, so that sqlparser.data.php can be covered by PHPUnit --- libraries/sqlparser.lib.php | 18 ++++++++++++++++++ test/libraries/PMA_SQL_parser_data_test.php | 18 ++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 46c34eddbe..c4cba5b16e 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -3018,4 +3018,22 @@ function PMA_SQP_isKeyWord($column) return in_array(strtoupper($column), $PMA_SQPdata_forbidden_word); } + +/** + * Get Parser Data Map from sqlparser.data.php + * + * @return Array Parser Data Map from sqlparser.data.php + */ +function PMA_SQP_getParserDataMap() +{ + include 'libraries/sqlparser.data.php'; + return array( + 'PMA_SQPdata_function_name' => $PMA_SQPdata_function_name, + 'PMA_SQPdata_column_attrib' => $PMA_SQPdata_column_attrib, + 'PMA_SQPdata_reserved_word' => $PMA_SQPdata_reserved_word, + 'PMA_SQPdata_forbidden_word' => $PMA_SQPdata_forbidden_word, + 'PMA_SQPdata_column_type' => $PMA_SQPdata_column_type, + ); +} + ?> diff --git a/test/libraries/PMA_SQL_parser_data_test.php b/test/libraries/PMA_SQL_parser_data_test.php index a10ee81fe2..22f694c4a4 100644 --- a/test/libraries/PMA_SQL_parser_data_test.php +++ b/test/libraries/PMA_SQL_parser_data_test.php @@ -10,6 +10,7 @@ * Include to test. */ require_once 'libraries/sqlparser.data.php'; +require_once 'libraries/sqlparser.lib.php'; class PMA_SQLParser_Data_Test extends PHPUnit_Framework_TestCase { @@ -28,7 +29,7 @@ class PMA_SQLParser_Data_Test extends PHPUnit_Framework_TestCase public function testPMA_SQPdata() { - $data = PMA_SQL_Parse_Data_Mock::getDataArray(); + $data = PMA_SQP_getParserDataMap(); $this->_assertSorted($data['PMA_SQPdata_function_name']); $this->_assertSorted($data['PMA_SQPdata_column_attrib']); $this->_assertSorted($data['PMA_SQPdata_reserved_word']); @@ -63,19 +64,4 @@ class PMA_SQLParser_Data_Test extends PHPUnit_Framework_TestCase } -class PMA_SQL_Parse_Data_Mock -{ - public static function getDataArray(){ - //so that sqlparser.data.php can be covered by PHPUnit - include 'libraries/sqlparser.data.php'; - return array( - 'PMA_SQPdata_function_name' => $PMA_SQPdata_function_name, - 'PMA_SQPdata_column_attrib' => $PMA_SQPdata_column_attrib, - 'PMA_SQPdata_reserved_word' => $PMA_SQPdata_reserved_word, - 'PMA_SQPdata_forbidden_word' => $PMA_SQPdata_forbidden_word, - 'PMA_SQPdata_column_type' => $PMA_SQPdata_column_type, - ); - } -} - ?>