false alarm on this test
This commit is contained in:
@@ -102,16 +102,14 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
|
|||||||
$GLOBALS['cfg']['ServerDefault'] = 'y';
|
$GLOBALS['cfg']['ServerDefault'] = 'y';
|
||||||
|
|
||||||
$separator = PMA_get_arg_separator();
|
$separator = PMA_get_arg_separator();
|
||||||
$expected = 'server=x' . htmlentities($separator)
|
$expected = 'server=x' . $separator
|
||||||
. 'lang=x' . htmlentities($separator)
|
. 'lang=x' . $separator
|
||||||
. 'convcharset=x' . htmlentities($separator)
|
. 'convcharset=x' . $separator
|
||||||
. 'collation_connection=x' . htmlentities($separator)
|
. 'collation_connection=x' . $separator
|
||||||
. 'token=x'
|
. 'token=x'
|
||||||
;
|
;
|
||||||
|
|
||||||
$expected = 'db=db'
|
$expected = 'db=db' . $separator . 'table=table' . $separator . $expected;
|
||||||
. htmlentities($separator) . 'table=table'
|
|
||||||
. htmlentities($separator) . $expected;
|
|
||||||
$this->assertEquals($expected, PMA_generate_common_url('db', 'table', '&'));
|
$this->assertEquals($expected, PMA_generate_common_url('db', 'table', '&'));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -125,15 +123,14 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase
|
|||||||
$GLOBALS['cfg']['ServerDefault'] = 'y';
|
$GLOBALS['cfg']['ServerDefault'] = 'y';
|
||||||
|
|
||||||
$separator = PMA_get_arg_separator();
|
$separator = PMA_get_arg_separator();
|
||||||
$expected = 'server=x' . htmlentities($separator)
|
$expected = 'server=x' . $separator
|
||||||
. 'lang=x' . htmlentities($separator)
|
. 'lang=x' . $separator
|
||||||
. 'convcharset=x' . htmlentities($separator)
|
. 'convcharset=x' . $separator
|
||||||
. 'collation_connection=x' . htmlentities($separator)
|
. 'collation_connection=x' . $separator
|
||||||
. 'token=x'
|
. 'token=x'
|
||||||
;
|
;
|
||||||
|
|
||||||
$expected = 'db=db'
|
$expected = 'db=db' . $separator . $expected;
|
||||||
. htmlentities($separator) . $expected;
|
|
||||||
$this->assertEquals($expected, PMA_generate_common_url('db', '', '&'));
|
$this->assertEquals($expected, PMA_generate_common_url('db', '', '&'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user