@@ -26,7 +25,7 @@ class UrlTest extends WebTestBase {
publicstaticfunctiongetInfo(){
returnarray(
'name'=>'URL generation tests',
'description'=>'Confirm that url(), drupal_get_query_parameters(), \Drupal\Component\Utility\UrlHelper::buildQuery(), and l() work correctly with various input.',
'description'=>'Confirm that url(), \Drupal\Component\Utility\UrlHelper::filterQueryParameters(), \Drupal\Component\Utility\UrlHelper::buildQuery(), and l() work correctly with various input.',
'group'=>'Common',
);
}
...
...
@@ -184,7 +183,7 @@ private function hasAttribute($attribute, $link, $class) {
}
/**
* Tests drupal_get_query_parameters().
* Tests UrlHelper::filterQueryParameters().
*/
functiontestDrupalGetQueryParameters(){
$original=array(
...
...
@@ -201,22 +200,22 @@ function testDrupalGetQueryParameters() {
// First-level exclusion.
$result=$original;
unset($result['b']);
$this->assertEqual(drupal_get_query_parameters($original,array('b')),$result,"'b' was removed.");
$this->assertEqual(UrlHelper::filterQueryParameters($original,array('b')),$result,"'b' was removed.");
// Second-level exclusion.
$result=$original;
unset($result['b']['d']);
$this->assertEqual(drupal_get_query_parameters($original,array('b[d]')),$result,"'b[d]' was removed.");
$this->assertEqual(UrlHelper::filterQueryParameters($original,array('b[d]')),$result,"'b[d]' was removed.");
// Third-level exclusion.
$result=$original;
unset($result['b']['e']['f']);
$this->assertEqual(drupal_get_query_parameters($original,array('b[e][f]')),$result,"'b[e][f]' was removed.");
$this->assertEqual(UrlHelper::filterQueryParameters($original,array('b[e][f]')),$result,"'b[e][f]' was removed.");