workpattern 0.3.5 → 0.3.6

data/test/test_helper.rb

@@ -1,3 +1,2 @@
-require 'stringio'
 require 'minitest/autorun'
 require File.dirname(__FILE__) + '/../lib/workpattern.rb'

data/test/test_hour.rb

@@ -274,6 +274,13 @@ class TestHour < MiniTest::Unit::TestCase #:nodoc:
     assert_equal DateTime.new(2013,1,1,1,2), result
     assert_equal 0,remainder
   end
+######
+  def test_can_subtract_using_next_hour_and_non_working_59_in_patterned_hour
+    start_date=DateTime.new(2013,1,1,0,0)
+    result, remainder=@pattern_hour.wp_calc(start_date,-9,true)
+    assert_equal DateTime.new(2013,1,1,0,50), result
+    assert_equal 0,remainder
+  end
 
   def test_can_change_working_to_resting
     new_hour=@working_hour.wp_workpattern(0,59,0)

data/test/test_week.rb

@@ -3,6 +3,17 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 class TestWeek < MiniTest::Unit::TestCase #:nodoc:
 
   def setup
+    start=DateTime.new(2000,1,3)
+    finish=DateTime.new(2000,1,9)
+    @working_week=Workpattern::Week.new(start,finish,1)
+
+    @resting_week=Workpattern::Week.new(start,finish,0)
+
+    @pattern_week=Workpattern::Week.new(start,finish,1)
+    @pattern_week.workpattern(:weekend,Workpattern.clock(0,0),Workpattern.clock(23,59),0)
+    @pattern_week.workpattern(:weekday,Workpattern.clock(0,0),Workpattern.clock(8,59),0)
+    @pattern_week.workpattern(:weekday,Workpattern.clock(12,30),Workpattern.clock(13,0),0)
+    @pattern_week.workpattern(:weekday,Workpattern.clock(17,0),Workpattern.clock(23,59),0)
     
   end
 
@@ -20,11 +31,6 @@ class TestWeek < MiniTest::Unit::TestCase #:nodoc:
     assert_equal 60, duration
     assert_equal DateTime.civil(2013,9,27,0,0), start
   end
-
-
-######################################################
-######################################################
-######################################################
   
   def test_must_create_a_working_week
     start=DateTime.new(2000,1,1,11,3)
@@ -55,6 +61,24 @@ class TestWeek < MiniTest::Unit::TestCase #:nodoc:
     assert_equal 3156480, new_week.total#2192
     
   end
+
+  def test_must_set_week_pattern_correctly
+    start=DateTime.new(2000,1,3)
+    finish=DateTime.new(2000,1,9)
+
+    pattern_week=Workpattern::Week.new(start,finish,1)
+    assert_equal start, pattern_week.start
+    assert_equal finish, pattern_week.finish
+    assert_equal 10080, pattern_week.week_total
+    pattern_week.workpattern(:weekend,Workpattern.clock(0,0),Workpattern.clock(23,59),0)
+    assert_equal 7200, pattern_week.week_total
+    pattern_week.workpattern(:weekday,Workpattern.clock(0,0),Workpattern.clock(8,59),0)
+    assert_equal 4500, pattern_week.week_total
+    pattern_week.workpattern(:weekday,Workpattern.clock(12,30),Workpattern.clock(13,0),0)
+    assert_equal 4345, pattern_week.week_total
+    pattern_week.workpattern(:weekday,Workpattern.clock(17,0),Workpattern.clock(23,59),0)
+    assert_equal 2245, pattern_week.week_total
+  end
   
   def test_must_set_patterns_correctly
     start=DateTime.new(2000,1,1,0,0)
@@ -78,275 +102,324 @@ class TestWeek < MiniTest::Unit::TestCase #:nodoc:
     working_week.workpattern(:all,clock(0,0),clock(23,59),1)
     assert_equal 10080, working_week.week_total
     working_week.workpattern(:weekend,clock(0,0),clock(23,59),0)
-    assert_equal 7200, working_week.week_total
-    
+    assert_equal 7200, working_week.week_total    
   end
