Upgrade to CGI.pm 2.752, from Lincoln Stein.

[perl5.git] / t / lib / cgi-html.t
diff --git a/t/lib/cgi-html.t b/t/lib/cgi-html.t

index a49388b..93e5dac 100755 (executable)
--- a/t/lib/cgi-html.t
+++ b/t/lib/cgi-html.t
@@ -2,7 +2,7 @@
  
  BEGIN {
      chdir('t') if -d 't';
-    unshift @INC, '../lib';
+    @INC = '../lib';
  }
  
  # Test ability to retrieve HTTP request info
@@ -17,6 +17,15 @@ print "ok 1\n";
  
  ######################### End of black magic.
  
+my $CRLF = "\015\012";
+if ($^O eq 'VMS') { 
+  $CRLF = "\n";  # via web server carriage is inserted automatically
+}
+if (ord("\t") != 9) { # EBCDIC?
+  $CRLF = "\r\n";
+}
+
+
  # util
  sub test {
      local($^W) = 0;
@@ -24,14 +33,6 @@ sub test {
      print($true ? "ok $num\n" : "not ok $num $msg\n");
  }
  
-my $CRLF = "\015\012";
-if ($^O eq 'VMS') { 
-    $CRLF = "\n";  # via web server carriage is inserted automatically
-}
-if (ord("\t") != 9) { # EBCDIC?
-    $CRLF = "\r\n";
-}
-
  # all the automatic tags
  test(2,h1() eq '<h1 />',"single tag");
  test(3,h1('fred') eq '<h1>fred</h1>',"open/close tag");
@@ -45,50 +46,50 @@ test(7,h1({-align=>'CENTER'},['fred','agnes']) eq
      local($") = '-'; 
      test(8,h1('fred','agnes','maura') eq '<h1>fred-agnes-maura</h1>',"open/close tag \$\" interpolation");
  }
-my $CRLF = "\015\012";
-if ($^O eq 'VMS') { 
-    $CRLF = "\n"; # only on a webserver does a \r get inserted
-}
-if (ord("\t") != 9) { 
-    $CRLF = "\r\n"; # EBCDIC CRLF
-}
  test(9,header() eq "Content-Type: text/html; charset=ISO-8859-1${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${CRLF}Content-Type: image/gif${CRLF}${CRLF}","header()");
-test(12,header(-nph=>1) eq "HTTP/1.0 200 OK${CRLF}Content-Type: text/html; charset=ISO-8859-1${CRLF}${CRLF}","header()");
+test(12,header(-nph=>1) =~ m!HTTP/1.0 200 OK${CRLF}Server: cmdline${CRLF}Date:.+${CRLF}Content-Type: text/html; charset=ISO-8859-1${CRLF}${CRLF}!,"header()");
  test(13,start_html() ."\n" eq <<END,"start_html()");
-<!DOCTYPE HTML
-       PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+       PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
+       "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" lang="en-US"><head><title>Untitled Document</title>
  </head><body>
  END
      ;
  test(14,start_html(-dtd=>"-//IETF//DTD HTML 3.2//FR") ."\n" eq <<END,"start_html()");
-<!DOCTYPE HTML
+<!DOCTYPE html
         PUBLIC "-//IETF//DTD HTML 3.2//FR">
  <html xmlns="http://www.w3.org/1999/xhtml" lang="en-US"><head><title>Untitled Document</title>
  </head><body>
  END
      ;
  test(15,start_html(-Title=>'The world of foo') ."\n" eq <<END,"start_html()");
-<!DOCTYPE HTML
-       PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+       PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
+       "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" lang="en-US"><head><title>The world of foo</title>
  </head><body>
  END
      ;
  test(16,($cookie=cookie(-name=>'fred',-value=>['chocolate','chip'],-path=>'/')) eq 'fred=chocolate&chip; path=/',"cookie()");
  my $h = header(-Cookie=>$cookie);
-test(17,$h =~ m!^Set-Cookie: fred=chocolate&chip\; path=/\015\012Date:.*\015\012Content-Type: text/html; charset=ISO-8859-1\015\012\015\012!s, 
+test(17,$h =~ m!^Set-Cookie: fred=chocolate&chip\; path=/${CRLF}Date:.*${CRLF}Content-Type: text/html; charset=ISO-8859-1${CRLF}${CRLF}!s, 
    "header(-cookie)");
  test(18,start_h3 eq '<h3>');
  test(19,end_h3 eq '</h3>');
  test(20,start_table({-border=>undef}) eq '<table border>');
  test(21,h1(escapeHTML("this is <not> \x8bright\x9b")) eq '<h1>this is &lt;not&gt; &#139;right&#155;</h1>');
  charset('utf-8');
+if (ord("\t") == 9) {
  test(22,h1(escapeHTML("this is <not> \x8bright\x9b")) eq '<h1>this is &lt;not&gt; \8bright\9b</h1>');
+}
+else {
+test(22,h1(escapeHTML("this is <not> \x8bright\x9b")) eq '<h1>this is &lt;not&gt; »rightº</h1>');
+}
  test(23,i(p('hello there')) eq '<i><p>hello there</p></i>');
  my $q = new CGI;
  test(24,$q->h1('hi') eq '<h1>hi</h1>');