From 24a1a8b96f133ff84ede87e13f4ffd7c7b316606 Mon Sep 17 00:00:00 2001 From: Kevin Chabowski Date: Wed, 28 Aug 2013 00:49:03 +0200 Subject: Chronos infos can now be stringified and parsed. --- chronos/chronos_test.go | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) (limited to 'chronos/chronos_test.go') diff --git a/chronos/chronos_test.go b/chronos/chronos_test.go index 692af14..1798b4c 100644 --- a/chronos/chronos_test.go +++ b/chronos/chronos_test.go @@ -6,32 +6,40 @@ import ( ) func mktime(y int, month time.Month, d, h, min int) time.Time { - return time.Date(y, month, d, h, min, 0, 0, time.Local) + return time.Date(y, month, d, h, min, 0, 0, time.UTC) } func TestChronos(t *testing.T) { tbl := []struct { - start time.Time - end time.Time - unit TimeUnit - count uint - now time.Time - want time.Time + chronos string + now time.Time + want time.Time }{ - {mktime(1991, 4, 30, 0, 0), nilTime, Year, 1, mktime(2013, 8, 26, 13, 37), mktime(2014, 4, 30, 0, 0)}, - {mktime(2013, 1, 1, 0, 0), nilTime, Year, 0, mktime(2013, 8, 26, 13, 37), nilTime}, - {mktime(2013, 1, 1, 0, 0), nilTime, Year, 0, mktime(2012, 1, 1, 0, 0), mktime(2013, 1, 1, 0, 0)}, - {mktime(1900, 12, 24, 12, 34), nilTime, Year, 5, mktime(2013, 8, 26, 13, 37), mktime(2015, 12, 24, 12, 34)}, - {mktime(1900, 12, 24, 12, 34), mktime(2010, 1, 1, 1, 1), Year, 5, mktime(2013, 8, 26, 13, 37), nilTime}, - {mktime(2013, 8, 1, 4, 2), nilTime, Week, 3, mktime(2013, 8, 26, 13, 37), mktime(2013, 9, 12, 4, 2)}, - {mktime(2013, 8, 26, 13, 37), nilTime, Year, 0, mktime(2013, 8, 26, 13, 37), mktime(2013, 8, 26, 13, 37)}, - {mktime(2013, 8, 25, 13, 37), nilTime, Day, 1, mktime(2013, 8, 26, 13, 37), mktime(2013, 8, 26, 13, 37)}, + {"1991-04-30 00:00:00 +1 Year", mktime(2013, 8, 26, 13, 37), mktime(2014, 4, 30, 0, 0)}, + {"2013-01-01 00:00:00", mktime(2013, 8, 26, 13, 37), nilTime}, + {"2013-01-01 00:00:00", mktime(2012, 1, 1, 0, 0), mktime(2013, 1, 1, 0, 0)}, + {"1900-12-24 12:34:00 +5 Year", mktime(2013, 8, 26, 13, 37), mktime(2015, 12, 24, 12, 34)}, + {"1900-12-24 12:34:00 +5 Year !2010-01-01 01:01:00", mktime(2013, 8, 26, 13, 37), nilTime}, + {"2013-08-01 04:02:00 +3 Week", mktime(2013, 8, 26, 13, 37), mktime(2013, 9, 12, 4, 2)}, + {"2013-08-26 13:37:00", mktime(2013, 8, 26, 13, 37), mktime(2013, 8, 26, 13, 37)}, + {"2013-08-25 13:37:00 +1 Day", mktime(2013, 8, 26, 13, 37), mktime(2013, 8, 26, 13, 37)}, + {"2012-12-31 23:59:00 +100 Minute", mktime(2013, 1, 1, 0, 0), mktime(2013, 1, 1, 1, 39)}, } for i, e := range tbl { - have := Chronos{e.start, e.end, Frequency{e.unit, e.count}}.NextAfter(e.now) + c, err := ParseChronos(e.chronos) + if err != nil { + t.Errorf("#%d: Failed parsing \"%s\": %s", i, e.chronos, err) + continue + } + have := c.NextAfter(e.now) if !have.Equal(e.want) { t.Errorf("#%d: Want: %s, Have: %s", i, e.want, have) } + + if s := c.String(); s != e.chronos { + t.Errorf("#%d: String() failed: \"%s\" != \"%s\"", i, e.chronos, s) + } + } } -- cgit v1.2.3-54-g00ecf