svn commit: r1702195 - in /perl/modperl/trunk/t: lib/TestAPRlib/uri.pm response/TestAPI/uri.pm

[st...@apache.org]

Author: stevehay
Date: Thu Sep 10 08:58:55 2015
New Revision: 1702195

URL: http://svn.apache.org/r1702195
Log:
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.

Modified:
    perl/modperl/trunk/t/lib/TestAPRlib/uri.pm
    perl/modperl/trunk/t/response/TestAPI/uri.pm

Modified: perl/modperl/trunk/t/lib/TestAPRlib/uri.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/lib/TestAPRlib/uri.pm?rev=1702195&r1=1702194&r2=1702195&view=diff
==============================================================================
--- perl/modperl/trunk/t/lib/TestAPRlib/uri.pm (original)
+++ perl/modperl/trunk/t/lib/TestAPRlib/uri.pm Thu Sep 10 08:58:55 2015
@@ -88,7 +88,7 @@ sub test {
     # - 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 #

Modified: perl/modperl/trunk/t/response/TestAPI/uri.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/response/TestAPI/uri.pm?rev=1702195&r1=1702194&r2=1702195&view=diff
==============================================================================
--- perl/modperl/trunk/t/response/TestAPI/uri.pm (original)
+++ perl/modperl/trunk/t/response/TestAPI/uri.pm Thu Sep 10 08:58:55 2015
@@ -105,7 +105,7 @@ sub handler {
     }
     {
         # 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);