X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FTime%2FLocal.t;h=39c99a090bd100c2cfa8d8829f61c04210125b05;hb=07be1b83a6b2d24b492356181ddf70e1c7917ae3;hp=06db37e6591059f72ea0b74ab0ec21742c445431;hpb=4ab0373fd39c5730a2e94dc529349ae645b4daca;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/Time/Local.t b/lib/Time/Local.t
index 06db37e..39c99a0 100755
--- a/lib/Time/Local.t
+++ b/lib/Time/Local.t
@@ -23,6 +23,7 @@ my @time =
    [1999, 12, 31, 23, 59, 59],
    [2000,  1,  1, 00, 00, 00],
    [2010, 10, 12, 14, 13, 12],
+   # leap day
    [2020,  2, 29, 12, 59, 59],
    [2030,  7,  4, 17, 07, 06],
 # The following test fails on a surprising number of systems
@@ -31,51 +32,99 @@ my @time =
 #  [2038,  1, 17, 23, 59, 59],     # last full day in any tz
   );
 
+my @bad_time =
+    (
+     # month too large
+     [1995, 13, 01, 01, 01, 01],
+     # day too large
+     [1995, 02, 30, 01, 01, 01],
+     # hour too large
+     [1995, 02, 10, 25, 01, 01],
+     # minute too large
+     [1995, 02, 10, 01, 60, 01],
+     # second too large
+     [1995, 02, 10, 01, 01, 60],
+    );
+
+my @neg_time =
+    (
+     # test negative epochs for systems that handle it
+     [ 1969, 12, 31, 16, 59, 59 ],
+     [ 1950, 04, 12, 9, 30, 31 ],
+    );
+
+# Use 3 days before the start of the epoch because with Borland on
+# Win32 it will work for -3600 _if_ your time zone is +01:00 (or
+# greater).
+my $neg_epoch_ok = defined ((localtime(-259200))[0]) ? 1 : 0;
+
 # use vmsish 'time' makes for oddness around the Unix epoch
-if ($^O eq 'VMS') { $time[0][2]++ }
+if ($^O eq 'VMS') {
+    $time[0][2]++;
+    $neg_epoch_ok = 0; # time_t is unsigned
+}
 
-my $tests = (@time * 12) + 6;
+my $tests = (@time * 12);
+$tests += @neg_time * 12;
+$tests += @bad_time;
+$tests += 6;
 $tests += 2 if $ENV{PERL_CORE};
-$tests += 5 if $ENV{MAINTAINER};
+$tests += 6 if $ENV{MAINTAINER};
 
 plan tests => $tests;
 
-for (@time) {
+for (@time, @neg_time) {
     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
     $year -= 1900;
     $mon--;
 
     if ($^O eq 'vos' && $year == 70) {
         skip(1, "skipping 1970 test on VOS.\n") for 1..6;
+    } elsif ($year < 70 && ! $neg_epoch_ok) {
+        skip(1, "skipping negative epoch.\n") for 1..6;
     } else {
-        my $time = timelocal($sec,$min,$hour,$mday,$mon,$year);
+        my $year_in = $year < 70 ? $year + 1900 : $year;
+        my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
 
         my($s,$m,$h,$D,$M,$Y) = localtime($time);
 
-        ok($s, $sec, 'second');
-        ok($m, $min, 'minute');
-        ok($h, $hour, 'hour');
-        ok($D, $mday, 'day');
-        ok($M, $mon, 'month');
-        ok($Y, $year, 'year');
+        ok($s, $sec, "timelocal second for @$_");
+        ok($m, $min, "timelocal minute for @$_");
+        ok($h, $hour, "timelocal hour for @$_");
+        ok($D, $mday, "timelocal day for @$_");
+        ok($M, $mon, "timelocal month for @$_");
+        ok($Y, $year, "timelocal year for @$_");
     }
 
     if ($^O eq 'vos' && $year == 70) {
         skip(1, "skipping 1970 test on VOS.\n") for 1..6;
+    } elsif ($year < 70 && ! $neg_epoch_ok) {
+        skip(1, "skipping negative epoch.\n") for 1..6;
     } else {
-        my $time = timegm($sec,$min,$hour,$mday,$mon,$year);
+        my $year_in = $year < 70 ? $year + 1900 : $year;
+        my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
 
         my($s,$m,$h,$D,$M,$Y) = gmtime($time);
 
-        ok($s, $sec, 'second');
-        ok($m, $min, 'minute');
-        ok($h, $hour, 'hour');
-        ok($D, $mday, 'day');
-        ok($M, $mon, 'month');
-        ok($Y, $year, 'year');
+        ok($s, $sec, "timegm second for @$_");
+        ok($m, $min, "timegm minute for @$_");
+        ok($h, $hour, "timegm hour for @$_");
+        ok($D, $mday, "timegm day for @$_");
+        ok($M, $mon, "timegm month for @$_");
+        ok($Y, $year, "timegm year for @$_");
     }
 }
 
+for (@bad_time) {
+    my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+    $year -= 1900;
+    $mon--;
+
+    eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+
+    ok($@, qr/.*out of range.*/, 'invalid time caused an error');
+}
+
 ok(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
    'one hour difference between two calls to timelocal');
 
@@ -98,21 +147,20 @@ ok(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
     ok($hour == 2 || $hour == 3, 1, 'hour should be 2 or 3');
 }
 
-# round trip was broken for edge cases
-if ($^O eq "aix" && $Config{osvers} =~ m/^4\.3\./) {
-    skip ("No fix expected for edge case test for $_ on AIX 4.3") for qw( timegm timelocal );
-} else {
-    ok(sprintf('%x', timegm(gmtime(0x7fffffff))), sprintf('%x', 0x7fffffff),
-       '0x7fffffff round trip through gmtime then timegm');
+if ($neg_epoch_ok) {
+    eval { timegm(0,0,0,29,1,1900) };
+    ok($@, qr/Day '29' out of range 1\.\.28/);
 
-    ok(sprintf('%x', timelocal(localtime(0x7fffffff))), sprintf('%x', 0x7fffffff),
-       '0x7fffffff round trip through localtime then timelocal');
+    eval { timegm(0,0,0,29,1,1904) };
+    ok($@, '');
+} else {
+    skip(1, "skipping negative epoch.\n") for 1..2;
 }
 
 if ($ENV{MAINTAINER}) {
     eval { require POSIX; POSIX::tzset() };
     if ($@) {
-        skip("Cannot call POSIX::tzset() on this platform\n") for 1..3;
+        skip( 1, "Cannot call POSIX::tzset() on this platform\n" ) for 1..3;
     }
     else {
         local $ENV{TZ} = 'Europe/Vienna';
@@ -150,6 +198,12 @@ if ($ENV{MAINTAINER}) {
         $time = timelocal(0, 30, 2, 28, 9, 101);
         ok($time, 1004200200,
            'timelocal for non-existent time gives you the time one hour later');
+
+        local $ENV{TZ} = 'Europe/London';
+        POSIX::tzset();
+        $time = timelocal( localtime(1111917720) );
+        ok($time, 1111917720,
+           'timelocal for round trip bug on date of DST change for Europe/London');
     }
 }