From 08458a5450ca8f6814a44ce55f749cd171af84eb Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 23 Nov 2008 20:53:39 +0000 Subject: [PATCH] false alarm on this test --- test/PMA_generateCommonUrl_test.php | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/test/PMA_generateCommonUrl_test.php b/test/PMA_generateCommonUrl_test.php index e724924d4..3c6115557 100644 --- a/test/PMA_generateCommonUrl_test.php +++ b/test/PMA_generateCommonUrl_test.php @@ -102,16 +102,14 @@ class PMA_generate_common_url_test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['ServerDefault'] = 'y'; $separator = PMA_get_arg_separator(); - $expected = 'server=x' . htmlentities($separator) - . 'lang=x' . htmlentities($separator) - . 'convcharset=x' . htmlentities($separator) - . 'collation_connection=x' . htmlentities($separator) + $expected = 'server=x' . $separator + . 'lang=x' . $separator + . 'convcharset=x' . $separator + . 'collation_connection=x' . $separator . 'token=x' ; - $expected = 'db=db' - . htmlentities($separator) . 'table=table' - . htmlentities($separator) . $expected; + $expected = 'db=db' . $separator . 'table=table' . $separator . $expected; $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'; $separator = PMA_get_arg_separator(); - $expected = 'server=x' . htmlentities($separator) - . 'lang=x' . htmlentities($separator) - . 'convcharset=x' . htmlentities($separator) - . 'collation_connection=x' . htmlentities($separator) + $expected = 'server=x' . $separator + . 'lang=x' . $separator + . 'convcharset=x' . $separator + . 'collation_connection=x' . $separator . 'token=x' ; - $expected = 'db=db' - . htmlentities($separator) . $expected; + $expected = 'db=db' . $separator . $expected; $this->assertEquals($expected, PMA_generate_common_url('db', '', '&')); }