taskjuggler 3.0.0 → 3.1.0

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

@@ -0,0 +1,21 @@
+project "Test" 2011-12-11 +1m
+
+task "Foo"
+
+textreport frame "textreport" {
+  taskreport r1 ""
+  taskreport r2 ""
+
+  formats html
+  header -8<-
+  This is the header
+  ----
+  ->8-
+  left "<[report id='frame.r1']>"
+  center "Center"
+  right "<[report id='frame.r2']>"
+  footer -8<-
+  ----
+  This is the footer
+  ->8-
+}

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

@@ -69,7 +69,7 @@ rate 390.0
 
 # Register Good Friday as a global holiday for all resources.
 # *** EXAMPLE: vacation +
-vacation "Good Friday" 2002-03-29
+leaves holiday "Good Friday" 2002-03-29
 # *** EXAMPLE: vacation -
 # *** EXAMPLE: flags +
 flags team
@@ -122,7 +122,7 @@ resource dev "Developers" {
   resource dev3 "Klaus Müller" {
     email "Klaus.Mueller@crappysoftware.com"
     Phone "x490"
-    vacation 2002-02-01 - 2002-02-05
+    leaves annual 2002-02-01 - 2002-02-05
   }
   flags team
 }
@@ -138,7 +138,7 @@ resource misc "The Others" {
     email "sung@crappysoftware.com"
     Phone "x482"
     rate 300.0
-    vacation 2002-03-11 - 2002-03-16
+    leaves annual 2002-03-11 - 2002-03-16
   }
 
   flags team
