Fix web url test

refs #4639
This commit is contained in:
Johannes Meyer 2014-04-09 15:03:09 +02:00
parent e1793c9ea1
commit 4c65acac13

View File

@ -101,7 +101,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
); );
$url->setBaseUrl('path/to'); $url->setBaseUrl('path/to');
$this->assertEquals( $this->assertEquals(
'/path/to/my/test/url.html?param1=val1&param2=val2', '/path/to/my/test/url.html?param1=val1&param2=val2',
$url->getAbsoluteUrl(), $url->getAbsoluteUrl(),
'Assert additional parameters to be correctly added to the Url' 'Assert additional parameters to be correctly added to the Url'
); );
@ -124,7 +124,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
); );
$url->setBaseUrl('path/to'); $url->setBaseUrl('path/to');
$this->assertEquals( $this->assertEquals(
'/path/to/my/test/url.html?param1=val1&param2=val2', '/path/to/my/test/url.html?param1=val1&param2=val2',
$url->getAbsoluteUrl(), $url->getAbsoluteUrl(),
'Assert additional parameters to be correctly added to the Url and overwriting existing parameters' 'Assert additional parameters to be correctly added to the Url and overwriting existing parameters'
); );
@ -146,9 +146,9 @@ class UrlTest extends \PHPUnit_Framework_TestCase
); );
$url->setBaseUrl('path/to'); $url->setBaseUrl('path/to');
$this->assertEquals( $this->assertEquals(
'/path/to/my/test/url.html?flatarray'.urlencode('[0]').'=val1&'. '/path/to/my/test/url.html?flatarray'.urlencode('[0]').'=val1&'.
'flatarray'.urlencode('[1]').'=val2&'. 'flatarray'.urlencode('[1]').'=val2&'.
'param'.urlencode('[value1]').'=val1&'. 'param'.urlencode('[value1]').'=val1&'.
'param'.urlencode('[value2]').'=val2', 'param'.urlencode('[value2]').'=val2',
$url->getAbsoluteUrl(), $url->getAbsoluteUrl(),
'Assert array parameters to be correctly encoded and added to the Url' 'Assert array parameters to be correctly encoded and added to the Url'
@ -188,8 +188,8 @@ class UrlTest extends \PHPUnit_Framework_TestCase
); );
$url = Url::fromRequest(array(), $request); $url = Url::fromRequest(array(), $request);
$this->assertEquals( $this->assertEquals(
'/path/to/my/test/url.html?param1=value1&'. '/path/to/my/test/url.html?param1=value1&'.
'param2'.urlencode('[key1]').'=value1&'. 'param2'.urlencode('[key1]').'=value1&'.
'param2'.urlencode('[key2]').'=value2', 'param2'.urlencode('[key2]').'=value2',
$url->getAbsoluteUrl(), $url->getAbsoluteUrl(),
'Asserting absolute path resembling the requests path appended by the baseUrl' 'Asserting absolute path resembling the requests path appended by the baseUrl'