-  
-  def test_must_add_minutes_in_a_working_week
-    start=DateTime.new(2000,1,1,0,0)
-    finish=DateTime.new(2005,12,31,8,59)
-    working_week=week(start,finish,1)
-      
-    [# yyyy,mm,dd,hh,mn,durtn,ryyyy,rmm,rdd,rhh,rmn,rdurtn
-     [ 2000, 1, 1, 0, 0,    0, 2000,  1,  1,  0,  0,     0],
-     [ 2005,12,31, 8,59,   10, 2005, 12, 31,  9,  9,     0],
-     [ 2005,12,31,23,59,    1, 2006,  1,  1,  0,  0,     0],
-     [ 2005,12,31,23,59,    2, 2006,  1,  1,  0,  0,     1],
-     [ 2005,11,30,23,59,    2, 2005, 12,  1,  0,  1,     0]
-    ].each {|yyyy,mm,dd,hh,mn,durtn,ryyyy,rmm,rdd,rhh,rmn,rdurtn|
-      start=DateTime.new(yyyy,mm,dd,hh,mn)
-      result_date, result_duration= working_week.calc(start,durtn)
-      assert_equal DateTime.new(ryyyy,rmm,rdd,rhh,rmn), result_date, "result_date for working_week.calc(#{start},#{durtn})"
-      assert_equal rdurtn, result_duration,"result_duration for working_week.calc(#{start},#{durtn})"
-    }
+
+  def test_must_add_minutes_in_a_working_week_result_in_same_day
+    result_date, result_duration, midnight_flag = @working_week.calc(DateTime.new(2000,1,3,7,31),29)
+    assert_equal DateTime.new(2000,1,3,8,0), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
   end
-  
+
+  def test_must_add_minutes_in_a_working_week_result_in_next_day
+    result_date, result_duration, midnight_flag = @working_week.calc(DateTime.new(2000,1,3,7,31),990)
+    assert_equal DateTime.new(2000,1,4,0,1), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_add_minutes_in_a_working_week_result_in_later_day
+    result_date, result_duration, midnight_flag = @working_week.calc(DateTime.new(2000,1,3,7,31),2430)
+    assert_equal DateTime.new(2000,1,5,0,1), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_add_minutes_in_a_working_week_result_in_start_next_day
+    result_date, result_duration, midnight_flag = @working_week.calc(DateTime.new(2000,1,3,7,31),989)
+    assert_equal DateTime.new(2000,1,4,0,0), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_add_0_minutes_in_a_working_week
+    result_date, result_duration, midnight_flag = @working_week.calc(DateTime.new(2000,1,3,7,31),0)
+    assert_equal DateTime.new(2000,1,3,7,31), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_add_too_many_minutes_in_a_working_week
+    result_date, result_duration, midnight_flag = @working_week.calc(DateTime.new(2000,1,3,7,31),9630)
+    assert_equal DateTime.new(2000,1,10,0,0), result_date
+    refute midnight_flag
+    assert_equal 1, result_duration
+  end
+
   def test_must_add_minutes_in_a_resting_week
-    start=DateTime.new(2000,1,1,0,0)
-    finish=DateTime.new(2005,12,31,8,59)
-    resting_week=week(start,finish,0)
-      
-    [# yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight
-     [ 2000, 1, 1, 0, 0,    0,   false, 2000,  1,  1,  0,  0,     0,   false],
-     [ 2005,12,31, 8,59,   10,   false, 2006,  1,  1,  0,  0,    10,   false],
-     [ 2005,12,31,23,59,    1,   false, 2006,  1,  1,  0,  0,     1,   false],
-     [ 2005,12,31,23,59,    2,   false, 2006,  1,  1,  0,  0,     2,   false],
-     [ 2005,11,30,23,59,    2,   false, 2006,  1,  1,  0,  0,     2,   false],
-     [ 2000, 1, 1, 0, 0,    0,    true, 2000,  1,  1,  0,  0,     0,   false],
-     [ 2005,12,31, 8,59,   10,    true, 2006,  1,  1,  0,  0,    10,   false],
-     [ 2005,12,31,23,59,    1,    true, 2006,  1,  1,  0,  0,     1,   false],
-     [ 2005,12,31,23,59,    2,    true, 2006,  1,  1,  0,  0,     2,   false],
-     [ 2005,11,30,23,59,    2,    true, 2006,  1,  1,  0,  0,     2,   false]     
-    ].each {|yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight|
-      start=DateTime.new(yyyy,mm,dd,hh,mn)
-      result_date, result_duration,result_midnight= resting_week.calc(start,durtn,midnight)
-      assert_equal DateTime.new(ryyyy,rmm,rdd,rhh,rmn), result_date, "result_date for resting_week.calc(#{start},#{durtn},#{midnight})"
-      assert_equal rdurtn, result_duration,"result_duration for resting_week.calc(#{start},#{durtn},#{midnight})"
-      assert_equal rmidnight, result_midnight,"result_midnight for resting_week.calc(#{start},#{durtn},#{midnight})"      
-    }
+    result_date, result_duration, midnight_flag = @resting_week.calc(DateTime.new(2000,1,3,7,31),29)
+    assert_equal DateTime.new(2000,1,10,0,0), result_date
+    refute midnight_flag
+    assert_equal 29, result_duration
   end
