X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=t%2Ftestload.pm;fp=t%2Ftestload.pm;h=e1f8efcc222e1384876ba8aa8564f6201734fad5;hb=9a2930defe8c992ecc154a1056314997f4b19fae;hp=63a2bb4a3335603b04c7fa8ab422b4c8c28f6433;hpb=946f3ae86f85cbd6b9c9d00b504bac234433184e;p=deb_pkgs%2Flibhtml-calendarmonth-perl.git

diff --git a/t/testload.pm b/t/testload.pm
index 63a2bb4..e1f8efc 100644
--- a/t/testload.pm
+++ b/t/testload.pm
@@ -12,6 +12,7 @@ require Exporter;
 @EXPORT = qw( $Dat_Dir check_datetool case_count
               check_basic_with_datetool
               check_woy_with_datetool
+              dq_nums
             );
 
 use File::Spec;
@@ -27,7 +28,7 @@ BEGIN {
   $pkg = File::Spec->canonpath($INC{$pkg});
   my $file;
   ($vol, $dir, $file) = File::Spec->splitpath($pkg);
-  $base_dir = File::Spec->catpath($vol, $dir);
+  $base_dir = File::Spec->catpath($vol, $dir, '');
 }
 $Dat_Dir = $base_dir;
 
@@ -68,6 +69,17 @@ while (<D>) {
 
 close(D);
 
+#############
+
+# guard against HTML::Tree starting to quote numeric attrs as of
+# v3.19_02
+
+sub dq_nums {
+  my $str = shift;
+  $str =~ s/\"(\d+)\"/$1/g;
+  return $str;
+}
+
 sub case_count { scalar @Cals }
 
 sub check_datetool {
@@ -92,7 +104,7 @@ sub check_basic_with_datetool {
     my $gen_html = $c->as_HTML;
     $gen_html =~ s/\=\"(\d+)\"/=$1/g;
     my $day1 = $days[$cal->[3] - 1];
-    cmp_ok($gen_html, 'eq', $cal->[2],
+    cmp_ok(dq_nums($c->as_HTML), 'eq', $cal->[2],
        sprintf("(%d/%-02d %s 1st day) using %s",
                $cal->[0], $cal->[1], $day1, $method));
     if ($DEBUG && $c->as_HTML ne $cal->[2]) {
@@ -112,7 +124,7 @@ sub check_woy_with_datetool {
       head_week  => 1,
       datetool   => $datetool,
     );
-    my $ct = $cal->as_HTML;
+    my $ct = dq_nums($cal->as_HTML);
     chomp $ct;
     $ct =~ s/\=\"(\d+)\"/=$1/g;
     cmp_ok($ct, 'eq', $tc, "($year/$month week of year) using $datetool");