webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity

Simplify Drizzle test using new dummy dbi

Browse Source
This commit is contained in:
Michal Čihař
2012-09-17 17:05:40 +02:00
parent d282fdb6ca
commit 52e43c7e62
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/dbi/dummy.lib.php
View File

@@ -138,6 +138,11 @@ $GLOBALS['dummy_queries'] = array(
'query' => 'SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`TABLES` WHERE `TABLE_SCHEMA`=\'pma_test\' AND `TABLE_TYPE`=\'BASE TABLE\'',
'result' => array(),
),
array(
'query' => 'SELECT upper(plugin_name) f FROM data_dictionary.plugins WHERE plugin_name IN (\'MYSQL_PASSWORD\',\'ROT13\') AND plugin_type = \'Function\' AND is_active',
'columns' => array('f'),
'result' => array(array('ROT13')),
),
);
/**

32
test/classes/PMA_Types_Drizzle_test.php
View File

@@ -11,6 +11,8 @@
require_once 'libraries/Types.class.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/database_interface.lib.php';
require_once 'libraries/Tracker.class.php';
class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase
{
@@ -175,13 +177,6 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase
public function testGetFunctionsClass($class, $output)
{
if (! function_exists('PMA_DBI_fetch_result')) {
function PMA_DBI_fetch_result($query)
{
return array('table1', 'table`2');
}
}
$this->assertEquals(
$output,
$this->object->getFunctionsClass($class)
@@ -288,18 +283,17 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase
11 => 'MONTHNAME',
12 => 'QUOTE',
13 => 'REVERSE',
14 => 'RTRIM',
15 => 'SCHEMA',
16 => 'SPACE',
17 => 'TRIM',
18 => 'UNCOMPRESS',
19 => 'UNHEX',
20 => 'UPPER',
21 => 'USER',
22 => 'UUID',
23 => 'VERSION',
24 => 'table1',
25 => 'table`2'
14 => 'ROT13',
15 => 'RTRIM',
16 => 'SCHEMA',
17 => 'SPACE',
18 => 'TRIM',
19 => 'UNCOMPRESS',
20 => 'UNHEX',
21 => 'UPPER',
22 => 'USER',
23 => 'UUID',
24 => 'VERSION',
)
),
array(