runt 0.7.0 → 0.9.0

data/test/daterangetest.rb

@@ -1,19 +1,17 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
-require 'runt'
-require 'date'
+require 'minitest_helper'
 
 # Unit tests for DateRange class
 #
 # Author:: Matthew Lipper
-class DateRangeTest < Test::Unit::TestCase
+class DateRangeTest < MiniTest::Unit::TestCase
 
   include Runt
 
   def test_sub_range
-    r_start = PDate.sec(2004,2,29,16,24,12)
-    r_end = PDate.sec(2004,3,2,4,22,58)
+    r_start = PDate.min(2004,2,29,16,24)
+    r_end = PDate.min(2004,3,2,4,22)
     range = DateRange.new(r_start,r_end)
     assert(range.min==r_start)
     assert(range.max==r_end)

data/test/diweektest.rb

@@ -1,32 +1,32 @@
-#!/usr/bin/env ruby
-
-require 'baseexpressiontest'
-
-# Unit tests for DIWeek class
-# Author:: Matthew Lipper
-
-class DIWeekTest < BaseExpressionTest
-
-  def test_day_in_week_te
-    expr = DIWeek.new(Friday)
-    assert expr.include?(@date_20040109), "'Friday' should include #{@date_20040109} which is a Friday"
-    assert expr.include?(@date_20040116), "'Friday' should include #{@date_20040116} which is a Friday"
-    assert !expr.include?(@date_20040125), "'Friday' should not include #{@date_20040125} which is a Sunday"
-  end
-  
-  def test_day_in_week_te_to_s
-    assert_equal 'Friday', DIWeek.new(Friday).to_s
-  end
-
-  def test_day_in_week_dates
-    expr = DIWeek.new(Sunday)
-    dates = expr.dates(@date_20050101..@date_20050131)
-    assert dates.size == 5, "There are five Sundays in January, 2005: found #{dates.size}" 
-    assert dates.include?(@date_20050102), "Should include #{@date_20050102}"
-    assert dates.include?(@date_20050109), "Should include #{@date_20050109}"
-    assert dates.include?(@date_20050116), "Should include #{@date_20050116}"
-    assert dates.include?(@date_20050123), "Should include #{@date_20050123}"
-    assert dates.include?(@date_20050130), "Should include #{@date_20050130}"
-  end
-
-end
+#!/usr/bin/env ruby
+
+require 'baseexpressiontest'
+
+# Unit tests for DIWeek class
+# Author:: Matthew Lipper
+
+class DIWeekTest < BaseExpressionTest
+
+  def test_day_in_week_te
+    expr = DIWeek.new(Friday)
+    assert expr.include?(@date_20040109), "'Friday' should include #{@date_20040109} which is a Friday"
+    assert expr.include?(@date_20040116), "'Friday' should include #{@date_20040116} which is a Friday"
+    assert !expr.include?(@date_20040125), "'Friday' should not include #{@date_20040125} which is a Sunday"
+  end
+  
+  def test_day_in_week_te_to_s
+    assert_equal 'Friday', DIWeek.new(Friday).to_s
+  end
+
+  def test_day_in_week_dates
+    expr = DIWeek.new(Sunday)
+    dates = expr.dates(@date_20050101..@date_20050131)
+    assert dates.size == 5, "There are five Sundays in January, 2005: found #{dates.size}" 
+    assert dates.include?(@date_20050102), "Should include #{@date_20050102}"
+    assert dates.include?(@date_20050109), "Should include #{@date_20050109}"
+    assert dates.include?(@date_20050116), "Should include #{@date_20050116}"
+    assert dates.include?(@date_20050123), "Should include #{@date_20050123}"
+    assert dates.include?(@date_20050130), "Should include #{@date_20050130}"
+  end
+
+end

data/test/dprecisiontest.rb

@@ -1,14 +1,12 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
-require 'runt'
-require 'date'
+require 'minitest_helper'
 
 # Unit tests for DPrecision class
 #
 # Author:: Matthew Lipper
 
-class DPrecisionTest < Test::Unit::TestCase
+class DPrecisionTest < MiniTest::Unit::TestCase
 
   include Runt
 

