Refactor tests (first pass)

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

diff --git a/t/table2.t b/t/table2.t
index a8bff3ef6737479aa95457bad64a1fa8b6bdb994..3566c63da5eafba825f7eb455ae9f1245418daa6 100644 (file)
--- a/t/table2.t
+++ b/t/table2.t
@@ -1,55 +1,34 @@
-# This might look like shell script, but it's actually -*- perl -*-
-use strict;
-use lib qw(t/ t/m/);
-
-
-use File::Slurp;
-use Test::More;
-use Test::XML;
-
-use TestUtils;
-
-use Data::Dumper;
-use HTML::TreeBuilder;
-use HTML::Element::Library;
-
+#!/usr/bin/perl
+use t::lib tests => 1;
+use lib 't';
 use data::table2;
 
 my $root = 't/html/table2';
-my $o    = data::table2->new;
 my $d    = data::table2->load_data;
-my $tree = HTML::TreeBuilder->new_from_file("$root.html");
-
-#warn 'D:', Dumper $d;
+my $tree = mktree 't/html/table2.html';
 
 for my $dataset (keys %$d) {
-  my %tbody = ('4dig' => 0, '3dig' => 1);
-  $tree->table2 (
-#    debug => 1,
-    table_data => $d->{$dataset},
-    tr_base_id => $dataset,
-    tr_ld => sub {
-      my $t = shift;
-      my $tbody = ($t->look_down('_tag' => 'tbody'))[$tbody{$dataset}];
-      my @tbody_child = $tbody->content_list;
-      $tbody_child[$_]->detach for (1 .. $#tbody_child) ;
-      $tbody->content_list;
-    },
-    td_proc => sub {
-      my ($tr, $data) = @_;
-      my @td = $tr->look_down('_tag' => 'td');
-      for my $i (0..$#td) {
-#      warn $i;
-       $td[$i]->splice_content(0, 1, $data->[$i]);
-      }
-    }
-   );
+       my %tbody = ('4dig' => 0, '3dig' => 1);
+       $tree->table2 (
+               debug => $ENV{TEST_VERBOSE},
+               table_data => $d->{$dataset},
+               tr_base_id => $dataset,
+               tr_ld => sub {
+                       my $t = shift;
+                       my $tbody = ($t->look_down('_tag' => 'tbody'))[$tbody{$dataset}];
+                       my @tbody_child = $tbody->content_list;
+                       $tbody_child[$_]->detach for (1 .. $#tbody_child) ;
+                       $tbody->content_list;
+               },
+               td_proc => sub {
+                       my ($tr, $data) = @_;
+                       my @td = $tr->look_down('_tag' => 'td');
+                       for my $i (0..$#td) {
+                               #       warn $i;
+                               $td[$i]->splice_content(0, 1, $data->[$i]);
+                       }
+               }
+       );
 }
 
-
-my $generated_html = ptree($tree, "$root.gen");
-
-is($generated_html, File::Slurp::read_file("$root.exp"), 'genhtml');
-
-
-done_testing;
+isxml $tree, 't/html/table2.exp', 'table2';