src/timetable: Move normalise to be a method on timetable object

[etc/awesome.git] / spec / timetable_spec.lua

diff --git a/spec/timetable_spec.lua b/spec/timetable_spec.lua
index 653645921fbbc5aa876b66304b6f2b4ece8c7c33..a72a0f9b50a5db77ea019b7103f4884a3f329466 100644 (file)
--- a/spec/timetable_spec.lua
+++ b/spec/timetable_spec.lua
@@ -12,26 +12,26 @@ describe ( "Time table library" , function ( )
        end )
 
        it ( "Get day of week correct" , function ( )
-               local function native_normalise ( tbl )
-                       return os.date("*t",os.time(tbl))
+               local function native_normalise ( year , month , day )
+                       return os.date("*t",os.time{
+                               year = year ;
+                               month = month ;
+                               day = day ;
+                       })
                end
-               local tbl = {
-                       year = 2013 ;
-                       month = 7 ;
-                       day = 23 ;
-               }
-               assert.are.same ( native_normalise ( tbl ).wday  , timetable.normalise ( tbl ).wday )
-               tbl.day=24
-               assert.are.same ( native_normalise ( tbl ).wday  , timetable.normalise ( tbl ).wday )
-               tbl.day=25
-               assert.are.same ( native_normalise ( tbl ).wday  , timetable.normalise ( tbl ).wday )
-               tbl.day=26
-               assert.are.same ( native_normalise ( tbl ).wday  , timetable.normalise ( tbl ).wday )
-               tbl.day=27
-               assert.are.same ( native_normalise ( tbl ).wday  , timetable.normalise ( tbl ).wday )
-               tbl.day=28
-               assert.are.same ( native_normalise ( tbl ).wday  , timetable.normalise ( tbl ).wday )
-               tbl.day=29
-               assert.are.same ( native_normalise ( tbl ).wday  , timetable.normalise ( tbl ).wday )
+               local function assert_same_wday ( year , month , day )
+                       return assert.are.same (
+                               native_normalise ( year , month , day ).wday ,
+                               timetable.new ( year , month , day ):normalise().wday
+                       )
+               end
+
+               assert_same_wday ( 2013 , 7 , 23 )
+               assert_same_wday ( 2013 , 7 , 24 )
+               assert_same_wday ( 2013 , 7 , 25 )
+               assert_same_wday ( 2013 , 7 , 26 )
+               assert_same_wday ( 2013 , 7 , 27 )
+               assert_same_wday ( 2013 , 7 , 28 )
+               assert_same_wday ( 2013 , 7 , 29 )
        end )
 end )