taskjuggler 0.0.7 → 0.0.8

data/test/TestSuite/ReportGenerator/Errors/no_report_defined.tjp

@@ -0,0 +1,7 @@
+project "test" 2010-05-23 +1w
+
+task "foo"
+
+# MARK: warning 0 no_report_defined
+# MARK: warning 0 all_formats_empty
+

data/test/TestSuite/ReportGenerator/Errors/rtp_report_recursion.tjp

@@ -13,8 +13,8 @@ textreport r1 "R1" {
 textreport r2 "R2" {
   center "<[report id='r3']>"
 }
+# MARK: error 19 rtp_report_recursion
 textreport r3 "R3" {
   left "Hello, world!"
-# MARK: error 19 rtp_report_recursion
   center "<[report id='r1']>"
 }

data/test/TestSuite/StatusSheets/TimeSheets/2002-03-01/missing-reports

@@ -0,0 +1,2 @@
+resource1
+resource2

data/test/TestSuite/StatusSheets/run

@@ -34,6 +34,8 @@ tj3ss_sender --dryrun -e 2002-03-02 > sender.log || error "sender1"
 check "From: foo@bar.com" sender.log 2
 check "Content-Disposition: attachment;" sender.log 2
 check "^statussheet " sender.log 2
+check "^resource1" sender.log 0
+check "^resource2" sender.log 2
 
 # Run a receiver test
 tj3ss_receiver --dryrun < boss_mail >> receiver.log || error "rec1"

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

@@ -17,10 +17,18 @@ task test "Testing" {
 }
 
 supplement resource tux {
-  # This is the work that has been done up until now by tux.
-  booking test 2007-01-06 +8h { sloppy 2 }
-  booking test 2007-01-08 +4h,
-             2007-01-09 +4h { sloppy 2 }
-  # Book interval that extends into off-hours.
+  # Book a whole day (8 hours). The 1 hour lunch break is skipped.
+  booking test 2007-01-06-9:00 +9h { sloppy 1 }
+  # Book 2 days in the afternoon, 4 hours each.
+  booking test 2007-01-08-13:00 +4h,
+               2007-01-09-13:00 +4h
+  # This is a common mistake. With standard working hours, this will
+  # yield a zero time booking! The interval is midnight to 8am. So
+  # it's outside of the working hours and 'sloopy 2' surpresses the
+  # warning.
+  booking test 2007-01-11 +8h { sloppy 2 }
+  # Use 'overtime' to book off-hour slots. This booking will book the
+  # full 10 hours, ignoring the lunch break and adding an extra hour
+  # in the morning.
   booking test 2007-01-11-8:00 +10h { overtime 1 }
 }

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

@@ -0,0 +1,21 @@
+project "Test" "1.0" 2010-11-10 +2m
+
+resource org "Org" {
+  resource team1 "Team1" {
+    resource r1 "R1"
+    resource r2 "R2"
+    resource r3 "R3"
+  }
+  resource r4 "R4"
+}
+resource r5 "R5"
+
+task "T"
+
+resourcereport "ResourceRoot" {
+  formats html
+  columns name, id
+  # Only list the Team1 as if it would be a top-level resource.
+  resourceroot team1
+}
+

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

@@ -0,0 +1,21 @@
+project "Test" "1.0" 2010-11-10 +2m
+
+resource org "Org" {
+  resource team1 "Team1" {
+    resource r1 "R1"
+    resource r2 "R2"
+    resource r3 "R3"
+  }
+  resource r4 "R4"
+}
+resource r5 "R5"
+
+task "T"
+
+resourcereport "RollupResource" {
+  formats html
+  columns name, id
+  # Don't list the Team1 resources.
+  rollupresource plan.id = 'team1'
+}
+

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

@@ -1,4 +1,4 @@
-project prj "Taskroot Example" "1.0" 2005-07-22 - 2005-08-26
+project "Taskroot Example" 2005-07-22 - 2005-08-26
 
 task items "Project breakdown" {
   start 2005-07-22

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

@@ -1 +1 @@
-# MARK: error 2 unexpctd_token
+# MARK: error 1 unexpctd_token

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

@@ -0,0 +1,2 @@
+# MARK: error 2 include_before_project
+include "foo.tji"

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

@@ -0,0 +1,6 @@
+project test "Test" "1.0" 2010-11-06 +1m 
+
+task t "T" {
+# MARK: error 5 no_reduce
+	effort 1dd
+}

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

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

data/test/TestSuite/TimeSheets/run

@@ -50,7 +50,7 @@ tj3ts_summary --dryrun -e 2002-03-01 >> summary.log || error "summary"
 check "To: archive@bar.com" summary.log 2
 check "To: crew@bar.com" summary.log 1
 check "From: foo@bar.com" summary.log 7
-check "From: =?UTF-8?B?U8OpYmFzdGllbg==?= Bono <SBono@crappysoftware.com>" summary.log 1
+check "Message-ID:" summary.log 8
 check "The following 5 person(s) have not yet submitted their time sheets" summary.log 4
 check "Weekly Report from" summary.log 4
 check "Green" summary.log 12

data/test/test_CSV-Reports.rb

@@ -52,11 +52,9 @@ class TestScheduler < Test::Unit::TestCase
   # Compare the output CSV (passed as String) with the content of the CSV
   # reference files _refFile_.
   def compareCSVs(outStr, refFile)
-    ref = []
-    TaskJuggler::CSVFile.new(ref).read(refFile)
+    ref = TaskJuggler::CSVFile.new.read(refFile)
 
-    out = []
-    TaskJuggler::CSVFile.new(out).parse(outStr)
+    out = TaskJuggler::CSVFile.new.parse(outStr)
     assert(ref.length == out.length,
            "Line number mismatch (#{out.length} instead of #{ref.length}) " +
            "in #{refFile}")

data/test/test_CollisionDetector.rb

@@ -0,0 +1,85 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = test_GanttRouter.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 'reports/GanttRouter'
+
+class TaskJuggler
+
+class TestCollisionDetector < Test::Unit::TestCase
+
+  def test_collisions
+    # To test the collion?() method we use a fix block area and then try
+    # various lines that either collide or not.
+    #
+    #  2,2
+    #   +--+
+    #   |  |
+    #   +--+
+    #      4,4
+    #
+    # We use the same set of lines for horizontal and vertical tests. The
+    # first value is the x or y coordinate of the line, the tuple is the start
+    # and end coordinate in the other dimension. The third value is the
+    # expected result.
+    lines = [
+      [ [ 1, [0, 1] ], false ],
+      [ [ 2, [0, 1] ], false ],
+      [ [ 3, [0, 1] ], false ],
+      [ [ 4, [0, 1] ], false ],
+      [ [ 5, [0, 1] ], false ],
+      [ [ 1, [0, 2] ], false ],
+      [ [ 2, [0, 2] ], true ],
+      [ [ 3, [0, 2] ], true ],
+      [ [ 4, [0, 2] ], true ],
+      [ [ 5, [0, 2] ], false ],
+      [ [ 1, [0, 4] ], false ],
+      [ [ 2, [0, 4] ], true ],
+      [ [ 3, [0, 4] ], true ],
+      [ [ 4, [0, 4] ], true ],
+      [ [ 5, [0, 4] ], false ],
+      [ [ 1, [0, 5] ], false ],
+      [ [ 2, [0, 5] ], true ],
+      [ [ 3, [0, 5] ], true ],
+      [ [ 4, [0, 5] ], true ],
+      [ [ 5, [0, 6] ], false ],
+      [ [ 1, [4, 6] ], false ],
+      [ [ 2, [4, 6] ], true ],
+      [ [ 3, [4, 6] ], true ],
+      [ [ 4, [4, 6] ], true ],
+      [ [ 5, [4, 6] ], false ],
+      [ [ 1, [5, 6] ], false ],
+      [ [ 2, [5, 6] ], false],
+      [ [ 3, [5, 6] ], false ],
+      [ [ 4, [5, 6] ], false ],
+      [ [ 5, [5, 6] ], false ]
+    ]
+    # Try horizontal lines first.
+    cd = CollisionDetector.new(10, 10)
+    cd.addBlockedZone(2, 2, 3, 3, true, true)
+
+    lines.each do |line|
+      assert_equal(line[1], cd.collision?(*(line[0] + [ true ])),
+                   "Horizontal #{line[0]} is not #{line[1]}")
+    end
+    lines.each do |line|
+      assert_equal(line[1], cd.collision?(*(line[0] + [ false ])),
+                   "Vertical #{line[0]} is not #{line[1]}")
+    end
+  end
+
+end
+
+end
+

data/test/test_Project.rb

@@ -42,12 +42,12 @@ class TestProject < Test::Unit::TestCase
     assert_equal(p['rate'], 100.0)
 
     t = Task.new(p, 'foo', 'Foo', nil)
-    t['start', 0] = TjTime.new('2008-07-25 9:00')
+    t['start', 0] = TjTime.new('2008-07-25-9:00')
     t['duration', 0] = 10
     assert_equal(p.task('foo'), t)
 
     p.schedule
-    assert_equal(t['end', 0], TjTime.new('2008-07-25 19:00'))
+    assert_equal(t['end', 0], TjTime.new('2008-07-25-19:00'))
     p.generateReports(1)
   end
 

data/test/test_ProjectFileScanner.rb

@@ -44,21 +44,21 @@ comment */
 EOT
 
     ref = [
-      ['ID', 'Hello', 1],
-      ['ID', 'world', 1],
-      ['INTEGER', 1, 1],
-      ['FLOAT', 2.0, 2],
-      ['DATE', TjTime.new('2008-12-14'), 3],
-      ['ID_WITH_COLON', 'foo', 5],
-      ['ABSOLUTE_ID', 'a.b.c', 6],
-      ['LITERAL', '-', 6],
-      ['LITERAL', '$', 6],
-      ['MACRO', 'A Macro', 6],
-      ['TIME', ((15 * 60) + 23) * 60, 7],
-      ['STRING', 'A string', 7],
-      ['STRING', "It's a string", 8],
-      ['STRING', "A\nmult\"i line\nstring", 9],
-      ['.', '<END>', 14 ]
+      [:ID, 'Hello', 1],
+      [:ID, 'world', 1],
+      [:INTEGER, 1, 1],
+      [:FLOAT, 2.0, 2],
+      [:DATE, TjTime.new('2008-12-14'), 3],
+      [:ID_WITH_COLON, 'foo', 5],
+      [:ABSOLUTE_ID, 'a.b.c', 6],
+      [:LITERAL, '-', 6],
+      [:LITERAL, '$', 6],
+      [:MACRO, 'A Macro', 6],
+      [:TIME, time(15, 23), 7],
+      [:STRING, 'A string', 7],
+      [:STRING, "It's a string", 8],
+      [:STRING, "A\nmult\"i line\nstring", 9],
+      [:eof, '<END>', 14 ]
     ]
 
     check(text, ref)
@@ -76,19 +76,57 @@ EOT
     ]
 
     ref = [
-      ['ID', 'This', 1],
-      ['ID', 'great', 1],
-      ['ID', 'software', 1],
-      ['ID', 'macro', 2],
-      ['ID', 'with', 2],
-      ['ID', 'arg1', 2],
-      ['ID', 'argument', 2],
-      ['.', '<END>', 3]
+      [:ID, 'This', 1],
+      [:ID, 'great', 1],
+      [:ID, 'software', 1],
+      [:ID, 'macro', 2],
+      [:ID, 'with', 2],
+      [:ID, 'arg1', 2],
+      [:ID, 'argument', 2],
+      [:eof, '<END>', 3]
     ]
 
     check(text, ref, macros)
   end
 
+  def test_time
+    text = <<'EOT'
+0:00
+00:00
+1:00
+11:59
+12:01
+24:00
+EOT
+    ref = [
+      [:TIME, time(0, 0), 1],
+      [:TIME, time(0, 0), 2],
+      [:TIME, time(1, 0), 3],
+      [:TIME, time(11, 59), 4],
+      [:TIME, time(12, 1), 5],
+      [:TIME, time(24, 0), 6],
+      [:eof, '<END>', 7]
+    ]
+
+    check(text, ref)
+  end
+
+  def test_date
+    text = <<'EOT'
+1970-01-01
+2035-12-31-23:59:59
+2010-08-11-23:10
+EOT
+    ref = [
+      [:DATE, TjTime.new('1970-01-01'), 1],
+      [:DATE, TjTime.new('2035-12-31-23:59:59'), 2],
+      [:DATE, TjTime.new('2010-08-11-23:10'), 3],
+      [:eof, '<END>', 4]
+    ]
+
+    check(text, ref)
+  end
+
   def test_macroDef
     text = <<'EOT'
     [ foo ]
@@ -106,13 +144,13 @@ EOT
 EOT
 
     ref = [
-      [ 'MACRO', ' foo ', 1 ],
-      [ 'MACRO', "\n      bar ", 2 ],
-      [ 'MACRO', " foo\n    ", 4 ],
-      [ 'MACRO', "\n    bar\n    ", 6 ],
-      [ 'MACRO', '', 9 ],
-      [ 'MACRO', "\n    ", 10 ],
-      [ '.', '<END>', 13 ]
+      [ :MACRO, ' foo ', 1 ],
+      [ :MACRO, "\n      bar ", 2 ],
+      [ :MACRO, " foo\n    ", 4 ],
+      [ :MACRO, "\n    bar\n    ", 6 ],
+      [ :MACRO, '', 9 ],
+      [ :MACRO, "\n    ", 10 ],
+      [ :eof, '<END>', 13 ]
     ]
 
     check(text, ref)
@@ -124,7 +162,7 @@ EOT
       [ 'foo', 'hello' ]
     ]
     ref = [
-      [ 'ID', 'hello', 1 ]
+      [ :ID, 'hello', 1 ]
     ]
 
     check(text, ref, macros)
