taskjuggler 0.0.4 → 0.0.5

data/test/test_RichText.rb

@@ -29,7 +29,7 @@ require 'RichTextFunctionHandler'
 
     # Return a XMLElement tree that represents the navigator in HTML code.
     def to_html(args)
-      TaskJuggler::XMLElement.new('blockfunc:dummy', args)
+      TaskJuggler::XMLElement.new('blockfunc:dummy', args, true)
     end
   end
 
@@ -57,7 +57,7 @@ class TestRichText < Test::Unit::TestCase
 
     # Check HTML output.
     out = newRichText(inp).to_html.to_s + "\n"
-    ref = "<div/>\n"
+    ref = "<div></div>\n"
     assert_equal(ref, out)
 
     assert_equal(true, newRichText(inp).empty?)
@@ -193,18 +193,18 @@ EOT
     rt.lineWidth = 60
     out = rt.to_s
     ref = <<'EOT'
---------------------------------------------------------
+------------------------------------------------------------
 Line above and below
 
---------------------------------------------------------
-1 A heading
+------------------------------------------------------------
+1) A heading
 
---------------------------------------------------------
---------------------------------------------------------
---------------------------------------------------------
+------------------------------------------------------------
+------------------------------------------------------------
+------------------------------------------------------------
 Another bit of text.
 
---------------------------------------------------------
+------------------------------------------------------------
 EOT
     assert_equal(ref, out)
 
@@ -336,7 +336,7 @@ EOT
   def test_ref
     inp = <<'EOT'
 This is a reference [[item]].
-For more info see [[manual the user manual]].
+For more info see [[manual|the user manual]].
 EOT
 
     # Check tagged output.
@@ -362,6 +362,35 @@ EOT
     assert_equal(ref, out)
   end
 
+  def test_img
+    inp = <<'EOT'
+This is an [[File:image.jpg]].
+For more info see [[File:icon.png|alt=this image]].
+EOT
+
+    # Check tagged output.
+    out = newRichText(inp).to_tagged + "\n"
+    ref = <<'EOT'
+<div>[This] [is] [an] <img file="image.jpg"/>[.] [For] [more] [info] [see] <img file="icon.png"/>[.]</div>
+EOT
+    assert_equal(ref, out)
+
+    # Check ASCII output.
+    rt = newRichText(inp)
+    out = rt.to_s + "\n"
+    ref = <<'EOT'
+This is an . For more info see this image.
+EOT
+    assert_equal(ref, out)
+
+    # Check HTML output.
+    out = newRichText(inp).to_html.to_s + "\n"
+    ref = <<'EOT'
+<div>This is an <img src="image.jpg"></img>. For more info see <img alt="this image" src="icon.png"></img>.</div>
+EOT
+    assert_equal(ref, out)
+  end
+
   def test_href
     inp = <<'EOT'
 This is a reference [http://www.taskjuggler.org].
@@ -420,11 +449,11 @@ EOT
     ref = <<'EOT'
 = This is not a headline
 
-1 This is level 1
+1) This is level 1
 
-1.1 This is level 2
+1.1) This is level 2
 
-1.1.1 This is level 3
+1.1.1) This is level 3
 
 EOT
     assert_equal(ref, out)
@@ -463,11 +492,11 @@ EOT
     rt = newRichText(inp)
     out = rt.to_s + "\n"
     ref = <<'EOT'
-* This is a bullet item
+ * This is a bullet item
 
- * This is a level 2 bullet item
+  * This is a level 2 bullet item
 
-  * This is a level 3 bullet item
+   * This is a level 3 bullet item
 
 
 EOT
@@ -548,45 +577,45 @@ EOT
     rt = newRichText(inp)
     out = rt.to_s + "\n"
     ref = <<'EOT'
-1. This is item 1
+ 1. This is item 1
 
-2. This is item 2
+ 2. This is item 2
 
-3. This is item 3
+ 3. This is item 3
 
 Normal text.
 
-1. This is item 1
+ 1. This is item 1
 
-1.1 This is item 1.1
+ 1.1 This is item 1.1
 
-1.2 This is item 1.2
+ 1.2 This is item 1.2
 
-1.3 This is item 1.3
+ 1.3 This is item 1.3
 
-2. This is item 2
+ 2. This is item 2
 