-  
-  def test_must_add_minutes_in_a_patterned_week
-    start=DateTime.new(2000,1,1,0,0) #saturday
-    finish=DateTime.new(2005,12,31,8,59) #saturday
-    working_week=week(start,finish,0)
-    working_week.workpattern(:sun,clock(9,0),clock(9,13),1) 
-    
-    working_week.workpattern(:weekday,clock(9,0),clock(11,59),1)
-    working_week.workpattern(:weekday,clock(13,0),clock(17,59),1)
-    
-    working_week.workpattern(:mon,clock(0,0),clock(23,59),0) 
-    working_week.workpattern(:mon,clock(9,0),clock(9,13),1)
-    working_week.workpattern(:mon,clock(10,1),clock(10,1),1)        
-    
-    
-    [# yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight
-     [ 2000, 1, 1, 0, 0,    0,   false, 2000,  1,  1,  0,  0,     0,   false],
-     [ 2000, 1, 1, 0, 0,    1,   false, 2000,  1,  2,  9,  1,     0,   false],
-     [ 2000, 1, 2, 9, 0,   14,   false, 2000,  1,  2,  9,  14,     0,   false], #Issue #9 - getting wrong time when hour had exactly the right number of minutes
-     [ 2000, 1, 2, 9, 0,   15,   false, 2000,  1,  3,  9,  1,     0,   false],
-     [ 2000, 1, 2, 9, 0,   29,   false, 2000,  1,  3,  10,  2,     0,   false],     
-     [ 2000, 1, 2, 9, 0, 1950,   false, 2000,  1,  9,   9,  1,     0,   false],
-     [ 2005,12,25, 9, 0, 1950,   false, 2006,  1,  1,   0,  0,     1,   false],
-     [ 2005,12,25, 9, 0, 1949,   false, 2005, 12, 30,  18,  0,     0,   false]#,          
-    ].each {|yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight|
-      start=DateTime.new(yyyy,mm,dd,hh,mn)   
-      result_date, result_duration,result_midnight= working_week.calc(start,durtn,midnight)
-      assert_equal DateTime.new(ryyyy,rmm,rdd,rhh,rmn), result_date, "result_date for working_week.calc(#{start},#{durtn},#{midnight})"
-      assert_equal rdurtn, result_duration,"result_duration for working_week.calc(#{start},#{durtn},#{midnight})"
-      assert_equal rmidnight, result_midnight,"result_midnight for working_week.calc(#{start},#{durtn},#{midnight})"      
-    }
+
+  def test_must_add_minutes_from_start_of_resting_week
+    result_date, result_duration, midnight_flag = @resting_week.calc(DateTime.new(2000,1,3,0,0),990)
+    assert_equal DateTime.new(2000,1,10,0,0), result_date
+    refute midnight_flag
+    assert_equal 990, result_duration
   end
-  
-  def test_must_subtract_minutes_in_a_working_week
-    start=DateTime.new(2000,1,1,0,0)
-    finish=DateTime.new(2005,12,31,8,59)
-    working_week=week(start,finish,1)
-    [# yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight
-     [ 2000, 1, 1, 0, 0,    0,   false, 2000,  1,  1,  0,  0,     0,   false],
-     [ 2005,12,31, 0, 0,  -10,   false, 2005, 12, 30, 23, 50,     0,   false],
-     [ 2005,12,31, 0, 0,   -1,   false, 2005, 12, 30, 23, 59,     0,   false],
-     [ 2005,12,31, 0, 1,   -2,   false, 2005, 12, 30, 23, 59,     0,   false], #Issue 6 - available minutes not calculating correctly for a time of 00:01
-     [ 2000, 1, 1, 0, 1,   -2,   false, 1999, 12, 31,  0,  0,     -1,   true], #Issue 6 - available minutes not calculating correctly for a time of 00:01
-     [ 2000, 1, 1, 0, 0,    0,    true, 2000,  1,  1,  0,  0,     0,   false],
-     [ 2005,12,31, 0, 0,  -10,    true, 2005, 12, 31, 23, 50,     0,   false],
-     [ 2005,12,31, 0, 0,   -1,    true, 2005, 12, 31, 23, 59,     0,   false],
-     [ 2005,12,31, 0, 1,   -2,    true, 2005, 12, 31, 23, 58,     0,   false],#Issue 7 - midnight flag should override hour and minutes     
-     [ 2000, 1, 1, 0, 1,   -2,    true, 2000,  1,  1, 23, 58,     0,   false] #Issue 7 - midnight flag should override hour and minutes     
-    ].each {|yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight|
-      start=DateTime.new(yyyy,mm,dd,hh,mn)
-      result_date, result_duration,result_midnight= working_week.calc(start,durtn,midnight)
-      assert_equal DateTime.new(ryyyy,rmm,rdd,rhh,rmn), result_date, "result_date for working_week.calc(#{start},#{durtn},#{midnight})"
-      assert_equal rdurtn, result_duration,"result_duration for working_week.calc(#{start},#{durtn},#{midnight})"
-      assert_equal rmidnight, result_midnight,"result_midnight for working_week.calc(#{start},#{durtn},#{midnight})"      
-    }
+
+  def test_must_add_minutes_to_last_minute_of_a_resting_week
+    result_date, result_duration, midnight_flag = @resting_week.calc(DateTime.new(2000,1,9,23,59),2430)
+    assert_equal DateTime.new(2000,1,10,0,0), result_date
+    refute midnight_flag
+    assert_equal 2430, result_duration
   end