@@ -132,6 +170,10 @@ EOT
 
   private
 
+  def time(h, m)
+    (h * 60 + m) * 60
+  end
+
   def check(text, ref, macros = [])
     s = TaskJuggler::ProjectFileScanner.new(text, MessageHandler.new(true))
     s.open(true)

data/test/test_Query.rb

@@ -23,8 +23,8 @@ class TestQuery < Test::Unit::TestCase
   def setup
     @mh = MessageHandler.new
     @p = TaskJuggler::Project.new('id', 'name', 'ver', @mh)
-    @p['start'] = TjTime.new(1202491644)
-    @p['end'] = TjTime.new(1202439409)
+    @p['start'] = TjTime.new('2010-09-25')
+    @p['end'] = TjTime.new('2010-09-25')
   end
 
   def teardown

data/test/test_ReportGenerator.rb

@@ -53,7 +53,7 @@ class TestReportGenerator < Test::Unit::TestCase
     Dir.glob(path + 'TestSuite/ReportGenerator/Correct/*.tjp').each do |f|
       ENV['TZ'] = 'Europe/Berlin'
       tj = TaskJuggler.new(true)
-      assert(tj.parse([ f ]), "Parser failed for ${f}")
+      assert(tj.parse([ f ]), "Parser failed for #{f}")
       assert(tj.schedule, "Scheduler failed for #{f}")
       assert(tj.generateReports(@tmpDir), "Report generator failed for #{f}")
       assert(tj.messageHandler.messages.empty?, "Unexpected error in #{f}")

data/test/test_RichText.rb

@@ -47,10 +47,10 @@ class TestRichText < Test::Unit::TestCase
 
     assert_outputs(inp, tagged, str, html)
 
-    assert_equal(true, newRichText(inp).empty?)
-    assert_equal(true, newRichText("\n").empty?)
-    assert_equal(true, newRichText("\n \n").empty?)
-    assert_equal(false, newRichText("foo").empty?)
+    assert_equal(true, newRichText(inp).empty?, 'Empty string')
+    assert_equal(true, newRichText("\n").empty?, '\n')
+    assert_equal(true, newRichText("\n \n").empty?, '\n \n')
+    assert_equal(false, newRichText("foo").empty?, 'foo')
   end
 
   def test_one_word