data/test/everytetest.rb

@@ -7,6 +7,12 @@ require 'baseexpressiontest'
 
 class EveryTETest < BaseExpressionTest
 
+  def test_every_other_week
+    date = @pdate_20081112
+    expr = EveryTE.new(date, 14, DPrecision::DAY)
+    assert !expr.include?(date + 7)
+    assert expr.include?(date + 14)
+  end
 
   def test_every_2_minutes
     date = @pdate_200401282100

data/test/expressionbuildertest.rb

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
-require 'runt'
+require 'minitest_helper'
 
-class ExpressionBuilderTest < Test::Unit::TestCase
+class ExpressionBuilderTest < MiniTest::Unit::TestCase
 
   def setup
     @builder = ExpressionBuilder.new

data/test/icalendartest.rb

@@ -1,15 +1,12 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
-require 'date'
-require 'runt'
-require 'set'
+require 'minitest_helper'
 
-include Runt
 
 # RFC 2445 is the iCalendar specification.  It includes dozens of
 # specific examples that make great tests for Runt temporal expressions.
-class ICalendarTest < Test::Unit::TestCase
+class ICalendarTest < MiniTest::Unit::TestCase
+  include Runt
 
   # "Daily for 10 occurences"
   def test_example_1

data/test/minitest_helper.rb

@@ -0,0 +1,7 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+require 'runt'
+require 'date'
+require 'time'
+require 'rubygems' # Needed for minitest on 1.8.7
+require 'minitest/autorun'

data/test/pdatetest.rb

@@ -1,12 +1,10 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
-require 'date'
-require 'runt'
+require 'minitest_helper'
 
 # Unit tests for PDate class
 # Author:: Matthew Lipper
-class PDateTest < Test::Unit::TestCase
+class PDateTest < MiniTest::Unit::TestCase
 
   include Runt
 
@@ -25,13 +23,24 @@ class PDateTest < Test::Unit::TestCase
     @second_prec = PDate.sec(2004,3,1,0,0,10)
   end
 
+  def test_pdate_with_native_range
+	start_dt = PDate.min(2013,04,22,8,0)
+	middle_dt = PDate.min(2013,04,22,8,2)
+	end_dt = PDate.min(2013,04,22,8,04)
+	range = start_dt..end_dt
+	assert(range.include?(middle_dt))
+  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
+    refute_nil pdate.date_precision
     data=Marshal.dump pdate
     obj=Marshal.load data
-    assert_not_nil obj.date_precision
+    refute_nil obj.date_precision
+	#FIXME: marshall broken in 1.9
+	#assert(obj.eql?(pdate))
+    #assert(pdate.eql?(obj))
   end
 
   def test_include
@@ -144,4 +153,10 @@ class PDateTest < Test::Unit::TestCase
     end
   end
   
+  def test_parse_with_precision
+    month_parsed = PDate.parse('April 2004', :precision => PDate::MONTH)
+    assert_equal month_parsed, PDate.month(2004,04)
+    refute_equal month_parsed, PDate.year(2004,04)
+  end
+  
 end

data/test/redaytest.rb

@@ -35,6 +35,9 @@ class REDayTest < BaseExpressionTest
     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"
+	## Date class which has no public hour or min methods should not cause an exception
+	assert !expr.include?(@date_19611101), \
+	  "Expression #{expr.to_s} created with less_precise_match=false should not hurl when given a Date instance"
   end
   
 end

data/test/reyeartest.rb

@@ -31,7 +31,7 @@ class REYearTest < BaseExpressionTest
     assert expr.end_day == REYear::NO_DAY, "End day should equal constant NO_DAY"
   end
 
-  def test_ctor_three_args
+  def test_ctor_four_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"

data/test/runttest.rb

@@ -1,11 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
-require 'runt'
-require 'date'
-require 'pp'
+require 'minitest_helper'
 
-class RuntModuleTest < Test::Unit::TestCase
+class RuntModuleTest < MiniTest::Unit::TestCase
   
   def test_last
     assert Runt::Last == -1
@@ -80,19 +77,19 @@ class RuntModuleTest < Test::Unit::TestCase
 
   def test_date_class_dprecision
     date=Date.today