-  
-  def test_must_subtract_minutes_in_a_resting_week
-    start=DateTime.new(2000,1,1,0,0)
-    finish=DateTime.new(2005,12,31,8,59)
-    resting_week=week(start,finish,0)
-    [# yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight
-     [ 2000, 1, 1, 0, 0,    0,   false, 2000,  1,  1,  0,  0,     0,    false],
-     [ 2005,12,31, 0, 0,  -10,   false, 1999, 12, 31,  0,  0,   -10,     true],
-     [ 2005,12,31, 0, 0,   -1,   false, 1999, 12, 31,  0,  0,    -1,     true],
-     [ 2005,12,31, 0, 1,   -2,   false, 1999, 12, 31,  0,  0,    -2,     true],
-     [ 2000, 1, 1, 0, 1,   -2,   false, 1999, 12, 31,  0,  0,    -2,     true]
-    ].each {|yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight|
-      start=DateTime.new(yyyy,mm,dd,hh,mn)
-      result_date, result_duration, result_midnight= resting_week.calc(start,durtn,midnight)
-      assert_equal DateTime.new(ryyyy,rmm,rdd,rhh,rmn), result_date, "result_date for resting_week.calc(#{start},#{durtn},#{midnight})"
-      assert_equal rdurtn, result_duration,"result_duration for resting_week.calc(#{start},#{durtn},#{midnight})"
-      assert_equal rmidnight, result_midnight,"result_midnight for resting_week.calc(#{start},#{durtn},#{midnight})"      
-    }
+
+  def test_must_add_zero_minutes_in_a_resting_week
+    result_date, result_duration, midnight_flag = @resting_week.calc(DateTime.new(2000,1,3,7,31),0)
+    assert_equal DateTime.new(2000,1,3,7,31), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_add_minutes_from_working_in_a_pattern_week_result_in_same_day
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,3,10,11),110)
+    assert_equal DateTime.new(2000,1,3,12,1), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_add_minutes_from_resting_in_a_pattern_week_result_in_same_day
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,3,12,45),126)
+    assert_equal DateTime.new(2000,1,3,15,7), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_add_minutes_from_working_in_a_pattern_week_result_in_next_day
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,3,10,11),379)
+    assert_equal DateTime.new(2000,1,4,9,1), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_add_minutes_from_resting_in_a_pattern_week_result_in_next_day
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,3,12,45),240)
+    assert_equal DateTime.new(2000,1,4,9,1), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_add_minutes_from_working_in_a_working_week_result_in_later_day
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,3,10,11),828)
+    assert_equal DateTime.new(2000,1,5,9,1), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_add_minutes_from_resting_in_a_working_week_result_in_later_day
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,3,12,45),689)
+    assert_equal DateTime.new(2000,1,5,9,1), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_add_0_minutes_from_working_in_a_resting_week
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,3,10,11),0)
+    assert_equal DateTime.new(2000,1,3,10,11), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_add_0_minutes_from_resting_in_a_resting_week
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,3,12,45),0)
+    assert_equal DateTime.new(2000,1,3,12,45), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_add_too_many_minutes_in_a_pattern__week
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,3,10,11),2175)
+    assert_equal DateTime.new(2000,1,10,0,0), result_date
+    refute midnight_flag
+    assert_equal 1, result_duration
+  end
+
+  def test_must_subtract_minutes_in_a_working_week_result_in_same_day
+    result_date, result_duration, midnight_flag = @working_week.calc(DateTime.new(2000,1,8,7,31),-29)
+    assert_equal DateTime.new(2000,1,8,7,2), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_subtract_minutes_in_a_working_week_result_in_previous_day
+    result_date, result_duration, midnight_flag = @working_week.calc(DateTime.new(2000,1,8,7,31),-452)
+    assert_equal DateTime.new(2000,1,7,23,59), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_subtract_minutes_in_a_working_week_result_in_earlier_day
+    result_date, result_duration, midnight_flag = @working_week.calc(DateTime.new(2000,1,8,7,31),-1892)
+    assert_equal DateTime.new(2000,1,6,23,59), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_subtract_minutes_in_a_working_week_result_at_start_of_day
+    result_date, result_duration, midnight_flag = @working_week.calc(DateTime.new(2000,1,8,7,31),-451)
+    assert_equal DateTime.new(2000,1,8,0,0), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_subtract_minutes_in_a_working_week_result_at_start_of_previous_day
+    result_date, result_duration, midnight_flag = @working_week.calc(DateTime.new(2000,1,8,7,31),-1891)
+    assert_equal DateTime.new(2000,1,7,0,0), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_subtract_too_many_minutes_from_a_working_week
+    result_date, result_duration, midnight_flag = @working_week.calc(DateTime.new(2000,1,8,7,31),-7652)
+    assert_equal DateTime.new(2000,1,2,0,0), result_date
+    assert midnight_flag
+    assert_equal -1, result_duration
+  end
+
+  def test_must_subtract_1_minute_from_start_of_next_day_after_working_week
+    result_date, result_duration, midnight_flag = @working_week.calc(DateTime.new(2000,1,9,0,0),-1,true)
+    assert_equal DateTime.new(2000,1,9,23,59), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_subtract_2_minutes_from_start_of_next_day_after_working_week
+    result_date, result_duration, midnight_flag = @working_week.calc(DateTime.new(2000,1,9,0,0),-2,true)
+    assert_equal DateTime.new(2000,1,9,23,58), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_subtract_minutes_from_last_day_in_a_resting_week
+    result_date, result_duration, midnight_flag = @resting_week.calc(DateTime.new(2000,1,10,7,31),-29)
+    assert_equal DateTime.new(2000,1,2,0,0), result_date
+    assert midnight_flag
+    assert_equal -29, result_duration
+  end
+
+  def test_must_subtract_minutes_from_middle_day_in_a_resting_week
+    result_date, result_duration, midnight_flag = @resting_week.calc(DateTime.new(2000,1,8,7,31),-452)
+    assert_equal DateTime.new(2000,1,2,0,0), result_date
+    assert midnight_flag
+    assert_equal -452, result_duration
+  end
+
+  def test_must_subtract_minutes_from_start_of_resting_week
+    result_date, result_duration, midnight_flag = @resting_week.calc(DateTime.new(2000,1,3,0,0),-1892)
+    assert_equal DateTime.new(2000,1,2,0,0), result_date
+    assert midnight_flag
+    assert_equal -1892, result_duration
+  end
+
+  def test_must_subtract_minutes_from_start_of_next_day_after_resting_week
+    result_date, result_duration, midnight_flag = @resting_week.calc(DateTime.new(2000,1,9,0,0),-1,true)
+    assert_equal DateTime.new(2000,1,2,0,0), result_date
+    assert midnight_flag
+    assert_equal -1, result_duration
   end
   