-2.1 This is item 2.1
+ 2.1 This is item 2.1
 
-2.2 This is item 2.2
+ 2.2 This is item 2.2
 
-2.2.1 This is item 2.2.1
+ 2.2.1 This is item 2.2.1
 
-2.2.2 This is item 2.2.2
+ 2.2.2 This is item 2.2.2
 
-3. This is item 3
+ 3. This is item 3
 
-3.1 This is item 3.1
+ 3.1 This is item 3.1
 
-3.1.1 This is item 3.1.1
+ 3.1.1 This is item 3.1.1
 
-4. This is item 4
+ 4. This is item 4
 
-4.0.1 This is item 4.0.1
+ 4.0.1 This is item 4.0.1
 
 Normal text.
 
-1. This is item 1
+ 1. This is item 1
 
 
 EOT
@@ -639,6 +668,16 @@ EOT
  main() {
    printf("Hello, world!\n")
  }
+
+Some normal text.
+
+* A
+ bullet
+ item
+
+ Some code
+
+More text.
 EOT
 
     # Check tagged output.
@@ -650,6 +689,14 @@ main() {
 }
 </pre>
 
+<p>[Some] [normal] [text.]</p>
+
+<ul><li>* [A] [bullet] [item]</li>
+</ul><pre>Some code
+</pre>
+
+<p>[More] [text.]</p>
+
 </div>
 EOT
     assert_equal(ref, out)
@@ -663,17 +710,32 @@ main() {
   printf("Hello, world!\n")
 }
 
+Some normal text.
+
+ * A bullet item
+
+Some code
+
+More text.
+
 EOT
     assert_equal(ref, out)
 
     # Check HTML output.
     out = newRichText(inp).to_html.to_s + "\n"
     ref = <<'EOT'
-<div><pre>#include &lt;stdin.h&gt;
+<div>
+ <div codesection="1"><pre codesection="1">#include &lt;stdin.h&gt;
 main() {
   printf("Hello, world!\n")
 }
 </pre></div>
+ <p>Some normal text.</p>
+ <ul><li>A bullet item</li></ul>
+ <div codesection="1"><pre codesection="1">Some code
+</pre></div>
+ <p>More text.</p>
+</div>
 EOT
     assert_equal(ref, out)
   end
@@ -727,27 +789,27 @@ EOT
     rt = newRichText(inp)
     out = rt.to_s
     ref = <<'EOT'
-1 This the first section
+1) This the first section
 
-1.1 This is the section 1.1
+1.1) This is the section 1.1
 
 Not sure what to put here. Maybe just some silly text.
 
-* A bullet
+ * A bullet
 
- * Another bullet
+  * Another bullet
 
-1. A number item
+ 1. A number item
 
-* A bullet
+ * A bullet
 
-0.1 Number 0.1, I guess
+ 0.1 Number 0.1, I guess
 
-2 Section 2
+2) Section 2
 
-* Starts with bullets
+ * Starts with bullets
 
-* ...
+ * ...
 
 Some more text. And we're done.
 
@@ -828,27 +890,27 @@ EOT
     rt = newRichText(inp)
     out = rt.to_s
     ref = <<'EOT'
-1 This the first section
+1) This the first section
 
-1.1 This is the section 1.1
+1.1) This is the section 1.1
 
 Not sure ''what'' to put here. Maybe just some silly text.
 
-* A bullet
+ * A bullet
 
- * Another bullet
+  * Another bullet
 
-1. A number item
+ 1. A number item
 
-* A bullet
+ * A bullet
 
 ## Number 0.1, I guess
 
 == Section 2 ==
 
-* Starts with bullets
+ * Starts with bullets
 
-* ...
+ * ...
 
 Some more text. And we're done.
 
@@ -880,10 +942,39 @@ EOT
     assert_equal(ref, out)
   end
 
+# Need to find out why == without spaces don't work properly.
+#  def test_many_chapters
+#    inp = <<EOT
+#==Red:==
+#
+#./.
+#
+#==Yellow:==
+#
+#./.
+#
+#==Green:==
+#
+#=== Task Graphical User Interface ===
+#(ID: AcSo.software.gui)
+#
+#Your headline here!
+#
+#EOT
+#
+#    # Check tagged output.
+#    out = newRichText(inp).to_tagged + "\n"
+#    ref = <<EOT
+#<div></div>
+#EOT
+#    assert_equal(ref, out)
+#
+#  end
+
   def test_hline_and_link
     inp = <<EOT
 ----
