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

Fixed conflict due to upstream merge

Browse Source
This commit is contained in:
ninadsp
2010-07-23 21:59:15 +05:30
parent 13ec1423f6 049886139c
commit e646a2760c
331 changed files with 127280 additions and 132228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/PMA_generateCommonUrl_test.php
View File

@@ -3,7 +3,6 @@
/**
* tests for PMA_generate_common_url()
*
* @version $Id$
* @package phpMyAdmin-test
*/
@@ -21,14 +20,13 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
{
public function setUp()
{
unset($_COOKIE['pma_lang'], $_COOKIE['pma_charset'], $_COOKIE['pma_collation_connection']);
unset($_COOKIE['pma_lang'], $_COOKIE['pma_collation_connection']);
}
public function testOldStyle()
{
$GLOBALS['server'] = 'x';
$GLOBALS['lang'] = 'x';
$GLOBALS['convcharset'] = 'x';
$GLOBALS['collation_connection'] = 'x';
$_SESSION[' PMA_token '] = 'x';
$GLOBALS['cfg']['ServerDefault'] = 'y';
@@ -36,7 +34,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
$separator = PMA_get_arg_separator();
$expected = 'server=x' . htmlentities($separator)
. 'lang=x' . htmlentities($separator)
. 'convcharset=x' . htmlentities($separator)
. 'collation_connection=x' . htmlentities($separator)
. 'token=x'
;
@@ -52,7 +49,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
{
$GLOBALS['server'] = 'x';
$GLOBALS['lang'] = 'x';
$GLOBALS['convcharset'] = 'x';
$GLOBALS['collation_connection'] = 'x';
$_SESSION[' PMA_token '] = 'x';
$GLOBALS['cfg']['ServerDefault'] = 'y';
@@ -60,7 +56,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
$separator = PMA_get_arg_separator();
$expected = 'server=x' . htmlentities($separator)
. 'lang=x' . htmlentities($separator)
. 'convcharset=x' . htmlentities($separator)
. 'collation_connection=x' . htmlentities($separator)
. 'token=x'
;
@@ -75,7 +70,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
{
$GLOBALS['server'] = 'x';
$GLOBALS['lang'] = 'x';
$GLOBALS['convcharset'] = 'x';
$GLOBALS['collation_connection'] = 'x';
$_SESSION[' PMA_token '] = 'x';
$GLOBALS['cfg']['ServerDefault'] = 'y';
@@ -83,7 +77,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
$separator = PMA_get_arg_separator();
$expected = 'server=x' . htmlentities($separator)
. 'lang=x' . htmlentities($separator)
. 'convcharset=x' . htmlentities($separator)
. 'collation_connection=x' . htmlentities($separator)
. 'token=x'
;
@@ -99,7 +92,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
{
$GLOBALS['server'] = 'x';
$GLOBALS['lang'] = 'x';
$GLOBALS['convcharset'] = 'x';
$GLOBALS['collation_connection'] = 'x';
$_SESSION[' PMA_token '] = 'x';
$GLOBALS['cfg']['ServerDefault'] = 'y';
@@ -107,7 +99,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
$separator = PMA_get_arg_separator();
$expected = 'server=x' . $separator
. 'lang=x' . $separator
. 'convcharset=x' . $separator
. 'collation_connection=x' . $separator
. 'token=x'
;
@@ -120,7 +111,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
{
$GLOBALS['server'] = 'x';
$GLOBALS['lang'] = 'x';
$GLOBALS['convcharset'] = 'x';
$GLOBALS['collation_connection'] = 'x';
$_SESSION[' PMA_token '] = 'x';
$GLOBALS['cfg']['ServerDefault'] = 'y';
@@ -128,7 +118,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
$separator = PMA_get_arg_separator();
$expected = 'server=x' . $separator
. 'lang=x' . $separator
. 'convcharset=x' . $separator
. 'collation_connection=x' . $separator
. 'token=x'
;
@@ -141,7 +130,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
{
$GLOBALS['server'] = 'x';
$GLOBALS['lang'] = 'x';
$GLOBALS['convcharset'] = 'x';
$GLOBALS['collation_connection'] = 'x';
$_SESSION[' PMA_token '] = 'x';
$GLOBALS['cfg']['ServerDefault'] = 'y';
@@ -149,7 +137,6 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
$separator = PMA_get_arg_separator();
$expected = 'server=x' . htmlentities($separator)
. 'lang=x' . htmlentities($separator)
. 'convcharset=x' . htmlentities($separator)
. 'collation_connection=x' . htmlentities($separator)
. 'token=x'
;