taskjuggler 0.1.1 → 0.2.0

data/test/TestSuite/TimeSheets/ts.tji

@@ -0,0 +1,351 @@
+# The status headline should be no more than 60 characters and may
+# not be empty! The status summary is optional and should be no
+# longer than one or two sentences of plain text. The details section
+# is also optional has no length limitation. You can use simple
+# markup in this section.  It is recommended that you provide at
+# least a summary or a details section.
+# See http://www.taskjuggler.org/tj3/manual/timesheet.html for details.
+timesheet boss 2002-01-16-00:00-+0100 - 2002-05-17-17:00-+0200 {
+
+  # Vacation time: 1.1506849315068493%
+
+  # There were no planned tasks assignements for this period!
+
+  # If you had unplanned tasks, uncomment and fill out the
+  # following lines:
+  # newtask new.task.id "A task title" {
+  #   work X%
+  #   remaining Y.Yd
+  # }
+
+  # You can use the following section to report personal notes.
+  # status green "A headline" {
+  #   summary -8<-
+  #   Uncomment and put one or two sentences here!
+  #   ->8-
+  #   details -8<-
+  #   Uncomment and put markup text here.
+  #   ->8-
+  # }
+}
+
+timesheet dev1 2002-01-16-00:00-+0100 - 2002-05-17-17:00-+0200 {
+
+  # Vacation time: 1.1506849315068493%
+
+  # Task: Specification
+  task AcSo.spec {
+    work 7.767123287671233%
+    remaining 0.0d
+    status green "Your headline here!" {
+    #  summary -8<-
+    #  Uncomment and put one or two sentences here!
+    #  ->8-
+    #  details -8<-
+    #  Uncomment and put markup text here.
+    #  ->8-
+    }
+  }
+
+  # Task: Database coupling
+  task AcSo.software.database {
+    work 11.506849315068495%
+    remaining 0.0d
+    status green "Your headline here!" {
+    #  summary -8<-
+    #  Uncomment and put one or two sentences here!
+    #  ->8-
+    #  details -8<-
+    #  Uncomment and put markup text here.
+    #  ->8-
+    }
+  }
+
+  # Task: Back-End Functions
+  task AcSo.software.backend {
+    work 17.26027397260274%
+    remaining 0.0d
+    status green "Your headline here!" {
+    #  summary -8<-
+    #  Uncomment and put one or two sentences here!
+    #  ->8-
+    #  details -8<-
+    #  Uncomment and put markup text here.
+    #  ->8-
+    }
+  }
+
+  # Task: Beta Test
+  task AcSo.test.beta {
+    work 13.08904109589041%
+    remaining 0.0d
+    status green "Your headline here!" {
+    #  summary -8<-
+    #  Uncomment and put one or two sentences here!
+    #  ->8-
+    #  details -8<-
+    #  Uncomment and put markup text here.
+    #  ->8-
+    }
+  }
+
+  # If you had unplanned tasks, uncomment and fill out the
+  # following lines:
+  # newtask new.task.id "A task title" {
+  #   work X%
+  #   remaining Y.Yd
+  # }
+
+  # You can use the following section to report personal notes.
+  # status green "A headline" {
+  #   summary -8<-
+  #   Uncomment and put one or two sentences here!
+  #   ->8-
+  #   details -8<-
+  #   Uncomment and put markup text here.
+  #   ->8-
+  # }
+}
+
+timesheet dev2 2002-01-16-00:00-+0100 - 2002-05-17-17:00-+0200 {
+
+  # Vacation time: 1.1506849315068493%
+
+  # Task: Specification
+  task AcSo.spec {
+    work 7.767123287671233%
+    remaining 0.0d
+    status green "Your headline here!" {
+    #  summary -8<-
+    #  Uncomment and put one or two sentences here!
+    #  ->8-
+    #  details -8<-
+    #  Uncomment and put markup text here.
+    #  ->8-
+    }
+  }
+
+  # Task: Database coupling
+  task AcSo.software.database {
+    work 11.506849315068495%
+    remaining 0.0d
+    status green "Your headline here!" {
+    #  summary -8<-
+    #  Uncomment and put one or two sentences here!
+    #  ->8-
+    #  details -8<-
+    #  Uncomment and put markup text here.
+    #  ->8-
+    }
+  }
+
+  # Task: Graphical User Interface
+  task AcSo.software.gui {
+    work 20.136986301369863%
+    remaining 0.0d
+    status green "Your headline here!" {
+    #  summary -8<-
+    #  Uncomment and put one or two sentences here!
+    #  ->8-
+    #  details -8<-
+    #  Uncomment and put markup text here.
+    #  ->8-
+    }
+  }
+
+  # Task: Back-End Functions
+  task AcSo.software.backend {
+    work 17.26027397260274%
+    remaining 0.0d
+    status green "Your headline here!" {
+    #  summary -8<-
+    #  Uncomment and put one or two sentences here!
+    #  ->8-
+    #  details -8<-
+    #  Uncomment and put markup text here.
+    #  ->8-
+    }
+  }
+
+  # Task: Alpha Test
+  task AcSo.test.alpha {
+    work 3.1643835616438363%
+    remaining 0.0d
+    status green "Your headline here!" {
+    #  summary -8<-
+    #  Uncomment and put one or two sentences here!
+    #  ->8-
+    #  details -8<-
+    #  Uncomment and put markup text here.
+    #  ->8-
+    }
+  }
+
+  # If you had unplanned tasks, uncomment and fill out the
+  # following lines:
+  # newtask new.task.id "A task title" {
+  #   work X%
+  #   remaining Y.Yd
+  # }
+
+  # You can use the following section to report personal notes.
+  # status green "A headline" {
+  #   summary -8<-
+  #   Uncomment and put one or two sentences here!
+  #   ->8-
+  #   details -8<-
+  #   Uncomment and put markup text here.
+  #   ->8-
+  # }
+}
+
+timesheet dev3 2002-01-16-00:00-+0100 - 2002-05-17-17:00-+0200 {
+
+  # Vacation time: 3.4520547945205484%
+
+  # Task: Specification
+  task AcSo.spec {
+    work 7.767123287671233%
+    remaining 0.0d
+    status green "Your headline here!" {
+    #  summary -8<-
+    #  Uncomment and put one or two sentences here!
+    #  ->8-
+    #  details -8<-
+    #  Uncomment and put markup text here.
+    #  ->8-
+    }
+  }
+
+  # Task: Graphical User Interface
+  task AcSo.software.gui {
+    work 20.136986301369863%
+    remaining 0.0d
+    status green "Your headline here!" {
+    #  summary -8<-
+    #  Uncomment and put one or two sentences here!
+    #  ->8-
+    #  details -8<-
+    #  Uncomment and put markup text here.
+    #  ->8-
+    }
+  }
+
+  # Task: Manual
+  task AcSo.manual {
+    work 23.732876712328768%
+    remaining 0.0d
+    status green "Your headline here!" {
+    #  summary -8<-
+    #  Uncomment and put one or two sentences here!
+    #  ->8-
+    #  details -8<-
+    #  Uncomment and put markup text here.
+    #  ->8-
+    }
+  }
+
+  # If you had unplanned tasks, uncomment and fill out the
+  # following lines:
+  # newtask new.task.id "A task title" {
+  #   work X%
+  #   remaining Y.Yd
+  # }
+
+  # You can use the following section to report personal notes.
+  # status green "A headline" {
+  #   summary -8<-
+  #   Uncomment and put one or two sentences here!
+  #   ->8-
+  #   details -8<-
+  #   Uncomment and put markup text here.
+  #   ->8-
+  # }
+}
+
+timesheet test 2002-01-16-00:00-+0100 - 2002-05-17-17:00-+0200 {
+
+  # Vacation time: 1.1506849315068493%
+
+  # Task: Alpha Test
+  task AcSo.test.alpha {
+    work 2.589041095890411%
+    remaining 0.0d
+    status green "Your headline here!" {
+    #  summary -8<-
+    #  Uncomment and put one or two sentences here!
+    #  ->8-
+    #  details -8<-
+    #  Uncomment and put markup text here.
+    #  ->8-
+    }
+  }
+
+  # Task: Beta Test
+  task AcSo.test.beta {
+    work 9.924657534246577%
+    remaining 0.0d
+    status green "Your headline here!" {
+    #  summary -8<-
+    #  Uncomment and put one or two sentences here!
+    #  ->8-
+    #  details -8<-
+    #  Uncomment and put markup text here.
+    #  ->8-
+    }
+  }
+
+  # If you had unplanned tasks, uncomment and fill out the
+  # following lines:
+  # newtask new.task.id "A task title" {
+  #   work X%
+  #   remaining Y.Yd
+  # }
+
+  # You can use the following section to report personal notes.
+  # status green "A headline" {
+  #   summary -8<-
+  #   Uncomment and put one or two sentences here!
+  #   ->8-
+  #   details -8<-
+  #   Uncomment and put markup text here.
+  #   ->8-
+  # }
+}
+
+timesheet doc 2002-01-16-00:00-+0100 - 2002-05-17-17:00-+0200 {
+
+  # Vacation time: 6.904109589041097%
+
+  # Task: Manual
+  task AcSo.manual {
+    work 33.801369863013704%
+    remaining 0.0d
+    status green "Your headline here!" {
+    #  summary -8<-
+    #  Uncomment and put one or two sentences here!
+    #  ->8-
+    #  details -8<-
+    #  Uncomment and put markup text here.
+    #  ->8-
+    }
+  }
+
+  # If you had unplanned tasks, uncomment and fill out the
+  # following lines:
+  # newtask new.task.id "A task title" {
+  #   work X%
+  #   remaining Y.Yd
+  # }
+
+  # You can use the following section to report personal notes.
+  # status green "A headline" {
+  #   summary -8<-
+  #   Uncomment and put one or two sentences here!
+  #   ->8-
+  #   details -8<-
+  #   Uncomment and put markup text here.
+  #   ->8-
+  # }
+}
+

