gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that ColumnTypes is set on test run

Browse Source
This commit is contained in:
Michal Čihař 2011-08-05 16:01:39 +02:00
parent cdd2044274
commit 43161e7876
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
View File

@ -6,7 +6,6 @@
* @package phpMyAdmin-test
*/
require_once 'libraries/data_mysql.inc.php';
require_once 'libraries/common.lib.php';
@ -17,6 +16,11 @@ require_once 'libraries/rte/rte_routines.lib.php';
class PMA_RTN_getDataFromRequest_test extends PHPUnit_Framework_TestCase
{
public function setUp()
{
require 'libraries/data_mysql.inc.php';
}
/**
* @dataProvider provider
*/
@ -24,10 +28,6 @@ class PMA_RTN_getDataFromRequest_test extends PHPUnit_Framework_TestCase
{
global $cfg, $_REQUEST;
if (! isset($cfg['ColumnTypes'])) {
$this->markTestSkipped('Can\'t get column types'); // FIXME
}
unset($_REQUEST);
foreach ($in as $key => $value) {
if ($value !== '') {

3
test/libraries/rte/PMA_RTN_getEditorForm_test.php
View File

@ -6,7 +6,6 @@
* @package phpMyAdmin-test
*/
require_once 'libraries/common.lib.php';
require_once 'libraries/data_mysql.inc.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/url_generating.lib.php';
/*
@ -18,6 +17,8 @@ class PMA_RTN_getEditorForm_test extends PHPUnit_Framework_TestCase
{
public function setUp()
{
require 'libraries/data_mysql.inc.php';
if (! function_exists('PMA_generateCharsetDropdownBox')) {
function PMA_generateCharsetDropdownBox() {}
}

2
test/libraries/rte/PMA_RTN_getExecuteForm_test.php
View File

@ -53,7 +53,7 @@ class PMA_RTN_getExecuteForm_test extends PHPUnit_Framework_TestCase
$cfg['DefaultFunctions']['FUNC_DATE'] = '';
$GLOBALS['tear_down']['default'] = true;
}
eval(substr(file_get_contents('libraries/data_mysql.inc.php'), 5, -3)); // FIXME
require 'libraries/data_mysql.inc.php';
}
public function tearDown()

9
test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
View File

@ -9,7 +9,6 @@
/*
* Needed for PMA_backquote() and PMA_RTN_getQueryFromRequest()
*/
//require_once 'libraries/data_mysql.inc.php';
require_once 'libraries/common.lib.php';
require_once 'libraries/php-gettext/gettext.inc';
@ -28,15 +27,9 @@ class PMA_RTN_getQueryFromRequest_test extends PHPUnit_Framework_TestCase
{
global $_REQUEST, $errors, $cfg;
// FIXME: the below two lines are needed to get the test to work,
// but are definitely the wrong way to go about the issue
// of $cfg['ColumnTypes'] being undefined
$cfg['ShowFunctionFields'] = false;
eval(substr(file_get_contents('libraries/data_mysql.inc.php'), 5, -3));
if (! isset($cfg['ColumnTypes'])) {
$this->markTestSkipped('Can\'t get column types'); // FIXME
}
require 'libraries/data_mysql.inc.php';
$errors = array();
PMA_RTN_setGlobals();