-  def test_must_subtract_minutes_in_a_patterned_week
-    start=DateTime.new(2000,1,1,0,0) #saturday
-    finish=DateTime.new(2005,12,31,8,59) #saturday
-    working_week=week(start,finish,0)
-    working_week.workpattern(:sun,clock(9,0),clock(9,13),1) 
-    
-    working_week.workpattern(:weekday,clock(9,0),clock(11,59),1)
-    working_week.workpattern(:weekday,clock(13,0),clock(17,59),1)
-    
-    working_week.workpattern(:mon,clock(0,0),clock(23,59),0) 
-    working_week.workpattern(:mon,clock(9,0),clock(9,13),1)
-    working_week.workpattern(:mon,clock(10,1),clock(10,1),1)        
-    
-    
-    [# yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight
-     [ 2000, 1, 1, 0, 0,    0,   false, 2000,  1,  1,  0,  0,     0,   false],
-     [ 2000, 1, 1, 0, 0,   -1,   false, 1999, 12, 31,  0,  0,     -1,   true],
-     [ 2000, 1, 2, 9, 0,   14,   false, 2000,  1,  2,  9,  14,     0,   false], 
-     [ 2000, 1, 2, 9, 0,   15,   false, 2000,  1,  3,  9,  1,     0,   false],
-     [ 2000, 1, 2, 9, 0,   29,   false, 2000,  1,  3,  10,  2,     0,   false],     
-     [ 2000, 1, 2, 9, 0, 1950,   false, 2000,  1,  9,   9,  1,     0,   false],
-     [ 2005,12,25, 9, 0, 1950,   false, 2006,  1,  1,   0,  0,     1,   false],
-     [ 2005,12,25, 9, 0, 1949,   false, 2005, 12, 30,  18,  0,     0,   false]#,          
-    ].each {|yyyy,mm,dd,hh,mn,durtn,midnight,ryyyy,rmm,rdd,rhh,rmn,rdurtn,rmidnight|
-      start=DateTime.new(yyyy,mm,dd,hh,mn)   
-      result_date, result_duration,result_midnight= working_week.calc(start,durtn,midnight)
-      assert_equal DateTime.new(ryyyy,rmm,rdd,rhh,rmn), result_date, "result_date for working_week.calc(#{start},#{durtn},#{midnight})"
-      assert_equal rdurtn, result_duration,"result_duration for working_week.calc(#{start},#{durtn},#{midnight})"
-      assert_equal rmidnight, result_midnight,"result_midnight for working_week.calc(#{start},#{durtn},#{midnight})"      
-    }
+  def test_must_subtract_minutes_from_resting_day_in_a_pattern_week
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,8,13,29),-29)
+    assert_equal DateTime.new(2000,1,7,16,31), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_subtract_minutes_from_working_day_in_a_pattern_week
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,7,13,29),-29)
+    assert_equal DateTime.new(2000,1,7,12,29), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_subtract_minutes_in_a_pattern_week_result_in_previous_day
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,7,9,1),-2)
+    assert_equal DateTime.new(2000,1,6,16,59), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_subtract_minutes_in_a_pattern_week_result_in_earlier_day
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,7,13,29),-240)
+    assert_equal DateTime.new(2000,1,6,16,58), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_subtract_minutes_in_a_pattern_week_result_at_start_of_day
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,7,13,29),-238)
+    assert_equal DateTime.new(2000,1,7,9,0), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_subtract_minutes_in_a_pattern_week_result_at_start_of_previous_day
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,7,13,29),-687)
+    assert_equal DateTime.new(2000,1,6,9,0), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_subtract_too_many_minutes_from_a_pattern_week
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,7,9,0),-1797)
+    assert_equal DateTime.new(2000,1,2,0,0), result_date
+    assert midnight_flag
+    assert_equal -1, result_duration
   end