data/test/TestSuite/TimeSheets/tsdef.tji

@@ -0,0 +1,2 @@
+timesheetreport "ts.tji" {
+}

data/test/test_Limits.rb

@@ -54,17 +54,19 @@ class TestLimits < Test::Unit::TestCase
   def test_inc
     l = Limits.new
     l.setProject(@p)
-    l.setLimit('weeklymax', 2, Interval.new(TjTime.new('2009-02-10'),
-                                            TjTime.new('2009-02-15')))
+    l.setLimit('weeklymax', 2,
+               ScoreboardInterval.new(@p['start'], @p['scheduleGranularity'],
+                                      TjTime.new('2009-02-10'),
+                                      TjTime.new('2009-02-15')))
     # Outside of limit interval, should be ignored
-    l.inc(TjTime.new('2009-02-05-10:00'))
-    l.inc(TjTime.new('2009-02-20-10:00'))
+    l.inc(-1)
+    l.inc(100000)
     assert(l.ok?)
     # Inside the calendar week interval
-    l.inc(TjTime.new('2009-02-09-10:00'))
+    l.inc(dateToIdx('2009-02-09-10:00'))
     assert(l.ok?)
     # The inc will exceed the weekly limit
-    l.inc(TjTime.new('2009-02-09-11:00'))
+    l.inc(dateToIdx('2009-02-09-11:00'))
     assert(!l.ok?)
   end
 
