taskjuggler 0.0.10 → 0.0.11

data/test/TestSuite/TimeSheets/dev2_mail1

@@ -28,7 +28,7 @@ Content-ID: <4b892fc99c190_42e342cd5469937@xpc.mail>
  > # See http://www.taskjuggler.org/tj3/manual/timesheet.html for details.
  > #
  > # --------8<--------8<--------
- > timesheet dev2 2002-02-22-00:00-+0100 - 2002-03-01-00:00-+0100 {
+ > timesheet dev2 2002-02-22-00:00-+0000 - 2002-03-01-00:00-+0000 {
  >
  >   # Vacation time: 0.0%
  >

data/test/TestSuite/TimeSheets/dev2_mail2

@@ -28,7 +28,7 @@ date must be in a single line that starts at the beginning of the line.
 # See http://www.taskjuggler.org/tj3/manual/timesheet.html for details.
 #
 # --------8<--------8<--------
-timesheet dev2 2002-02-22-00:00-+0100 - 2002-03-01-00:00-+0100 {
+timesheet dev2 2002-02-22-00:00-+0000 - 2002-03-01-00:00-+0000 {
 
   # Vacation time: 0.0%
 

data/test/TestSuite/TimeSheets/run

@@ -39,7 +39,7 @@ 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 2
-check "Green" receiver.log 6
+check "Green" receiver.log 9
 
 # Update the project with the server to include the submitted time
 # sheets. This is only to test the time sheet data surpression.
@@ -53,7 +53,7 @@ check "From: foo@bar.com" summary.log 7
 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
+check "Green" summary.log 18
 check "Your time sheet for the period ending 2002-03-01 is overdue" summary.log 5
 
 tj3client --silent terminate

data/test/TestSuite/TimeSheets/uu.txt

@@ -0,0 +1,29 @@
+IyBUaGUgc3RhdHVzIGhlYWRsaW5lIHNob3VsZCBiZSBubyBtb3JlIHRoYW4g
+NjAgY2hhcmFjdGVycyBhbmQgbWF5CiMgbm90IGJlIGVtcHR5ISBUaGUgc3Rh
+dHVzIHN1bW1hcnkgaXMgb3B0aW9uYWwgYW5kIHNob3VsZCBiZSBubwojIGxv
+bmdlciB0aGFuIG9uZSBvciB0d28gc2VudGVuY2VzIG9mIHBsYWluIHRleHQu
+IFRoZSBkZXRhaWxzIHNlY3Rpb24KIyBpcyBhbHNvIG9wdGlvbmFsIGhhcyBu
+byBsZW5ndGggbGltaXRhdGlvbi4gWW91IGNhbiB1c2Ugc2ltcGxlCiMgbWFy
+a3VwIGluIHRoaXMgc2VjdGlvbi4gIEl0IGlzIHJlY29tbWVuZGVkIHRoYXQg
+eW91IHByb3ZpZGUgYXQKIyBsZWFzdCBhIHN1bW1hcnkgb3IgYSBkZXRhaWxz
+IHNlY3Rpb24uCiMgU2VlIGh0dHA6Ly93d3cudGFza2p1Z2dsZXIub3JnL3Rq
+My9tYW51YWwvdGltZXNoZWV0Lmh0bWwgZm9yIGRldGFpbHMuCiMKIyAtLS0t
+LS0tLTg8LS0tLS0tLS04PC0tLS0tLS0tCnRpbWVzaGVldCBib3NzIDIwMDIt
+MDItMjItMDA6MDAtKzAwMDAgLSAyMDAyLTAzLTAxLTAwOjAwLSswMDAwIHsK
+CiAgIyBWYWNhdGlvbiB0aW1lOiAwLjAlCgogICMgVGhlcmUgd2VyZSBubyBw
+bGFubmVkIHRhc2tzIGFzc2lnbm1lbnRzIGZvciB0aGlzIHBlcmlvZCEKCiAg
+IyBJZiB5b3UgaGFkIHVucGxhbm5lZCB0YXNrcywgdW5jb21tZW50IGFuZCBm
+aWxsIG91dCB0aGUKICAjIGZvbGxvd2luZyBsaW5lczoKICAjIG5ld3Rhc2sg
+bmV3LnRhc2suaWQgIkEgdGFzayB0aXRsZSIgewogICMgICB3b3JrIFglCiAg
+IyAgIHJlbWFpbmluZyBZLllkCiAgIyAgIHN0YXR1cyBncmVlbiAiWW91ciBo
+ZWFkbGluZSBoZXJlISIgewogICMgICAgIHN1bW1hcnkgLTg8LQogICMgICAg
+IEEgc3VtbWFyeSB0ZXh0CiAgIyAgICAgLT44LQogICMgICAgIGRldGFpbHMg
+LTg8LQogICMgICAgIFNvbWUgbW9yZSBkZXRhaWxzCiAgIyAgICAgLT44LQog
+ICMgICB9CiAgIyB9CgogICMgWW91IGNhbiB1c2UgdGhlIGZvbGxvd2luZyBz
+ZWN0aW9uIHRvIHJlcG9ydCBwZXJzb25hbCBub3Rlcy4KICAjIHN0YXR1cyBn
+cmVlbiAiWW91ciBoZWFkbGluZSBoZXJlISIgewogICMgICBzdW1tYXJ5IC04
+PC0KICAjICAgQSBzdW1tYXJ5IHRleHQKICAjICAgLT44LQogICMgICBkZXRh
+aWxzIC04PC0KICAjICAgU29tZSBtb3JlIGRldGFpbHMKICAjICAgLT44LQog
+ICMgfQoKICAjIFlvdSBoYXZlIG5vIGZ1dHVyZSBhc3NpZ25tZW50cyBmb3Ig
+dGhpcyBwcm9qZWN0IQp9CiMgLS0tLS0tLS0+OC0tLS0tLS0tPjgtLS0tLS0t
+LQoK

data/test/test_AlgorithmDiff.rb

@@ -0,0 +1,139 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = test_AlgorithmDiff.rb -- The TaskJuggler III Project Management Software
+#
+# 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') if __FILE__ == $0
+
+require 'test/unit'
+
+require 'taskjuggler/AlgorithmDiff'
+
+class AlgorithmDiff < Test::Unit::TestCase
+
+  class TestData < Struct.new(:name, :a, :b, :a_b, :b_a)
+  end
+
+  def test_editScript_and_patch
+    data = [
+      TestData.new("identical inputs",
+        [ 1, 2, 3 ],
+        [ 1, 2, 3 ],
+        [ ],
+        [ ]
+      ),
+      TestData.new("delete 1 element in the middle",
+        [ 1, 2, 3 ],
+        [ 1, 3 ],
+        [ '2d1' ],
+        [ '2i2' ]
+      ),
+      TestData.new("delete 2 elements in the middle",
+        [ 1, 2, 3, 4 ],
+        [ 1, 4 ],
+        [ '2d2' ],
+        [ '2i2,3' ]
+      ),
+      TestData.new("delete 2 elements at 2 different locations",
+        [ 1, 2, 3, 4, 5 ],
+        [ 1, 3, 5 ],
+        [ '2d1', '4d1' ],
+        [ '2i2', '4i4' ]
+      ),
+      TestData.new("delete 2 and insert 1 elements at 2 different locations",
+        [ 1, 2, 3, 5, 6, 7 ],
+        [ 1, 3, 4, 5, 7 ],
+        [ '2d1', '3i4', '5d1' ],
+        [ '2i2', '3d1', '5i6' ]
+      ),
+      TestData.new("delete at start",
+        [ 1, 2 ],
+        [ 2 ],
+        [ '1d1' ],
+        [ '1i1' ]
+      ),
+      TestData.new("delete at end",
+        [ 1, 2 ],
+        [ 1 ],
+        [ '2d1' ],
+        [ '2i2' ]
+      ),
+      TestData.new("delete all",
+        [ 1 ],
+        [ ],
+        [ '1d1' ],
+        [ '1i1' ]
+      ),
+      TestData.new("replace 1 in the middle",
+        [ 1, 0, 3 ],
+        [ 1, 2, 3 ],
+        [ '2d1', '2i2' ],
+        [ '2d1', '2i0' ]
+      ),
+      TestData.new("replace 2 in the middle",
+        [ 1, 0, 0, 4 ],
+        [ 1, 2, 3, 4 ],
+        [ '2d2', '2i2,3' ],
+        [ '2d2', '2i0,0' ]
+      ),
+      TestData.new("many similar values, some changes",
+        [ 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 1 ],
+        [ 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1 ],
+        [ '3i1,1', '7d1', '11d1', '12i0' ],
+        [ '3d2', '7i1', '12d1', '11i1' ]
+      )
+    ]
+
+    data.each do |set|
+      set.a.extend(Diffable)
+      set.b.extend(Diffable)
+      res = (diff = set.a.diff(set.b)).editScript
+      assert_equal(set.a_b, res,
+                   "A->B edit script #{set.name} failed")
+      assert_equal(set.b, set.a.patch(diff),
+                   "A->B patch #{set.name} failed")
+
+      res = (diff = set.b.diff(set.a)).editScript
+      assert_equal(set.b_a, res,
+                   "B->A edit script #{set.name} failed")
+      assert_equal(set.a, set.b.patch(diff),
+                   "B->A patch #{set.name} failed")
+    end
+  end
+
+  def test_StringDiff
+    data = [
+      TestData.new("Some insertions, some changes, some deletions",
+        "0\n1\n2\n4\n5\n6\n7\n",
+        "0\n2\nA\nB\n6\n5\n7\n \n",
+        "2d1\n< 1\n4,5c3,4\n< 4\n< 5\n---\n> A\n> B\n6a6\n> 5\n7a8\n>  \n",
+        "1a2\n> 1\n3,5c4\n< A\n< B\n< 6\n---\n> 4\n6a6\n> 6\n8d7\n<  \n"
+      )
+    ]
+
+    data.each do |set|
+      set.a.extend(DiffableString)
+      set.b.extend(DiffableString)
+      res = (diff = set.a.diff(set.b)).to_s
+      assert_equal(set.a_b, res,
+                   "A->B text diff #{set.name} failed")
+      assert_equal(set.b, set.a.patch(diff),
+                   "A->B text patch #{set.name} failed")
+
+      res = (diff = set.b.diff(set.a)).to_s
+      assert_equal(set.b_a, res,
+                   "B->A text diff #{set.name} failed")
+      assert_equal(set.a, set.b.patch(diff),
+                   "B->A text patch #{set.name} failed")
+    end
+  end
+
+end

data/test/test_BatchProcessor.rb

@@ -14,7 +14,8 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if __FILE__ == $0
 
 require 'test/unit'
-require 'BatchProcessor'
+
+require 'taskjuggler/BatchProcessor'
 
 class TestProject < Test::Unit::TestCase
 

data/test/test_CSV-Reports.rb

@@ -16,10 +16,11 @@ $:.unshift File.dirname(__FILE__)
 
 require 'stringio'
 require 'test/unit'
-require 'TaskJuggler'
-require 'reports/CSVFile'
-require 'MessageChecker'
 
+require 'MessageChecker'
+require 'taskjuggler/TaskJuggler'
+require 'taskjuggler/reports/CSVFile'
+require 'taskjuggler/AlgorithmDiff'
 
 class TestScheduler < Test::Unit::TestCase
 
@@ -53,22 +54,31 @@ 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.read(refFile)
-    out = TaskJuggler::CSVFile.new.parse(outStr)
-
-    assert(ref.length == out.length,
-           "Line number mismatch (#{out.length} instead of #{ref.length}) " +
-           "in #{refFile}")
-    0.upto(ref.length - 1) do |line|
-      refLine = ref[line]
-      outLine = out[line]
-      assert(refLine.length == outLine.length,
-             "Line #{line} size mismatch (#{outLine.length} instead of " +
-             "#{refLine.length}) in #{refFile}")
-      0.upto(refLine.length - 1) do |cell|
-        assert(refLine[cell] == outLine[cell],
-               "Cell #{cell} of line #{line} mismatch: " +
-               "'#{outLine[cell]}' instead of '#{refLine[cell]}' in #{refFile}")
+    refStr = File.new(refFile, 'r').read
+
+    diff = refStr.extend(DiffableString).diff(outStr).to_s
+    if diff != ''
+      puts diff
+      File.new('failed.csv', 'w').write(outStr)
+
+      ref = TaskJuggler::CSVFile.new.parse(refStr)
+      out = TaskJuggler::CSVFile.new.parse(outStr)
+
+      assert(ref.length == out.length,
+             "Line number mismatch (#{out.length} instead of #{ref.length}) " +
+             "in #{refFile}")
+      0.upto(ref.length - 1) do |line|
+        refLine = ref[line]
+        outLine = out[line]
+        assert(refLine.length == outLine.length,
+               "Line #{line} size mismatch (#{outLine.length} instead of " +
+               "#{refLine.length}) in #{refFile}")
+        0.upto(refLine.length - 1) do |cell|
+          assert(refLine[cell] == outLine[cell],
+                 "Cell #{cell} of line #{line} mismatch: " +
+                 "'#{outLine[cell]}' instead of '#{refLine[cell]}' " +
+                 "in #{refFile}")
+        end
       end
     end
   end
@@ -108,6 +118,7 @@ class TestScheduler < Test::Unit::TestCase
 
     testDir = path + '/TestSuite/CSV-Reports/'
     Dir.glob(testDir + '*.tjp').each do |f|
+      TaskJuggler::TjTime.setTimeZone('Europe/Berlin')
       checkCSVReport(f)
     end
   end

data/test/test_CSVFile.rb

@@ -14,7 +14,8 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if __FILE__ == $0
 
 require 'test/unit'
-require 'reports/CSVFile'
+
+require 'taskjuggler/reports/CSVFile'
 
 class TestCSVFile < Test::Unit::TestCase
 

data/test/test_CollisionDetector.rb

@@ -14,7 +14,8 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if __FILE__ == $0
 
 require 'test/unit'
-require 'reports/GanttRouter'
+
+require 'taskjuggler/reports/GanttRouter'
 
 class TaskJuggler
 

data/test/test_Export-Reports.rb

@@ -0,0 +1,128 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = test_Export-Reports.rb -- The TaskJuggler III Project Management Software
+#
+# 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') if __FILE__ == $0
+$:.unshift File.dirname(__FILE__)
+
+require 'stringio'
+require 'test/unit'
+
+require 'MessageChecker'
+require 'taskjuggler/TaskJuggler'
+require 'taskjuggler/AlgorithmDiff'
+
+class TestExportReport < Test::Unit::TestCase
+
+  include MessageChecker
+
+  # This function captures the $stdout output of the passed block to a String
+  # and returns it.
+  def captureStdout
+    oldStdOut = $stdout
+    $stdout = (out = StringIO.new)
+    begin
+      yield
+    ensure
+      $stdout = oldStdOut
+    end
+    out.string
+  end
+
+  # This functions redirects all output of the passed block to a new file with
+  # the name fileName.
+  def stdoutToFile(fileName)
+    oldStdOut = $stdout
+    $stdout = File.open(fileName, 'w')
+    begin
+      yield
+      $stdout.close
+    ensure
+      $stdout = oldStdOut
+    end
+  end
+
+  # Compare the output Export (passed as String in _out_) with the content of
+  # the Export reference files _refFile_.
+  def compareExports(out, refFile, testCase)
+    ref = File.new(refFile, 'r').read
+
+    diff = ref.extend(DiffableString).diff(out).to_s
+    if diff != ''
+      File.new('failed.tjp', 'w').write(out)
+    end
+    assert_equal('', diff, "output for #{testCase} does not match " +
+                 "#{refFile}:\n#{diff}")
+  end
+
+  def checkExportReport(projectFile, repFile, refFile)
+    tj = TaskJuggler.new(true)
+    assert(tj.parse([ projectFile, repFile ]),
+           "Parser failed for #{projectFile}")
+
+    # Schedule the project.
+    assert(tj.schedule, "Scheduler failed for #{projectFile}")
+
+    tj.project.reports.each do |report|
+      next unless report.get('formats').include?(:tjp)
+
+      if File.file?(refFile)
+        # If there is a reference Export file for this test case, compare the
+        # output against it.
+        out = captureStdout do
+          assert(tj.generateReport(report.fullId, false),
+                 "Report generation failed for #{projectFile}")
+        end
+        compareExports(out, refFile, projectFile)
+      else
+        # If not, we generate the reference file.
+        stdoutToFile(refFile) do
+          assert(tj.generateReport(report.fullId, false),
+                 "Reference file generation failed for #{projectFile}")
+        end
+      end
+    end
+    assert(tj.messageHandler.messages.empty?,
+           "Unexpected error in #{projectFile}")
+  end
+
+  def test_Export_Reports
+    path = File.dirname(__FILE__)
+
+    testDir = path + '/TestSuite/Syntax/Correct/'
+    Dir.glob(testDir + '*.tjp').each do |f|
+      # We ignore some test cases that cannot work in this setup.
+      next if %w( Freeze.tjp Export.tjp ).include?(f[testDir.length..-1])
+
+      # Take the project, schedule it, check it against the reference and
+      # export it. Then check the export against the reference file.
+
+      refFile = refFileName(f)
+      repFile = reportDefFileName(f)
+      checkExportReport(f, repFile, refFile)
+      checkExportReport(refFile, repFile, refFile)
+    end
+  end
+
+  private
+
+  def refFileName(originalFile)
+    baseDir = File.dirname(originalFile)
+    baseName = File.basename(originalFile, '.tjp')
+    baseDir + "/../../Export-Reports/refs/#{baseName}.tjp"
+  end
+
+  def reportDefFileName(originalFile)
+    File.dirname(originalFile) + "/../../Export-Reports/export.tji"
+  end
+
+end

data/test/test_Journal.rb

@@ -14,7 +14,8 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if __FILE__ == $0
 
 require 'test/unit'
-require 'Project'
+
+require 'taskjuggler/Project'
 
 class TaskJuggler