-    assert_equal(Runt::DPrecision::DEFAULT,date.date_precision)
+    assert_equal(Runt::DPrecision::DAY,date.date_precision)
   end
 
   def test_datetime_class_dprecision
     date=DateTime.civil
-    assert_equal(Runt::DPrecision::DEFAULT,date.date_precision)
+    assert_equal(Runt::DPrecision::SEC,date.date_precision)
   end
 
   def test_time_plus
     time=Time.local(2006, 12, 9, 5, 56, 12)
     # Default precision is minute
     assert_equal(Runt::PDate.min(2006,12,9,5,56),Runt::DPrecision.to_p(time))
-    assert_not_equal(Time.parse("Sat Dec 09 05:56:00 -0500 2006"),time)
+    refute_equal(Time.parse("Sat Dec 09 05:56:00 -0500 2006"),time)
   end
 
 end

data/test/scheduletest.rb

@@ -1,12 +1,10 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
-require 'runt'
-require 'date'
+require 'minitest_helper'
 
 # Unit tests for Schedule classes
 # Author:: Matthew Lipper
-class ScheduleTest < Test::Unit::TestCase
+class ScheduleTest < MiniTest::Unit::TestCase
 
   include Runt
 
@@ -87,14 +85,15 @@ class ScheduleTest < Test::Unit::TestCase
     @sched=Schedule.new
     e1=Event.new("e1")
     assert(!@sched.include?(e1,nil))
-    range=RSpec.new(DateRange.new(PDate.new(2006,12,3),PDate.new(2007,1,24)))
-    in_range=PDate.new(2007,1,4)
-    assert(range.include?(in_range))
-    out_of_range=PDate.new(2006,1,4)
-    assert(!range.include?(out_of_range))
-    @sched.add(e1,range)
-    assert(@sched.include?(e1,in_range))
-    assert(!@sched.include?(e1,out_of_range))
+    #FIXME: Temporarily comment this out since it hangs JRuby 1.9
+    #range=TemporalRange.new(DateRange.new(PDate.new(2006,12,3),PDate.new(2007,1,24)))
+    #in_range=PDate.new(2007,1,4)
+    #assert(range.include?(in_range))
+    #out_of_range=PDate.new(2006,1,4)
+    #assert(!range.include?(out_of_range))
+    #@sched.add(e1,range)
+    #assert(@sched.include?(e1,in_range))
+    #assert(!@sched.include?(e1,out_of_range))
   end
 
   def test_dates
@@ -113,10 +112,10 @@ class ScheduleTest < Test::Unit::TestCase
   def test_using_a_schedule
         
     # September 18th - 19th, 2005, 8am - 10am 
-    expr1=RSpec.new(DateRange.new(PDate.day(2005,9,18),PDate.day(2005,9,19))) & REDay.new(8,0,10,0)
+    expr1=TemporalRange.new(DateRange.new(PDate.day(2005,9,18),PDate.day(2005,9,19))) & REDay.new(8,0,10,0)
     assert(expr1.include?(PDate.min(2005,9,18,8,15)))
     # September 19th - 20th, 2005, 9am - 11am 
-    expr2=RSpec.new(DateRange.new(PDate.day(2005,9,19),PDate.day(2005,9,20))) & REDay.new(9,0,11,0) 
+    expr2=TemporalRange.new(DateRange.new(PDate.day(2005,9,19),PDate.day(2005,9,20))) & REDay.new(9,0,11,0) 
     # Quick sanuty check
     assert(expr1.overlap?(expr2))
     # Setup a @schedule w/first expression

data/test/sugartest.rb

@@ -1,14 +1,12 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
-require 'runt'
-require 'runt/sugar'
+require 'minitest_helper'
 
-class SugarTest < Test::Unit::TestCase
+class SugarTest < MiniTest::Unit::TestCase
   include Runt
 
-  def test_build__should_return_nil_when_an_unknown_name_is_given
-    assert self.build('duh').nil?
+  def setup
+    @date = PDate.day(2008,7,1)
   end
 
   def test_method_missing_should_be_called_for_invalid_name
@@ -87,6 +85,30 @@ class SugarTest < Test::Unit::TestCase
     end
   end
 