@@ -73,17 +75,17 @@ class TestLimits < Test::Unit::TestCase
     l.setProject(@p)
     l.setLimit('dailymax', 4)
     assert_equal(l.limits.length, 1, 'setLimits() failed')
-    l.inc(TjTime.new('2009-02-01-10:00'))
+    l.inc(dateToIdx('2009-02-01-10:00'))
     assert(l.ok?)
-    l.inc(TjTime.new('2009-02-01-11:00'))
+    l.inc(dateToIdx('2009-02-01-11:00'))
     assert(l.ok?)
-    l.inc(TjTime.new('2009-02-01-12:00'))
+    l.inc(dateToIdx('2009-02-01-12:00'))
     assert(l.ok?)
-    l.inc(TjTime.new('2009-02-01-13:00'))
+    l.inc(dateToIdx('2009-02-01-13:00'))
     assert(!l.ok?)
-    assert(l.ok?(TjTime.new('2009-01-31')))
-    assert(!l.ok?(TjTime.new('2009-02-01')))
-    assert(l.ok?(TjTime.new('2009-02-01'), false))
+    assert(l.ok?(dateToIdx('2009-01-31')))
+    assert(!l.ok?(dateToIdx('2009-02-01')))
+    assert(l.ok?(dateToIdx('2009-02-01'), false))
   end
 
   def test_with_resource_1
@@ -92,13 +94,13 @@ class TestLimits < Test::Unit::TestCase
     l.setLimit('dailymax', 4)
     r = Resource.new(@p, 'r', 'R', nil)
     l.setLimit('dailymax', 5, nil, r)
