complete initial test set

diff --git a/framework/Date_Parser/test/Horde/Date/Repeater/MonthTest.php b/framework/Date_Parser/test/Horde/Date/Repeater/MonthTest.php
index 71974e3..61395f2 100644 (file)
--- a/framework/Date_Parser/test/Horde/Date/Repeater/MonthTest.php
+++ b/framework/Date_Parser/test/Horde/Date/Repeater/MonthTest.php
@@ -16,42 +16,25 @@ class Horde_Date_Repeater_MonthTest extends PHPUnit_Framework_TestCase
     {
         $this->now = new Horde_Date('2006-08-16 14:00:00');
     }
-    /*
-  def test_offset_by
-    # future
 
-    time = Chronic::RepeaterMonth.new(:month).offset_by(@now, 1, :future)
-    assert_equal Time.local(2006, 9, 16, 14), time
-
-    time = Chronic::RepeaterMonth.new(:month).offset_by(@now, 5, :future)
-    assert_equal Time.local(2007, 1, 16, 14), time
-
-    # past
-
-    time = Chronic::RepeaterMonth.new(:month).offset_by(@now, 1, :past)
-    assert_equal Time.local(2006, 7, 16, 14), time
-
-    time = Chronic::RepeaterMonth.new(:month).offset_by(@now, 10, :past)
-    assert_equal Time.local(2005, 10, 16, 14), time
-  end
-
-  def test_offset
-    # future
-
-    span = Chronic::Span.new(@now, @now + 60)
-    offset_span = Chronic::RepeaterMonth.new(:month).offset(span, 1, :future)
-
-    assert_equal Time.local(2006, 9, 16, 14), offset_span.begin
-    assert_equal Time.local(2006, 9, 16, 14, 1), offset_span.end
+    public function testOffsetFuture()
+    {
+        $span = new Horde_Date_Span($this->now, $this->now->add(60));
+        $repeater = new Horde_Date_Repeater_Month();
+        $offsetSpan = $repeater->offset($span, 1, 'future');
 
-   # past
+        $this->assertEquals('2006-09-16 14:00:00', (string)$offsetSpan->begin);
+        $this->assertEquals('2006-09-16 14:01:00', (string)$offsetSpan->end);
+    }
 
-   span = Chronic::Span.new(@now, @now + 60)
-   offset_span = Chronic::RepeaterMonth.new(:month).offset(span, 1, :past)
+    public function testOffsetPast()
+    {
+        $span = new Horde_Date_Span($this->now, $this->now->add(60));
+        $repeater = new Horde_Date_Repeater_Month();
+        $offsetSpan = $repeater->offset($span, 1, 'past');
 
-   assert_equal Time.local(2006, 7, 16, 14), offset_span.begin
-   assert_equal Time.local(2006, 7, 16, 14, 1), offset_span.end
-  end
-    */
+        $this->assertEquals('2006-07-16 14:00:00', (string)$offsetSpan->begin);
+        $this->assertEquals('2006-07-16 14:01:00', (string)$offsetSpan->end);
+    }
 
 }

diff --git a/framework/Date_Parser/test/Horde/Date/Repeater/TimeTest.php b/framework/Date_Parser/test/Horde/Date/Repeater/TimeTest.php
index 38cd6d9..17e26f6 100644 (file)
--- a/framework/Date_Parser/test/Horde/Date/Repeater/TimeTest.php
+++ b/framework/Date_Parser/test/Horde/Date/Repeater/TimeTest.php
@@ -16,66 +16,68 @@ class Horde_Date_Repeater_TimeTest extends PHPUnit_Framework_TestCase
     {
         $this->now = new Horde_Date('2006-08-16 14:00:00');
     }