-[[foo bar]]
+[[foo|bar]]
 EOT
 
     # Check tagged output.
@@ -901,7 +992,7 @@ EOT
     rt.lineWidth = 60
     out = rt.to_s
     ref = <<EOT
---------------------------------------------------------
+------------------------------------------------------------
 bar
 
 EOT
@@ -938,7 +1029,7 @@ EOT
     rt.lineWidth = 60
     out = rt.to_s
     ref = <<EOT
-0.1 Header
+0.1) Header
 
 some text
 
@@ -959,6 +1050,123 @@ EOT
     assert_equal(ref, out)
   end
 
+  def test_stringLineWrapping
+    inp = <<EOT
+The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog.
+----
+EOT
+
+    # Check ASCII output.
+    rt = newRichText(inp)
+    rt.lineWidth = 60
+    out = rt.to_s
+    ref = <<EOT
+The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog.
+
+------------------------------------------------------------
+EOT
+    assert_equal(ref, out)
+
+    inp = <<EOT
+The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog.
+----
+EOT
+
+    # Check ASCII output.
+    rt = newRichText(inp)
+    rt.lineWidth = 60
+    out = rt.to_s
+    ref = <<EOT
+The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog.
+
+------------------------------------------------------------
+EOT
+    assert_equal(ref, out)
+
+    inp = <<EOT
+The_quick_brown_fox_jumps_over_the_lazy_dog.
+The_quick_brown_fox_jumps_over_the_lazy_dog.
+The_quick_brown_fox_jumps_over_the_lazy_dog.
+----
+EOT
+
+    # Check ASCII output.
+    rt = newRichText(inp)
+    rt.lineWidth = 60
+    out = rt.to_s
+    ref = <<EOT
+The_quick_brown_fox_jumps_over_the_lazy_dog.
+The_quick_brown_fox_jumps_over_the_lazy_dog.
+The_quick_brown_fox_jumps_over_the_lazy_dog.
+
+------------------------------------------------------------
+EOT
+    assert_equal(ref, out)
+
+    inp = <<EOT
+The_quick_brown_fox_jumps_over_the_lazy_dog.The_quick_brown_fox_jumps_over_the_lazy_dog.The_quick_brown_fox_jumps_over_the_lazy_dog.
+----
+EOT
+
+    # Check ASCII output.
+    rt = newRichText(inp)
+    rt.lineWidth = 60
+    out = rt.to_s
+    ref = <<EOT
+The_quick_brown_fox_jumps_over_the_lazy_dog.The_quick_brown_fox_jumps_over_the_lazy_dog.The_quick_brown_fox_jumps_over_the_lazy_dog.
+
+------------------------------------------------------------
+EOT
+    assert_equal(ref, out)
+  end
+
+  def test_bulletWrapping
+    inp = <<EOT
+* The quick brown fox jumps over the lazy dog.
+* The quick brown fox jumps over the lazy dog.
+** The quick brown fox jumps over the lazy dog.
+*** The quick brown fox jumps over the lazy dog.
+----
+EOT
+
+    # Check ASCII output.
+    rt = newRichText(inp)
+    rt.lineWidth = 22
+    out = rt.to_s
+    ref = <<EOT
+ * The quick brown fox
+   jumps over the lazy
+   dog.
+
+ * The quick brown fox
+   jumps over the lazy
+   dog.
+
+  * The quick brown
+    fox jumps over the
+    lazy dog.
+
+   * The quick brown
+     fox jumps over
+     the lazy dog.
+
+----------------------
+EOT
+    assert_equal(ref, out)
+  end
+
   def newRichText(text)
     begin
       rText = TaskJuggler::RichText.new(text, [ RTFDummy.new ])

data/test/test_Scheduler.rb

@@ -27,6 +27,7 @@ class TestScheduler < Test::Unit::TestCase
       ENV['TZ'] = 'Europe/Berlin'
       tj = TaskJuggler.new(false)
       assert(tj.parse([ f ]), "Parser failed for #{f}")
+      tj.warnTsDeltas = true
       tj.schedule
       checkMessages(tj, f)
     end

data/test/test_TextFormatter.rb

