runt 0.6.0 → 0.7.0

data/test/pdatetest.rb

@@ -1,117 +1,147 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
-require 'date'
-require 'runt'
-
-# Unit tests for PDate class
-# Author:: Matthew Lipper
-class PDateTest < Test::Unit::TestCase
-
-  include Runt
-
-  def setup
-    # 2010 (August - ignored)
-    @year_prec = PDate.year(2010,8)
-    #August, 2004
-    @month_prec = PDate.month(2004,8)
-    #January 25th, 2004 (11:39 am - ignored)
-    @day_prec = PDate.day(2004,1,25,11,39)
-    #11:59(:04 - ignored), December 31st, 1999
-    @minute_prec = PDate.min(1999,12,31,23,59,4)
-    #12:00:10 am, March 1st, 2004
-    @second_prec = PDate.sec(2004,3,1,0,0,10)
-  end
-
-  def test_marshal
-    # Thanks to Jodi Showers for finding/fixing this bug
-    pdate=PDate.new(2004,2,29,22,13,2)
-    assert_not_nil pdate.date_precision
-    data=Marshal.dump pdate
-    obj=Marshal.load data
-    assert_not_nil obj.date_precision
-  end
-
-  def test_include
-    pdate = PDate.new(2006,3,10)
-    assert(pdate.include?(Date.new(2006,3,10)))
-    date = Date.new(2006,3,10)
-    assert(date.include?(PDate.new(2006,3,10)))
-  end
-
-  def test_new
-    date = PDate.new(2004,2,29)
-    assert(!date.date_precision.nil?)
-    date_time = PDate.new(2004,2,29,22,13,2)
-    assert(!date_time.date_precision.nil?)
-    date2 = PDate.day(2004,2,29)
-    assert(date==date2)
-    date_time2 = PDate.sec(2004,2,29,22,13,2)
-    assert(date_time==date_time2)
-  end
-
-  def test_plus
-    assert(PDate.year(2022,12)==(@year_prec+12))
-    assert(PDate.month(2005,2)==(@month_prec+6))
-    assert(PDate.day(2004,2,1)==(@day_prec+7))
-    assert(PDate.min(2000,1,1,0,0)==(@minute_prec+1))
-    assert(PDate.sec(2004,3,1,0,0,21)==(@second_prec+11))
-  end
-
-  def test_minus
-    assert(PDate.year(1998,12)==(@year_prec-12))
-    assert(PDate.month(2002,6)==(@month_prec-26))
-    #Hmmm...FIXME? @day_prec-26 == 12/31??
-    assert(PDate.day(2003,12,30)==(@day_prec-26))
-    assert(PDate.min(1999,12,31,21,57)==(@minute_prec-122))
-    assert(PDate.sec(2004,2,29,23,59,59)==(@second_prec-11))
-  end
-  def test_spaceship_comparison_operator
-    sec_prec = PDate.sec(2002,8,28,6,04,02)
-    assert(PDate.year(1998,12)<sec_prec)
-    assert(PDate.month(2002,9)>sec_prec)
-    assert(PDate.day(2002,8,28)==sec_prec)
-    assert(PDate.min(1999,12,31,21,57)<sec_prec)
-    assert(DateTime.new(2002,8,28,6,04,02)==sec_prec)
-    assert(Date.new(2004,8,28)>sec_prec)
-  end
-  def test_succ
-    #~ fail("FIXME! Implement succ")
-  end
-  def test_range
-    #11:50 pm (:22 seconds ignored), February 2nd, 2004
-    min1 = PDate.min(2004,2,29,23,50,22)
-    #12:02 am , March 1st, 2004
-    min2 = PDate.min(2004,3,1,0,2)
-    #Inclusive Range w/minute precision
-    r_min = min1..min2
-    assert( r_min.include?(PDate.min(2004,2,29,23,50,22)) )
-    assert( r_min.include?(PDate.min(2004,3,1,0,2)) )
-    assert( r_min.include?(PDate.min(2004,3,1,0,0)) )
-    assert( ! r_min.include?(PDate.min(2004,3,1,0,3)) )
-    #Exclusive Range w/minute precision
-    r_min = min1...min2
-    assert( r_min.include?(PDate.min(2004,2,29,23,50,22)) )
-    assert( !r_min.include?(PDate.min(2004,3,1,0,2)) )
-  end
-
-  def test_create_with_class_methods
-    #December 12th, 1968
-    no_prec = PDate.civil(1968,12,12)
-    #December 12th, 1968 (at 11:15 am - ignored)
-    day_prec = PDate.day(1968,12,12,11,15)
-    assert(no_prec==day_prec, "PDate instance does not equal precisioned instance.")
-    #December 2004 (24th - ignored)
-    month_prec1 = PDate.month(2004,12,24)
-    #December 31st, 2004  (31st - ignored)
-    month_prec2 = PDate.month(2004,12,31)
-    assert(month_prec1==month_prec2, "PDate.month instances not equal.")
-    #December 2004
-    month_prec3 = PDate.month(2004,12)
-    assert(month_prec1==month_prec3, "PDate.month instances not equal.")
-    assert(month_prec2==month_prec3, "PDate.month instances not equal.")
-    #December 2003
-    month_prec4 = PDate.month(2003,12)
-    assert(month_prec4!=month_prec1, "PDate.month instances not equal.")
-  end
-end
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'date'
+require 'runt'
+
+# Unit tests for PDate class
+# Author:: Matthew Lipper
+class PDateTest < Test::Unit::TestCase
+
+  include Runt
+
+  def setup
+    # 2010 (August - ignored)
+    @year_prec = PDate.year(2010,8)
+    #August, 2004
+    @month_prec = PDate.month(2004,8)
+    #January 25th, 2004 (11:39 am - ignored)
+    @week_prec = PDate.week(2004,1,25,11,39)
+    #January 25th, 2004 (11:39 am - ignored)
+    @day_prec = PDate.day(2004,1,25,11,39)
+    #11:59(:04 - ignored), December 31st, 1999
+    @minute_prec = PDate.min(1999,12,31,23,59,4)
+    #12:00:10 am, March 1st, 2004
+    @second_prec = PDate.sec(2004,3,1,0,0,10)
+  end
+
+  def test_marshal
+    # Thanks to Jodi Showers for finding/fixing this bug
+    pdate=PDate.new(2004,2,29,22,13,2)
+    assert_not_nil pdate.date_precision
+    data=Marshal.dump pdate
+    obj=Marshal.load data
+    assert_not_nil obj.date_precision
+  end
+
+  def test_include
+    pdate = PDate.new(2006,3,10)
+    assert(pdate.include?(Date.new(2006,3,10)))
+    date = Date.new(2006,3,10)
+    assert(date.include?(PDate.new(2006,3,10)))
+  end
+
+  def test_new
+    date = PDate.new(2004,2,29)
+    assert(!date.date_precision.nil?)
+    date_time = PDate.new(2004,2,29,22,13,2)
+    assert(!date_time.date_precision.nil?)
+    date2 = PDate.day(2004,2,29)
+    assert(date==date2)
+    date_time2 = PDate.sec(2004,2,29,22,13,2)
+    assert(date_time==date_time2)
+  end
+
+  def test_plus
+    assert(PDate.year(2022,12)==(@year_prec+12))
+    assert(PDate.month(2005,2)==(@month_prec+6))
+    assert(PDate.week(2004,2,1)==(@week_prec+1))
+    assert(PDate.day(2004,2,1)==(@day_prec+7))
+    assert(PDate.min(2000,1,1,0,0)==(@minute_prec+1))
+    assert(PDate.sec(2004,3,1,0,0,21)==(@second_prec+11))
+  end
+
+  def test_minus
+    assert(PDate.year(1998,12)==(@year_prec-12))
+    assert(PDate.month(2002,6)==(@month_prec-26))
+    assert(PDate.week(2004,1,11)==(@week_prec-2))    
+    #Hmmm...FIXME? @day_prec-26 == 12/31??
+    assert(PDate.day(2003,12,30)==(@day_prec-26))
+    assert(PDate.min(1999,12,31,21,57)==(@minute_prec-122))
+    assert(PDate.sec(2004,2,29,23,59,59)==(@second_prec-11))
+  end
+  def test_spaceship_comparison_operator
+    sec_prec = PDate.sec(2002,8,28,6,04,02)
+    assert(PDate.year(1998,12)<sec_prec)
+    assert(PDate.month(2002,9)>sec_prec)
+    assert(PDate.week(2002,8,28)==sec_prec)
+    assert(PDate.day(2002,8,28)==sec_prec)
+    assert(PDate.min(1999,12,31,21,57)<sec_prec)
+    assert(DateTime.new(2002,8,28,6,04,02)==sec_prec)
+    assert(Date.new(2004,8,28)>sec_prec)
+  end
+  def test_succ
+    #~ fail("FIXME! Implement succ")
+  end
+  def test_range
+    #11:50 pm (:22 seconds ignored), February 2nd, 2004
+    min1 = PDate.min(2004,2,29,23,50,22)
+    #12:02 am , March 1st, 2004
+    min2 = PDate.min(2004,3,1,0,2)
+    #Inclusive Range w/minute precision
+    r_min = min1..min2
+    assert( r_min.include?(PDate.min(2004,2,29,23,50,22)) )
+    assert( r_min.include?(PDate.min(2004,3,1,0,2)) )
+    assert( r_min.include?(PDate.min(2004,3,1,0,0)) )
+    assert( ! r_min.include?(PDate.min(2004,3,1,0,3)) )
+    #Exclusive Range w/minute precision
+    r_min = min1...min2
+    assert( r_min.include?(PDate.min(2004,2,29,23,50,22)) )
+    assert( !r_min.include?(PDate.min(2004,3,1,0,2)) )
+  end
+
+  def test_create_with_class_methods
+    #December 12th, 1968
+    no_prec = PDate.civil(1968,12,12)
+    #December 12th, 1968 (at 11:15 am - ignored)
+    day_prec = PDate.day(1968,12,12,11,15)
+    assert(no_prec==day_prec, "PDate instance does not equal precisioned instance.")
+    #December 2004 (24th - ignored)
+    month_prec1 = PDate.month(2004,12,24)
+    #December 31st, 2004  (31st - ignored)
+    month_prec2 = PDate.month(2004,12,31)
+    assert(month_prec1==month_prec2, "PDate.month instances not equal.")
+    #December 2004
+    month_prec3 = PDate.month(2004,12)
+    assert(month_prec1==month_prec3, "PDate.month instances not equal.")
+    assert(month_prec2==month_prec3, "PDate.month instances not equal.")
+    #December 2003
+    month_prec4 = PDate.month(2003,12)
+    assert(month_prec4!=month_prec1, "PDate.month instances not equal.")
+
+    one_week = [
+      PDate.week(2004, 12, 20), # Monday
+      PDate.week(2004, 12, 21), # Tuesday
+      PDate.week(2004, 12, 22), # Wednesday
+      PDate.week(2004, 12, 23), # Thursday
+      PDate.week(2004, 12, 24), # Friday
+      PDate.week(2004, 12, 25), # Saturday
+      PDate.week(2004, 12, 26), # Sunday
+    ]
+
+    one_week.each do |week_prec1|
+      one_week.each do |week_prec2|
+        assert_equal week_prec1, week_prec2
+      end
+    end
+
+    week_before = PDate.week(2004, 12, 19)
+    week_after  = PDate.week(2004, 12, 27)
+        
+    one_week.each do |week_prec|
+      assert week_prec != week_before
+      assert week_prec != week_after
+    end
+  end
+  
+end