-    /*
-  def test_next_future
-    t = Chronic::RepeaterTime.new('4:00')
-    t.start = @now
 
-    assert_equal Time.local(2006, 8, 16, 16), t.next(:future).begin
-    assert_equal Time.local(2006, 8, 17, 4), t.next(:future).begin
+    public function testNextFuture()
+    {
+        $t = new Horde_Date_Repeater_Time('4:00');
+        $t->now = $this->now;
 
-    t = Chronic::RepeaterTime.new('13:00')
-    t.start = @now
+        $this->assertEquals('2006-08-16 16:00:00', $t->next('future')->begin);
+        $this->assertEquals('2006-08-17 04:00:00', $t->next('future')->begin);
 
-    assert_equal Time.local(2006, 8, 17, 13), t.next(:future).begin
-    assert_equal Time.local(2006, 8, 18, 13), t.next(:future).begin
+        $t = new Horde_Date_Repeater_Time('13:00');
+        $t->now = $this->now;
 
-    t = Chronic::RepeaterTime.new('0400')
-    t.start = @now
+        $this->assertEquals('2006-08-17 13:00:00', $t->next('future')->begin);
+        $this->assertEquals('2006-08-18 13:00:00', $t->next('future')->begin);
 
-    assert_equal Time.local(2006, 8, 17, 4), t.next(:future).begin
-    assert_equal Time.local(2006, 8, 18, 4), t.next(:future).begin
-  end
+        $t = new Horde_Date_Repeater_Time('0400');
+        $t->now = $this->now;
 
-  def test_next_past
-    t = Chronic::RepeaterTime.new('4:00')
-    t.start = @now
+        $this->assertEquals('2006-08-17 04:00:00', $t->next('future')->begin);
+        $this->assertEquals('2006-08-18 04:00:00', $t->next('future')->begin);
+    }
 
-    assert_equal Time.local(2006, 8, 16, 4), t.next(:past).begin
-    assert_equal Time.local(2006, 8, 15, 16), t.next(:past).begin
+    public function testNextPast()
+    {
+        $t = new Horde_Date_Repeater_Time('4:00');
+        $t->now = $this->now;
 
-    t = Chronic::RepeaterTime.new('13:00')
-    t.start = @now
+        $this->assertEquals('2006-08-16 04:00:00', $t->next('past')->begin);
+        $this->assertEquals('2006-08-15 16:00:00', $t->next('past')->begin);
 
-    assert_equal Time.local(2006, 8, 16, 13), t.next(:past).begin
-    assert_equal Time.local(2006, 8, 15, 13), t.next(:past).begin
-  end
+        $t = new Horde_Date_Repeater_Time('13:00');
+        $t->now = $this->now;
 
-  def test_type
-    t1 = Chronic::RepeaterTime.new('4')
-    assert_equal 14_400, t1.type.time
+        $this->assertEquals('2006-08-16 13:00:00', $t->next('past')->begin);
+        $this->assertEquals('2006-08-15 13:00:00', $t->next('past')->begin);
+    }
 
-    t1 = Chronic::RepeaterTime.new('14')
-    assert_equal 50_400, t1.type.time
+    public function testType()
+    {
+        $t = new Horde_Date_Repeater_Time('4');
+        $this->assertEquals(14400, $t->type->time);
+
+        $t = new Horde_Date_Repeater_Time('14');
+        $this->assertEquals(50400, $t->type->time);
 
-    t1 = Chronic::RepeaterTime.new('4:00')
-    assert_equal 14_400, t1.type.time
+        $t = new Horde_Date_Repeater_Time('4:00');
+        $this->assertEquals(14400, $t->type->time);
 
-    t1 = Chronic::RepeaterTime.new('4:30')
-    assert_equal 16_200, t1.type.time
+        $t = new Horde_Date_Repeater_Time('4:30');
+        $this->assertEquals(16200, $t->type->time);
 
-    t1 = Chronic::RepeaterTime.new('1400')
-    assert_equal 50_400, t1.type.time
+        $t = new Horde_Date_Repeater_Time('1400');
+        $this->assertEquals(50400, $t->type->time);
 
-    t1 = Chronic::RepeaterTime.new('0400')
-    assert_equal 14_400, t1.type.time
+        $t = new Horde_Date_Repeater_Time('0400');
+        $this->assertEquals(14400, $t->type->time);
 
-    t1 = Chronic::RepeaterTime.new('04')
-    assert_equal 14_400, t1.type.time
+        $t = new Horde_Date_Repeater_Time('04');
+        $this->assertEquals(14400, $t->type->time);
 
-    t1 = Chronic::RepeaterTime.new('400')
-    assert_equal 14_400, t1.type.time
-  end
-    */
+        $t = new Horde_Date_Repeater_Time('400');
+        $this->assertEquals(14400, $t->type->time);
+    }
 
 }

