Fix t/api/uri.t, t/apr/uri.t and t/apr-ext/uri.t under perl-5.22.0
I'm working on CPAN RT#101962: Support for perl-5.22.0. The new "Redundant argument in sprintf" warning has revealed a couple of problems in our test suite which causes these tests to fail.
git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/trunk@1702195 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/t/lib/TestAPRlib/uri.pm b/t/lib/TestAPRlib/uri.pm
index a68ad77..8c01282 100644
--- a/t/lib/TestAPRlib/uri.pm
+++ b/t/lib/TestAPRlib/uri.pm
@@ -88,7 +88,7 @@
# - if no flags are passed to unparse, APR::Const::URI_UNP_OMITPASSWORD
# is passed by default -- it hides the password
my $url1 = sprintf "%s://%s\@%s%s",
- map { $url{$_}[1] } grep !/^(password|port)$/, @keys_urls;
+ map { $url{$_}[1] } qw(scheme user hostname path);
ok t_cmp($url_unparsed, $url1, "unparsed url");
# various unparse flags #
diff --git a/t/response/TestAPI/uri.pm b/t/response/TestAPI/uri.pm
index 89f22bc..87ff65d 100644
--- a/t/response/TestAPI/uri.pm
+++ b/t/response/TestAPI/uri.pm
@@ -105,7 +105,7 @@
}
{
# this time include args and a pool object
- my $curl = $r->construct_url(sprintf "%s?%s", $r->uri, $r->args,
+ my $curl = $r->construct_url(sprintf("%s?%s", $r->uri, $r->args),
$r->pool->new);
t_debug("construct_url: $curl");
t_debug("r->uri: ", $r->uri);