+
+  def test_must_subtract_1_minute_from_start_of_next_day_after_pattern_week
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,9,0,0),-1,true)
+    assert_equal DateTime.new(2000,1,7,16,59), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+  def test_must_subtract_2_minutes_from_start_of_next_day_after_pattern_week
+    result_date, result_duration, midnight_flag = @pattern_week.calc(DateTime.new(2000,1,9,0,0),-2,true)
+    assert_equal DateTime.new(2000,1,7,16,58), result_date
+    refute midnight_flag
+    assert_equal 0, result_duration
+  end
+
+######################################################
+#    start=DateTime.new(2000,1,3)
+#    finish=DateTime.new(2000,1,9)
+#
+#    @pattern_week=Workpattern::Week.new(start,finish,1)
+#    @pattern_week.workpattern(:weekend,Workpattern.clock(0,0),Workpattern.clock(23,59),0)
+#    @pattern_week.workpattern(:weekday,Workpattern.clock(0,0),Workpattern.clock(8,59),0)
+#    @pattern_week.workpattern(:weekday,Workpattern.clock(12,30),Workpattern.clock(13,0),0)
+#    @pattern_week.workpattern(:weekday,Workpattern.clock(17,0),Workpattern.clock(23,59),0)
+
+### @pattern_week centric
+
   
   def test_must_calculate_difference_between_dates_in_working_week
