From 57ecddfa56ec7500e1daebf716dddd31271689a2 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Tue, 28 Apr 2015 15:42:32 +0530
Subject: [PATCH] Fix method names in tests

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 test/libraries/PMA_SQL_parse_analyze_test.php |  2 +-
 test/libraries/PMA_SQL_parser_data_test.php   | 13 ++---
 test/libraries/PMA_bookmark_test.php          | 10 ++--
 test/libraries/PMA_ip_allow_deny_test.php     |  6 +-
 test/libraries/core/PMA_getLinks_test.php     |  6 +-
 .../rte/PMA_EVN_getDataFromRequest_test.php   |  2 +-
 .../rte/PMA_EVN_getEditorForm_test.php        | 20 +++----
 .../rte/PMA_RTN_ParameterParser_test.php      | 26 ++++-----
 .../rte/PMA_RTN_getEditorForm_test.php        | 56 +++++++++----------
 .../rte/PMA_RTN_getExecuteForm_test.php       | 16 +++---
 .../rte/PMA_TRI_getDataFromRequest_test.php   |  4 +-
 11 files changed, 80 insertions(+), 81 deletions(-)

diff --git a/test/libraries/PMA_SQL_parse_analyze_test.php b/test/libraries/PMA_SQL_parse_analyze_test.php
index 6a539297e4..ee62290dff 100644
--- a/test/libraries/PMA_SQL_parse_analyze_test.php
+++ b/test/libraries/PMA_SQL_parse_analyze_test.php
@@ -26,7 +26,7 @@ class PMA_SQLParserAnalyze_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_SQP_getParserAnalyzeMa()
+    public function test_getParserAnalyzeMa()
     {
         //select statement
         $sql_query = "select * from PMA.PMAParse";
diff --git a/test/libraries/PMA_SQL_parser_data_test.php b/test/libraries/PMA_SQL_parser_data_test.php
index a77b17dfd1..4db8c5f207 100644
--- a/test/libraries/PMA_SQL_parser_data_test.php
+++ b/test/libraries/PMA_SQL_parser_data_test.php
@@ -54,7 +54,7 @@ class PMA_SQLParser_Data_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_SQPdata()
+    public function test_data()
     {
         $data = PMA_SQP_getParserDataMap();
         $this->_assertSorted($data['PMA_SQPdata_function_name']);
@@ -70,7 +70,7 @@ class PMA_SQLParser_Data_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_SQPdata_function_name()
+    public function test_data_function_name()
     {
         $this->_assertParserData('PMA_SQPdata_function_name');
     }
@@ -81,7 +81,7 @@ class PMA_SQLParser_Data_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_SQPdata_column_attrib()
+    public function test_data_column_attrib()
     {
         $this->_assertParserData('PMA_SQPdata_column_attrib');
     }
@@ -92,7 +92,7 @@ class PMA_SQLParser_Data_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_SQPdata_reserved_word()
+    public function test_data_reserved_word()
     {
         $this->_assertParserData('PMA_SQPdata_reserved_word');
     }
@@ -103,7 +103,7 @@ class PMA_SQLParser_Data_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_SQPdata_forbidden_word()
+    public function test_data_forbidden_word()
     {
         $this->_assertParserData('PMA_SQPdata_forbidden_word');
     }
@@ -114,11 +114,10 @@ class PMA_SQLParser_Data_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_SQPdata_column_type()
+    public function test_data_column_type()
     {
         $this->_assertParserData('PMA_SQPdata_column_type');
     }
-
 }
 
 ?>
diff --git a/test/libraries/PMA_bookmark_test.php b/test/libraries/PMA_bookmark_test.php
index bedee1e31f..ca6f8de5fd 100644
--- a/test/libraries/PMA_bookmark_test.php
+++ b/test/libraries/PMA_bookmark_test.php
@@ -44,7 +44,7 @@ class PMA_Bookmark_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_Bookmark_getParams()
+    public function test_getParams()
     {
         $this->assertEquals(
             false,
@@ -57,7 +57,7 @@ class PMA_Bookmark_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_Bookmark_getList()
+    public function test_getList()
     {
         $this->assertEquals(
             array(),
@@ -70,7 +70,7 @@ class PMA_Bookmark_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_Bookmark_get()
+    public function test_get()
     {
         $this->assertEquals(
             '',
@@ -83,7 +83,7 @@ class PMA_Bookmark_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_Bookmark_save()
+    public function test_save()
     {
         $bookmark = array(
             'dbase' => 'phpmyadmin',
@@ -100,7 +100,7 @@ class PMA_Bookmark_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_Bookmark_delete()
+    public function test_delete()
     {
         $this->assertFalse(
             PMA_Bookmark_delete('1')
diff --git a/test/libraries/PMA_ip_allow_deny_test.php b/test/libraries/PMA_ip_allow_deny_test.php
index e204d6d8e4..33809fa165 100644
--- a/test/libraries/PMA_ip_allow_deny_test.php
+++ b/test/libraries/PMA_ip_allow_deny_test.php
@@ -53,7 +53,7 @@ class PMA_Ip_Allow_Deny_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_getIp()
+    public function test_getIp()
     {
         //$_SERVER['REMOTE_ADDR'] is empty
         $this->assertEquals(
@@ -85,7 +85,7 @@ class PMA_Ip_Allow_Deny_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_ipMaskTest()
+    public function test_ipMaskTest()
     {
         //IPV4 testing
         $testRange = "255.255.0.0/8";
@@ -163,7 +163,7 @@ class PMA_Ip_Allow_Deny_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_allowDeny()
+    public function test_allowDeny()
     {
         $_SERVER['REMOTE_ADDR'] = "";
         $this->assertEquals(
diff --git a/test/libraries/core/PMA_getLinks_test.php b/test/libraries/core/PMA_getLinks_test.php
index f946c78a12..716c6c7206 100644
--- a/test/libraries/core/PMA_getLinks_test.php
+++ b/test/libraries/core/PMA_getLinks_test.php
@@ -36,7 +36,7 @@ class PMA_GetLinks_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testPMA_getPHPDocLink()
+    public function test_getPHPDocLink()
     {
         $lang = _pgettext('PHP documentation language', 'en');
         $this->assertEquals(
@@ -47,7 +47,7 @@ class PMA_GetLinks_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Data provider for testPMA_linkURL
+     * Data provider for test_linkURL
      *
      * @return array
      */
@@ -73,7 +73,7 @@ class PMA_GetLinks_Test extends PHPUnit_Framework_TestCase
      *
      * @dataProvider providerLinkURL
      */
-    public function testPMA_linkURL($link, $url)
+    public function test_linkURL($link, $url)
     {
         $this->assertEquals(PMA_linkURL($link), $url);
     }
diff --git a/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php b/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
index b55ac84340..6e527ae152 100644
--- a/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
+++ b/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
@@ -28,7 +28,7 @@ class PMA_EVN_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
      *
      * @dataProvider provider
      */
-    public function testgetDataFromRequest_empty($in, $out)
+    public function testgetDataFromRequestEmpty($in, $out)
     {
         global $_REQUEST;
 
diff --git a/test/libraries/rte/PMA_EVN_getEditorForm_test.php b/test/libraries/rte/PMA_EVN_getEditorForm_test.php
index 006f53d6e6..adad7c3a3d 100644
--- a/test/libraries/rte/PMA_EVN_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_EVN_getEditorForm_test.php
@@ -56,9 +56,9 @@ class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      *
-     * @dataProvider provider_add
+     * @dataProvider providerAdd
      */
-    public function testgetEditorForm_add($data, $matcher)
+    public function testgetEditorFormAdd($data, $matcher)
     {
         $GLOBALS['is_ajax_request'] = false;
         PMA_EVN_setGlobals();
@@ -71,11 +71,11 @@ class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Data provider for testgetEditorForm_add
+     * Data provider for testgetEditorFormAdd
      *
      * @return array
      */
-    public function provider_add()
+    public function providerAdd()
     {
         $data = array(
             'item_name'           => '',
@@ -241,9 +241,9 @@ class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      *
-     * @dataProvider provider_edit
+     * @dataProvider providerEdit
      */
-    public function testgetEditorForm_edit($data, $matcher)
+    public function testgetEditorFormEdit($data, $matcher)
     {
         $GLOBALS['is_ajax_request'] = false;
         PMA_EVN_setGlobals();
@@ -260,7 +260,7 @@ class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
      *
      * @return array
      */
-    public function provider_edit()
+    public function providerEdit()
     {
         $data = array(
             'item_name'           => 'foo',
@@ -426,9 +426,9 @@ class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      *
-     * @dataProvider provider_ajax
+     * @dataProvider providerAjax
      */
-    public function testgetEditorForm_ajax($data, $matcher)
+    public function testgetEditorFormAjax($data, $matcher)
     {
         $GLOBALS['is_ajax_request'] = true;
         PMA_EVN_setGlobals();
@@ -445,7 +445,7 @@ class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
      *
      * @return array
      */
-    public function provider_ajax()
+    public function providerAjax()
     {
         $data = array(
             'item_name'           => '',
diff --git a/test/libraries/rte/PMA_RTN_ParameterParser_test.php b/test/libraries/rte/PMA_RTN_ParameterParser_test.php
index bb1a9a6071..2ee03142ac 100644
--- a/test/libraries/rte/PMA_RTN_ParameterParser_test.php
+++ b/test/libraries/rte/PMA_RTN_ParameterParser_test.php
@@ -32,9 +32,9 @@ class PMA_RTN_ParameterParser_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      *
-     * @dataProvider definer_provider
+     * @dataProvider definerProvider
      */
-    public function test_parseDefiner($source, $target)
+    public function testParseDefiner($source, $target)
     {
         PMA_RTN_setGlobals();
         $this->assertEquals(
@@ -44,11 +44,11 @@ class PMA_RTN_ParameterParser_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Data provider for test_parseDefiner
+     * Data provider for testParseDefiner
      *
      * @return array
      */
-    public function definer_provider()
+    public function definerProvider()
     {
         return array(
             array('CREATE PROCEDURE FOO() SELECT NULL', ''),
@@ -71,20 +71,20 @@ class PMA_RTN_ParameterParser_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      *
-     * @dataProvider param_provider
+     * @dataProvider paramProvider
      */
-    public function test_parseOneParameter($source, $target)
+    public function testParseOneParameter($source, $target)
     {
         PMA_RTN_setGlobals();
         $this->assertEquals($target, PMA_RTN_parseOneParameter($source));
     }
 
     /**
-     * Data provider for test_parseOneParameter
+     * Data provider for testParseOneParameter
      *
      * @return array
      */
-    public function param_provider()
+    public function paramProvider()
     {
         return array(
             array('`foo` TEXT', array('', 'foo', 'TEXT', '', '')),
@@ -124,10 +124,10 @@ class PMA_RTN_ParameterParser_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      *
-     * @depends test_parseOneParameter
-     * @dataProvider query_provider
+     * @depends testParseOneParameter
+     * @dataProvider queryProvider
      */
-    public function test_parseAllParameters($query, $type, $target)
+    public function testParseAllParameters($query, $type, $target)
     {
         PMA_RTN_setGlobals();
         $this->assertEquals(
@@ -137,11 +137,11 @@ class PMA_RTN_ParameterParser_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Data provider for test_parseAllParameters
+     * Data provider for testParseAllParameters
      *
      * @return array
      */
-    public function query_provider()
+    public function queryProvider()
     {
         return array(
             array(
diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
index b90bfe987e..8f4aa9892e 100644
--- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
@@ -52,7 +52,7 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      */
-    public function testgetParameterRow_empty()
+    public function testgetParameterRowEmpty()
     {
         $GLOBALS['is_ajax_request'] = false;
         PMA_RTN_setGlobals();
@@ -68,8 +68,8 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      *
-     * @depends testgetParameterRow_empty
-     * @dataProvider provider_row
+     * @depends testgetParameterRowEmpty
+     * @dataProvider providerRow
      */
     public function testgetParameterRow($data, $index, $matcher)
     {
@@ -83,7 +83,7 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
      *
      * @return array
      */
-    public function provider_row()
+    public function providerRow()
     {
         $data = array(
             'item_name'                 => '',
@@ -184,9 +184,9 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
      * @return void
      *
      * @depends testgetParameterRow
-     * @dataProvider provider_row_ajax
+     * @dataProvider providerRowAjax
      */
-    public function testgetParameterRow_ajax($data, $matcher)
+    public function testgetParameterRowAjax($data, $matcher)
     {
         $GLOBALS['is_ajax_request'] = false;
         PMA_RTN_setGlobals();
@@ -194,11 +194,11 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Data provider for testgetParameterRow_ajax
+     * Data provider for testgetParameterRowAjax
      *
      * @return array
      */
-    public function provider_row_ajax()
+    public function providerRowAjax()
     {
         $data = array(
             'item_name'                 => '',
@@ -292,10 +292,10 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      *
-     * @depends testgetParameterRow_ajax
-     * @dataProvider provider_editor_1
+     * @depends testgetParameterRowAjax
+     * @dataProvider providerEditor1
      */
-    public function testgetEditorForm_1($data, $matcher)
+    public function testgetEditorForm1($data, $matcher)
     {
         $GLOBALS['is_ajax_request'] = false;
         PMA_RTN_setGlobals();
@@ -303,11 +303,11 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Data provider for testgetEditorForm_1
+     * Data provider for testgetEditorForm1
      *
      * @return array
      */
-    public function provider_editor_1()
+    public function providerEditor1()
     {
         $data = array(
             'item_name'                 => '',
@@ -492,10 +492,10 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      *
-     * @depends testgetParameterRow_ajax
-     * @dataProvider provider_editor_2
+     * @depends testgetParameterRowAjax
+     * @dataProvider providerEditor2
      */
-    public function testgetEditorForm_2($data, $matcher)
+    public function testgetEditorForm2($data, $matcher)
     {
         $GLOBALS['is_ajax_request'] = false;
         PMA_RTN_setGlobals();
@@ -505,11 +505,11 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Data provider for testgetEditorForm_2
+     * Data provider for testgetEditorForm2
      *
      * @return array
      */
-    public function provider_editor_2()
+    public function providerEditor2()
     {
         $data = array(
             'item_name'                 => 'foo',
@@ -695,10 +695,10 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      *
-     * @depends testgetParameterRow_ajax
-     * @dataProvider provider_editor_3
+     * @depends testgetParameterRowAjax
+     * @dataProvider providerEditor3
      */
-    public function testgetEditorForm_3($data, $matcher)
+    public function testgetEditorForm3($data, $matcher)
     {
         $GLOBALS['is_ajax_request'] = true;
         PMA_RTN_setGlobals();
@@ -710,11 +710,11 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Data provider for testgetEditorForm_3
+     * Data provider for testgetEditorForm3
      *
      * @return array
      */
-    public function provider_editor_3()
+    public function providerEditor3()
     {
         $data = array(
             'item_name'                 => 'foo',
@@ -899,10 +899,10 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      *
-     * @depends testgetParameterRow_ajax
-     * @dataProvider provider_editor_4
+     * @depends testgetParameterRowAjax
+     * @dataProvider providerEditor4
      */
-    public function testgetEditorForm_4($data, $matcher)
+    public function testgetEditorForm4($data, $matcher)
     {
         $GLOBALS['is_ajax_request'] = false;
         PMA_RTN_setGlobals();
@@ -914,11 +914,11 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Data provider for testgetEditorForm_4
+     * Data provider for testgetEditorForm4
      *
      * @return array
      */
-    public function provider_editor_4()
+    public function providerEditor4()
     {
         $data = array(
             'item_name'                 => 'foo',
diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
index c69b267fd4..31688ebe29 100644
--- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
@@ -52,9 +52,9 @@ class PMA_RTN_GetExecuteForm_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      *
-     * @dataProvider provider_1
+     * @dataProvider provider1
      */
-    public function testgetExecuteForm_1($data, $matcher)
+    public function testgetExecuteForm1($data, $matcher)
     {
         $GLOBALS['is_ajax_request'] = false;
         PMA_RTN_setGlobals();
@@ -62,11 +62,11 @@ class PMA_RTN_GetExecuteForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Data provider for testgetExecuteForm_1
+     * Data provider for testgetExecuteForm1
      *
      * @return array
      */
-    public function provider_1()
+    public function provider1()
     {
         $data = array(
             'item_name'                 => 'foo',
@@ -219,9 +219,9 @@ class PMA_RTN_GetExecuteForm_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      *
-     * @dataProvider provider_2
+     * @dataProvider provider2
      */
-    public function testgetExecuteForm_2($data, $matcher)
+    public function testgetExecuteForm2($data, $matcher)
     {
         $GLOBALS['is_ajax_request'] = true;
         PMA_RTN_setGlobals();
@@ -229,11 +229,11 @@ class PMA_RTN_GetExecuteForm_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Data provider for testgetExecuteForm_2
+     * Data provider for testgetExecuteForm2
      *
      * @return array
      */
-    public function provider_2()
+    public function provider2()
     {
         $data = array(
             'item_name'                 => 'foo',
diff --git a/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php b/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php
index b1b6f7399a..c2853311fd 100644
--- a/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php
+++ b/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php
@@ -28,7 +28,7 @@ class PMA_TRI_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
      *
      * @dataProvider provider
      */
-    public function testgetDataFromRequest_empty($in, $out)
+    public function testgetDataFromRequestEmpty($in, $out)
     {
         global $_REQUEST;
 
@@ -42,7 +42,7 @@ class PMA_TRI_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Data provider for testgetDataFromRequest_empty
+     * Data provider for testgetDataFromRequestEmpty
      *
      * @return array
      */