taskjuggler 0.0.8 → 0.0.9

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

@@ -2,23 +2,30 @@ project test "Test Project" "$Id" 2000-01-01 - 2000-01-04
 
 flags important
 
+# *** EXAMPLE: resource +
 resource joe "Joe"
+# *** EXAMPLE: resource -
 
+# *** EXAMPLE: task +
 task top "Top Task" {
-  start 2000-01-01
-
-  task sub "Sub Task" {
-  }
+  task sub "Sub Task"
   supplement task sub {
     length 1d
   }
 }
+# *** EXAMPLE: task -
 
+# *** EXAMPLE: resource +
 supplement resource joe {
   vacation 2000-02-10 - 2000-02-20
 }
+# *** EXAMPLE: resource -
 
+# *** EXAMPLE: task +
 supplement task top {
   flags important
+  supplement task sub {
+    allocate joe
+  }
 }
-
+# *** EXAMPLE: task -

data/test/TestSuite/Syntax/Correct/TaskPrefix.tji

@@ -0,0 +1,3 @@
+task sub_task1 "Sub task 1" {
+  effort 1d
+}

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

@@ -0,0 +1,24 @@
+project project "Include task prefix test" "1.0" 2010-12-01 +1m {
+  now 2010-12-01
+}
+
+resource tux "Tux"
+
+task parent_task "Parent task" {
+  start ${projectstart} 
+  allocate tux
+}
+
+include "TaskPrefix.tji" { taskprefix parent_task }
+
+task other_task "Other task" {
+  start ${projectstart} 
+  effort 1d
+  allocate tux
+}
+
+supplement resource tux {
+  booking parent_task.sub_task1 2010-12-01-9:00 +9h { sloppy 2 }
+  booking other_task 2010-12-02-9:00 +9h { sloppy 2 }
+}
+

data/test/TestSuite/Syntax/Correct/css/tjreport.css

@@ -17,16 +17,20 @@ h3 { font-size:16px; }
 }
 i.tj_journal { font-size:9px; }
 h1.tj_journal {
+  font-size:16px;
+  margin-left:0px;
+}
+h2.tj_journal {
   font-size:14px;
   margin-left:10px;
 }