-    l.inc(TjTime.new('2009-02-01-10:00'))
+    l.inc(dateToIdx('2009-02-01-10:00'))
     assert(l.ok?)
-    l.inc(TjTime.new('2009-02-01-11:00'))
+    l.inc(dateToIdx('2009-02-01-11:00'))
     assert(l.ok?)
-    l.inc(TjTime.new('2009-02-01-12:00'))
+    l.inc(dateToIdx('2009-02-01-12:00'))
     assert(l.ok?)
-    l.inc(TjTime.new('2009-02-01-13:00'))
+    l.inc(dateToIdx('2009-02-01-13:00'))
     assert(!l.ok?)
     assert(l.ok?(nil, true, r))
   end
@@ -109,16 +111,16 @@ class TestLimits < Test::Unit::TestCase
     l.setLimit('dailymax', 5)
     r = Resource.new(@p, 'r', 'R', nil)
     l.setLimit('dailymax', 1, nil, r)
-    l.inc(TjTime.new('2009-02-01-10:00'))
+    l.inc(dateToIdx('2009-02-01-10:00'))
     assert(l.ok?)
-    l.inc(TjTime.new('2009-02-01-11:00'))
+    l.inc(dateToIdx('2009-02-01-11:00'))
     assert(l.ok?)
-    l.inc(TjTime.new('2009-02-01-12:00'))
+    l.inc(dateToIdx('2009-02-01-12:00'))
     assert(l.ok?)
-    l.inc(TjTime.new('2009-02-01-13:00'))
+    l.inc(dateToIdx('2009-02-01-13:00'))
     assert(l.ok?)
     assert(l.ok?(nil, true, r))
-    l.inc(TjTime.new('2009-02-01-14:00'), r)
+    l.inc(dateToIdx('2009-02-01-14:00'), r)
     assert(!l.ok?)
     assert(!l.ok?(nil, true, r))
   end
@@ -129,13 +131,13 @@ class TestLimits < Test::Unit::TestCase
     l.setLimit('dailymax', 5)
     r = Resource.new(@p, 'r', 'R', nil)
     l.setLimit('dailymax', 3, nil, r)
-    l.inc(TjTime.new('2009-02-01-10:00'), r)
+    l.inc(dateToIdx('2009-02-01-10:00'), r)
     assert(l.ok?)
-    l.inc(TjTime.new('2009-02-01-11:00'))
+    l.inc(dateToIdx('2009-02-01-11:00'))
     assert(l.ok?)
-    l.inc(TjTime.new('2009-02-01-12:00'), r)
+    l.inc(dateToIdx('2009-02-01-12:00'), r)
     assert(l.ok?)
-    l.inc(TjTime.new('2009-02-01-13:00'), r)
+    l.inc(dateToIdx('2009-02-01-13:00'), r)
     assert(l.ok?)
     assert(!l.ok?(nil, true, r))
   end
@@ -146,18 +148,24 @@ class TestLimits < Test::Unit::TestCase
     l.setLimit('dailymax', 2)
     r = Resource.new(@p, 'r', 'R', nil)
     l.setLimit('dailymax', 3, nil, r)
-    l.inc(TjTime.new('2009-02-01-10:00'), r)
+    l.inc(dateToIdx('2009-02-01-10:00'), r)
     assert(l.ok?)
-    l.inc(TjTime.new('2009-02-01-11:00'))
+    l.inc(dateToIdx('2009-02-01-11:00'))
     assert(!l.ok?)
-    l.inc(TjTime.new('2009-02-01-12:00'), r)
+    l.inc(dateToIdx('2009-02-01-12:00'), r)
     assert(!l.ok?)
     assert(l.ok?(nil, true, r))
-    l.inc(TjTime.new('2009-02-01-13:00'), r)
+    l.inc(dateToIdx('2009-02-01-13:00'), r)
     assert(!l.ok?)
     assert(!l.ok?(nil, true, r))
   end
 
+  private
+
+  def dateToIdx(date)
+    @p.dateToIdx(TjTime.new(date))
+  end
+
 end
 
 end

data/test/test_Scheduler.rb

@@ -39,10 +39,10 @@ class TestScheduler < Test::Unit::TestCase
     path = File.dirname(__FILE__) + '/'
     Dir.glob(path + 'TestSuite/Scheduler/Correct/*.tjp').each do |f|
       ENV['TZ'] = 'Europe/Berlin'
