Add tests outside the date range possible with 32-bit time
calculation. Also add a few more nominal date/time test values
to the 32-bit "tests" array. Add min / max tests for years 0001
and 9999.
Signed-off-by: Vladimir Serbinenko <phco...@gmail.com>
Signed-off-by: Andrew Hamilton <adham...@gmail.com>
---
tests/date_unit_test.c | 75 +++++++++++++++++++++++++++++++++++++-----
1 file changed, 66 insertions(+), 9 deletions(-)
diff --git a/tests/date_unit_test.c b/tests/date_unit_test.c
index 99774f199..d3bf5a712 100644
--- a/tests/date_unit_test.c
+++ b/tests/date_unit_test.c
@@ -25,12 +25,13 @@
#include <grub/test.h>
static void
-date_test (grub_int32_t v)
+date_test (grub_int64_t v)
{
struct grub_datetime dt;
time_t t = v;
struct tm *g;
int w;
+ grub_int64_t back = 0;
g = gmtime (&t);
@@ -38,28 +39,56 @@ date_test (grub_int32_t v)
w = grub_get_weekday (&dt);
- grub_test_assert (g->tm_sec == dt.second, "time %d bad second: %d vs %d", v,
+ grub_datetime2unixtime (&dt, &back);
+
+ grub_test_assert (g->tm_sec == dt.second, "time %lld bad second: %d vs %d",
(long long) v,
g->tm_sec, dt.second);
- grub_test_assert (g->tm_min == dt.minute, "time %d bad minute: %d vs %d", v,
+ grub_test_assert (g->tm_min == dt.minute, "time %lld bad minute: %d vs %d",
(long long) v,
g->tm_min, dt.minute);
- grub_test_assert (g->tm_hour == dt.hour, "time %d bad hour: %d vs %d", v,
+ grub_test_assert (g->tm_hour == dt.hour, "time %lld bad hour: %d vs %d",
(long long) v,
g->tm_hour, dt.hour);
- grub_test_assert (g->tm_mday == dt.day, "time %d bad day: %d vs %d", v,
+ grub_test_assert (g->tm_mday == dt.day, "time %lld bad day: %d vs %d", (long
long) v,
g->tm_mday, dt.day);
- grub_test_assert (g->tm_mon + 1 == dt.month, "time %d bad month: %d vs %d",
v,
+ grub_test_assert (g->tm_mon + 1 == dt.month, "time %lld bad month: %d vs
%d",(long long) v,
g->tm_mon + 1, dt.month);
grub_test_assert (g->tm_year + 1900 == dt.year,
- "time %d bad year: %d vs %d", v,
+ "time %lld bad year: %d vs %d", (long long) v,
g->tm_year + 1900, dt.year);
- grub_test_assert (g->tm_wday == w, "time %d bad week day: %d vs %d", v,
+ grub_test_assert (g->tm_wday == w, "time %lld bad week day: %d vs %d", (long
long) v,
g->tm_wday, w);
+ grub_test_assert (back == v, "time %lld bad back transform: %lld", (long
long) v,
+ (long long) back);
}
static void
date_test_iter (void)
{
- grub_int32_t tests[] = { -1, 0, +1, -2133156255, GRUB_INT32_MIN,
+ /*
+ * Test several interesting UNIX timestamps in 32-bit time:
+ * 1. -1: 1969-12-31 23:59:59 - Just before EPOCH
+ * 2. 0: 1970-01-01 00:00:00 - EPOCH
+ * 3. +1: 1970-01-01 00:00:01 - Just after EPOCH
+ * 4. 978224552: 2000-12-31 01:02:32 - Leap year, prior to Feb
+ * 5. -2133156255: 1902-05-28 16:35:45 - Nominal value
+ * 6. -2110094321: 1903-02-19 14:41:19 - Nominal value
+ * 7. GRUB_INT32_MIN: 1901-12-13 20:45:52 - 32-bit Min value
+ * 8. GRUB_INT32_MAX: 2038-01-19 03:14:07 - 32-bit Max value
+ */
+ grub_int32_t tests[] = { -1, 0, +1, 978224552, -2133156255, -2110094321,
GRUB_INT32_MIN,
GRUB_INT32_MAX };
+ /*
+ * Test several known UNIX timestamps outside 32-bit time:
+ * 1. 5774965200: 2152-12-31 21:00:00 - Leap year
+ * 2. 4108700725: 2100-03-14 09:45:25 - Not a leap year
+ * 3. -5029179792: 1810-08-19 21:36:48 - Not a leap year
+ * 4. -62135596799: 0001-01-01 00:00:00 - Minimum AD
+ * 5. 253402300799: 9999-12-31 23:59:59 - Maximum 4 digit year
+ */
+ grub_int64_t tests64[] = { (grub_int64_t) 5774965200,
+ (grub_int64_t) 4108700725,
+ (grub_int64_t) -5029179792,
+ (grub_int64_t) -62135596799,
+ (grub_int64_t) 253402300799 };
unsigned i;
for (i = 0; i < ARRAY_SIZE (tests); i++)
@@ -71,6 +100,34 @@ date_test_iter (void)
date_test (x);
date_test (-x);
}
+
+ if (sizeof (time_t) > 4)
+ {
+ for (i = 0; i < ARRAY_SIZE (tests64); i++)
+ date_test (tests64[i]);
+ for (i = 0; i < 5000000; i++)
+ {
+ /*
+ * Test some pseudo-random dates/times between 1970 and 9999
+ * "117" is used to scale the random 32-bit int from range
+ * 0..2147483648 to 0..251255586816. This is reasonably
+ * close to max 9999 date represented by 253402300799.
+ */
+ grub_int64_t x = (grub_int64_t) rand () * (grub_int64_t) 117;
+ date_test (x);
+ }
+ for (i = 0; i < 5000000; i++)
+ {
+ /*
+ * Test some pseudo-random dates/times between 0001 and 1969
+ * "-28" is used to scale the random 32-bit int from range
+ * 0..2147483648 to -60129542144..0. This is reasonably
+ * close to min 0001 date represented by -62135596799.
+ */
+ grub_int64_t x = (grub_int64_t) rand () * (grub_int64_t) -28;
+ date_test (x);
+ }
+ }
}
GRUB_UNIT_TEST ("date_unit_test", date_test_iter);
--
2.39.5
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