diff --git a/framework/Date_Parser/test/Horde/Date/Repeater/WeekTest.php b/framework/Date_Parser/test/Horde/Date/Repeater/WeekTest.php
index f92ef38..8d7865a 100644 (file)
--- a/framework/Date_Parser/test/Horde/Date/Repeater/WeekTest.php
+++ b/framework/Date_Parser/test/Horde/Date/Repeater/WeekTest.php
@@ -16,59 +16,63 @@ class Horde_Date_Repeater_WeekTest extends PHPUnit_Framework_TestCase
     {
         $this->now = new Horde_Date('2006-08-16 14:00:00');
     }
-    /*
-  def test_next_future
-    weeks = Chronic::RepeaterWeek.new(:week)
-    weeks.start = @now
 
-    next_week = weeks.next(:future)
-    assert_equal Time.local(2006, 8, 20), next_week.begin
-    assert_equal Time.local(2006, 8, 27), next_week.end
+    public function testNextFuture()
+    {
+        $weeks = new Horde_Date_Repeater_Week();
+        $weeks->now = $this->now;
 
-    next_next_week = weeks.next(:future)
-    assert_equal Time.local(2006, 8, 27), next_next_week.begin
-    assert_equal Time.local(2006, 9, 3), next_next_week.end
-  end
+        $nextWeek = $weeks->next('future');
+        $this->assertEquals('2006-08-20 00:00:00', (string)$nextWeek->begin);
+        $this->assertEquals('2006-08-27 00:00:00', (string)$nextWeek->end);
 
-  def test_next_past
-    weeks = Chronic::RepeaterWeek.new(:week)
-    weeks.start = @now
+        $nextNextWeek = $weeks->next('future');
+        $this->assertEquals('2006-08-27 00:00:00', (string)$nextNextWeek->begin);
+        $this->assertEquals('2006-09-03 00:00:00', (string)$nextNextWeek->end);
+    }
 
-    last_week = weeks.next(:past)
-    assert_equal Time.local(2006, 8, 6), last_week.begin
-    assert_equal Time.local(2006, 8, 13), last_week.end
+    public function testNextPast()
+    {
+        $weeks = new Horde_Date_Repeater_Week();
+        $weeks->now = $this->now;
 
-    last_last_week = weeks.next(:past)
-    assert_equal Time.local(2006, 7, 30), last_last_week.begin
-    assert_equal Time.local(2006, 8, 6), last_last_week.end
-  end
+        $lastWeek = $weeks->next('past');
+        $this->assertEquals('2006-08-06 00:00:00', (string)$lastWeek->begin);
+        $this->assertEquals('2006-08-13 00:00:00', (string)$lastWeek->end);
 
-  def test_this_future
-    weeks = Chronic::RepeaterWeek.new(:week)
-    weeks.start = @now
+        $lastLastWeek = $weeks->next('past');
+        $this->assertEquals('2006-07-30 00:00:00', (string)$lastLastWeek->begin);
+        $this->assertEquals('2006-08-06 00:00:00', (string)$lastLastWeek->end);
+    }
 
-    this_week = weeks.this(:future)
-    assert_equal Time.local(2006, 8, 16, 15), this_week.begin
-    assert_equal Time.local(2006, 8, 20), this_week.end
-  end
+    public function testThisFuture()
+    {
+        $weeks = new Horde_Date_Repeater_Week();
+        $weeks->now = $this->now;
 
-  def test_this_past
-    weeks = Chronic::RepeaterWeek.new(:week)
-    weeks.start = @now
+        $thisWeek = $weeks->this('future');
+        $this->assertEquals('2006-08-16 15:00:00', (string)$thisWeek->begin);
+        $this->assertEquals('2006-08-20 00:00:00', (string)$thisWeek->end);
+    }
 
-    this_week = weeks.this(:past)
-    assert_equal Time.local(2006, 8, 13, 0), this_week.begin
-    assert_equal Time.local(2006, 8, 16, 14), this_week.end
-  end
+    public function testThisPast()
+    {
+        $weeks = new Horde_Date_Repeater_Week();
+        $weeks->now = $this->now;
 
-  def test_offset
-    span = Chronic::Span.new(@now, @now + 1)
+        $thisWeek = $weeks->this('past');
+        $this->assertEquals('2006-08-13 00:00:00', (string)$thisWeek->begin);
+        $this->assertEquals('2006-08-16 14:00:00', (string)$thisWeek->end);
+    }
 
-    offset_span = Chronic::RepeaterWeek.new(:week).offset(span, 3, :future)
+    public function testOffset()
+    {
+        $weeks = new Horde_Date_Repeater_Week();
+        $span = new Horde_Date_Span($this->now, $this->now->add(1));
 
-    assert_equal Time.local(2006, 9, 6, 14), offset_span.begin
-    assert_equal Time.local(2006, 9, 6, 14, 0, 1), offset_span.end
-  end
-    */
+        $offsetSpan = $weeks->offset($span, 3, 'future');
+        $this->assertEquals('2006-09-06 14:00:00', (string)$offsetSpan->begin);
+        $this->assertEquals('2006-09-06 14:00:01', (string)$offsetSpan->end);
+    }
 
 }

