Refactor tests (first pass)

[html-element-library.git] / t / table2-tr_ld.t

diff --git a/t/table2-tr_ld.t b/t/table2-tr_ld.t
index 6e01c51bce21f5761559b8b43603d3ad447621a2..c6852056639646e51deec7988123dd45c6932b61 100644 (file)
--- a/t/table2-tr_ld.t
+++ b/t/table2-tr_ld.t
@@ -1,82 +1,54 @@
-# This might look like shell script, but it's actually -*- perl -*-
-# Test the 3 possible look_down calls to table2()
-#   a = default
-#   b = supplied array ref
-#   c = supplied code ref
-
-use strict;
-use lib qw(t/ t/m/);
-
-
-use File::Slurp;
-use Test::More qw(no_plan);
-
-use HTML::TreeBuilder;
-use HTML::Element::Library;
-use Scalar::Listify;
-use Test::XML;
-
-use data::table2;
-
-
-my $o    = data::table2->new;
+#!/usr/bin/perl
+use t::lib tests => 3;
 
 # a - default table_ld
 
-my $root = 't/html/table2';
-my $tree = HTML::TreeBuilder->new_from_file("$root.html");
-
+my $tree = mktree 't/html/table2.html';
 
 my @tr = HTML::Element::Library::ref_or_ld(
-  $tree,
-  ['_tag' => 'tr']
- );
+       $tree,
+       ['_tag' => 'tr']
+);
 
-is (scalar @tr, 16, 'default ld_tr');
+is (scalar @tr, 16, 'table2 tr look_down (default)');
 
 # b - arrayref tr_ld
 
-$root = 't/html/table2-tr_ld-arrayref';
-$tree = HTML::TreeBuilder->new_from_file("$root.html");
-
+$tree = mktree 't/html/table2-tr_ld-arrayref.html';
 
 my $tr = HTML::Element::Library::ref_or_ld(
-  $tree,
-  [class => 'findMe']
- );
+       $tree,
+       [class => 'findMe']
+);
 
-is_xml ($tr->as_XML, scalar File::Slurp::read_file("$root.exp"), $root);
+isxml $tr, 't/html/table2-tr_ld-arrayref.exp', 'table2 tr look_down (arrayref)';
 
 # c - coderef tr_ld
 # removes windows listings before returning @tr
 
-$root = 't/html/table2';
-$tree = HTML::TreeBuilder->new_from_file("$root.html");
-
+$tree = mktree 't/html/table2.html';
 
 @tr = HTML::Element::Library::ref_or_ld(
-  $tree,
-  sub {
-    my ($t) = @_;
-    my @tr = $t->look_down('_tag' => 'tr');
-    my @keep;
-    for my $tr (@tr) {
-
-      my @td = $tr->look_down ('_tag' => 'td') ;
-      my $detached;
-      for my $td (@td) {
-       if (grep { $_ =~ /Windows/ } $td->content_list) {
-         $tr->detach();
-         ++$detached;
-         last;
+       $tree,
+       sub {
+               my ($t) = @_;
+               my @tr = $t->look_down('_tag' => 'tr');
+               my @keep;
+               for my $tr (@tr) {
+
+                       my @td = $tr->look_down ('_tag' => 'td') ;
+                       my $detached;
+                       for my $td (@td) {
+                               if (grep { $_ =~ /Windows/ } $td->content_list) {
+                                       $tr->detach;
+                                       ++$detached;
+                                       last;
+                               }
+                       }
+                       push @keep, $tr unless $detached;
+               }
+               @keep;
        }
-      }
-      push @keep, $tr unless $detached;
-    }
-    @keep;
-  }
- );
-
-#warn $_->as_HTML, $/ for @tr;
+);
 
-is_xml ($tree->as_XML, scalar File::Slurp::read_file("$root-tr_ld-coderef.exp"), $root);
+isxml $tree, 't/html/table2-tr_ld-coderef.exp', 'table2 tr look_down (coderef)';