From 3a25fa6bc889620d8194bdbb558c5121e984559b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 26 Apr 2012 10:31:48 +0200 Subject: [PATCH] This file no longer defines functions --- test/libraries/rte/PMA_RTN_getDataFromRequest_test.php | 8 +------- test/libraries/rte/PMA_RTN_getEditorForm_test.php | 9 +-------- test/libraries/rte/PMA_RTN_getExecuteForm_test.php | 9 +-------- test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php | 9 +-------- 4 files changed, 4 insertions(+), 31 deletions(-) diff --git a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php index e7ae440174..8a2e33cc40 100644 --- a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php +++ b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php @@ -22,13 +22,7 @@ class PMA_RTN_getDataFromRequest_test extends PHPUnit_Framework_TestCase $cfg['ShowFunctionFields'] = false; - if (function_exists('PMA_supportedDataTypesDescriptions')) { - $this->markTestSkipped( - 'Skipping test since we need to reload data_mysql.inc.php, but cannot do it at this point' - ); - } else { - include 'libraries/data_mysql.inc.php'; - } + include 'libraries/data_mysql.inc.php'; } /** diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php index 720813a197..626c888880 100644 --- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php +++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php @@ -21,14 +21,7 @@ class PMA_RTN_getEditorForm_test extends PHPUnit_Framework_TestCase $cfg['ShowFunctionFields'] = false; - if (function_exists('PMA_supportedDataTypesDescriptions')) { - $this->markTestSkipped( - 'Skipping test since we need to reload data_mysql.inc.php, but cannot do it at this point' - ); - return; - } else { - include 'libraries/data_mysql.inc.php'; - } + include 'libraries/data_mysql.inc.php'; if (! function_exists('PMA_generateCharsetDropdownBox')) { function PMA_generateCharsetDropdownBox() {} diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php index 0b1ce5c201..9625215499 100644 --- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php +++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php @@ -20,14 +20,7 @@ class PMA_RTN_getExecuteForm_test extends PHPUnit_Framework_TestCase { global $cfg; - if (function_exists('PMA_supportedDataTypesDescriptions')) { - $this->markTestSkipped( - 'Skipping test since we need to reload data_mysql.inc.php, but cannot do it at this point' - ); - return; - } else { - include 'libraries/data_mysql.inc.php'; - } + include 'libraries/data_mysql.inc.php'; if (! defined('PMA_MYSQL_INT_VERSION')) { define('PMA_MYSQL_INT_VERSION', 51000); diff --git a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php index 56e548cb4b..2d2717eb5d 100644 --- a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php +++ b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php @@ -29,14 +29,7 @@ class PMA_RTN_getQueryFromRequest_test extends PHPUnit_Framework_TestCase $cfg['ShowFunctionFields'] = false; - if (function_exists('PMA_supportedDataTypesDescriptions')) { - $this->markTestSkipped( - 'Skipping test since we need to reload data_mysql.inc.php, but cannot do it at this point' - ); - return; - } else { - include 'libraries/data_mysql.inc.php'; - } + include 'libraries/data_mysql.inc.php'; $errors = array(); PMA_RTN_setGlobals();