Merge pull request #36 from JRaspass/master

Replace "Test" with "Test::More"

Author: simbabque

Changes

@@ -4,6 +4,7 @@ Change history for HTML-Form
 
     - Replace "use vars" with "our" (GH#34) (James Raspass)
     - Remove superfluous "use lib" (GH#35) (James Raspass)
+    - Replace "Test" with "Test::More" (GH#36) (James Raspass)
 
 6.08      2022-08-14 09:26:10Z
     - Remove Authority section from dist.ini (GH#27) (Olaf Alders)

META.json

@@ -72,7 +72,6 @@
             "ExtUtils::MakeMaker" : "0",
             "File::Spec" : "0",
             "HTTP::Response" : "0",
-            "Test" : "0",
             "Test::More" : "0.96",
             "warnings" : "0"
          }

Makefile.PL

@@ -30,7 +30,6 @@ my %WriteMakefileArgs = (
     "ExtUtils::MakeMaker" => 0,
     "File::Spec" => 0,
     "HTTP::Response" => 0,
-    "Test" => 0,
     "Test::More" => "0.96",
     "warnings" => 0
   },
@@ -50,7 +49,6 @@ my %FallbackPrereqs = (
   "HTTP::Request" => 6,
   "HTTP::Request::Common" => "6.03",
   "HTTP::Response" => 0,
-  "Test" => 0,
   "Test::More" => "0.96",
   "URI" => "1.10",
   "strict" => 0,

cpanfile

@@ -15,7 +15,6 @@ on 'test' => sub {
   requires "ExtUtils::MakeMaker" => "0";
   requires "File::Spec" => "0";
   requires "HTTP::Response" => "0";
-  requires "Test" => "0";
   requires "Test::More" => "0.96";
   requires "warnings" => "0";
 };

t/form-label.t

@@ -2,10 +2,8 @@
 
 use strict;
 use warnings;
-use Test qw(plan ok);
-
-plan tests => 2;
 
+use Test::More tests => 2;
 use HTML::Form;
 
 {
@@ -16,7 +14,7 @@ my $form = HTML::Form->parse(<<"EOT", base => "http://example.com", strict => 1)
  </label>
 </form>
 EOT
-ok($form->param('tt'), 'test content');
+is($form->param('tt'), 'test content');
 
 }
 
@@ -29,5 +27,5 @@ my $form = HTML::Form->parse(<<"EOT", base => "http://example.com", strict => 1)
 </form>
 EOT
 
-ok($form->param('tt'), 'test content');
+is($form->param('tt'), 'test content');
 }

t/form-selector.t

@@ -1,10 +1,9 @@
-#!perl -w
+#!perl
 
 use strict;
-use Test qw(plan ok);
-
-plan tests => 12;
+use warnings;
 
+use Test::More tests => 12;
 use HTML::Form;
 
 my $form = HTML::Form->parse(<<"EOT", base => "http://example.com", strict => 1);
@@ -23,24 +22,24 @@ EOT
 
 #$form->dump;
 
-ok($form->value("n1"), 1);
-ok($form->value("^n1"), 1);
-ok($form->value("#id1"), 1);
-ok($form->value(".A"), 1);
-ok($form->value("#id2"), 2);
-ok($form->value(".B"), 3);
+is($form->value("n1"), 1);
+is($form->value("^n1"), 1);
+is($form->value("#id1"), 1);
+is($form->value(".A"), 1);
+is($form->value("#id2"), 2);
+is($form->value(".B"), 3);
 
-ok(j(map $_->value, $form->find_input(".A")), "1:2");
+is(j(map $_->value, $form->find_input(".A")), "1:2");
 
 $form->find_input("#id2")->name("n2");
 $form->value("#id2", 22);
-ok($form->click->uri->query, "n1=1&n2=22");
+is($form->click->uri->query, "n1=1&n2=22");
 
 # try some odd names
-ok($form->find_input("##foo")->name, "#bar");
-ok($form->find_input("#bar"), undef);
-ok($form->find_input("^#bar")->class, ".D");
-ok($form->find_input("..D")->id, "#foo");
+is($form->find_input("##foo")->name, "#bar");
+is($form->find_input("#bar"), undef);
+is($form->find_input("^#bar")->class, ".D");
+is($form->find_input("..D")->id, "#foo");
 
 sub j {
     join(":", @_);

t/form-unicode.t

@@ -1,10 +1,9 @@
-#!perl -w
+#!perl
 
 use strict;
+use warnings;
 
-use Test qw(plan ok);
-plan tests => 15;
-
+use Test::More tests => 15;
 use HTML::Form;
 
 my @warn;
@@ -18,32 +17,32 @@ my $f = HTML::Form->parse(<<'EOT', "http://localhost/");
 <form></form>
 EOT
 
-ok($f->value("name"), "");
-ok($f->accept_charset, "UNKNOWN");
+is($f->value("name"), "");
+is($f->accept_charset, "UNKNOWN");
 my $req = $f->click;
-ok($req->uri, "http://localhost/abc?name=&latin=");
+is($req->uri, "http://localhost/abc?name=&latin=");
 
 $f->value(name => "\x{0424}");  # capital cyrillic ef
 $f->value(latin => "\xE5");     # aring
 $req = $f->click;
-ok($req->method, "GET");
-ok($req->uri, "http://localhost/abc?name=%D0%A4&latin=%C3%A5");
+is($req->method, "GET");
+is($req->uri, "http://localhost/abc?name=%D0%A4&latin=%C3%A5");
 
 $f->method('POST');
 $f->enctype('multipart/form-data');
 
 $req = $f->click;
-ok($req->uri, "http://localhost/abc");
-ok($req->content, "--xYzZY\r\nContent-Disposition: form-data; name=\"name\"\r\n\r\n\xD0\xA4\r\n--xYzZY\r\nContent-Disposition: form-data; name=\"latin\"\r\n\r\n\xC3\xA5\r\n--xYzZY--\r\n");
+is($req->uri, "http://localhost/abc");
+is($req->content, "--xYzZY\r\nContent-Disposition: form-data; name=\"name\"\r\n\r\n\xD0\xA4\r\n--xYzZY\r\nContent-Disposition: form-data; name=\"latin\"\r\n\r\n\xC3\xA5\r\n--xYzZY--\r\n");
 
 $f->accept_charset('koi8-r');
 $req = $f->click;
-ok($req->uri, "http://localhost/abc");
-ok($req->content, "--xYzZY\r\nContent-Disposition: form-data; name=\"name\"\r\n\r\n\xE6\r\n--xYzZY\r\nContent-Disposition: form-data; name=\"latin\"\r\n\r\n?\r\n--xYzZY--\r\n");
+is($req->uri, "http://localhost/abc");
+is($req->content, "--xYzZY\r\nContent-Disposition: form-data; name=\"name\"\r\n\r\n\xE6\r\n--xYzZY\r\nContent-Disposition: form-data; name=\"latin\"\r\n\r\n?\r\n--xYzZY--\r\n");
 
 $f->method('GET');
 $req = $f->click;
-ok($req->uri, "http://localhost/abc?name=%E6&latin=%3F");
+is($req->uri, "http://localhost/abc?name=%E6&latin=%3F");
 
 $f = HTML::Form->parse(<<'EOT', "http://localhost/");
 <form action="abc" name="foo" accept-charset="koi8-r">
@@ -52,16 +51,16 @@ $f = HTML::Form->parse(<<'EOT', "http://localhost/");
 <form></form>
 EOT
 
-ok($f->accept_charset, 'koi8-r');
+is($f->accept_charset, 'koi8-r');
 
 $f->value(name => "\x{0425}");  # capital cyrillic kha
 $req = $f->click;
-ok($req->method, "GET");
-ok($req->uri, "http://localhost/abc?name=%E8");
+is($req->method, "GET");
+is($req->uri, "http://localhost/abc?name=%E8");
 
 $f->method('POST');
 $f->enctype('multipart/form-data');
 
 $req = $f->click;
-ok($req->uri, "http://localhost/abc");
-ok($req->content, "--xYzZY\r\nContent-Disposition: form-data; name=\"name\"\r\n\r\n\xE8\r\n--xYzZY--\r\n");
+is($req->uri, "http://localhost/abc");
+is($req->content, "--xYzZY\r\nContent-Disposition: form-data; name=\"name\"\r\n\r\n\xE8\r\n--xYzZY--\r\n");