Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Refactor PMA_extractColumnSpec_test
Move PMA_extractColumnSpec_test to UtilTest

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
  • Loading branch information
MauricioFauth committed Sep 29, 2017
1 parent ddc3a56 commit 3b3e2ed
Show file tree
Hide file tree
Showing 2 changed files with 136 additions and 164 deletions.
136 changes: 136 additions & 0 deletions test/classes/UtilTest.php
Expand Up @@ -723,4 +723,140 @@ public function providerExpandUserString()
array('@PHPMYADMIN@', 'phpMyAdmin PMA_VERSION'),
);
}

/**
* Test case for parsing SHOW COLUMNS output
*
* @param string $in Column specification
* @param array $out Expected value
*
* @return void
*
* @covers PhpMyAdmin\Util::extractColumnSpec
* @dataProvider providerExtractColumnSpec
*/
public function testExtractColumnSpec($in, $out)
{
$GLOBALS['cfg']['LimitChars'] = 1000;

$this->assertEquals(
$out, Util::extractColumnSpec($in)
);
}

/**
* Data provider for testExtractColumnSpec
*
* @return array
*/
public function providerExtractColumnSpec()
{
return array(
array(
"SET('a','b')",
array(
'type' => 'set',
'print_type' => "set('a', 'b')",
'binary' => false,
'unsigned' => false,
'zerofill' => false,
'spec_in_brackets' => "'a','b'",
'enum_set_values' => array('a', 'b'),
'attribute' => ' ',
'can_contain_collation' => true,
'displayed_type' => "set('a', 'b')"
),
),
array(
"SET('\'a','b')",
array(
'type' => 'set',
'print_type' => "set('\'a', 'b')",
'binary' => false,
'unsigned' => false,
'zerofill' => false,
'spec_in_brackets' => "'\'a','b'",
'enum_set_values' => array("'a", 'b'),
'attribute' => ' ',
'can_contain_collation' => true,
'displayed_type' => "set('\'a', 'b')"
),
),
array(
"SET('''a','b')",
array(
'type' => 'set',
'print_type' => "set('''a', 'b')",
'binary' => false,
'unsigned' => false,
'zerofill' => false,
'spec_in_brackets' => "'''a','b'",
'enum_set_values' => array("'a", 'b'),
'attribute' => ' ',
'can_contain_collation' => true,
'displayed_type' => "set('''a', 'b')"
),
),
array(
"ENUM('a&b', 'b''c\\'d', 'e\\\\f')",
array(
'type' => 'enum',
'print_type' => "enum('a&b', 'b''c\\'d', 'e\\\\f')",
'binary' => false,
'unsigned' => false,
'zerofill' => false,
'spec_in_brackets' => "'a&b', 'b''c\\'d', 'e\\\\f'",
'enum_set_values' => array('a&b', 'b\'c\'d', 'e\\f'),
'attribute' => ' ',
'can_contain_collation' => true,
'displayed_type' => "enum('a&amp;b', 'b''c\\'d', 'e\\\\f')"
),
),
array(
"INT UNSIGNED zerofill",
array(
'type' => 'int',
'print_type' => 'int',
'binary' => false,
'unsigned' => true,
'zerofill' => true,
'spec_in_brackets' => '',
'enum_set_values' => array(),
'attribute' => 'UNSIGNED ZEROFILL',
'can_contain_collation' => false,
'displayed_type' => "int"
),
),
array(
"VARCHAR(255)",
array(
'type' => 'varchar',
'print_type' => 'varchar(255)',
'binary' => false,
'unsigned' => false,
'zerofill' => false,
'spec_in_brackets' => '255',
'enum_set_values' => array(),
'attribute' => ' ',
'can_contain_collation' => true,
'displayed_type' => "varchar(255)"
),
),
array(
"VARBINARY(255)",
array(
'type' => 'varbinary',
'print_type' => 'varbinary(255)',
'binary' => false,
'unsigned' => false,
'zerofill' => false,
'spec_in_brackets' => '255',
'enum_set_values' => array(),
'attribute' => ' ',
'can_contain_collation' => false,
'displayed_type' => "varbinary(255)"
),
),
);
}
}
164 changes: 0 additions & 164 deletions test/libraries/common/PMA_extractColumnSpec_test.php

This file was deleted.

0 comments on commit 3b3e2ed

Please sign in to comment.