-    start=DateTime.new(2012,10,1)
-    finish=DateTime.new(2012,10,7)
-    week=week(start,finish,1)
-        
-    [
-     [ 2012,10, 1, 0, 0, 2012,10, 1, 0, 0,    0,2012,10, 1, 0, 0],
-     [ 2012,10, 1, 0, 0, 2012,10, 1, 0, 1,    1,2012,10, 1, 0, 1],
-     [ 2012,10, 1, 0,50, 2012,10, 1, 0,59,    9,2012,10, 1, 0,59],
-     [ 2012,10, 1, 8,50, 2012,10, 1, 9, 0,   10,2012,10, 1, 9, 0],
-     [ 2012,10, 1, 0, 0, 2012,10, 1,23,59, 1439,2012,10, 1,23,59],
-     [ 2012,10, 1, 0, 0, 2012,10, 2, 0, 0, 1440,2012,10, 2, 0, 0],
-     [ 2012,10, 1, 0, 0, 2012,10, 2, 0, 1, 1441,2012,10, 2, 0, 1],     
-     [ 2012,10, 1, 0, 0, 2013, 3,22, 6,11,10080,2012,10, 8, 0, 0],
-     [ 2012,10, 1, 0, 1, 2012,10, 1, 0, 0,    1,2012,10, 1, 0, 1],
-     [ 2012,10, 1, 0,59, 2012,10, 1, 0,50,    9,2012,10, 1, 0,59],
-     [ 2012,10, 1, 9, 0, 2012,10, 1, 8,50,   10,2012,10, 1, 9, 0],
-     [ 2012,10, 1,23,59, 2012,10, 1, 0, 0, 1439,2012,10, 1,23,59],
-     [ 2012,10, 2, 0, 0, 2012,10, 1, 0, 0, 1440,2012,10, 2, 0, 0],
-     [ 2012,10, 2, 0, 1, 2012,10, 1, 0, 0, 1441,2012,10, 2, 0, 1],     
-     [ 2013, 3,22, 6,11, 2012,10, 1, 0, 0,10080,2012,10, 8, 0, 0],
-     [ 2012,10, 2, 6,11, 2012,10, 4, 8, 9, 2998,2012,10, 4, 8, 9]
-    ].each {|start_year, start_month, start_day, start_hour,start_min,
-             finish_year, finish_month, finish_day, finish_hour,finish_min,result,
-             y,m,d,h,n|
-      start=DateTime.new(start_year, start_month, start_day, start_hour,start_min)
-      finish=DateTime.new(finish_year, finish_month, finish_day, finish_hour,finish_min)
-      expected_date=DateTime.new(y,m,d,h,n)       
-      duration, result_date=week.diff(start,finish)
-      assert_equal result, duration,"duration diff(#{start}, #{finish})"
-      assert_equal expected_date, result_date,"date diff(#{start}, #{finish})"
-    }
+    late_date=DateTime.new(2000,1,6,9,32)
+    early_date=DateTime.new(2000,1,6,8,20)
+    result_dur, result_date = @working_week.diff(early_date,late_date)
+    assert_equal 72, result_dur
+    assert_equal late_date, result_date
   end
 
   def test_must_calculate_difference_between_dates_in_resting_week
-
-    start=DateTime.new(2012,10,1)
-    finish=DateTime.new(2012,10,7)
-    week=week(start,finish,0)
-  
-    [
-     [ 2012,10, 1, 0, 0, 2012,10, 1, 0, 0,   0,2012,10, 1, 0, 0],
-     [ 2012,10, 1, 0, 0, 2012,10, 1, 0, 1,   0,2012,10, 1, 0, 1],
-     [ 2012,10, 1, 0,50, 2012,10, 1, 0,59,   0,2012,10, 1, 0,59],
-     [ 2012,10, 1, 8,50, 2012,10, 1, 9, 0,   0,2012,10, 1, 9, 0],
-     [ 2012,10, 1, 0, 0, 2012,10, 1,23,59,   0,2012,10, 1,23,59],
-     [ 2012,10, 1, 0, 0, 2012,10, 2, 0, 0,   0,2012,10, 2, 0, 0],
-     [ 2012,10, 1, 0, 0, 2012,10, 2, 0, 1,   0,2012,10, 2, 0, 1],     
-     [ 2012,10, 1, 0, 0, 2013, 3,22, 6,11,   0,2012,10, 8, 0, 0],
-     [ 2012,10, 1, 0, 1, 2012,10, 1, 0, 0,   0,2012,10, 1, 0, 1],
-     [ 2012,10, 1, 0,59, 2012,10, 1, 0,50,   0,2012,10, 1, 0,59],
-     [ 2012,10, 1, 9, 0, 2012,10, 1, 8,50,   0,2012,10, 1, 9, 0],
-     [ 2012,10, 1,23,59, 2012,10, 1, 0, 0,   0,2012,10, 1,23,59],
-     [ 2012,10, 2, 0, 0, 2012,10, 1, 0, 0,   0,2012,10, 2, 0, 0],
-     [ 2012,10, 2, 0, 1, 2012,10, 1, 0, 0,   0,2012,10, 2, 0, 1],     
-     [ 2013, 3,22, 6,11, 2012,10, 1, 0, 0,   0,2012,10, 8, 0, 0]
-    ].each {|start_year, start_month, start_day, start_hour,start_min,
-             finish_year, finish_month, finish_day, finish_hour,finish_min,result,
-             y,m,d,h,n|
-      start=DateTime.new(start_year, start_month, start_day, start_hour,start_min)
-      finish=DateTime.new(finish_year, finish_month, finish_day, finish_hour,finish_min)
-      expected_date=DateTime.new(y,m,d,h,n)       
-      duration, result_date=week.diff(start,finish)
-      assert_equal result, duration,"duration diff(#{start}, #{finish})"
-      assert_equal expected_date, result_date,"date diff(#{start}, #{finish})"
-     }
+    late_date=DateTime.new(2000,1,6,9,32)
+    early_date=DateTime.new(2000,1,6,8,20)
+    result_dur, result_date = @resting_week.diff(early_date,late_date)
+    assert_equal 0, result_dur
+    assert_equal late_date, result_date
   end
 
   def test_must_calculate_difference_between_dates_in_pattern_week