-h2.tj_journal { 
+h3.tj_journal { 
   margin-top:5px;
   font-size:13px; 
   margin-bottom:1px;
   margin-left:20px;
 }
-h3.tj_journal { 
+h4.tj_journal { 
   font-size:12px;
   margin-left:30px;
 }
@@ -108,6 +112,7 @@ p.tj_journal {
   width:100%;
   border-spacing:0px;
   position: relative;
+  overflow:hidden;
 } 
 
 /* The symbol is the icon to the left of the text label in a table

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

@@ -104,6 +104,7 @@ resource boss "Paul Henry Bullock" {
   rate 480
 }
 resource dev "Developers" {
+  managers boss
   resource dev1 "Paul Smith" {
     email "paul@crappysoftware.com"
     Phone "x362"
@@ -121,6 +122,7 @@ resource dev "Developers" {
   flags team
 }
 resource misc "The Others" {
+  managers boss
   resource test "Peter Murphy" {
     email "murphy@crappysoftware.com"
     Phone "x666"
@@ -410,6 +412,7 @@ navigator navbar {
 }
 # *** EXAMPLE: navigator -
 
+# *** EXAMPLE: tasktip +
 macro TaskTip [
   tooltip istask() -8<-
     '''Start: ''' <-query attribute='start'->
@@ -428,6 +431,7 @@ macro TaskTip [
     <-query attribute='followers'->
     ->8-
 ]
+# *** EXAMPLE: tasktip -
 
 # *** EXAMPLE: overview_report1 +
 # *** EXAMPLE: overview_report2 +
@@ -550,17 +554,22 @@ macro AlertColor [
 ]
 
 taskreport status "" {
-  columns wbs, name, start, end, effort, alert { tooltip plan.journal
-  != '' "<-query attribute='journal'->" }, status
+  columns wbs { width 50 }, name { width 150 },
+          start { width 100 }, end { width 100 },
+          effort { width 100 },
+          alert { tooltip plan.journal
+                          != '' "<-query attribute='journal'->" width 150 },
+          status { width 150 }
   scenarios delayed 
 
   taskreport dashboard "" {
     headline "Project Dashboard (<-query attribute='now'->)"
-    columns name { title "Task" ${AlertColor} },
+    columns name { title "Task" ${AlertColor} width 200},
             resources { width 200 ${AlertColor} 
+                        listtype bullets listmode 2
                         start ${projectstart} end ${projectend} },
-            alerttrend { title "Trend" ${AlertColor} },
-            journalmessages { width 260 ${AlertColor} }
+            alerttrend { title "Trend" ${AlertColor} width 50 },
+            journalmessages { width 350 ${AlertColor} }
     hidetask ~hasalert(0)
     sorttasks alert.down, delayed.end.up
     period %{${now} - 1w} +1w
@@ -606,6 +615,7 @@ resourcereport contactList "" {
   columns name,
           email { celltext 1 "[mailto:<-email-> <-email->]" },
           Phone,
+          managers { title "Manager" },
           chart { scale day }
   hideresource ~isleaf()
   sortresources name.up

data/test/all.rb

@@ -3,14 +3,12 @@
 #
 # = all.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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')
-$:.unshift File.dirname(__FILE__)
 
 Dir.glob(File.dirname(__FILE__) + '/test_*.rb').each { |f| require f }

data/test/test_BatchProcessor.rb

@@ -3,7 +3,8 @@
 #
 # = test_BatchProcessor.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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_CSV-Reports.rb

@@ -3,7 +3,8 @@
 #
 # = test_CSV-Reports.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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
@@ -53,8 +54,8 @@ class TestScheduler < Test::Unit::TestCase
   # reference files _refFile_.
   def compareCSVs(outStr, refFile)
     ref = TaskJuggler::CSVFile.new.read(refFile)
-
     out = TaskJuggler::CSVFile.new.parse(outStr)
+
     assert(ref.length == out.length,
            "Line number mismatch (#{out.length} instead of #{ref.length}) " +
            "in #{refFile}")
@@ -72,32 +73,42 @@ class TestScheduler < Test::Unit::TestCase
     end
   end
 
+  def checkCSVReport(projectFile)
+    baseDir = File.dirname(projectFile)
+    baseName = File.basename(projectFile, '.tjp')
+    # The reference files must have the same base name as the project file but
+    # they need to be in the ./refs/ directory relative to the project file.
+    refFile = baseDir + "/refs/#{baseName}.csv"
+
+    tj = TaskJuggler.new(true)
+    assert(tj.parse([ projectFile ]), "Parser failed for #{projectFile}")
+    assert(tj.schedule, "Scheduler failed for #{projectFile}")
+    if File.file?(refFile)
+      # If there is a reference CSV file for this test case, compare the
+      # output against it.
+      out = captureStdout do
+        assert(tj.generateReports(baseDir),
+               "Report generation failed for #{projectFile}")
+      end
+      compareCSVs(out, refFile)
+    else
+      # If not, we generate the reference file.
+      puts "refFile: #{refFile}"
+      stdoutToFile(refFile) do
+        assert(tj.generateReports,
+               "Reference file generation failed for #{projectFile}")
+      end
+    end
+    assert(tj.messageHandler.messages.empty?,
+           "Unexpected error in #{projectFile}")
+  end
+
   def test_CSV_Reports
     path = File.dirname(__FILE__)
 
     testDir = path + '/TestSuite/CSV-Reports/'
     Dir.glob(testDir + '*.tjp').each do |f|
-      baseName = f[22 + path.length, f.length - (path.length + 26)]
-      refFile = testDir + "#{baseName}-Reference.csv"
-      tj = TaskJuggler.new(true)
-      assert(tj.parse([ f ]), "Parser failed for #{f}")
-      assert(tj.schedule, "Scheduler failed for #{f}")
-      if File.file?(refFile)
-        # If there is a reference CSV file for this test case, compare the
-        # output against it.
-        out = captureStdout do
-          assert(tj.generateReports(testDir),
-                 "Report generation failed for #{f}")
-        end
-        compareCSVs(out, refFile)
-      else
-        # If not, we generate the reference file.
-        stdoutToFile(refFile) do
-          assert(tj.generateReports,
-                 "Reference file generation failed for #{f}")
-        end
-      end
-      assert(tj.messageHandler.messages.empty?, "Unexpected error in #{f}")
+      checkCSVReport(f)
     end
   end
 

data/test/test_CSVFile.rb

@@ -3,7 +3,8 @@
 #
 # = test_CSVFile.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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_CollisionDetector.rb

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = test_GanttRouter.rb -- The TaskJuggler III Project Management Software
+# = test_CollisionDetector.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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

@@ -3,7 +3,8 @@
 #
 # = test_Journal.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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_Limits.rb

@@ -3,7 +3,8 @@
 #
 # = test_Limits.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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_LogicalExpression.rb

@@ -3,7 +3,8 @@
 #
 # = test_LogicalExpression.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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_MacroTable.rb

@@ -3,7 +3,8 @@
 #
 # = test_MacroTable.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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_Project.rb

@@ -3,7 +3,8 @@
 #
 # = test_Project.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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
@@ -47,7 +48,7 @@ class TestProject < Test::Unit::TestCase
     assert_equal(p.task('foo'), t)
 
     p.schedule
-    assert_equal(t['end', 0], TjTime.new('2008-07-25-19:00'))
+    assert_equal(TjTime.new('2008-07-25-19:00'), t['end', 0])
     p.generateReports(1)
   end
 

data/test/test_ProjectFileScanner.rb

@@ -3,7 +3,8 @@
 #
 # = test_ProjectFileScanner.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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_PropertySet.rb

@@ -3,7 +3,8 @@
 #
 # = test_PropertySet.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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_Query.rb

@@ -3,7 +3,8 @@
 #
 # = test_Query.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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_RealFormat.rb

@@ -3,7 +3,8 @@
 #
 # = test_RealFormat.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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_ReportGenerator.rb

@@ -3,7 +3,8 @@
 #
 # = test_ReportGenerator.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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_RichText.rb

@@ -3,7 +3,8 @@
 #
 # = test_RichText.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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_Scheduler.rb

@@ -3,7 +3,8 @@
 #
 # = test_Scheduler.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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