Update to CGI.pm 2.78.

[p5sagit/p5-mst-13.2.git] / lib / CGI / t / pretty.t

diff --git a/lib/CGI/t/pretty.t b/lib/CGI/t/pretty.t
index 14f6447..9a311fb 100755 (executable)
--- a/lib/CGI/t/pretty.t
+++ b/lib/CGI/t/pretty.t
@@ -1,41 +1,40 @@
 #!/usr/local/bin/perl -w
 
-BEGIN {
-    chdir('t') if -d 't';
-    @INC = '../lib';
-}
-
-# Test ability to retrieve HTTP request info
-######################### We start with some black magic to print on failure.
-use lib '../blib/lib','../blib/arch';
-
-BEGIN {$| = 1; print "1..5\n"; }
-END {print "not ok 1\n" unless $loaded;}
-use CGI::Pretty (':standard','-no_debug','*h3','start_table');
-$loaded = 1;
-print "ok 1\n";
-
-######################### End of black magic.
-
-# util
-sub test {
-    local($^W) = 0;
-    my($num, $true,$msg) = @_;
-    print($true ? "ok $num\n" : "not ok $num $msg\n");
-}
-
-# all the automatic tags
-test(2,h1() eq '<h1>',"single tag");
-test(3,ol(li('fred'),li('ethel')) eq "<ol>\n\t<li>\n\t\tfred\n\t</li>\n\t <li>\n\t\tethel\n\t</li>\n</ol>\n","basic indentation");
-test(4,p('hi',pre('there'),'frog') eq 
-'<p>
+use strict;
+use lib 't/lib','../blib/lib','./blib/lib';
+use Test::More tests => 5;
+
+BEGIN { use_ok('CGI::Pretty') };
+
+# This is silly use_ok should take arguments
+use CGI::Pretty (':all');
+
+is(h1(), '<h1>',"single tag");
+
+is(ol(li('fred'),li('ethel')), <<HTML,   "basic indentation");
+<ol>
+       <li>
+               fred
+       </li>
+       <li>
+               ethel
+       </li>
+</ol>
+HTML
+
+
+is(p('hi',pre('there'),'frog'), <<HTML, "<pre> tags");
+<p>
        hi <pre>there</pre>
-        frog
+       frog
 </p>
-',"<pre> tags");
-test(5,p('hi',a({-href=>'frog'},'there'),'frog') eq 
-'<p>
+HTML
+
+
+is(p('hi',a({-href=>'frog'},'there'),'frog'), <<HTML,   "as-is");
+<p>
        hi <a href="frog">there</a>
-        frog
+       frog
 </p>
-',"as-is");
+HTML
+