tests: improved

Author: dg

tests/Http/Request.request.phpt

@@ -42,6 +42,8 @@ test(function() {
 	Assert::same( '/file.php',  $request->getUrl()->path );
 	Assert::same( "x param=val.&pa%\x72am=val2&param3=v a%26l%3Du%2Be",  $request->getUrl()->query );
 	Assert::same( '',  $request->getUrl()->fragment );
+	Assert::same( 'val.',  $request->getQuery('x_param') );
+	Assert::same( 'val2',  $request->getQuery('pa%ram') );
 	Assert::same( 'nette.org:8080',  $request->getUrl()->authority );
 	Assert::same( 'https://nette.org:8080',  $request->getUrl()->hostUrl );
 	Assert::same( 'https://nette.org:8080/',  $request->getUrl()->baseUrl );

tests/Http/Url.canonicalize.phpt

@@ -12,7 +12,10 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $url = new Url('http://hostname/path?arg=value&arg2=v%20a%26l%3Du%2Be');
-Assert::same( 'arg=value&arg2=v%20a%26l%3Du%2Be',  $url->query );
+$url->canonicalize();
+Assert::same( 'http://hostname/path?arg=value&arg2=v a%26l%3Du%2Be', (string) $url );
+
 
+$url = new Url('http://username%3A:password%3A@hostN%61me:60/p%61th%2f%25()?arg=value&arg2=v%20a%26l%3Du%2Be#%61nchor');
 $url->canonicalize();
-Assert::same( 'arg=value&arg2=v a%26l%3Du%2Be',  $url->query );
+Assert::same( 'http://hostname:60/path%2F%25()?arg=value&arg2=v a%26l%3Du%2Be#anchor', (string) $url );

tests/Http/Url.isEqual().phpt

@@ -11,14 +11,19 @@ use Nette\Http\Url,
 require __DIR__ . '/../bootstrap.php';
 
 
-$url = new Url('http://exampl%65.COM?text=foo%20bar+foo&value');
-Assert::true( $url->isEqual('http://example.com/?text=foo+bar%20foo&value') );
-Assert::true( $url->isEqual('http://example.com/?value&text=foo+bar%20foo') );
-Assert::false( $url->isEqual('http://example.com/?value&text=foo+bar%20foo#abc') );
-Assert::false( $url->isEqual('http://example.com/?text=foo+bar%20foo') );
-Assert::false( $url->isEqual('https://example.com/?text=foo+bar%20foo&value') );
-Assert::false( $url->isEqual('http://example.org/?text=foo+bar%20foo&value') );
-Assert::false( $url->isEqual('http://example.com/path?text=foo+bar%20foo&value') );
+$url = new Url('http://exampl%65.COM/p%61th?text=foo%20bar+foo&value');
+Assert::true( $url->isEqual('http://example.com/path?text=foo+bar%20foo&value') );
+Assert::true( $url->isEqual('http://example.com/%70ath?value&text=foo+bar%20foo') );
+Assert::false( $url->isEqual('http://example.com/Path?text=foo+bar%20foo&value') );
+Assert::false( $url->isEqual('http://example.com/path?value&text=foo+bar%20foo#abc') );
+Assert::false( $url->isEqual('http://example.com/path?text=foo+bar%20foo') );
+Assert::false( $url->isEqual('https://example.com/path?text=foo+bar%20foo&value') );
+Assert::false( $url->isEqual('http://example.org/path?text=foo+bar%20foo&value') );
+
+
+$url = new Url('http://example.com');
+Assert::true( $url->isEqual('http://example.com/') );
+Assert::true( $url->isEqual('http://example.com') );
 
 
 $url = new Url('http://example.com/?arr[]=item1&arr[]=item2');

tests/Http/Url.query.phpt

@@ -26,6 +26,10 @@ Assert::same( 'arg=value&arg2=value2',  $url->query );
 $url->appendQuery(array('arg3' => 'value3'));
 Assert::same( 'arg=value&arg2=value2&arg3=value3',  $url->query );
 
+$url->appendQuery('arg4[]=1');
+$url->appendQuery('arg4[]=2');
+Assert::same( 'arg=value&arg2=value2&arg3=value3&arg4[]=1&arg4[]=2',  $url->query );
+
 $url->setQuery(array('arg3' => 'value3'));
 Assert::same( 'arg3=value3',  $url->query );