+  def test_after_should_define_after_te_with_inclusive_parameter
+    result = self.after(@date, true)
+    assert_expression AfterTE.new(@date, true), result
+    assert result.instance_variable_get("@inclusive")
+  end
+
+  def test_after_should_define_after_te_without_inclusive_parameter
+    result = self.after(@date)
+    assert_expression AfterTE.new(@date), result
+    assert !result.instance_variable_get("@inclusive")
+  end
+
+  def test_before_should_define_before_te_with_inclusive_parameter
+    result = self.before(@date, true)
+    assert_expression BeforeTE.new(@date, true), result
+    assert result.instance_variable_get("@inclusive")
+  end
+
+  def test_before_should_define_before_te_without_inclusive_parameter
+    result = self.before(@date)
+    assert_expression BeforeTE.new(@date), result
+    assert !result.instance_variable_get("@inclusive")
+  end
+
   private 
   def assert_expression(expected, actual)
     assert_equal expected.to_s, actual.to_s, \

data/test/{spectest.rb → temporaldatetest.rb}

@@ -3,19 +3,29 @@
 
 require 'baseexpressiontest'
 
-# Unit tests for Spec class
+# Unit tests for TemporalDate class
 # Author:: Matthew Lipper
 
-class SpecTest < BaseExpressionTest
+class TemporalDateTest < BaseExpressionTest
 
   def setup
     super
-    @spec = Spec.new(@stub1)
+    @spec = TemporalDate.new(@stub1)
   end
 
   def test_initialize
     assert_same @stub1, @spec.date_expr, "Expected #{@stub1}, instead got #{@spec.date_expr}"
   end
+  
+  def test_specific_date
+    date_spec = TemporalDate.new(Date.new(2006,06,27))
+    
+    assert !date_spec.include?(Date.new(2005,06,27))
+    assert !date_spec.include?(Date.new(2006,06,26))
+    assert date_spec.include?(Date.new(2006,06,27))
+    assert !date_spec.include?(Date.new(2006,06,28))
+    assert !date_spec.include?(Date.new(2007,06,27))
+  end
 
   def test_include_arg_has_include_method
     assert !@spec.include?(@stub2), "Expression should not include configured stub"
@@ -24,7 +34,7 @@ class SpecTest < BaseExpressionTest
   end
 
   def test_include_arg_without_include_method
-    @spec = Spec.new(4)
+    @spec = TemporalDate.new(4)
     assert !@spec.include?(3), "Expression #{@spec.to_s} should not include 3"
     assert @spec.include?(4), "Expression #{@spec.to_s} should include 4"
   end 

data/test/{rspectest.rb → temporalrangetest.rb}

@@ -3,13 +3,13 @@
 
 require 'baseexpressiontest'
 
-# Unit tests for RSpec class
+# Unit tests for TemporalRange class
 # Author:: Matthew Lipper
 
-class RSpecTest < BaseExpressionTest
+class TemporalRangeTest < BaseExpressionTest
 
   def test_include
-    rspec = RSpec.new(@stub1)
+    rspec = TemporalRange.new(@stub1)
     assert !rspec.include?("Any Object"), "Expression should not include any given argument"
     @stub1.match = true
     assert rspec.include?("Any Object"), "Expression should include any given argument"
@@ -17,7 +17,7 @@ class RSpecTest < BaseExpressionTest
   
   def test_overlap
     range = DateRange.new(@date_20050101, @date_20050109)
-    rspec = RSpec.new(range)
+    rspec = TemporalRange.new(range)
     assert !rspec.include?(@date_20050116), "Expression #{rspec.to_s} should not include #{@date_20050116.to_s}"
     assert rspec.include?(@date_20050102), "Expression #{rspec.to_s} should include #{@date_20050102.to_s}"
   end

data/test/test_runt.rb

@@ -0,0 +1,11 @@
+require 'minitest_helper'
+
+class TestRunt < MiniTest::Unit::TestCase
+  def test_that_it_has_a_version_number
+    refute_nil ::Runt::VERSION
+  end
+
+  def test_it_does_something_useful
+    #assert false
+  end
+end