taskjuggler 0.0.3 → 0.0.4

data/test/TestSuite/Syntax/Correct/tutorial.tjp

@@ -99,6 +99,11 @@ balance cost rev
 # *** EXAMPLE: balance -
 
 # *** EXAMPLE: resources +
+resource boss "Paul Henry Bullock" {
+  Email "phb@crappysoftware.com"
+  Phone "x100"
+  rate 480
+}
 resource dev "Developers" {
   resource dev1 "Paul Smith" {
     Email "paul@crappysoftware.com"
@@ -212,6 +217,18 @@ task AcSo "Accounting Software" {
       effort 20d
       allocate dev1, dev2
 # *** EXAMPLE: software +
+      journalentry 2002-02-03 "Problems with the SQL Libary" {
+        author dev1
+        alert yellow
+        summary -8<-
+          We ran into some compatibility problems with the SQL
+          Library.
+        ->8-
+        details -8<-
+          We have already contacted the vendor and are now waiting for
+          their advise.
+        ->8-  
+      }
     }
 # *** EXAMPLE: database -
 # *** EXAMPLE: software -
@@ -278,6 +295,17 @@ task AcSo "Accounting Software" {
       depends !!software
       allocate test, dev2
       note "Hopefully most bugs will be found and fixed here."
+      journalentry 2002-03-01 "Contract with Peter not yet signed" {
+        author boss
+        alert red
+        summary -8<-
+          The paperwork is stuck with HR and I can't hunt it down.
+        ->8-
+        details -8<-
+          If we don't get the contract closed within the next week,
+          the start of the testing is at risk.
+        ->8-
+      }
     }
 
     task beta "Beta Test" {
@@ -300,6 +328,10 @@ task AcSo "Accounting Software" {
     purge chargeset
     chargeset doc
 # *** EXAMPLE: task1 +
+    journalentry 2002-02-28 "User manual completed" {
+      author boss
+      summary "The doc writers did a really great job to finish on time."
+    }
   }
 # *** EXAMPLE: manual -
 # *** EXAMPLE: task1 -
@@ -380,8 +412,7 @@ navigator navbar {
 
 # *** EXAMPLE: overview_report1 +
 # *** EXAMPLE: overview_report2 +
-textreport "Overview" {
-  formats html
+textreport "" {
 # *** EXAMPLE: overview_report1 -
   header -8<-
     == Accounting Software Project ==
@@ -389,23 +420,46 @@ textreport "Overview" {
     <[navigator id="navbar"]>
     ----
   ->8-
+  footer "----"
 # *** EXAMPLE: overview_report1 +
-  center '<[report id="overview"]>'
+  textreport "Overview" {
+    formats html
+    center '<[report id="overview"]>'
+  }
 # *** EXAMPLE: overview_report1 -
 # *** EXAMPLE: overview_report2 -
 
+  textreport "Status" {
+    formats html
+    center -8<-
+      <[report id="status.dashboard"]>
+      ----
+      <[report id="status.completed"]>
+      ----
+      <[report id="status.ongoing"]>
+      ----
+      <[report id="status.future"]>
+    ->8-   
+  }
+
   textreport "Development" {
+    formats html
     center '<[report id="development"]>'
   }
 
   textreport "Deliveries" {
+    formats html
     center '<[report id="deliveries"]>'
   }
 
   textreport "ContactList" {
+    formats html
+    title "Contact List"
     center '<[report id="contactList"]>'
   }
-  textreport "Resource Graph" {
+  textreport "ResourceGraph" {
+    formats html
+    title "Resource Graph"
     center '<[report id="resourceGraph"]>'
   }
 # *** EXAMPLE: overview_report1 +
@@ -429,11 +483,13 @@ taskreport overview "" {
     # [[Development]]
     # Testing
     
-    === Project Plan ===
+    === Original Project Plan ===
   ->8-
 # *** EXAMPLE: overview4 -
 # *** EXAMPLE: overview1 +
-  columns hierarchindex, name, start, end, effort, duration, cost,
+  columns hierarchindex,
+          name { tooltip 1 "'''ID''': <-query attribute='id'->" },
+          start, end, effort, duration, cost,
           revenue, chart
 # *** EXAMPLE: overview1 -
   # For this report we like to have the abbreviated weekday in front
@@ -467,29 +523,69 @@ taskreport overview "" {
 # *** EXAMPLE: overview1 -
 # *** EXAMPLE: overview -
 
+# Macro to set the background color of a cell according to the alert
+# level of the task.
+macro AlertColor [
+  cellcolor plan.alert = 0 "#00D000" # green
+  cellcolor plan.alert = 1 "#D0D000" # yellow
+  cellcolor plan.alert = 2 "#D00000" # red
+]
+
+taskreport status "" {
+  columns wbs, name, start, end, effort, alert, status
+  scenarios delayed 
+
+  taskreport dashboard "" {
+    headline "Project Dashboard (<-query attribute='now'->)"
+    columns name { title "Task" ${AlertColor} },
+            resources { width 200 ${AlertColor} 
+                        start ${projectstart} end ${projectend} },
+            alerttrend { title "Trend" ${AlertColor} },
+            alertmessage { width 260 ${AlertColor} }
+    hidetask ~hasalert(0)
+    sorttasks alert.down, delayed.end.up
+    period %{${now} - 1w} +1w
+  }
+  taskreport completed "" {
+    headline "Already completed tasks"
+    hidetask ~(delayed.end <= ${now})
+  }
+  taskreport ongoing "" {
+    headline "Ongoing tasks"
+    hidetask ~((delayed.start <= ${now}) & (delayed.end > ${now}))
+  }
+  taskreport future "" {
+    headline "Future tasks"
+    hidetask ~(delayed.start > ${now})
+  }
+}
+
 # A list of tasks showing the resources assigned to each task.
 taskreport development "" {
+  scenarios delayed
   headline "Development - Resource Allocation Report"
   columns hierarchindex, name, start, end, effort { title "Work" },
-          duration, chart { scale day }
+          duration, chart { scale day width 500 }
   timeformat "%Y-%m-%d"
-  hideresource ~isleaf()
+  hideresource ~(isleaf() & isleaf_())
   sortresources name.up
 }
 
 # A list of all tasks with the percentage completed for each task
 taskreport deliveries "" {
-  headline "Project Deliveries"
-  columns hierarchindex, name, start, end, note, complete, chart
+  headline "Project Deliverables"
+  columns hierarchindex, name, start, end, note { width 150 }, complete, chart
   taskroot AcSo.deliveries
-  loadunit days
   hideresource 1
   scenarios plan, delayed
 }
 # A list of all employees with their contact details.
 resourcereport contactList "" {
+  scenarios delayed
   headline "Contact list and duty plan"
-  columns name, Email { cellurl "mailto:$${Email}" }, Phone,
+  columns name,
+          Email { celltext 1 "[mailto:<-Email-> <-Email->]" },
+          Phone,
           chart { scale day }
   hideresource ~isleaf()
   sortresources name.up
@@ -499,9 +595,12 @@ resourcereport contactList "" {
 # A graph showing resource allocation. It identifies whether each
 # resource is under- or over-allocated for.
 resourcereport resourceGraph "" {
+  scenarios delayed
   headline "Resource Allocation Graph"
-  columns no, name, effort, rate, weekly #, utilization, freeload, chart
+  columns no, name, effort, rate, weekly
   loadunit shortauto
-  hidetask ~isleaf()
+  # We only like to show leaf tasks for leaf resources.
+  hidetask ~(isleaf() & isleaf_())
   sorttasks plan.start.up
 }
+

data/test/TestSuite/Syntax/Errors/macro_stack_overflow.tjp

@@ -0,0 +1,28 @@
+project "Macro Stack Overflow" 2009-11-01 +2m
+
+macro foo [ task "bar" { ${foo} } ]
+
+# MARK: error 27 macro_stack_overflow
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+# MARK: info 3 macro_stack
+${foo}
+

data/test/TestSuite/Syntax/Errors/unsupported_token.tjp

@@ -0,0 +1,12 @@
+project "Test" 2009-11-28 +2m 
+
+task t "T" {
+	journalentry 2009-11-28 "Just testing" {
+# MARK: error 8 unsupported_token
+    summary -8<-
+      This is all good.
+      * This is bad.
+    ->8-
+  }
+}
+

data/test/all.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = test_all.rb -- The TaskJuggler III Project Management Software
+# = all.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/test/test_BatchProcessor.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = test_Project.rb -- The TaskJuggler III Project Management Software
+# = test_BatchProcessor.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -18,25 +18,54 @@ require 'BatchProcessor'
 class TestProject < Test::Unit::TestCase
 
   def test_simple
-    bp = TaskJuggler::BatchProcessor.new(2)
-    @i = 0
-    6.times { |i| bp.queue("job #{i}") { job(i) } }
-    bp.wait { |j| postprocess(j) }
-    assert_equal(6, @i, "Not all threads terminated propertly (#{@i})")
+    doRun(1, 1) { sleep 0.1 }
+    doRun(1, 2) { sleep 0.1 }
+    doRun(1, 7) { sleep 0.1 }
+    doRun(2, 1) { sleep 0.1 }
+    doRun(2, 2) { sleep 0.1 }
+    doRun(2, 33) { sleep 0.1 }
+    doRun(3, 1) { sleep 0.1 }
+    doRun(3, 3) { sleep 0.1 }
+    doRun(3, 67) { sleep 0.1 }
   end
 
-  def job(n)
+  # This test case triggers a Ruby 1.9.x mutex bug
+  #def test_fileIO
+  #  doRun(3, 200) do
+  #    fname = "test#{$$}.txt"
+  #    f = File.new(fname, 'w')
+  #    0.upto(10000) { |i| f.puts "#{i} Hello, world!" }
+  #    f.close
+  #    File.delete(fname)
+  #  end
+  #end
+
+  def doRun(maxCPUs, jobs, &block)
+    bp = TaskJuggler::BatchProcessor.new(maxCPUs)
+    jobs.times do |i|
+      bp.queue("job #{i}") { runJob(i, &block) }
+    end
+    @cnt = 0
+    lock = Monitor.new
+    bp.wait do |j|
+      puts "Signal error" if j.retVal.signaled?
+      postprocess(j)
+      lock.synchronize { @cnt += 1 }
+    end
+    assert_equal(jobs, @cnt, "Not all threads terminated propertly (#{@cnt})")
+  end
+
+  def runJob(n, &block)
     puts "Job #{n} started"
-    sleep(1)
+    yield
     $stderr.puts "Error #{n}" if n % 2 == 0
     puts "Job #{n} finished"
-    exit n
+    n
   end
 
   def postprocess(job)
-    @i += 1
-    assert_equal(job.retVal.exitstatus, job.jobId)
-    assert_equal(job.retVal.pid, job.pid)
+    assert_equal(job.retVal.exitstatus, job.jobId, 'JobID mismatch')
+    assert_equal(job.retVal.pid, job.pid, 'PID mismatch')
     assert_equal("job #{job.jobId}", job.tag)
     text = <<"EOT"
 Job #{job.jobId} started

data/test/test_CSV-Reports.rb

@@ -3,7 +3,7 @@
 #
 # = test_CSV-Reports.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/test/test_Journal.rb

@@ -0,0 +1,176 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = test_Journal.rb -- The TaskJuggler III Project Management Software
+#
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if __FILE__ == $0
+
+require 'test/unit'
+require 'Project'
+
+class TaskJuggler
+
+class TestJournal < Test::Unit::TestCase
+
+  def setup
+    @p = TaskJuggler::Project.new('hello', 'Hello World', '1.0',
+                                  MessageHandler.new(true))
+    @p['start'] = tm('2009-11-01')
+    @p['end'] = tm('2009-12-31')
+    @j = @p['journal']
+  end
+
+  def teardown
+  end
+
+  def test_add
+    # First some simple add tests.
+    @j.addEntry(e = JournalEntry.new(@j, tm('2009-11-29'), "E1", 1))
+    assert_equal(1, @j.entries.count)
+
+    # Make sure we don't add the same entry twice.
+    @j.addEntry(e)
+    assert_equal(1, @j.entries.count)
+
+    @j.addEntry(JournalEntry.new(@j, tm('2009-11-30'), "E2", 2))
+    @j.addEntry(JournalEntry.new(@j, tm('2009-12-01'), "E3", 3))
+    assert_equal(3, @j.entries.count)
+  end
+
+  def test_sort
+    # Add a bunch of entries and see if the sorting by date works properly.
+    @j.addEntry(JournalEntry.new(@j, tm('2009-12-10'), "E4", 4))
+    @j.addEntry(JournalEntry.new(@j, tm('2009-12-03'), "E2", 2))
+    @j.addEntry(JournalEntry.new(@j, tm('2009-12-06'), "E3", 3))
+    @j.addEntry(JournalEntry.new(@j, tm('2009-11-29'), "E0", 0))
+    @j.addEntry(JournalEntry.new(@j, tm('2009-12-01'), "E1", 1))
+    @j.addEntry(JournalEntry.new(@j, tm('2009-12-24'), "E5", 5))
+
+    pList = []
+    @j.entries.each { |e| pList << e.property }
+    pList.each do |i|
+      assert_equal(pList.index(i), i)
+    end
+  end
+
+  def test_sortSameDate
+    # Add a bunch of entries and see if the sorting by date works properly.
+    @j.addEntry(e = JournalEntry.new(@j, tm('2009-12-10'), "A2", 0))
+    e.alertLevel = 2
+    @j.addEntry(e = JournalEntry.new(@j, tm('2009-12-10'), "A0", 0))
+    e.alertLevel = 0
+    @j.addEntry(e = JournalEntry.new(@j, tm('2009-12-10'), "A1", 0))
+    e.alertLevel = 1
+    @j.addEntry(e = JournalEntry.new(@j, tm('2009-12-10'), "A3", 0))
+    e.alertLevel = 3
+
+    i = 0
+    @j.entries.each do |entry|
+      assert_equal(i, entry.alertLevel)
+      i += 1
+    end
+  end
+
+  def test_currentEntries
+    createTaskTree
+    # Set a 0 alert for a task
+    a1 = addAlert('2009-11-29', 0, t = task('p1.m1.l1'))
+    ce = @j.currentEntriesR(tm('2009-12-05'), t)
+    assert_equal(1, ce.count)
+    assert_equal(a1, ce[0])
+
+    # Add a later alert for the same task
+    a2 = addAlert('2009-11-30', 0, t = task('p1.m1.l1'))
+    ce = @j.currentEntriesR(tm('2009-12-05'), t)
+    assert_equal(1, ce.count)
+    assert_equal(a2, ce[0])
+
+    # Add another alert to the sister task and check parent
+    a3 = addAlert('2009-11-30', 0, t = task('p1.m1.l2'))
+    ce = @j.currentEntriesR(tm('2009-12-05'), task('p1.m1'))
+    assert_equal(2, ce.count)
+    assert_equal(a2, ce[0])
+    assert_equal(a3, ce[1])
+
+    # Check root task
+    ce = @j.currentEntriesR(tm('2009-12-05'), task('p1'))
+    assert_equal(2, ce.count)
+    assert_equal(a2, ce[0])
+    assert_equal(a3, ce[1])
+
+    # Add old override alert to p1.m1
+    a4 = addAlert('2009-11-29', 0, t = task('p1.m1'))
+    ce = @j.currentEntriesR(tm('2009-12-05'), task('p1'))
+    assert_equal(2, ce.count)
+    assert_equal(a2, ce[0])
+    assert_equal(a3, ce[1])
+
+    # Add new override alert to p1.m1
+    a5 = addAlert('2009-12-01', 0, t = task('p1.m1'))
+    ce = @j.currentEntriesR(tm('2009-12-05'), task('p1'))
+    assert_equal(1, ce.count)
+    assert_equal(a5, ce[0])
+  end
+
+  def test_alertSimple
+    createTaskTree
+    # Set a 0 alert for a task
+    addAlert('2009-11-29', 0, t = task('p1.m1.l1'))
+    assert_equal(0, @j.alertLevel(tm('2009-12-01'), t))
+
+    # Now add a later 1 alert
+    addAlert('2009-12-01', 1, t)
+    assert_equal(1, @j.alertLevel(tm('2009-12-02'), t))
+
+    # Set a 2 alert for p1.m1.l2
+    addAlert('2009-11-29', 2, task('p1.m1.l2'))
+    assert_equal(2, @j.alertLevel(tm('2009-12-01'), task('p1')))
+
+    # Overide p1.m1 with 0 alert
+    addAlert('2009-12-01', 0, task('p1.m1'))
+    assert_equal(0, @j.alertLevel(tm('2009-12-01'), task('p1')))
+  end
+
+  private
+
+  def tm(s)
+    TjTime.new(s)
+  end
+
+  def addAlert(date, level, property)
+    raise "No property" unless property
+    @j.addEntry(e = JournalEntry.new(@j, tm(date),
+                                     "Set #{property.fullId} " +
+                                     "to level #{level}i at #{date}",
+                                     property))
+    e.alertLevel = level
+    e
+  end
+
+  def createTaskTree
+    p1 = newTask(nil, 'p1')
+    m1 = newTask(p1, 'm1')
+    m2 = newTask(p1, 'm2')
+    newTask(m1, 'l1')
+    newTask(m1, 'l2')
+    newTask(nil, 'p2')
+  end
+
+  def newTask(parent, id)
+    t = Task.new(@p, id, 'Task #{id}', parent)
+  end
+
+  def task(id)
+    @p.task(id) || ( raise "Unknown task id #{id}" )
+  end
+
+end
+
+end