geoff 2004/08/04 08:44:11
Modified: perl-framework/t/apache acceptpathinfo.t byterange2.t errordoc.t limits.t options.t perl-framework/t/apr uri.t perl-framework/t/filter case.t case_in.t perl-framework/t/http11 all.t basicauth.t chunked.t perl-framework/t/modules access.t asis.t cgi.t deflate.t dir.t env.t info.t rewrite.t status.t vhost_alias.t perl-framework/t/ssl basicauth.t env.t headers.t varlookup.t Log: s/have_module/need_module/g in plan() calls Revision Changes Path 1.4 +1 -1 httpd-test/perl-framework/t/apache/acceptpathinfo.t Index: acceptpathinfo.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/apache/acceptpathinfo.t,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- acceptpathinfo.t 12 Jul 2004 16:44:47 -0000 1.3 +++ acceptpathinfo.t 4 Aug 2004 15:44:08 -0000 1.4 @@ -23,7 +23,7 @@ push @files, "/test.sh" if ($havecgi); my $numtests = ((scalar keys %tests) * (scalar @files) * 4); -plan tests => $numtests, sub { have_apache(2) && have_module('include') }; +plan tests => $numtests, sub { need_apache(2) && need_module('include') }; my $loc = "/apache/acceptpathinfo"; 1.2 +1 -1 httpd-test/perl-framework/t/apache/byterange2.t Index: byterange2.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/apache/byterange2.t,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- byterange2.t 16 Jun 2004 17:11:57 -0000 1.1 +++ byterange2.t 4 Aug 2004 15:44:08 -0000 1.2 @@ -5,7 +5,7 @@ use Apache::TestUtil; use Apache::TestRequest; -plan tests => 1, have_min_apache_version('2.1.0'); +plan tests => 1, need_min_apache_version('2.1.0'); my $resp; 1.5 +1 -1 httpd-test/perl-framework/t/apache/errordoc.t Index: errordoc.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/apache/errordoc.t,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- errordoc.t 16 Jul 2004 13:51:41 -0000 1.4 +++ errordoc.t 4 Aug 2004 15:44:08 -0000 1.5 @@ -7,7 +7,7 @@ Apache::TestRequest::module('error_document'); -plan tests => 14, have_lwp; +plan tests => 14, need_lwp; # basic ErrorDocument tests 1.14 +1 -1 httpd-test/perl-framework/t/apache/limits.t Index: limits.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/apache/limits.t,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- limits.t 24 Mar 2004 00:36:27 -0000 1.13 +++ limits.t 4 Aug 2004 15:44:08 -0000 1.14 @@ -57,7 +57,7 @@ } my $subtests = (@conditions * 2) + 2; -plan tests => $subtests, \&have_lwp; +plan tests => $subtests, \&need_lwp; use vars qw($expected_rc); 1.3 +1 -1 httpd-test/perl-framework/t/apache/options.t Index: options.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/apache/options.t,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- options.t 11 Dec 2001 05:13:33 -0000 1.2 +++ options.t 4 Aug 2004 15:44:08 -0000 1.3 @@ -6,7 +6,7 @@ my @urls = qw(/); -plan tests => @urls * 2, \&have_lwp; +plan tests => @urls * 2, \&need_lwp; for my $url (@urls) { my $res = OPTIONS $url; 1.3 +1 -1 httpd-test/perl-framework/t/apr/uri.t Index: uri.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/apr/uri.t,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- uri.t 18 Sep 2001 15:41:03 -0000 1.2 +++ uri.t 4 Aug 2004 15:44:08 -0000 1.3 @@ -4,7 +4,7 @@ use Apache::Test; use Apache::TestRequest; -plan tests => 1, have_module 'test_apr_uri'; +plan tests => 1, need_module 'test_apr_uri'; my $body = GET_BODY '/test_apr_uri'; 1.5 +1 -1 httpd-test/perl-framework/t/filter/case.t Index: case.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/filter/case.t,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- case.t 12 Nov 2001 02:37:27 -0000 1.4 +++ case.t 4 Aug 2004 15:44:08 -0000 1.5 @@ -18,7 +18,7 @@ my $tests = 1 + grep { $modules{$_} } keys %urls; -plan tests => $tests, have_module 'case_filter'; +plan tests => $tests, need_module 'case_filter'; verify(GET '/', @filter); 1.4 +1 -1 httpd-test/perl-framework/t/filter/case_in.t Index: case_in.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/filter/case_in.t,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- case_in.t 12 Nov 2001 02:37:27 -0000 1.3 +++ case_in.t 4 Aug 2004 15:44:08 -0000 1.4 @@ -17,7 +17,7 @@ my $tests = 1 + grep { $modules{$_} } keys %urls; -plan tests => $tests, have_module 'case_filter_in'; +plan tests => $tests, need_module 'case_filter_in'; ok 1; 1.2 +1 -1 httpd-test/perl-framework/t/http11/all.t Index: all.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/http11/all.t,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- all.t 26 Aug 2001 19:14:18 -0000 1.1 +++ all.t 4 Aug 2004 15:44:08 -0000 1.2 @@ -5,6 +5,6 @@ use Apache::Test; #skip all tests in this directory unless we have client http/1.1 support -plan tests => 1, \&have_http11; +plan tests => 1, \&need_http11; ok 1; 1.6 +1 -1 httpd-test/perl-framework/t/http11/basicauth.t Index: basicauth.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/http11/basicauth.t,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- basicauth.t 6 Dec 2001 23:00:26 -0000 1.5 +++ basicauth.t 4 Aug 2004 15:44:09 -0000 1.6 @@ -11,7 +11,7 @@ Apache::TestRequest::scheme('http') unless have_module 'LWP::Protocol::https10'; #lwp 5.60 -plan tests => 3, have_module 'authany'; +plan tests => 3, need_module 'authany'; my $url = '/authany/index.html'; 1.17 +1 -1 httpd-test/perl-framework/t/http11/chunked.t Index: chunked.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/http11/chunked.t,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- chunked.t 2 Sep 2002 00:44:31 -0000 1.16 +++ chunked.t 4 Aug 2004 15:44:09 -0000 1.17 @@ -21,7 +21,7 @@ if (! have_module 'random_chunk') { print "# Skipping; missing prerequisite module 'random_chunk'\n"; } -plan tests => $tests, have_module 'random_chunk'; +plan tests => $tests, need_module 'random_chunk'; my $location = '/random_chunk'; my $requests = 0; 1.12 +1 -1 httpd-test/perl-framework/t/modules/access.t Index: access.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/modules/access.t,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- access.t 10 Sep 2002 06:46:41 -0000 1.11 +++ access.t 4 Aug 2004 15:44:09 -0000 1.12 @@ -30,7 +30,7 @@ my @allow = @localhost; my @deny = @localhost; -plan tests => (@order * @allow * @deny * 2) + (@order * @allow), \&have_access; +plan tests => (@order * @allow * @deny * 2) + (@order * @allow), \&need_access; my $dir = $vars->{t_dir}; $dir .= "/htdocs/modules/access/htaccess"; 1.3 +1 -1 httpd-test/perl-framework/t/modules/asis.t Index: asis.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/modules/asis.t,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- asis.t 18 May 2004 12:24:16 -0000 1.2 +++ asis.t 4 Aug 2004 15:44:09 -0000 1.3 @@ -9,7 +9,7 @@ ## mod_asis tests ## -plan tests => 3, have_module 'asis'; +plan tests => 3, need_module 'asis'; my $body = GET_BODY "/modules/asis/foo.asis"; ok t_cmp("This is asis content.\n", $body, "asis content OK"); 1.16 +1 -1 httpd-test/perl-framework/t/modules/cgi.t Index: cgi.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/modules/cgi.t,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- cgi.t 16 Jun 2004 15:09:19 -0000 1.15 +++ cgi.t 4 Aug 2004 15:44:09 -0000 1.16 @@ -106,7 +106,7 @@ } my $tests = ((keys %test) * 2) + (@post_content * 3) + 4; -plan tests => $tests, \&have_cgi; +plan tests => $tests, \&need_cgi; my ($expected, $actual); my $path = "/modules/cgi"; 1.4 +1 -1 httpd-test/perl-framework/t/modules/deflate.t Index: deflate.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/modules/deflate.t,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- deflate.t 13 Aug 2003 21:24:57 -0000 1.3 +++ deflate.t 4 Aug 2004 15:44:09 -0000 1.4 @@ -16,7 +16,7 @@ my $vars = Apache::Test::vars(); my $module = 'default'; -plan tests => $tests, have_module 'deflate'; +plan tests => $tests, need_module 'deflate'; print "testing $module\n"; 1.7 +1 -1 httpd-test/perl-framework/t/modules/dir.t Index: dir.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/modules/dir.t,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dir.t 31 Jan 2004 00:54:32 -0000 1.6 +++ dir.t 4 Aug 2004 15:44:09 -0000 1.7 @@ -20,7 +20,7 @@ $actual =~ s/[\r\n]+$//s; } -plan tests => @bad_index * @index * 5 + @bad_index + 5, have_module 'dir'; +plan tests => @bad_index * @index * 5 + @bad_index + 5, need_module 'dir'; foreach my $bad_index (@bad_index) { 1.14 +1 -1 httpd-test/perl-framework/t/modules/env.t Index: env.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/modules/env.t,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- env.t 22 Dec 2001 02:15:33 -0000 1.13 +++ env.t 4 Aug 2004 15:44:09 -0000 1.14 @@ -24,7 +24,7 @@ delete $test{'host'}; } -plan tests => (keys %test) * 1, have_module('env', 'include'); +plan tests => (keys %test) * 1, need_module('env', 'include'); my ($actual, $expected); foreach (sort keys %test) { 1.5 +1 -1 httpd-test/perl-framework/t/modules/info.t Index: info.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/modules/info.t,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- info.t 28 Jul 2003 15:10:25 -0000 1.4 +++ info.t 4 Aug 2004 15:44:09 -0000 1.5 @@ -8,7 +8,7 @@ ## mod_info quick test ## -plan tests => 1, have_module 'info'; +plan tests => 1, need_module 'info'; my $uri = '/server-info'; my $info = GET_BODY $uri; 1.10 +1 -1 httpd-test/perl-framework/t/modules/rewrite.t Index: rewrite.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/modules/rewrite.t,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rewrite.t 13 Jan 2004 23:42:14 -0000 1.9 +++ rewrite.t 4 Aug 2004 15:44:09 -0000 1.10 @@ -14,7 +14,7 @@ my @url = qw(forbidden gone perm temp); my $r; -plan tests => @map * @num + 3, have_module 'rewrite'; +plan tests => @map * @num + 3, need_module 'rewrite'; foreach (@map) { foreach my $n (@num) { 1.5 +1 -1 httpd-test/perl-framework/t/modules/status.t Index: status.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/modules/status.t,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- status.t 5 Oct 2001 22:54:28 -0000 1.4 +++ status.t 4 Aug 2004 15:44:09 -0000 1.5 @@ -8,7 +8,7 @@ ## mod_status quick test ## -plan tests => 1, have_module 'status'; +plan tests => 1, need_module 'status'; my $uri = '/server-status'; my $servername = Apache::Test::vars()->{servername}; 1.13 +1 -1 httpd-test/perl-framework/t/modules/vhost_alias.t Index: vhost_alias.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/modules/vhost_alias.t,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- vhost_alias.t 31 Jan 2004 00:54:32 -0000 1.12 +++ vhost_alias.t 4 Aug 2004 15:44:09 -0000 1.13 @@ -14,7 +14,7 @@ my @vh = qw(www.vha-test.com big.server.name.from.heck.org ab.com w-t-f.net); -plan tests => @vh * 2, sub { have_module('vhost_alias') && have_cgi() }; +plan tests => @vh * 2, sub { need_module('vhost_alias') && need_cgi() }; Apache::TestRequest::scheme('http'); #ssl not listening on this vhost Apache::TestRequest::module('mod_vhost_alias'); #use this module's port 1.6 +1 -1 httpd-test/perl-framework/t/ssl/basicauth.t Index: basicauth.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/ssl/basicauth.t,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- basicauth.t 30 Sep 2002 21:21:44 -0000 1.5 +++ basicauth.t 4 Aug 2004 15:44:11 -0000 1.6 @@ -13,7 +13,7 @@ my $url = '/ssl-fakebasicauth/index.html'; -plan tests => 3, \&have_auth; +plan tests => 3, \&need_auth; Apache::TestRequest::scheme('https'); 1.9 +1 -1 httpd-test/perl-framework/t/ssl/env.t Index: env.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/ssl/env.t,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- env.t 28 Jul 2003 15:39:06 -0000 1.8 +++ env.t 4 Aug 2004 15:44:11 -0000 1.9 @@ -20,7 +20,7 @@ my $url = '/ssl-cgi/env.pl'; my $tests = (keys(%$server_expect) + keys(%$client_expect)) * 2; -plan tests => $tests, \&have_cgi; +plan tests => $tests, \&need_cgi; Apache::TestRequest::scheme('https'); 1.3 +1 -1 httpd-test/perl-framework/t/ssl/headers.t Index: headers.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/ssl/headers.t,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- headers.t 12 Jul 2004 16:44:47 -0000 1.2 +++ headers.t 4 Aug 2004 15:44:11 -0000 1.3 @@ -7,7 +7,7 @@ my $tests = 3; -plan tests => $tests, have_module('headers', 'ssl'); +plan tests => $tests, need_module('headers', 'ssl'); Apache::TestRequest::scheme('https'); 1.15 +1 -1 httpd-test/perl-framework/t/ssl/varlookup.t Index: varlookup.t =================================================================== RCS file: /home/cvs/httpd-test/perl-framework/t/ssl/varlookup.t,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- varlookup.t 12 Jul 2004 16:44:47 -0000 1.14 +++ varlookup.t 4 Aug 2004 15:44:11 -0000 1.15 @@ -66,7 +66,7 @@ push @vars, $key; } -plan tests => scalar @vars, have_module 'test_ssl'; +plan tests => scalar @vars, need_module 'test_ssl'; for my $key (@vars) { sok { verify($key); };