From: Charles Bailey Date: Mon, 28 Feb 2000 00:07:13 +0000 (+0000) Subject: When testing CGI.pm, use its notion of CRLF X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8d78cc1410cc3c0f744437370cbc0fa3b1af57c9;p=p5sagit%2Fp5-mst-13.2.git When testing CGI.pm, use its notion of CRLF p4raw-id: //depot/vmsperl@5298 --- diff --git a/t/lib/cgi-html.t b/t/lib/cgi-html.t index c51318e..6489e5a 100755 --- a/t/lib/cgi-html.t +++ b/t/lib/cgi-html.t @@ -18,6 +18,7 @@ print "ok 1\n"; ######################### End of black magic. my $Is_EBCDIC = $Config{'ebcdic'} eq 'define'; +my $crlf = $CGI::CRLF; # util sub test { @@ -39,17 +40,11 @@ test(7,h1({-align=>'CENTER'},['fred','agnes']) eq local($") = '-'; test(8,h1('fred','agnes','maura') eq '

fred-agnes-maura

',"open/close tag \$\" interpolation"); } -if (!$Is_EBCDIC) { -test(9,header() eq "Content-Type: text/html\015\012\015\012","header()"); -test(10,header(-type=>'image/gif') eq "Content-Type: image/gif\015\012\015\012","header()"); -test(11,header(-type=>'image/gif',-status=>'500 Sucks') eq "Status: 500 Sucks\015\012Content-Type: image/gif\015\012\015\012","header()"); -test(12,header(-nph=>1) eq "HTTP/1.0 200 OK\015\012Content-Type: text/html\015\012\015\012","header()"); -} else { -test(9,header() eq "Content-Type: text/html\r\n\r\n","header()"); -test(10,header(-type=>'image/gif') eq "Content-Type: image/gif\r\n\r\n","header()"); -test(11,header(-type=>'image/gif',-status=>'500 Sucks') eq "Status: 500 Sucks\r\nContent-Type: image/gif\r\n\r\n","header()"); -test(12,header(-nph=>1) eq "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n","header()"); -} + +test(9,header() eq "Content-Type: text/html$crlf$crlf","header()"); +test(10,header(-type=>'image/gif') eq "Content-Type: image/gif$crlf$crlf","header()"); +test(11,header(-type=>'image/gif',-status=>'500 Sucks') eq "Status: 500 Sucks$crlfContent-Type: image/gif$crlf$crlf","header()"); +test(12,header(-nph=>1) eq "HTTP/1.0 200 OK$crlfContent-Type: text/html$crlf$crlf","header()"); test(13,start_html() ."\n" eq < Untitled Document @@ -70,13 +65,11 @@ END ; test(16,($cookie=cookie(-name=>'fred',-value=>['chocolate','chip'],-path=>'/')) eq 'fred=chocolate&chip; path=/',"cookie()"); -if (!$Is_EBCDIC) { -test(17,header(-Cookie=>$cookie) =~ m!^Set-Cookie: fred=chocolate&chip\; path=/\015\012Date:.*\015\012Content-Type: text/html\015\012\015\012!s, +test(17,header(-Cookie=>$cookie) =~ m!^Set-Cookie: fred=chocolate&chip\; path=/$crlfDate:.*$crlfContent-Type: text/html$crlf$crlf!s, "header(-cookie)"); -} else { -test(17,header(-Cookie=>$cookie) =~ m!^Set-Cookie: fred=chocolate&chip\; path=/\r\nDate:.*\r\nContent-Type: text/html\r\n\r\n!s, - "header(-cookie)"); -} test(18,start_h3 eq '

'); test(19,end_h3 eq '

'); test(20,start_table({-border=>undef}) eq ''); + + +