-    start=DateTime.new(2000,1,1)
-    finish=DateTime.new(2012,12,31)
-    week=week(start,finish,1)
-    return
-    [[0,0,8,59],
-     [12,0,12,59],
-     [17,0,22,59]
-    ].each {|start_hour,start_min,finish_hour,finish_min|
-      week.workpattern(clock(start_hour, start_min),
-                      clock(finish_hour, finish_min),
-                      0)
-    }
-    assert_equal 480, day.total, "minutes in patterned day should be 480"
-    assert_equal 1, day.minutes(16,59,16,59),"16:59 should be 1"
-    assert_equal 0, day.minutes(17,0,17,0),"17:00 should be 0"
-    assert_equal 0, day.minutes(22,59,22,59),"22:59 should be 0"
-    assert_equal 1, day.minutes(23,0,23,0),"23:00 should be 1"
-  
-    [
-     [ 2012,10, 1, 0, 0, 2012,10, 1, 0, 0,   0,2012,10, 1, 0, 0],
-     [ 2012,10, 1, 0, 0, 2012,10, 1, 0, 1,   0,2012,10, 1, 0, 1],
-     [ 2012,10, 1, 0,50, 2012,10, 1, 9,59,  59,2012,10, 1, 9,59],
-     [ 2012,10, 1, 8,50, 2012,10, 1, 9,10,  10,2012,10, 1, 9,10],
-     [ 2012,10, 1, 0, 0, 2012,10, 1,23,59, 479,2012,10, 1,23,59],
-     [ 2012,10, 1, 0, 0, 2012,10, 2, 0, 0, 480,2012,10, 2, 0, 0],
-     [ 2012,10, 1, 0, 0, 2012,10, 2, 0, 1, 480,2012,10, 2, 0, 0],     
-     [ 2012,10, 1, 0, 0, 2013, 3,22, 6,11, 480,2012,10, 2, 0, 0],
-     [ 2012,10, 1, 0, 1, 2012,10, 1, 0, 0,   0,2012,10, 1, 0, 1],
-     [ 2012,10, 1, 9,59, 2012,10, 1, 0,50,  59,2012,10, 1, 9,59],
-     [ 2012,10, 1, 9, 0, 2012,10, 1, 8,50,   0,2012,10, 1, 9, 0],
-     [ 2012,10, 1,23,59, 2012,10, 1, 0, 0, 479,2012,10, 1,23,59],
-     [ 2012,10, 2, 0, 0, 2012,10, 1, 0, 0, 480,2012,10, 2, 0, 0],
-     [ 2012,10, 2, 0, 1, 2012,10, 1, 0, 0, 480,2012,10, 2, 0, 0],     
-     [ 2013, 3,22, 6,11, 2012,10, 1, 0, 0, 480,2012,10, 2, 0, 0]
-    ].each {|start_year, start_month, start_day, start_hour,start_min,
-             finish_year, finish_month, finish_day, finish_hour,finish_min,result,
-             y,m,d,h,n|
-      start=DateTime.new(start_year, start_month, start_day, start_hour,start_min)
-      finish=DateTime.new(finish_year, finish_month, finish_day, finish_hour,finish_min)
-      expected_date=DateTime.new(y,m,d,h,n)       
-      duration, result_date=day.diff(start,finish)
-      assert_equal result, duration,"duration diff(#{start}, #{finish})"
-      assert_equal expected_date, result_date,"date diff(#{start}, #{finish})"
-     }
-
+    late_date=DateTime.new(2000,1,6,13,1)
+    early_date=DateTime.new(2000,1,6,12,29)
+    result_dur, result_date = @pattern_week.diff(early_date,late_date)
+    assert_equal 1, result_dur
+    assert_equal late_date, result_date
   end
   
   private