-      tj = TaskJuggler.new(true)
+      tj = TaskJuggler.new(false)
       assert(tj.parse([ f ]), "Parser failed for #{f}")
       assert(tj.schedule, "Scheduler failed for #{f}")
-      assert(tj.messageHandler.messages.empty?, "Unexpected error in #{f}")
+      checkMessages(tj, f)
     end
   end
 

data/test/test_ShiftAssignments.rb

@@ -39,8 +39,8 @@ class TestPropertySet < Test::Unit::TestCase
     sas1.project = @p
     assert_equal(0, TaskJuggler::ShiftAssignments.scoreboards.length)
     sas1.addAssignment(sa1 = TaskJuggler::ShiftAssignment.new(@s1,
-      TaskJuggler::Interval.new(TaskJuggler::TjTime.new('2008-08-01'),
-                                TaskJuggler::TjTime.new('2008-08-05'))))
+      TaskJuggler::TimeInterval.new(TaskJuggler::TjTime.new('2008-08-01'),
+                                    TaskJuggler::TjTime.new('2008-08-05'))))
     assert_equal(1, TaskJuggler::ShiftAssignments.scoreboards.length)
 
     # Call finalizer directly to check for runtime errors that would otherwise
@@ -54,22 +54,22 @@ class TestPropertySet < Test::Unit::TestCase
     sas1.project = @p
     assert_equal(0, TaskJuggler::ShiftAssignments.scoreboards.length)
     sas1.addAssignment(TaskJuggler::ShiftAssignment.new(@s1,
-      TaskJuggler::Interval.new(TaskJuggler::TjTime.new('2008-08-01'),
-                                TaskJuggler::TjTime.new('2008-08-05'))))
+      TaskJuggler::TimeInterval.new(TaskJuggler::TjTime.new('2008-08-01'),
+                                    TaskJuggler::TjTime.new('2008-08-05'))))
 
     sas2 = TaskJuggler::ShiftAssignments.new
     sas2.project = @p
     sas2.addAssignment(TaskJuggler::ShiftAssignment.new(@s1,
-      TaskJuggler::Interval.new(TaskJuggler::TjTime.new('2008-08-01'),
-                                TaskJuggler::TjTime.new('2008-08-05'))))
+      TaskJuggler::TimeInterval.new(TaskJuggler::TjTime.new('2008-08-01'),
+                                    TaskJuggler::TjTime.new('2008-08-05'))))
 
     assert_equal(1, TaskJuggler::ShiftAssignments.scoreboards.length)
 
     sas3 = TaskJuggler::ShiftAssignments.new
     sas3.project = @p
     sas3.addAssignment(TaskJuggler::ShiftAssignment.new(@s2,
-      TaskJuggler::Interval.new(TaskJuggler::TjTime.new('2008-08-01'),
-                                TaskJuggler::TjTime.new('2008-08-05'))))
+      TaskJuggler::TimeInterval.new(TaskJuggler::TjTime.new('2008-08-01'),
+                                    TaskJuggler::TjTime.new('2008-08-05'))))
 
     assert_equal(2, TaskJuggler::ShiftAssignments.scoreboards.length)
 

data/test/test_WorkingHours.rb

@@ -165,8 +165,8 @@ class TestLimits < Test::Unit::TestCase
       [ '2010-09-20-17:00', '2010-09-21-10:00' ]
     ]
     workTimes.each do |iv|
-      assert(!wh.timeOff?(Interval.new(TjTime.new(iv[0]),
-                                       TjTime.new(iv[1]))),
+      assert(!wh.timeOff?(TimeInterval.new(TjTime.new(iv[0]),
+                                           TjTime.new(iv[1]))),
              "Work time interval #{iv[0]} - #{iv[1]} failed")
     end
 
@@ -178,8 +178,8 @@ class TestLimits < Test::Unit::TestCase
     ]
 
     offTimes.each do |iv|
-      assert(wh.timeOff?(Interval.new(TjTime.new(iv[0]),
-                                      TjTime.new(iv[1]))),
+      assert(wh.timeOff?(TimeInterval.new(TjTime.new(iv[0]),
+                                          TjTime.new(iv[1]))),
              "Off time interval #{iv[0]} - #{iv[1]} failed")
     end
   end