diff --git a/framework/Date_Parser/test/Horde/Date/Repeater/WeekendTest.php b/framework/Date_Parser/test/Horde/Date/Repeater/WeekendTest.php
index 7420906..ff05374 100644 (file)
--- a/framework/Date_Parser/test/Horde/Date/Repeater/WeekendTest.php
+++ b/framework/Date_Parser/test/Horde/Date/Repeater/WeekendTest.php
@@ -16,70 +16,73 @@ class Horde_Date_Repeater_WeekendTest extends PHPUnit_Framework_TestCase
     {
         $this->now = new Horde_Date('2006-08-16 14:00:00');
     }
-    /*
-  def test_next_future
-    weekend = Chronic::RepeaterWeekend.new(:weekend)
-    weekend.start = @now
 
-    next_weekend = weekend.next(:future)
-    assert_equal Time.local(2006, 8, 19), next_weekend.begin
-    assert_equal Time.local(2006, 8, 21), next_weekend.end
-  end
-
-  def test_next_past
-    weekend = Chronic::RepeaterWeekend.new(:weekend)
-    weekend.start = @now
-
-    next_weekend = weekend.next(:past)
-    assert_equal Time.local(2006, 8, 12), next_weekend.begin
-    assert_equal Time.local(2006, 8, 14), next_weekend.end
-  end
+    public function testNextFuture()
+    {
+        $weekend = new Horde_Date_Repeater_Weekend();
+        $weekend->now = $this->now;
 
-  def test_this_future
-    weekend = Chronic::RepeaterWeekend.new(:weekend)
-    weekend.start = @now
+        $nextWeekend = $weekend->next('future');
+        $this->assertEquals('2006-08-19 00:00:00', (string)$nextWeekend->begin);
+        $this->assertEquals('2006-08-21 00:00:00', (string)$nextWeekend->end);
+    }
 
-    next_weekend = weekend.this(:future)
-    assert_equal Time.local(2006, 8, 19), next_weekend.begin
-    assert_equal Time.local(2006, 8, 21), next_weekend.end
-  end
+    public function testNextPast()
+    {
+        $weekend = new Horde_Date_Repeater_Weekend();
+        $weekend->now = $this->now;
 
-  def test_this_past
-    weekend = Chronic::RepeaterWeekend.new(:weekend)
-    weekend.start = @now
+        $lastWeekend = $weekend->next('past');
+        $this->assertEquals('2006-08-12 00:00:00', (string)$lastWeekend->begin);
+        $this->assertEquals('2006-08-14 00:00:00', (string)$lastWeekend->end);
+    }
 
-    next_weekend = weekend.this(:past)
-    assert_equal Time.local(2006, 8, 12), next_weekend.begin
-    assert_equal Time.local(2006, 8, 14), next_weekend.end
-  end
+    public function testThisFuture()
+    {
+        $weekend = new Horde_Date_Repeater_Weekend();
+        $weekend->now = $this->now;
 
-  def test_this_none
-    weekend = Chronic::RepeaterWeekend.new(:weekend)
-    weekend.start = @now
+        $thisWeekend = $weekend->this('future');
+        $this->assertEquals('2006-08-19 00:00:00', (string)$thisWeekend->begin);
+        $this->assertEquals('2006-08-21 00:00:00', (string)$thisWeekend->end);
+    }
 
-    next_weekend = weekend.this(:future)
-    assert_equal Time.local(2006, 8, 19), next_weekend.begin
-    assert_equal Time.local(2006, 8, 21), next_weekend.end
-  end
+    public function testThisPast()
+    {
+        $weekend = new Horde_Date_Repeater_Weekend();
+        $weekend->now = $this->now;
 
-  def test_offset
-    span = Chronic::Span.new(@now, @now + 1)
+        $thisWeekend = $weekend->this('past');
+        $this->assertEquals('2006-08-12 00:00:00', (string)$thisWeekend->begin);
+        $this->assertEquals('2006-08-14 00:00:00', (string)$thisWeekend->end);
+    }
 
-    offset_span = Chronic::RepeaterWeekend.new(:weekend).offset(span, 3, :future)
+    public function testThisNone()
+    {
+        $weekend = new Horde_Date_Repeater_Weekend();
+        $weekend->now = $this->now;
 
-    assert_equal Time.local(2006, 9, 2), offset_span.begin
-    assert_equal Time.local(2006, 9, 2, 0, 0, 1), offset_span.end
+        $thisWeekend = $weekend->this('none');
+        $this->assertEquals('2006-08-19 00:00:00', (string)$thisWeekend->begin);
+        $this->assertEquals('2006-08-21 00:00:00', (string)$thisWeekend->end);
+    }
 
-    offset_span = Chronic::RepeaterWeekend.new(:weekend).offset(span, 1, :past)
+    public function testOffset()
+    {
+        $weekend = new Horde_Date_Repeater_Weekend();
+        $span = new Horde_Date_Span($this->now, $this->now->add(1));
 
-    assert_equal Time.local(2006, 8, 12), offset_span.begin
-    assert_equal Time.local(2006, 8, 12, 0, 0, 1), offset_span.end
+        $offsetSpan = $weekend->offset($span, 3, 'future');
+        $this->assertEquals('2006-09-02 00:00:00', (string)$offsetSpan->begin);
+        $this->assertEquals('2006-09-02 00:00:01', (string)$offsetSpan->end);
 
-    offset_span = Chronic::RepeaterWeekend.new(:weekend).offset(span, 0, :future)
+        $offsetSpan = $weekend->offset($span, 1, 'past');
+        $this->assertEquals('2006-08-12 00:00:00', (string)$offsetSpan->begin);
+        $this->assertEquals('2006-08-12 00:00:01', (string)$offsetSpan->end);
 
-    assert_equal Time.local(2006, 8, 12), offset_span.begin
-    assert_equal Time.local(2006, 8, 12, 0, 0, 1), offset_span.end
-  end
-    */
+        $offsetSpan = $weekend->offset($span, 0, 'future');
+        $this->assertEquals('2006-08-12 00:00:00', (string)$offsetSpan->begin);
+        $this->assertEquals('2006-08-12 00:00:01', (string)$offsetSpan->end);
+    }
 
 }