@@ -379,7 +379,7 @@ task AcSo "Accounting Software" {
 
     task prev "Technology Preview" {
       depends !!software.backend
-      startcredit 31000.0
+      charge 31000.0 onstart
       note "All '''major''' features should be usable."
     }
 
@@ -515,8 +515,8 @@ taskreport overview "" {
   ->8-
 # *** EXAMPLE: overview4 -
 # *** EXAMPLE: overview1 +
-  columns hierarchindex,
-          name, start, end, effort, duration, cost,
+  columns bsi { title 'WBS' },
+          name, start, end, effort, cost,
           revenue, chart { ${TaskTip} }
 # *** EXAMPLE: overview1 -
   # For this report we like to have the abbreviated weekday in front
@@ -559,7 +559,7 @@ macro AlertColor [
 ]
 
 taskreport status "" {
-  columns wbs { width 50 }, name { width 150 },
+  columns bsi { width 50 title 'WBS' }, name { width 150 },
           start { width 100 }, end { width 100 },
           effort { width 100 },
           alert { tooltip plan.journal
@@ -575,7 +575,9 @@ taskreport status "" {
                         listitem "<-query attribute='name'->"
                         start ${projectstart} end ${projectend} },
             alerttrend { title "Trend" ${AlertColor} width 50 },
-            journalmessages { width 350 ${AlertColor} }
+            journal { width 350 ${AlertColor} }
+    journalmode status_up
+    journalattributes headline, author, date, summary, details
     hidetask ~hasalert(0)
     sorttasks alert.down, delayed.end.up
     period %{${now} - 1w} +1w
@@ -598,7 +600,7 @@ taskreport status "" {
 taskreport development "" {
   scenarios delayed
   headline "Development - Resource Allocation Report"
-  columns hierarchindex, name, start, end, effort { title "Work" },
+  columns bsi { title 'WBS' }, name, start, end, effort { title "Work" },
           duration, chart { ${TaskTip} scale day width 500 }
   timeformat "%Y-%m-%d"
   hideresource ~(isleaf() & isleaf_())
@@ -608,7 +610,7 @@ taskreport development "" {
 # A list of all tasks with the percentage completed for each task
 taskreport deliveries "" {
   headline "Project Deliverables"
-  columns hierarchindex, name, start, end, note { width 150 }, complete,
+  columns bsi { title 'WBS' }, name, start, end, note { width 150 }, complete,
           chart { ${TaskTip} }
   taskroot AcSo.deliveries
   hideresource 1

data/test/TestSuite/Syntax/Errors/{adopt_common_root.tjp → adopt_duplicate_child-2.tjp}

@@ -2,7 +2,7 @@ project "Adopted Tasks" 2011-03-05 +1m
 
 task t1 "T1" {
   task t2 "T2"
-# MARK: error 6 adopt_common_root
+# MARK: error 6 adopt_duplicate_child
   task t3 "T3" {
     adopt t1.t2
   }

data/test/TestSuite/Syntax/Errors/{adopt_duplicate_parent.tjp → adopt_duplicate_child-3.tjp}

@@ -3,7 +3,7 @@ project "Adopted Tasks" 2011-03-05 +1m
 task t1 "T1" {
   task t2 "T2"
 }
-# MARK: error 7 adopt_duplicate_parent
+# MARK: error 7 adopt_duplicate_child
 task t3 "T3" {
   adopt t1, t1.t2
 }

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

@@ -0,0 +1,7 @@
+project "Adopted Tasks" 2011-11-17 +1m
+
+# MARK: error 4 adopt_self
+task t1 "T1" {
+  adopt t1
+}
+

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

@@ -0,0 +1,8 @@
+project "Test" 2011-12-08 +1m {
+# MARK: error 3 alert_level_redef
+  alertlevels foo "Foo" "#000",
+              bar "Bar" "#111",
+              foo "Foo2" "#222",
+              bar1 "Bar1" "#333"
+}
+

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

@@ -0,0 +1,8 @@
+project "Test" 2011-12-08 +1m {
+# MARK: error 3 alert_name_redef
+  alertlevels foo "Foo" "#000",
+              bar "Bar" "#111",
+              foo2 "Foo" "#222",
+              bar1 "Bar1" "#333"
+}
+

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

@@ -0,0 +1,5 @@
+project "Test" 2011-12-08 +1m {
+# MARK: error 3 too_few_alert_levels
+  alertlevels foo "Foo" "#000"
+}
+

data/test/TjpGen.rb

@@ -3,7 +3,7 @@
 #
 # = TjpGen.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/test/all.rb

@@ -3,7 +3,7 @@
 #
 # = all.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/test/test_AlgorithmDiff.rb

@@ -3,7 +3,7 @@
 #
 # = test_AlgorithmDiff.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/test/test_BatchProcessor.rb

@@ -3,7 +3,7 @@
 #
 # = test_BatchProcessor.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -19,6 +19,19 @@ require 'taskjuggler/BatchProcessor'
 
 class TestProject < Test::Unit::TestCase
 
+  def setup
+    @t = Thread.new do
+      # Timout for the watchdog timer. Even slow hardware should finish each
+      # test in under 30s.
+      sleep(30)
+      assert(false, 'Test timed out')
+    end
+  end
+
+  def teardown
+    @t.kill
+  end
+
   def test_simple
     doRun(1, 1) { sleep 0.1 }
     doRun(1, 2) { sleep 0.1 }
@@ -32,15 +45,15 @@ class TestProject < Test::Unit::TestCase
   end
 
   # 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 test_fileIO
+    doRun(3, 80) 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)

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, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/test/test_CSVFile.rb

@@ -3,7 +3,7 @@
 #
 # = test_CSVFile.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/test/test_CollisionDetector.rb

@@ -3,7 +3,7 @@
 #
 # = test_CollisionDetector.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/test/test_Export-Reports.rb

@@ -3,7 +3,7 @@
 #
 # = test_Export-Reports.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/test/test_Journal.rb

@@ -3,7 +3,7 @@
 #
 # = test_Journal.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -21,6 +21,20 @@ class TaskJuggler
 
 class TestJournal < Test::Unit::TestCase
 
+  class PTNMockup
+
+    attr_reader :index
+
+    def initialize(index)
+      @index = index
+    end
+
+    def ptn
+      self
+    end
+
+  end
+
   def setup
     @p = TaskJuggler::Project.new('hello', 'Hello World', '1.0',
                                   MessageHandler.new(true))
@@ -34,43 +48,56 @@ class TestJournal < Test::Unit::TestCase
 
   def test_add
     # First some simple add tests.
-    @j.addEntry(e = JournalEntry.new(@j, tm('2009-11-29'), "E1", 1))
+    @j.addEntry(e = JournalEntry.new(@j, tm('2009-11-29'), "E1",
+                                     PTNMockup.new(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))
+    @j.addEntry(JournalEntry.new(@j, tm('2009-11-30'), "E2",
+                                 PTNMockup.new(2)))
+    @j.addEntry(JournalEntry.new(@j, tm('2009-12-01'), "E3",
+                                 PTNMockup.new(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))
+    @j.addEntry(JournalEntry.new(@j, tm('2009-12-10'), "E4",
+                                 PTNMockup.new(4)))
+    @j.addEntry(JournalEntry.new(@j, tm('2009-12-03'), "E2",
+                                 PTNMockup.new(2)))
+    @j.addEntry(JournalEntry.new(@j, tm('2009-12-06'), "E3",
+                                 PTNMockup.new(3)))
+    @j.addEntry(JournalEntry.new(@j, tm('2009-11-29'), "E0",
+                                 PTNMockup.new(0)))
+    @j.addEntry(JournalEntry.new(@j, tm('2009-12-01'), "E1",
+                                 PTNMockup.new(1)))
+    @j.addEntry(JournalEntry.new(@j, tm('2009-12-24'), "E5",
+                                 PTNMockup.new(5)))
 
     pList = []
     @j.entries.each { |e| pList << e.property }
     pList.each do |i|
-      assert_equal(pList.index(i), i)
+      assert_equal(pList.index(i), i.index)
     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))
+    @j.addEntry(e = JournalEntry.new(@j, tm('2009-12-10'), "A2",
+                                     PTNMockup.new(0)))
     e.alertLevel = 2
-    @j.addEntry(e = JournalEntry.new(@j, tm('2009-12-10'), "A0", 0))
+    @j.addEntry(e = JournalEntry.new(@j, tm('2009-12-10'), "A0",
+                                     PTNMockup.new(0)))
     e.alertLevel = 0
-    @j.addEntry(e = JournalEntry.new(@j, tm('2009-12-10'), "A1", 0))
+    @j.addEntry(e = JournalEntry.new(@j, tm('2009-12-10'), "A1",
+                                     PTNMockup.new(0)))
     e.alertLevel = 1
-    @j.addEntry(e = JournalEntry.new(@j, tm('2009-12-10'), "A3", 0))
+    @j.addEntry(e = JournalEntry.new(@j, tm('2009-12-10'), "A3",
+                                     PTNMockup.new(0)))
     e.alertLevel = 3
 
     i = 0

data/test/test_Limits.rb

@@ -3,7 +3,7 @@
 #
 # = test_Limits.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/test/test_LogicalExpression.rb

@@ -3,7 +3,7 @@
 #
 # = test_LogicalExpression.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/test/test_MacroTable.rb

@@ -3,7 +3,7 @@
 #
 # = test_MacroTable.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -15,18 +15,23 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if __FILE__ == $0
 
 require 'test/unit'
 
-require 'taskjuggler/TextParser/MacroTable'
-
 class TaskJuggler
 
+require 'taskjuggler/TextParser/MacroTable'
+
 class TestMacroTable < Test::Unit::TestCase
 
   def setup
     @mt = TaskJuggler::TextParser::MacroTable.new
+    @t = Thread.new do
+      sleep(1)
+      assert('Test timed out')
+    end
   end
 
   def teardown
     @mt.clear
+    @t.kill
   end
 
   def test_addAndClear

data/test/test_Project.rb

@@ -3,7 +3,7 @@
 #
 # = test_Project.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify