taskjuggler 0.0.5 → 0.0.6

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

@@ -7,7 +7,7 @@
  */
 # *** EXAMPLE: header1 +
 # *** EXAMPLE: header2 +
-project "Accounting Software"  2002-01-16 +4m {
+project acso "Accounting Software"  2002-01-16 +4m {
 # *** EXAMPLE: header1 -
   # Hide the clock time. Only show the date.
 # *** EXAMPLE: formats +
@@ -42,7 +42,6 @@ project "Accounting Software"  2002-01-16 +4m {
 # *** EXAMPLE: scenario -
 # *** EXAMPLE: extend +
   extend resource {
-    text Email "Email"
     text Phone "Phone"
   }
 # *** EXAMPLE: extend -
@@ -100,22 +99,22 @@ balance cost rev
 
 # *** EXAMPLE: resources +
 resource boss "Paul Henry Bullock" {
-  Email "phb@crappysoftware.com"
+  email "phb@crappysoftware.com"
   Phone "x100"
   rate 480
 }
 resource dev "Developers" {
   resource dev1 "Paul Smith" {
-    Email "paul@crappysoftware.com"
+    email "paul@crappysoftware.com"
     Phone "x362"
     rate 350.0
   }
   resource dev2 "Sébastien Bono" {
-    Email "SBono@crappysoftware.com"
+    email "SBono@crappysoftware.com"
     Phone "x234"
   }
   resource dev3 "Klaus Müller" {
-    Email "Klaus.Mueller@crappysoftware.com"
+    email "Klaus.Mueller@crappysoftware.com"
     Phone "x490"
     vacation 2002-02-01 - 2002-02-05
   }
@@ -124,13 +123,13 @@ resource dev "Developers" {
 }
 resource misc "The Others" {
   resource test "Peter Murphy" {
-    Email "murphy@crappysoftware.com"
+    email "murphy@crappysoftware.com"
     Phone "x666"
     limits { dailymax 6.4h }
     rate 310.0
   }
   resource doc "Dim Sung" { 
-    Email "sung@crappysoftware.com"
+    email "sung@crappysoftware.com"
     Phone "x482"
     rate 300.0 
     vacation 2002-03-11 - 2002-03-16
@@ -463,7 +462,7 @@ textreport frame "" {
     ->8-   
   }
 
-  textreport "Development" {
+  textreport development "Development" {
     formats html
     center '<[report id="development"]>'
   }
@@ -501,7 +500,7 @@ taskreport overview "" {
     The project is structured into 3 phases.
     
     # Specification
-    # [[Development]]
+    # <-reportlink id='frame.development'->
     # Testing
     
     === Original Project Plan ===
@@ -552,7 +551,8 @@ macro AlertColor [
 ]
 
 taskreport status "" {
-  columns wbs, name, start, end, effort, alert, status
+  columns wbs, name, start, end, effort, alert { tooltip plan.journal
+  != '' "<-query attribute='journal'->" }, status
   scenarios delayed 
 
   taskreport dashboard "" {
@@ -561,7 +561,7 @@ taskreport status "" {
             resources { width 200 ${AlertColor} 
                         start ${projectstart} end ${projectend} },
             alerttrend { title "Trend" ${AlertColor} },
-            alertmessage { width 260 ${AlertColor} }
+            journalmessages { width 260 ${AlertColor} }
     hidetask ~hasalert(0)
     sorttasks alert.down, delayed.end.up
     period %{${now} - 1w} +1w
@@ -605,7 +605,7 @@ resourcereport contactList "" {
   scenarios delayed
   headline "Contact list and duty plan"
   columns name,
-          Email { celltext 1 "[mailto:<-Email-> <-Email->]" },
+          email { celltext 1 "[mailto:<-email-> <-email->]" },
           Phone,
           chart { scale day }
   hideresource ~isleaf()

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

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

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

@@ -5,3 +5,4 @@ project "Test" 2009-10-06 +2m
 # MARK: error 1 include_recursion 
 include "include_recursion.tji"
 
+task "Foo"

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

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

data/test/TestSuite/Syntax/Errors/{eof_in_istring1.tjp → no_token_match1.tjp}

@@ -1,5 +1,5 @@
 project test "Test" "1.0" 2009-08-25 +2m 
 
-# MARK: error 5 eof_in_istring1
+# MARK: error 5 no_token_match
 task t -8<-
-   
+    

data/test/TestSuite/Syntax/Errors/{eof_in_istring2.tjp → no_token_match2.tjp}

@@ -1,5 +1,5 @@
 project test "Test" "1.0" 2009-08-25 +2m 
 
-# MARK: error 5 eof_in_istring2
+# MARK: error 5 no_token_match
 task t -8<-
-   foo
+  foo

data/test/TestSuite/Syntax/Errors/{eof_in_istring3.tjp → no_token_match3.tjp}

@@ -1,6 +1,6 @@
 project test "Test" "1.0" 2009-08-25 +2m 
 
-# MARK: error 6 eof_in_istring3
+# MARK: error 6 no_token_match
 task t -8<-
   foo
   -

data/test/TestSuite/Syntax/Errors/{eof_in_istring4.tjp → no_token_match4.tjp}

@@ -1,6 +1,6 @@
 project test "Test" "1.0" 2009-08-25 +2m 
 
-# MARK: error 6 eof_in_istring4
+# MARK: error 6 no_token_match
 task t -8<-
   foo
   ->

data/test/TestSuite/Syntax/Errors/{eof_in_istring5.tjp → no_token_match5.tjp}

@@ -1,6 +1,6 @@
 project test "Test" "1.0" 2009-08-25 +2m 
 
-# MARK: error 6 eof_in_istring5
+# MARK: error 6 no_token_match
 task t -8<-
   foo
   ->8

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

@@ -0,0 +1,13 @@
+project test "Test" "1.0" 2010-04-28 +1w
+
+resource r "R"
+
+task "Foo" {
+  task bar "Bar" {
+    start ${projectstart}
+    effort 1d
+    allocate r
+# MARK: error 11 not_scheduled
+    scheduled
+  }
+}

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 8 unsupported_token
+# MARK: error 7 unsupported_token
     summary -8<-
       This is all good.
       * This is bad.

data/test/TestSuite/TimeSheets/run

@@ -37,7 +37,7 @@ check "^timesheet " sender.log 6
 tj3ts_receiver --dryrun < dev2_mail1 >> receiver.log || error "rec1"
 tj3ts_receiver --dryrun < dev2_mail2 >> receiver.log || error "rec2"
 check "From: foo@bar.com" receiver.log 2
-check "Report from " receiver.log 4
+check "Report from " receiver.log 2
 check "Green" receiver.log 3
 
 # Update the project with the server to include the submitted time
@@ -49,11 +49,11 @@ 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: SBono@crappysoftware.com" summary.log 1
-check "Report from .* is missing" summary.log 10
+check "From: =?UTF-8?B?U8OpYmFzdGllbg==?= Bono <SBono@crappysoftware.com>" summary.log 1
+check "The following 5 person(s) have not yet submitted their time sheets" summary.log 2
 check "Weekly Report from" summary.log 2
 check "Green" summary.log 6
-check "Your weekly report 2002-03-01 is overdue" summary.log 5
+check "Your time sheet for the period ending 2002-03-01 is overdue" summary.log 5
 
 tj3client --silent terminate
 sleep 2
@@ -69,7 +69,7 @@ check "WARN" tj3d.log 0
 check ERROR timesheets.log 0
 check WARN timesheets.log 1
 check INFO timesheets.log 44
-check "Your weekly report template" timesheets.log 6
+check "Your weekly time sheet template" timesheets.log 6
 
 cleanup
 exit 0

data/test/test_CSVFile.rb

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = test_CSVFile.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/CSVFile'
+
+class TestCSVFile < Test::Unit::TestCase
+
+  def test_to_s
+    csv = TaskJuggler::CSVFile.new([ [ "foo", "bar" ], [ "rab", "oof" ] ])
+    s = csv.to_s
+    ref = <<EOT
+"foo";"bar"
+"rab";"oof"
+EOT
+   assert_equal(ref, csv.to_s)
+  end
+
+  def test_simple
+    v = [ [ "foo" ], [ "bar" ] ]
+    check(v)
+  end
+
+  def test_justStrings
+    v = [ [ "foo1", "foo2" ], [ "bar2", "bar2" ] ]
+    check(v)
+  end
+
+  def test_stringsAndNumbers
+    v = [ [ "foo", 3.14 ], [ 42, "bar" ] ]
+    check(v)
+  end
+
+  def test_stringsAndNumbersAndEmtpy
+    v = [ [ "foo", nil, 3.14 ], [ 42, "bar", nil ] ]
+    check(v)
+  end
+
+  def test_allEmtpy
+    v = [ [ "", nil, "" ], [ nil, "", nil ] ]
+    check(v)
+  end
+
+  def test_multiLineStrings
+    s = <<'EOT'
+This
+is a
+multi line
+string
+EOT
+    v = [ [ s, nil ], [ nil, s ] ]
+    check(v)
+  end
+
+  def check(vIn)
+    csvIn = TaskJuggler::CSVFile.new(vIn)
+    str = csvIn.to_s
+    csvOut = TaskJuggler::CSVFile.new
+    vOut = csvOut.parse(str)
+    assert_equal(vIn, vOut)
+  end
+
+end
+

data/test/test_Limits.rb

@@ -53,7 +53,7 @@ class TestLimits < Test::Unit::TestCase
     l = Limits.new
     l.setProject(@p)
     l.setLimit('weeklymax', 2, Interval.new(TjTime.new('2009-02-10'),
-                                                         TjTime.new('2009-02-15')))
+                                            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'))
@@ -74,7 +74,9 @@ class TestLimits < Test::Unit::TestCase
     l.inc(TjTime.new('2009-02-01-10:00'))
     assert(l.ok?)
     l.inc(TjTime.new('2009-02-01-11:00'))
+    assert(l.ok?)
     l.inc(TjTime.new('2009-02-01-12:00'))
+    assert(l.ok?)
     l.inc(TjTime.new('2009-02-01-13:00'))
     assert(!l.ok?)
     assert(l.ok?(TjTime.new('2009-01-31')))
@@ -82,20 +84,76 @@ class TestLimits < Test::Unit::TestCase
     assert(l.ok?(TjTime.new('2009-02-01'), false))
   end
 
-  def test_with_resource
+  def test_with_resource_1
     l = Limits.new
     l.setProject(@p)
     l.setLimit('dailymax', 4)
     r = Resource.new(@p, 'r', 'R', nil)
-    l.setLimit('dailymax', 3, nil, r)
+    l.setLimit('dailymax', 5, nil, r)
     l.inc(TjTime.new('2009-02-01-10:00'))
     assert(l.ok?)
-    l.inc(TjTime.new('2009-02-01-11:00'), r)
+    l.inc(TjTime.new('2009-02-01-11:00'))
     assert(l.ok?)
-    l.inc(TjTime.new('2009-02-01-12:00'), r)
+    l.inc(TjTime.new('2009-02-01-12:00'))
+    assert(l.ok?)
+    l.inc(TjTime.new('2009-02-01-13:00'))
     assert(!l.ok?)
+    assert(l.ok?(nil, true, r))
+  end
+
+  def test_with_resource_2
+    l = Limits.new
+    l.setProject(@p)
+    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'))
+    assert(l.ok?)
+    l.inc(TjTime.new('2009-02-01-11:00'))
+    assert(l.ok?)
+    l.inc(TjTime.new('2009-02-01-12:00'))
+    assert(l.ok?)
     l.inc(TjTime.new('2009-02-01-13:00'))
+    assert(l.ok?)
+    assert(l.ok?(nil, true, r))
+    l.inc(TjTime.new('2009-02-01-14:00'), r)
+    assert(!l.ok?)
+    assert(!l.ok?(nil, true, r))
+  end
+
+  def test_with_resource_3
+    l = Limits.new
+    l.setProject(@p)
+    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)
+    assert(l.ok?)
+    l.inc(TjTime.new('2009-02-01-11:00'))
+    assert(l.ok?)
+    l.inc(TjTime.new('2009-02-01-12:00'), r)
+    assert(l.ok?)
+    l.inc(TjTime.new('2009-02-01-13:00'), r)
+    assert(l.ok?)
+    assert(!l.ok?(nil, true, r))
+  end
+
+  def test_with_resource_4
+    l = Limits.new
+    l.setProject(@p)
+    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)
+    assert(l.ok?)
+    l.inc(TjTime.new('2009-02-01-11:00'))
+    assert(!l.ok?)
+    l.inc(TjTime.new('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)
     assert(!l.ok?)
+    assert(!l.ok?(nil, true, r))
   end
 
 end

data/test/test_ProjectFileScanner.rb

@@ -0,0 +1,163 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = test_ProjectFileScanner.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')
+
+require 'test/unit'
+require 'ProjectFileScanner'
+require 'MessageHandler'
+
+class TaskJuggler
+
+class TestProjectFileScanner < Test::Unit::TestCase
+
+  def setup
+  end
+
+  def teardown
+  end
+
+  def test_basic
+    text = <<'EOT'
+Hello world 1
+2.0 # Comment
+2008-12-14 // Another comment
+
+foo:
+a.b.c - $ [A Macro]
+15:23 "A string"
+'It\'s a string'
+"A
+mult\"i line
+string" /*
+a
+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 ]
+    ]
+
+    check(text, ref)
+  end
+
+  def test_macro
+    text = <<'EOT'
+This ${adj} software
+${m1 "arg1"}
+EOT
+
+    macros = [
+      [ 'adj', 'great' ],
+      [ 'm1', 'macro with ${1} argument' ]
+    ]
+
+    ref = [
+      ['ID', 'This', 1],
+      ['ID', 'great', 1],
+      ['ID', 'software', 1],
+      ['ID', 'macro', 2],
+      ['ID', 'with', 2],
+      ['ID', 'arg1', 2],
+      ['ID', 'argument', 2],
+      ['.', '<END>', 3]
+    ]
+
+    check(text, ref, macros)
+  end
+
+  def test_macroDef
+    text = <<'EOT'
+    [ foo ]
+    [
+      bar ]
+    [ foo
+    ]
+    [
+    bar
+    ]
+    []
+    [
+    ]
+
+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 ]
+    ]
+
+    check(text, ref)
+  end
+
+  def test_macroCall
+    text = '${foo}'
+    macros = [
+      [ 'foo', 'hello' ]
+    ]
+    ref = [
+      [ 'ID', 'hello', 1 ]
+    ]
+
+    check(text, ref, macros)
+  end
+
+  private
+
+  def check(text, ref, macros = [])
+    s = TaskJuggler::ProjectFileScanner.new(text, MessageHandler.new(true))
+    s.open(true)
+
+    macros.each do |macro|
+      s.addMacro(TaskJuggler::Macro.new(macro[0], macro[1], nil))
+    end
+
+    ref.each do |type, val, line|
+      token = s.nextToken
+      assert_equal([ type, val ], token[0..1],
+                   "1: Bad token #{token[1]} instead of #{val}")
+      assert_equal(line, token[2].lineNo,
+                   "1: Bad line number #{token[2].lineNo} instead of #{line} for #{val}")
+      s.returnToken(token)
+      token = s.nextToken
+      assert_equal([ type, val ], token[0..1],
+                   "2: Bad token #{token[1]} instead of #{val}")
+      assert_equal(line, token[2].lineNo,
+                   "2: Bad line number #{token[2].lineNo} instead of #{line} for #{val}")
+    end
+
+    s.close
+  end
+
+end
+
+end
+