data/test/redaytest.rb

@@ -26,5 +26,15 @@ class REDayTest < BaseExpressionTest
   def test_range_each_day_te_to_s
     assert_equal 'from 11:10PM to 01:20AM daily', REDay.new(23,10,1,20).to_s
   end
+
+  def test_less_precise_argument_and_precision_policy
+    expr = REDay.new(8,00,10,00)
+    assert expr.include?(@pdate_20040531), \
+      "Expression #{expr.to_s} should include any lower precision argument by default"
+
+    expr = REDay.new(8,00,10,00, false)
+    assert !expr.include?(@pdate_20040531), \
+      "Expression #{expr.to_s} created with less_precise_match=false should not include any lower precision argument automatically"
+  end
   
 end

data/test/reyeartest.rb

@@ -1,98 +1,99 @@
-#!/usr/bin/env ruby
-
-require 'baseexpressiontest'
-
-# Unit tests for REYear class
-# Author:: Matthew Lipper
-
-class REYearTest < BaseExpressionTest
-
-  def test_ctor_one_arg
-    expr = REYear.new(11)
-    assert expr.start_month == 11, "Start month should equal 11"
-    assert expr.end_month == 11, "End month should equal 11"
-    assert expr.start_day == REYear::NO_DAY, "Start day should equal constant NO_DAY"
-    assert expr.end_day == REYear::NO_DAY, "End day should equal constant NO_DAY"
-  end
-  
-  def test_ctor_two_args
-    expr = REYear.new(11,12)
-    assert expr.start_month == 11, "Start month should equal 11"
-    assert expr.end_month == 12, "End month should equal 12"
-    assert expr.start_day == REYear::NO_DAY, "Start day should equal constant NO_DAY"
-    assert expr.end_day == REYear::NO_DAY, "End day should equal constant NO_DAY"
-  end
-
-  def test_ctor_three_args
-    expr = REYear.new(10,21,12)
-    assert expr.start_month == 10, "Start month should equal 10"
-    assert expr.end_month == 12, "End month should equal 12"
-    assert expr.start_day == 21, "Start day should equal 21"
-    assert expr.end_day == REYear::NO_DAY, "End day should equal constant NO_DAY"
-  end
-
-  def test_ctor_three_args
-    expr = REYear.new(10,21,12,3)
-    assert expr.start_month == 10, "Start month should equal 10"
-    assert expr.end_month == 12, "End month should equal 12"
-    assert expr.start_day == 21, "Start day should equal 21"
-    assert expr.end_day == 3, "End day should equal 3"
-  end
-
-  def test_specific_days_same_month
-    expr = REYear.new(10,20,10,29)
-    assert expr.include?(@pdate_20071028), "#{expr.to_s} should include #{@pdate_20071028}" 
-    assert !expr.include?(@pdate_20071114), "#{expr.to_s} should not include #{@pdate_20071114}" 
-    assert !expr.include?(@pdate_20071030), "#{expr.to_s} should not include #{@pdate_20071030}" 
-    assert !expr.include?(@pdate_20071008), "#{expr.to_s} should not include #{@pdate_20071008}" 
-  end
-
-  def test_specific_days_different_months
-    expr = REYear.new(5,31,9,6)
-    assert expr.include?(@pdate_198606), "#{expr.to_s} should include #{@pdate_198606}" 
-    assert expr.include?(@date_20040806), "#{expr.to_s} should include #{@date_20040806}" 
-    assert !expr.include?(@pdate_20071008), "#{expr.to_s} should not include #{@pdate_20071008}"  
-  end
-
-  def test_default_days_different_months
-    expr = REYear.new(11,12)
-    assert expr.include?(@date_19611101), "#{expr.to_s} should include #{@date_19611101}"
-    assert !expr.include?(@pdate_198606), "#{expr.to_s} should not include #{@pdate_198606}" 
-  end
-
-  def test_all_defaults
-    expr = REYear.new(8)
-    assert expr.include?(@date_20040806), "#{expr.to_s} should include #{@date_20040806}" 
-    assert !expr.include?(@pdate_198606), "#{expr.to_s} should not include #{@pdate_198606}" 
-    assert !expr.include?(@date_19611101), "#{expr.to_s} should not include #{@date_19611101}"
-  end
-  
-  def test_same_days_same_month
-    # Bug #5741
-    expr = REYear.new(9,21,9,21)
-    assert expr.include?(@pdate_20060921), "#{expr.to_s} should include #{@pdate_20060921.to_s}" 
-    assert !expr.include?(@pdate_20060914), "#{expr.to_s} should not include #{@pdate_20060914.to_s}"
-  end
-
-  def test_to_s
-    assert_equal 'June 1st through July 2nd', REYear.new(6, 1, 7, 2).to_s
-  end
-  
-  def test_dates_mixin
-    expr = REYear.new(4, 28, 5, 6)
-    assert (expr.dates(@date_20040501..@date_20060504)).size == 22, "Should be 22 occurences in dates Array"
-  end
-
-  # From bug #5749 
-  def test_mixed_precision_combo
-    # 10:00 am to 10:01 am
-    ten_ish = REDay.new(10,0,10,1)
-    # September 21st every year
-    every_21_sept = REYear.new(9,21,9,21)
-    # Between 10:00 am and 10:01 am every September 21st
-    combo = ten_ish & every_21_sept
-    assert !combo.include?(@pdate_20060921), "Should not include lower precision argument"
-    assert combo.include?(@pdate_200609211001), "Should include matching precision argument which is in range"
-    assert !combo.include?(@pdate_200609211002), "Should not include matching precision argument which is out of range"
-  end
-end
+#!/usr/bin/env ruby
+
+require 'baseexpressiontest'
+
+# Unit tests for REYear class
+# Author:: Matthew Lipper
+
+class REYearTest < BaseExpressionTest
+
+  def test_ctor_one_arg
+    expr = REYear.new(11)
+    assert expr.start_month == 11, "Start month should equal 11"
+    assert expr.end_month == 11, "End month should equal 11"
+    assert expr.start_day == REYear::NO_DAY, "Start day should equal constant NO_DAY"
+    assert expr.end_day == REYear::NO_DAY, "End day should equal constant NO_DAY"
+  end
+  
+  def test_ctor_two_args
+    expr = REYear.new(11,12)
+    assert expr.start_month == 11, "Start month should equal 11"
+    assert expr.end_month == 12, "End month should equal 12"
+    assert expr.start_day == REYear::NO_DAY, "Start day should equal constant NO_DAY"
+    assert expr.end_day == REYear::NO_DAY, "End day should equal constant NO_DAY"
+  end
+
+  def test_ctor_three_args
+    expr = REYear.new(10,21,12)
+    assert expr.start_month == 10, "Start month should equal 10"
+    assert expr.end_month == 12, "End month should equal 12"
+    assert expr.start_day == 21, "Start day should equal 21"
+    assert expr.end_day == REYear::NO_DAY, "End day should equal constant NO_DAY"
+  end
+
+  def test_ctor_three_args
+    expr = REYear.new(10,21,12,3)
+    assert expr.start_month == 10, "Start month should equal 10"
+    assert expr.end_month == 12, "End month should equal 12"
+    assert expr.start_day == 21, "Start day should equal 21"
+    assert expr.end_day == 3, "End day should equal 3"
+  end
+
+  def test_specific_days_same_month
+    expr = REYear.new(10,20,10,29)
+    assert expr.include?(@pdate_20071028), "#{expr.to_s} should include #{@pdate_20071028}" 
+    assert !expr.include?(@pdate_20071114), "#{expr.to_s} should not include #{@pdate_20071114}" 
+    assert !expr.include?(@pdate_20071030), "#{expr.to_s} should not include #{@pdate_20071030}" 
+    assert !expr.include?(@pdate_20071008), "#{expr.to_s} should not include #{@pdate_20071008}" 
+    assert !expr.include?(@pdate_20060921), "#{expr.to_s} should not include #{@pdate_20060921}"
+  end
+
+  def test_specific_days_different_months
+    expr = REYear.new(5,31,9,6)
+    assert expr.include?(@pdate_198606), "#{expr.to_s} should include #{@pdate_198606}" 
+    assert expr.include?(@date_20040806), "#{expr.to_s} should include #{@date_20040806}" 
+    assert !expr.include?(@pdate_20071008), "#{expr.to_s} should not include #{@pdate_20071008}"  
+  end
+
+  def test_default_days_different_months
+    expr = REYear.new(11,12)
+    assert expr.include?(@date_19611101), "#{expr.to_s} should include #{@date_19611101}"
+    assert !expr.include?(@pdate_198606), "#{expr.to_s} should not include #{@pdate_198606}" 
+  end
+
+  def test_all_defaults
+    expr = REYear.new(8)
+    assert expr.include?(@date_20040806), "#{expr.to_s} should include #{@date_20040806}" 
+    assert !expr.include?(@pdate_198606), "#{expr.to_s} should not include #{@pdate_198606}" 
+    assert !expr.include?(@date_19611101), "#{expr.to_s} should not include #{@date_19611101}"
+  end
+  
+  def test_same_days_same_month
+    # Bug #5741
+    expr = REYear.new(9,21,9,21)
+    assert expr.include?(@pdate_20060921), "#{expr.to_s} should include #{@pdate_20060921.to_s}" 
+    assert !expr.include?(@pdate_20060914), "#{expr.to_s} should not include #{@pdate_20060914.to_s}"
+  end
+
+  def test_to_s
+    assert_equal 'June 1st through July 2nd', REYear.new(6, 1, 7, 2).to_s
+  end
+  
+  def test_dates_mixin
+    expr = REYear.new(4, 28, 5, 6)
+    assert((expr.dates(@date_20040501..@date_20060504)).size == 22, "Should be 22 occurences in dates Array")
+  end
+
+  # From bug #5749 
+  def test_mixed_precision_combo
+    # 10:00 am to 10:01 am
+    ten_ish = REDay.new(10,0,10,1)
+    # September 21st every year
+    every_21_sept = REYear.new(9,21,9,21)
+    # Between 10:00 am and 10:01 am every September 21st
+    combo = ten_ish & every_21_sept
+    assert combo.include?(@pdate_20060921), "Should include lower precision argument"
+    assert combo.include?(@pdate_200609211001), "Should include matching precision argument which is in range"
+    assert !combo.include?(@pdate_200609211002), "Should not include matching precision argument which is out of range"
+  end
+end