@@ -0,0 +1,142 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = test_format_TextFormatter.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 'TextFormatter'
+
+class TestTextFormatter < Test::Unit::TestCase
+
+  def setup
+  end
+
+  def teardown
+  end
+
+  def test_format_empty
+    ftr = TaskJuggler::TextFormatter.new(20, 2, 4)
+
+    inp = ''
+    ref = "\n"
+    out = ftr.format(inp)
+    assert_equal(ref, out)
+  end
+
+  def test_format_singleWord
+    ftr = TaskJuggler::TextFormatter.new(20, 2, 4)
+
+    inp = 'foo'
+    ref = "    foo\n"
+    out = ftr.format(inp)
+    assert_equal(ref, out)
+  end
+
+  def test_format_multipleWords
+    ftr = TaskJuggler::TextFormatter.new(20, 2, 4)
+
+    inp = "foo  bar \n  foobar"
+    ref = "    foo bar foobar\n"
+    out = ftr.format(inp)
+    assert_equal(ref, out)
+  end
+
+  def test_format_multipleLines
+    ftr = TaskJuggler::TextFormatter.new(23, 2, 4)
+
+    inp = <<EOT
+The quick brown fox jumps over the lazy dog.
+EOT
+    ref = <<EOT
+    The quick brown fox
+  jumps over the lazy
+  dog.
+EOT
+    out = ftr.format(inp)
+    assert_equal(ref, out)
+  end
+
+  def test_format_multipleParagraphs
+    ftr = TaskJuggler::TextFormatter.new(30, 6, 3)
+
+    inp = <<EOT
+The quick brown fox jumps over the lazy dog.
+
+The quick brown fox jumps over the lazy dog.
+EOT
+    ref = <<EOT
+   The quick brown fox jumps
+      over the lazy dog.
+
+   The quick brown fox jumps
+      over the lazy dog.
+EOT
+    out = ftr.format(inp)
+    assert_equal(ref, out)
+  end
+
+  def test_format_longWords
+    ftr = TaskJuggler::TextFormatter.new(15, 2)
+
+    inp = <<EOT
+The quick brown_fox_jumps over the lazy dog.
+The quick brown_fox_jumps_over the lazy dog.
+
+The_quick_brown_fox_jumps_over the lazy dog.
+EOT
+    ref = <<EOT
+  The quick
+  brown_fox_jumps
+  over the lazy
+  dog. The
+  quick
+  brown_fox_jumps_over
+  the lazy dog.
+
+  The_quick_brown_fox_jumps_over
+  the lazy dog.
+EOT
+    out = ftr.format(inp)
+    assert_equal(ref, out)
+  end
+
+  def test_format_junkSpaces
+    ftr = TaskJuggler::TextFormatter.new(15, 2)
+
+    inp = "  foo  \n\n \n bar\n \n"
+    ref = <<EOT
+  foo
+
+  bar
+EOT
+    out = ftr.format(inp)
+    assert_equal(ref, out)
+  end
+
+  def test_ident
+    ftr = TaskJuggler::TextFormatter.new(15, 4, 2)
+
+    inp = <<EOT
+The quick brown fox jumps over the lazy dog.
+
+The quick brown fox jumps over the lazy dog.
+EOT
+    ref = <<EOT
+  The quick bro
+
+    The quick b
+EOT
+    out = ftr.indent(inp)
+    assert_equal(ref, out)
+  end
+
+end

data/test/test_TjTime.rb

@@ -110,5 +110,20 @@ class TestTjTime < Test::Unit::TestCase
     end
   end
 
+  def test_nextDayOfWeek
+    probes = [
+      [ '2010-03-17', 0, '2010-03-21' ],
+      [ '2010-03-17', 1, '2010-03-22' ],
+      [ '2010-03-17', 2, '2010-03-23' ],
+      [ '2010-03-17', 3, '2010-03-24' ],
+      [ '2010-03-17', 4, '2010-03-18' ],
+      [ '2010-03-17', 5, '2010-03-19' ],
+      [ '2010-03-17', 6, '2010-03-20' ],
+    ]
+    probes.each do |p|
+      assert_equal(TaskJuggler::TjTime.new(p[2]),
+                   TaskJuggler::TjTime.new(p[0]).nextDayOfWeek(p[1]))
+    end
+  end
 end