|
From: Ilya M. <m_...@us...> - 2002-12-22 21:25:58
|
Update of /cvsroot/http-webtest/HTTP-WebTest/t
In directory sc8-pr-cvs1:/tmp/cvs-serv10051/t
Modified Files:
12-request.t 11-delay.t 10-click.t 09-hooks.t 08-plugins.t
07-compat.t 06-parser.t 05-report.t 03-proxy.t 02-generic.t
01-api.t
Log Message:
Port self-test suite from Test to Test::More
Index: 12-request.t
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/t/12-request.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** 12-request.t 31 Jul 2002 15:26:23 -0000 1.3
--- 12-request.t 22 Dec 2002 21:25:49 -0000 1.4
***************
*** 6,12 ****
use strict;
- use Test;
! BEGIN { plan tests => 25 }
use HTTP::WebTest::Request;
--- 6,11 ----
use strict;
! use Test::More tests => 25;
use HTTP::WebTest::Request;
Index: 11-delay.t
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/t/11-delay.t,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** 11-delay.t 22 Dec 2002 20:35:38 -0000 1.6
--- 11-delay.t 22 Dec 2002 21:25:49 -0000 1.7
***************
*** 7,11 ****
use strict;
use HTTP::Status;
- use Test;
use Time::HiRes qw(gettimeofday);
--- 7,10 ----
***************
*** 14,18 ****
use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
! BEGIN { plan tests => 4 }
# init tests
--- 13,17 ----
use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
! use Test::More tests => 4;
# init tests
***************
*** 37,82 ****
}
! {
! if(defined $ENV{TEST_FAST}) {
! for (1..2) {
! skip('skip: delay tests are disabled', 1);
! }
! } else {
! my $start = gettimeofday;
! my $tests = [ { url => abs_url($URL, '/test'),
! delay => 2 } ];
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! opts => $OPTS,
! tests => $tests,
! check_file => 't/test.out/delay');
! my $delay = gettimeofday - $start;
! ok(1 < $delay and $delay < 3);
! }
}
! {
! if(defined $ENV{TEST_FAST}) {
! for (1..2) {
! skip('skip: delay tests are disabled', 1);
! }
! } else {
! my $start = gettimeofday;
! my $tests = [ { url => abs_url($URL, '/test'),
! delay => 4 } ];
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! opts => $OPTS,
! tests => $tests,
! check_file => 't/test.out/delay');
! my $delay = gettimeofday - $start;
! ok(3 < $delay and $delay < 5);
! }
}
--- 36,73 ----
}
! SKIP: {
! skip 'skip: delay tests are disabled', 2 if defined $ENV{TEST_FAST};
! my $start = gettimeofday;
! my $tests = [ { url => abs_url($URL, '/test'),
! delay => 2 } ];
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! opts => $OPTS,
! tests => $tests,
! check_file => 't/test.out/delay');
!
! my $delay = gettimeofday - $start;
! ok(1 < $delay and $delay < 3);
}
! SKIP: {
! skip 'skip: delay tests are disabled', 2 if defined $ENV{TEST_FAST};
! my $start = gettimeofday;
! my $tests = [ { url => abs_url($URL, '/test'),
! delay => 4 } ];
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! opts => $OPTS,
! tests => $tests,
! check_file => 't/test.out/delay');
!
! my $delay = gettimeofday - $start;
! ok(3 < $delay and $delay < 5);
}
Index: 10-click.t
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/t/10-click.t,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** 10-click.t 22 Dec 2002 20:35:38 -0000 1.11
--- 10-click.t 22 Dec 2002 21:25:49 -0000 1.12
***************
*** 7,11 ****
use strict;
use HTTP::Status;
- use Test;
use HTTP::WebTest;
--- 7,10 ----
***************
*** 13,17 ****
use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
! BEGIN { plan tests => 9 }
# init tests
--- 12,16 ----
use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
! use Test::More tests => 9;
# init tests
Index: 09-hooks.t
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/t/09-hooks.t,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** 09-hooks.t 22 Dec 2002 20:35:38 -0000 1.8
--- 09-hooks.t 22 Dec 2002 21:25:49 -0000 1.9
***************
*** 8,12 ****
use CGI::Cookie;
use HTTP::Status;
- use Test;
use HTTP::WebTest;
--- 8,11 ----
***************
*** 14,18 ****
use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
! BEGIN { plan tests => 13 }
# init tests
--- 13,17 ----
use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
! use Test::More tests => 13;
# init tests
Index: 08-plugins.t
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/t/08-plugins.t,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** 08-plugins.t 22 Dec 2002 20:35:38 -0000 1.6
--- 08-plugins.t 22 Dec 2002 21:25:49 -0000 1.7
***************
*** 7,11 ****
use strict;
use HTTP::Status;
- use Test;
use HTTP::WebTest;
--- 7,10 ----
***************
*** 15,19 ****
use lib 't';
! BEGIN { plan tests => 4 }
# init tests
--- 14,18 ----
use lib 't';
! use Test::More tests => 4;
# init tests
Index: 07-compat.t
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/t/07-compat.t,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** 07-compat.t 22 Dec 2002 20:35:38 -0000 1.7
--- 07-compat.t 22 Dec 2002 21:25:49 -0000 1.8
***************
*** 7,11 ****
use strict;
use HTTP::Status;
- use Test;
use HTTP::WebTest qw(run_web_test);
--- 7,10 ----
***************
*** 13,17 ****
use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
! BEGIN { plan tests => 10 }
# init test
--- 12,16 ----
use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
! use Test::More tests => 10;
# init test
Index: 06-parser.t
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/t/06-parser.t,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** 06-parser.t 13 Dec 2002 00:50:45 -0000 1.17
--- 06-parser.t 22 Dec 2002 21:25:49 -0000 1.18
***************
*** 6,15 ****
use strict;
- use Test;
use HTTP::WebTest::Parser;
use HTTP::WebTest::SelfTest;
! BEGIN { plan tests => 68 }
# 1-60: check parsed wt script (which contains all variants of
--- 6,14 ----
use strict;
use HTTP::WebTest::Parser;
use HTTP::WebTest::SelfTest;
! use Test::More tests => 68;
# 1-60: check parsed wt script (which contains all variants of
***************
*** 109,113 ****
parse_error_check(wtscript => 't/borked6.wt',
check_file => 't/test.out/borked6.err');
! if($] >= 5.006) {
my $out_filter = sub {
$_[0] =~ s/\(eval \d+\) line \d+/(eval NN) line N/;
--- 108,115 ----
parse_error_check(wtscript => 't/borked6.wt',
check_file => 't/test.out/borked6.err');
! SKIP: {
! skip 'skip: test is skipped because it triggers Perl bug', 1
! if $] < 5.006;
!
my $out_filter = sub {
$_[0] =~ s/\(eval \d+\) line \d+/(eval NN) line N/;
***************
*** 116,121 ****
check_file => 't/test.out/borked7.err',
out_filter => $out_filter);
- } else {
- skip('skip: test is skipped because it triggers Perl bug', 1);
}
parse_error_check(wtscript => 't/borked8.wt',
--- 118,121 ----
Index: 05-report.t
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/t/05-report.t,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** 05-report.t 22 Dec 2002 20:35:38 -0000 1.9
--- 05-report.t 22 Dec 2002 21:25:49 -0000 1.10
***************
*** 9,13 ****
use IO::File;
use HTTP::Status;
- use Test;
use HTTP::WebTest;
--- 9,12 ----
***************
*** 15,19 ****
use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
! BEGIN { plan tests => 12 }
# init tests
--- 14,18 ----
use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
! use Test::More tests => 12;
# init tests
***************
*** 55,104 ****
# 3-4: test show_cookie parameter
! {
my $skip = $HOSTNAME !~ /\..*\./ ?
'skip: cannot test cookies - ' .
'hostname does not contain two dots' :
undef;
! if($skip) {
! skip($skip, 1) for 1 .. 2;
! } else {
! my $opts = { show_cookies => 'yes' };
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! opts => $opts,
! out_filter => $COOKIE_FILTER,
! tests => [ $COOKIE_TEST ],
! check_file => 't/test.out/report-cookie1');
! # note that second time we should send cookie ourselves
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! opts => $opts,
! out_filter => $COOKIE_FILTER,
! tests => [ $COOKIE_TEST ],
! check_file => 't/test.out/report-cookie2');
! }
}
# 5: test show_cookie and show_html parameters
! {
my $skip = $HOSTNAME !~ /\..*\./ ?
'skip: cannot test cookies - ' .
'hostname does not contain two dots' :
undef;
! if($skip) {
! skip($skip, 1);
! } else {
! my $opts = { show_html => 'yes',
! show_cookies => 'yes' };
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! opts => $opts,
! out_filter => $COOKIE_FILTER,
! tests => [ $COOKIE_TEST ],
! check_file => 't/test.out/report-html-cookie');
! }
}
--- 54,99 ----
# 3-4: test show_cookie parameter
! SKIP: {
my $skip = $HOSTNAME !~ /\..*\./ ?
'skip: cannot test cookies - ' .
'hostname does not contain two dots' :
undef;
! skip $skip, 2 if $skip;
! my $opts = { show_cookies => 'yes' };
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! opts => $opts,
! out_filter => $COOKIE_FILTER,
! tests => [ $COOKIE_TEST ],
! check_file => 't/test.out/report-cookie1');
!
! # note that second time we should send cookie ourselves
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! opts => $opts,
! out_filter => $COOKIE_FILTER,
! tests => [ $COOKIE_TEST ],
! check_file => 't/test.out/report-cookie2');
}
# 5: test show_cookie and show_html parameters
! SKIP: {
my $skip = $HOSTNAME !~ /\..*\./ ?
'skip: cannot test cookies - ' .
'hostname does not contain two dots' :
undef;
! skip $skip, 1 if $skip;
! my $opts = { show_html => 'yes',
! show_cookies => 'yes' };
!
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! opts => $opts,
! out_filter => $COOKIE_FILTER,
! tests => [ $COOKIE_TEST ],
! check_file => 't/test.out/report-html-cookie');
}
***************
*** 160,194 ****
# 11-12: test show_html, show_cookie, show_headers with terse parameter
! {
! my $skip = $HOSTNAME !~ /\..*\./ ?
'skip: cannot test cookies - ' .
'hostname does not contain two dots' :
undef;
! if($skip) {
! skip($skip, 1) for 1 .. 2;
! } else {
! my $tests = [ $COOKIE_TEST,
! { url => abs_url($URL, '/non-existent') } ];
! my $out_filter = sub {
! $_[0] =~ s/: .*?GMT/: SOMEDAY/g;
! $_[0] =~ s|Server: libwww-perl-daemon/[\w\.]*|Server: libwww-perl-daemon/NN|g;
! $_[0] =~ s|User-Agent: HTTP-WebTest/[\w\.]*|User-Agent: HTTP-WebTest/NN|g;
! $COOKIE_FILTER->($_[0]);
! };
! for my $terse (qw(summary failed_only)) {
! my $opts = { terse => $terse,
! show_html => 'yes',
! show_cookie => 'yes',
! show_headers => 'yes' };
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! opts => $opts,
! tests => $tests,
! out_filter => $out_filter,
! check_file => "t/test.out/report-terse-show-$terse");
! }
}
}
--- 155,187 ----
# 11-12: test show_html, show_cookie, show_headers with terse parameter
! SKIP: {
! my $skip = $HOSTNAME !~ /\..*\./ ?
'skip: cannot test cookies - ' .
'hostname does not contain two dots' :
undef;
! skip $skip, 2 if $skip;
! my $tests = [ $COOKIE_TEST,
! { url => abs_url($URL, '/non-existent') } ];
! my $out_filter = sub {
! $_[0] =~ s/: .*?GMT/: SOMEDAY/g;
! $_[0] =~ s|Server: libwww-perl-daemon/[\w\.]*|Server: libwww-perl-daemon/NN|g;
! $_[0] =~ s|User-Agent: HTTP-WebTest/[\w\.]*|User-Agent: HTTP-WebTest/NN|g;
! $COOKIE_FILTER->($_[0]);
! };
! for my $terse (qw(summary failed_only)) {
! my $opts = { terse => $terse,
! show_html => 'yes',
! show_cookie => 'yes',
! show_headers => 'yes' };
!
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! opts => $opts,
! tests => $tests,
! out_filter => $out_filter,
! check_file => "t/test.out/report-terse-show-$terse");
}
}
Index: 03-proxy.t
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/t/03-proxy.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** 03-proxy.t 22 Dec 2002 20:35:39 -0000 1.5
--- 03-proxy.t 22 Dec 2002 21:25:49 -0000 1.6
***************
*** 8,12 ****
use HTTP::Response;
use HTTP::Status;
- use Test;
use HTTP::WebTest;
--- 8,11 ----
***************
*** 14,18 ****
use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
! BEGIN { plan tests => 2 }
# init tests
--- 13,17 ----
use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
! use Test::More tests => 2;
# init tests
Index: 02-generic.t
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/t/02-generic.t,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** 02-generic.t 22 Dec 2002 20:35:39 -0000 1.23
--- 02-generic.t 22 Dec 2002 21:25:50 -0000 1.24
***************
*** 9,13 ****
use HTTP::Response;
use HTTP::Status;
- use Test;
use HTTP::WebTest;
--- 9,12 ----
***************
*** 15,19 ****
use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
! BEGIN { plan tests => 35 }
# init tests
--- 14,18 ----
use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
! use Test::More tests => 35;
# init tests
***************
*** 128,162 ****
# 7: run response time tests
! {
! if(defined $ENV{TEST_FAST}) {
! skip('skip: long response time tests are disabled', 1);
! } else {
! my $tests = [ { url => abs_url($URL, '/sleep-2'),
! min_rtime => 1,
! max_rtime => 3 },
! { url => abs_url($URL, '/sleep-4'),
! min_rtime => 1,
! max_rtime => 3 },
! { url => abs_url($URL, '/sleep-2'),
! min_rtime => 3,
! max_rtime => 6 },
! { url => abs_url($URL, '/sleep-4'),
! min_rtime => 3,
! max_rtime => 6 }
! ];
! my $out_filter = sub {
! $_[0] =~ s|( Response \s+ time \s+ \( \s+ )
! ( \d+ \. ) ( \d+ )
! ( \s+ \) )
! |"$1$2" . ('0' x length($3)) . "$4"|xge;
! };
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! tests => $tests,
! check_file => 't/test.out/time',
! out_filter => $out_filter);
! }
}
--- 127,160 ----
# 7: run response time tests
! SKIP: {
! skip 'skip: long response time tests are disabled', 1
! if defined $ENV{TEST_FAST};
! my $tests = [ { url => abs_url($URL, '/sleep-2'),
! min_rtime => 1,
! max_rtime => 3 },
! { url => abs_url($URL, '/sleep-4'),
! min_rtime => 1,
! max_rtime => 3 },
! { url => abs_url($URL, '/sleep-2'),
! min_rtime => 3,
! max_rtime => 6 },
! { url => abs_url($URL, '/sleep-4'),
! min_rtime => 3,
! max_rtime => 6 }
! ];
! my $out_filter = sub {
! $_[0] =~ s|( Response \s+ time \s+ \( \s+ )
! ( \d+ \. ) ( \d+ )
! ( \s+ \) )
! |"$1$2" . ('0' x length($3)) . "$4"|xge;
! };
!
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! tests => $tests,
! check_file => 't/test.out/time',
! out_filter => $out_filter);
}
***************
*** 176,354 ****
# 9: test cookies - accept-cookies, send-cookies params
! {
my $skip = $HOSTNAME !~ /\..*\./ ?
'skip: cannot test cookies - ' .
'hostname does not contain two dots' :
undef;
! if($skip) {
! skip($skip, 1);
! } else {
! my $tests = [ { url => abs_url($URL, '/set-cookie-c1-v1') },
! { url => abs_url($URL, '/show-cookies'),
! text_require => [ '<c1>=<v1>' ] },
! { url => abs_url($URL, '/set-cookie-c2-v2'),
! accept_cookies => 'no' },
! { url => abs_url($URL, '/show-cookies'),
! text_forbid => [ '<c2>=<v2>' ] },
! { url => abs_url($URL, '/set-cookie-c3-v3'),
! accept_cookies => 'yes' },
! { url => abs_url($URL, '/show-cookies'),
! text_require => [ '<c3>=<v3>' ] },
! { url => abs_url($URL, '/show-cookies'),
! send_cookies => 'no',
! text_forbid => [ '<c1>=<v1>',
! '<c3>=<v3>'] },
! { url => abs_url($URL, '/show-cookies'),
! send_cookies => 'yes',
! text_require => [ '<c1>=<v1>',
! '<c3>=<v3>'] },
! ];
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! tests => $tests,
! check_file => 't/test.out/cookie1');
! }
}
# 10: test cookies - cookies param (deprecated syntax)
! {
my $skip = $HOSTNAME !~ /\..*\./ ?
'skip: cannot test cookies - ' .
'hostname does not contain two dots' :
undef;
! if($skip) {
! skip($skip, 1);
! } else {
! my $tests = [ { url => abs_url($URL, '/show-cookies'),
! cookies => [ [ 0, 'c4', 'v4', '/', $HOSTNAME ],
! [ 0, 'c5', 'v5', '/', $HOSTNAME,
! '', '', '', '', '' ],
! [ 0, 'c6', 'v6', '/', $HOSTNAME,
! undef, undef, undef, undef, undef ],
! [ 0, 'c7', 'v7', '/', $HOSTNAME,
! '', '', '', '', '',
! 'attr1', 'avalue1' ] ],
! text_require => [ '<c4>=<v4>',
! '<c5>=<v5>',
! '<c6>=<v6>',
! '<c7>=<v7>' ] },
! { url => abs_url($URL, '/show-cookies'),
! cookies => [ [ 0, 'c8', 'v8',
! '/wrong-path', $HOSTNAME ],
! [ 0, 'c9', 'v9', '/',
! 'wrong.hostname.com' ] ],
! text_forbid => [ '<c8>=<v8>',
! '<c9>=<v9>' ] }
! ];
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! tests => $tests,
! check_file => 't/test.out/cookie2');
! }
}
# 11-14: test cookies - cookies param (new syntax)
! {
my $skip = $HOSTNAME !~ /\..*\./ ?
'skip: cannot test cookies - ' .
'hostname does not contain two dots' :
undef;
! if($skip) {
! skip($skip, 1) for 1..4;
! } else {
! my $tests = [ { url => abs_url($URL, '/show-cookies'),
! cookies => [ [ name => 'N001',
! value => 'V001',
! path => '/',
! domain => $HOSTNAME ],
! [ name => 'N002',
! value => 'V002',
! path => '/',
! domain => $HOSTNAME,
! rest => [ Comment => 'test' ] ] ],
! text_require => [ '<N001>=<V001>',
! '<N002>=<V002>' ] },
! { url => abs_url($URL, '/show-cookies'),
! cookies => [ [ name => 'N003',
! value => 'V003',
! path => '/',
! domain => 'wrong.hostname.com' ],
! [ name => 'N004',
! value => 'V004',
! domain => $HOSTNAME,
! path => '/wrong/path' ] ],
! text_forbid => [ '<N003>=<V003>',
! '<N004>=<V004>' ] }
! ];
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! tests => $tests,
! check_file => 't/test.out/cookie2a');
! my $cookie_jar = $WEBTEST->user_agent->cookie_jar;
! my $n001a_ok = 0;
! my $n001b_ok = 0;
! my $n002_ok = 0;
! $cookie_jar->scan(sub {
! my @cookie = @_;
! # test cookie N001 for correct path
! if( $cookie[1] eq 'N001') {
! $n001a_ok = 1
! if $cookie[3] eq '/';
! }
! # test cookie N001 for correct domain
! if( $cookie[1] eq 'N001') {
! $n001b_ok = 1
! if $cookie[4] eq $HOSTNAME;
! }
! # test cookie N002 for correct comment
! # field
! if( $cookie[1] eq 'N002') {
! $n002_ok = 1
! if $cookie[10]{Comment} eq 'test';
! }
! });
! ok($n001a_ok);
! ok($n001b_ok);
! ok($n002_ok);
! }
}
# 15: and another cookie test (tests alias parameter)
! {
my $skip = $HOSTNAME !~ /\..*\./ ?
'skip: cannot test cookies - ' .
'hostname does not contain two dots' :
undef;
! if($skip) {
! skip($skip, 1);
! } else {
! my $domain = $HOSTNAME;
! $domain =~ s/^.*\././;
! my $tests = [ { url => abs_url($URL, '/show-cookies'),
! cookie => [ 0,
! 'webtest',
! 'This is the cookie value',
! '/',
! $domain,
! '',
! 0,
! '',
! 2592000,
! '',
! 'Comment',
! 'What a tasty cookie!' ],
! text_require => [ '<webtest>=<This is the cookie value>' ] }
! ];
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! tests => $tests,
! check_file => 't/test.out/cookie3',
! opts => { show_html => 'yes' });
! }
}
--- 174,344 ----
# 9: test cookies - accept-cookies, send-cookies params
! SKIP: {
my $skip = $HOSTNAME !~ /\..*\./ ?
'skip: cannot test cookies - ' .
'hostname does not contain two dots' :
undef;
! skip $skip, 1 if $skip;
! my $tests = [ { url => abs_url($URL, '/set-cookie-c1-v1') },
! { url => abs_url($URL, '/show-cookies'),
! text_require => [ '<c1>=<v1>' ] },
! { url => abs_url($URL, '/set-cookie-c2-v2'),
! accept_cookies => 'no' },
! { url => abs_url($URL, '/show-cookies'),
! text_forbid => [ '<c2>=<v2>' ] },
! { url => abs_url($URL, '/set-cookie-c3-v3'),
! accept_cookies => 'yes' },
! { url => abs_url($URL, '/show-cookies'),
! text_require => [ '<c3>=<v3>' ] },
! { url => abs_url($URL, '/show-cookies'),
! send_cookies => 'no',
! text_forbid => [ '<c1>=<v1>',
! '<c3>=<v3>'] },
! { url => abs_url($URL, '/show-cookies'),
! send_cookies => 'yes',
! text_require => [ '<c1>=<v1>',
! '<c3>=<v3>'] },
! ];
!
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! tests => $tests,
! check_file => 't/test.out/cookie1');
}
# 10: test cookies - cookies param (deprecated syntax)
! SKIP: {
my $skip = $HOSTNAME !~ /\..*\./ ?
'skip: cannot test cookies - ' .
'hostname does not contain two dots' :
undef;
! skip $skip, 1 if $skip;
! my $tests = [ { url => abs_url($URL, '/show-cookies'),
! cookies => [ [ 0, 'c4', 'v4', '/', $HOSTNAME ],
! [ 0, 'c5', 'v5', '/', $HOSTNAME,
! '', '', '', '', '' ],
! [ 0, 'c6', 'v6', '/', $HOSTNAME,
! undef, undef, undef, undef, undef ],
! [ 0, 'c7', 'v7', '/', $HOSTNAME,
! '', '', '', '', '',
! 'attr1', 'avalue1' ] ],
! text_require => [ '<c4>=<v4>',
! '<c5>=<v5>',
! '<c6>=<v6>',
! '<c7>=<v7>' ] },
! { url => abs_url($URL, '/show-cookies'),
! cookies => [ [ 0, 'c8', 'v8',
! '/wrong-path', $HOSTNAME ],
! [ 0, 'c9', 'v9', '/',
! 'wrong.hostname.com' ] ],
! text_forbid => [ '<c8>=<v8>',
! '<c9>=<v9>' ] }
! ];
!
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! tests => $tests,
! check_file => 't/test.out/cookie2');
}
# 11-14: test cookies - cookies param (new syntax)
! SKIP: {
my $skip = $HOSTNAME !~ /\..*\./ ?
'skip: cannot test cookies - ' .
'hostname does not contain two dots' :
undef;
! skip $skip, 4 if $skip;
! my $tests = [ { url => abs_url($URL, '/show-cookies'),
! cookies => [ [ name => 'N001',
! value => 'V001',
! path => '/',
! domain => $HOSTNAME ],
! [ name => 'N002',
! value => 'V002',
! path => '/',
! domain => $HOSTNAME,
! rest => [ Comment => 'test' ] ] ],
! text_require => [ '<N001>=<V001>',
! '<N002>=<V002>' ] },
! { url => abs_url($URL, '/show-cookies'),
! cookies => [ [ name => 'N003',
! value => 'V003',
! path => '/',
! domain => 'wrong.hostname.com' ],
! [ name => 'N004',
! value => 'V004',
! domain => $HOSTNAME,
! path => '/wrong/path' ] ],
! text_forbid => [ '<N003>=<V003>',
! '<N004>=<V004>' ] }
! ];
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! tests => $tests,
! check_file => 't/test.out/cookie2a');
!
! my $cookie_jar = $WEBTEST->user_agent->cookie_jar;
! my $n001a_ok = 0;
! my $n001b_ok = 0;
! my $n002_ok = 0;
! $cookie_jar->scan(sub {
! my @cookie = @_;
! # test cookie N001 for correct path
! if( $cookie[1] eq 'N001') {
! $n001a_ok = 1
! if $cookie[3] eq '/';
! }
! # test cookie N001 for correct domain
! if( $cookie[1] eq 'N001') {
! $n001b_ok = 1
! if $cookie[4] eq $HOSTNAME;
! }
! # test cookie N002 for correct comment
! # field
! if( $cookie[1] eq 'N002') {
! $n002_ok = 1
! if $cookie[10]{Comment} eq 'test';
! }
! });
! ok($n001a_ok);
! ok($n001b_ok);
! ok($n002_ok);
}
# 15: and another cookie test (tests alias parameter)
! SKIP: {
my $skip = $HOSTNAME !~ /\..*\./ ?
'skip: cannot test cookies - ' .
'hostname does not contain two dots' :
undef;
! skip $skip, 1 if $skip;
! my $domain = $HOSTNAME;
! $domain =~ s/^.*\././;
! my $tests = [ { url => abs_url($URL, '/show-cookies'),
! cookie => [ 0,
! 'webtest',
! 'This is the cookie value',
! '/',
! $domain,
! '',
! 0,
! '',
! 2592000,
! '',
! 'Comment',
! 'What a tasty cookie!' ],
! text_require => [ '<webtest>=<This is the cookie value>' ] }
! ];
!
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! tests => $tests,
! check_file => 't/test.out/cookie3',
! opts => { show_html => 'yes' });
}
***************
*** 645,676 ****
# 35: run timeout tests
! {
! if(defined $ENV{TEST_FAST}) {
! skip('skip: long response time tests are disabled', 1);
! } else {
! my $tests = [ { url => abs_url($URL, '/sleep-2'),
! max_rtime => 10,
! timeout => 4 },
! { url => abs_url($URL, '/sleep-3'),
! max_rtime => 10,
! timeout => 2 },
! { url => abs_url($URL, '/sleep-4'),
! max_rtime => 10,
! timeout => 1 },
! ];
! my $out_filter = sub {
! $_[0] =~ s|( Response \s+ time \s+ \( \s+ )
! ( \d+ \. ) ( \d+ )
! ( \s+ \) )
! |"$1$2" . ('0' x length($3)) . "$4"|xge;
! };
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! tests => $tests,
! check_file => 't/test.out/timeout',
! out_filter => $out_filter);
! }
}
--- 635,665 ----
# 35: run timeout tests
! SKIP: {
! skip 'skip: long response time tests are disabled', 1
! if defined $ENV{TEST_FAST};
! my $tests = [ { url => abs_url($URL, '/sleep-2'),
! max_rtime => 10,
! timeout => 4 },
! { url => abs_url($URL, '/sleep-3'),
! max_rtime => 10,
! timeout => 2 },
! { url => abs_url($URL, '/sleep-4'),
! max_rtime => 10,
! timeout => 1 },
! ];
! my $out_filter = sub {
! $_[0] =~ s|( Response \s+ time \s+ \( \s+ )
! ( \d+ \. ) ( \d+ )
! ( \s+ \) )
! |"$1$2" . ('0' x length($3)) . "$4"|xge;
! };
!
! check_webtest(webtest => $WEBTEST,
! server_url => $URL,
! tests => $tests,
! check_file => 't/test.out/timeout',
! out_filter => $out_filter);
}
Index: 01-api.t
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/t/01-api.t,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** 01-api.t 22 Dec 2002 20:35:39 -0000 1.13
--- 01-api.t 22 Dec 2002 21:25:50 -0000 1.14
***************
*** 7,11 ****
use strict;
use HTTP::Status;
- use Test;
use HTTP::WebTest;
--- 7,10 ----
***************
*** 13,17 ****
use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
! BEGIN { plan tests => 15 }
# init test
--- 12,16 ----
use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
! use Test::More tests => 15;
# init test
|
