docgenerator 1.0.4 → 1.1.1

data/unittest/unittest_docgenerator.rb

@@ -29,7 +29,9 @@ class Test_elements < Test::Unit::TestCase
     templogfile = set_temporary_logger()
     assert_equal( "<br />", element(:br,{},'content').to_html)
     #~ assert_equal_filecontent( "expected/test_content.log", get_temporary_logger() )
-    assert_equal(%Q{ WARN docgenerator: Add content to an element without this feature ["br/", :br, :newline, "br"], "content"\n},  get_temporary_logger(templogfile))
+    #Problem: ids.inspect is unsorted -> check only match
+    #~ assert_equal(%Q{ WARN docgenerator: Add content to an element without this feature ["br/", :br, :newline, "br"], "content"\n},  get_temporary_logger(templogfile))
+    assert_match(%r{WARN docgenerator: Add content to an element without this feature \[(.*):newline(.*)\], "content"\n},  get_temporary_logger(templogfile))
   end
   def test_symbols()
     #~ log = Log4r::Logger.new( 'section_logger')
@@ -75,24 +77,28 @@ class Test_elements < Test::Unit::TestCase
     assert_equal( '&rarr;', element(:rarr).to_html)
     assert_equal( '&rarr;', element(:rightarrow).to_html)
     assert_equal( '&rarr;', element(:'->').to_html)
+    assert_equal( '->', element(:'->').to_text)
     assert_equal( '\ensuremath{\rightarrow}', element(:rarr).to_latex)
     assert_equal( '\ensuremath{\rightarrow}', element(:rightarrow).to_latex)
     assert_equal( '\ensuremath{\rightarrow}', element(:'->').to_latex)
     assert_equal( '&rArr;', element(:rArr).to_html)
     assert_equal( '&rArr;', element(:Rightarrow).to_html)
     assert_equal( '&rArr;', element(:'=>').to_html)
+    assert_equal( '=>', element(:'=>').to_text)
     assert_equal( '\ensuremath{\Rightarrow}', element(:rArr).to_latex)
     assert_equal( '\ensuremath{\Rightarrow}', element(:Rightarrow).to_latex)
     assert_equal( '\ensuremath{\Rightarrow}', element(:'=>').to_latex)
     assert_equal( '&larr;', element(:larr).to_html)
     assert_equal( '&larr;', element(:leftarrow).to_html)
     assert_equal( '&larr;', element(:'<-').to_html)
+    assert_equal( '<-', element(:'<-').to_text)
     assert_equal( '\ensuremath{\leftarrow}', element(:larr).to_latex)
     assert_equal( '\ensuremath{\leftarrow}', element(:leftarrow).to_latex)
     assert_equal( '\ensuremath{\leftarrow}', element(:'<-').to_latex)
     assert_equal( '&lArr;', element(:lArr).to_html)
     assert_equal( '&lArr;', element(:Leftarrow).to_html)
     assert_equal( '&lArr;', element(:'<=').to_html)
+    assert_equal( '<=', element(:'<=').to_text)
     assert_equal( '\ensuremath{\Lefttarrow}', element(:lArr).to_latex)
     assert_equal( '\ensuremath{\Lefttarrow}', element(:Leftarrow).to_latex)
     assert_equal( '\ensuremath{\Lefttarrow}', element(:'<=').to_latex)
@@ -224,16 +230,18 @@ end #Test_lists
 
 class Test_footnotes < Test::Unit::TestCase
   def test_footnote
+    footnotegroup = Footnotegroup.new()
+    #~ footnotegroup = nil
     text = [
       element(:h1, {}, 'Abschnitt 1' ).cr,
       element(:par, {}, [ 
               'Text zu Abschnitt 1',
-              element(:footnote,{}, 'Fu� eins'),
+              element(:footnote,{ :group => footnotegroup }, 'Fu� eins'),
               'Weiterer Text',
               ]
       ).cr,
       element(:h2, {}, 'Fu�noten' ).cr,
-      Footnotegroup.get,
+      footnotegroup,
     ]
     assert_equal_filecontent( "expected/test_footnote.html", text.to_doc(:html))
     assert_equal_filecontent( "expected/test_footnote.latex", text.to_doc(:latex))
@@ -241,20 +249,21 @@ class Test_footnotes < Test::Unit::TestCase
     #~ assert_equal_filecontent( "expected/test_footnote.text", text.to_doc(:text))
   end #test_footnote
   def test_footnote_group
-    Footnotegroup.clear()
+    footnotegroup   = Footnotegroup.new()
+    footnotegroup2 = Footnotegroup.new('g2')
     text = [
       element(:h1, {}, 'Abschnitt 1' ).cr,
       element(:par, {}, [ 
               'Text zu Abschnitt 1',
-              element(:footnote,{ :groupid => 'g1' }, 'Fu� eins (g1)'),
+              element(:footnote,{ :group => footnotegroup2 }, 'Fu� eins (g1)'),
               'Weiterer Text',
-              element(:footnote,{}, 'Noch ne Fu�note'),
+              element(:footnote,{ :group => footnotegroup}, 'Noch ne Fu�note'),
               ]
       ).cr,
       element(:h2, {}, 'Fu�noten' ).cr,
-      Footnotegroup.get,
+      footnotegroup,
       element(:h3, {}, 'Fu�noten g1' ).cr,      
-      Footnotegroup.get('g1'),
+      footnotegroup2,
     ]
     assert_equal_filecontent( "expected/test_footnote_group.html", text.to_doc(:html))
     assert_equal_filecontent( "expected/test_footnote_group.latex", text.to_doc(:latex))

data/unittest/unittest_wiki2doc.rb

@@ -2,6 +2,7 @@ $: << 'C:/usr/Script/DocumentGenerator' #for AMAZON...
 #require 'privat/docgenerator_affiliate' 
 
 require 'test_docgenerator.rb'
+require 'wiki2doc/wiki2docgenerator'
 $fixme = []
 
 END { puts $fixme }
@@ -15,10 +16,10 @@ Text
 Text unter Titel 2
 wiki
     )
-    assert_equal_filecontent( "expected/test_wiki.html", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki.latex", wiki.to_doc(:latex))
-    assert_equal_filecontent( "expected/test_wiki.wiki", wiki.to_doc(:wiki))
-    assert_equal_filecontent( "expected/test_wiki.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki.latex", wiki.to_doc(:latex))
+    assert_equal_filecontent( "expected_wiki/test_wiki.wiki", wiki.to_doc(:wiki))
+    assert_equal_filecontent( "expected_wiki/test_wiki.text", wiki.to_doc(:text))
   end
   #
   #Including the definition of a label tor the toc.
@@ -32,10 +33,10 @@ Text unter Titel 2
 Text unter Titel 2b
 wiki
     )
-    assert_equal_filecontent( "expected/test_wiki_toc.html", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki_toc.latex", wiki.to_doc(:latex))
-    assert_equal_filecontent( "expected/test_wiki_toc.wiki", wiki.to_doc(:wiki))
-    assert_equal_filecontent( "expected/test_wiki_toc.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_toc.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_toc.latex", wiki.to_doc(:latex))
+    assert_equal_filecontent( "expected_wiki/test_wiki_toc.wiki", wiki.to_doc(:wiki))
+    assert_equal_filecontent( "expected_wiki/test_wiki_toc.text", wiki.to_doc(:text))
   end
   def test_wiki_inline()
     wiki = Wikitext.new(:content => <<wiki
@@ -47,12 +48,12 @@ Inline-Tags ''kursiv'', '''fett''', ''''kursiv und fett''''
 wiki
     )
     #fixme tex unklar. wie zwei dd-tags in tex nachbilden?
-    assert_equal_filecontent( "expected/test_wiki_inline.html", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki_inline.latex", wiki.to_doc(:latex))
+    assert_equal_filecontent( "expected_wiki/test_wiki_inline.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_inline.latex", wiki.to_doc(:latex))
     #~ bug! fixme
     $fixme << 'inline 2 wiki'
-    #~ assert_equal_filecontent( "expected/test_wiki_inline.wiki", wiki.to_doc(:wiki))
-    assert_equal_filecontent( "expected/test_wiki_inline.text", wiki.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_inline.wiki", wiki.to_doc(:wiki))
+    assert_equal_filecontent( "expected_wiki/test_wiki_inline.text", wiki.to_doc(:text))
   end
   
   def test_wiki_textformatting()
@@ -65,10 +66,10 @@ vorher{{newline|clear}}Nachher
 Nach einer Trennlinie
 wiki
     )
-    assert_equal_filecontent( "expected/test_wiki_textformatting.html", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki_textformatting.latex", wiki.to_doc(:latex))
-    assert_equal_filecontent( "expected/test_wiki_textformatting.wiki", wiki.to_doc(:wiki))
-    assert_equal_filecontent( "expected/test_wiki_textformatting.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_textformatting.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_textformatting.latex", wiki.to_doc(:latex))
+    assert_equal_filecontent( "expected_wiki/test_wiki_textformatting.wiki", wiki.to_doc(:wiki))
+    assert_equal_filecontent( "expected_wiki/test_wiki_textformatting.text", wiki.to_doc(:text))
   end
   
   def test_wiki_label()
@@ -81,10 +82,10 @@ text text
 wiki
     )
     #~ fixme: TeX href hyperlabel??
-    assert_equal_filecontent( "expected/test_wiki_label.html", wiki.to_doc(:html))
-    #~ assert_equal_filecontent( "expected/test_wiki_label.latex", wiki.to_doc(:latex))
-    #~ assert_equal_filecontent( "expected/test_wiki_label.wiki", wiki.to_doc(:wiki))   #fixme
-    #~ assert_equal_filecontent( "expected/test_wiki_label.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_label.html", wiki.to_doc(:html))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_label.latex", wiki.to_doc(:latex))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_label.wiki", wiki.to_doc(:wiki))   #fixme
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_label.text", wiki.to_doc(:text))
   end
   
   def test_wiki_list_ul()
@@ -98,10 +99,10 @@ Text before
 Text afterwords
 wiki
     )
-    assert_equal_filecontent( "expected/test_wiki_list_ul.html", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki_list_ul.latex", wiki.to_doc(:latex))
-    assert_equal_filecontent( "expected/test_wiki_list_ul.wiki", wiki.to_doc(:wiki))
-    assert_equal_filecontent( "expected/test_wiki_list_ul.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ul.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ul.latex", wiki.to_doc(:latex))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ul.wiki", wiki.to_doc(:wiki))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ul.text", wiki.to_doc(:text))
   end
   #It works fine here, but LaTeX will give you an error.
  def test_wiki_list_ul_too_much()
@@ -118,10 +119,10 @@ Text before
 Text afterwords
 wiki
     )
-    assert_equal_filecontent( "expected/test_wiki_list_ul_too_much.html", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki_list_ul_too_much.latex", wiki.to_doc(:latex))
-    assert_equal_filecontent( "expected/test_wiki_list_ul_too_much.wiki", wiki.to_doc(:wiki))
-    assert_equal_filecontent( "expected/test_wiki_list_ul_too_much.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ul_too_much.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ul_too_much.latex", wiki.to_doc(:latex))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ul_too_much.wiki", wiki.to_doc(:wiki))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ul_too_much.text", wiki.to_doc(:text))
   end  
   def test_wiki_list_ol()
     wiki = Wikitext.new(:content => <<wiki
@@ -134,10 +135,10 @@ Text before
 Text afterwords
 wiki
     )
-    assert_equal_filecontent( "expected/test_wiki_list_ol.html", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki_list_ol.latex", wiki.to_doc(:latex))
-    assert_equal_filecontent( "expected/test_wiki_list_ol.wiki", wiki.to_doc(:wiki))
-    assert_equal_filecontent( "expected/test_wiki_list_ol.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ol.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ol.latex", wiki.to_doc(:latex))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ol.wiki", wiki.to_doc(:wiki))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ol.text", wiki.to_doc(:text))
   end  #ol
 
   def test_wiki_list_ol_ul()
@@ -151,10 +152,10 @@ Text before
 Text afterwords
 wiki
     )
-    assert_equal_filecontent( "expected/test_wiki_list_ol_ul.html", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki_list_ol_ul.latex", wiki.to_doc(:latex))
-    assert_equal_filecontent( "expected/test_wiki_list_ol_ul.wiki", wiki.to_doc(:wiki))
-    assert_equal_filecontent( "expected/test_wiki_list_ol_ul.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ol_ul.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ol_ul.latex", wiki.to_doc(:latex))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ol_ul.wiki", wiki.to_doc(:wiki))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ol_ul.text", wiki.to_doc(:text))
     $fixmes << "nested lists/wiki: bug"
     $fixmes << "nested lists/text: bug"
   end  
@@ -167,10 +168,10 @@ Text before
 Text afterwords
 wiki
     )
-    assert_equal_filecontent( "expected/test_wiki_list_ol_after_ul.html", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki_list_ol_after_ul.latex", wiki.to_doc(:latex))
-    assert_equal_filecontent( "expected/test_wiki_list_ol_after_ul.wiki", wiki.to_doc(:wiki))
-    assert_equal_filecontent( "expected/test_wiki_list_ol_after_ul.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ol_after_ul.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ol_after_ul.latex", wiki.to_doc(:latex))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ol_after_ul.wiki", wiki.to_doc(:wiki))
+    assert_equal_filecontent( "expected_wiki/test_wiki_list_ol_after_ul.text", wiki.to_doc(:text))
   end  
 
   #Line breaks will be lost.
@@ -187,10 +188,10 @@ wiki
 *	nachher
 wiki
     )
-    assert_equal_filecontent( "expected/test_wiki_ul_multiple_line.html", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki_ul_multiple_line.latex", wiki.to_doc(:latex))
-    assert_equal_filecontent( "expected/test_wiki_ul_multiple_line.wiki", wiki.to_doc(:wiki))
-    assert_equal_filecontent( "expected/test_wiki_ul_multiple_line.text", wiki.to_doc(:text)) #fixme
+    assert_equal_filecontent( "expected_wiki/test_wiki_ul_multiple_line.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_ul_multiple_line.latex", wiki.to_doc(:latex))
+    assert_equal_filecontent( "expected_wiki/test_wiki_ul_multiple_line.wiki", wiki.to_doc(:wiki))
+    assert_equal_filecontent( "expected_wiki/test_wiki_ul_multiple_line.text", wiki.to_doc(:text)) #fixme
   end
   def test_wiki_description()
     wiki = Wikitext.new(:content => <<wiki
@@ -203,10 +204,10 @@ wiki
 wiki
     )
     #~ fixme - latex how to implement different <dd> values
-    assert_equal_filecontent( "expected/test_wiki_description.html", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki_description.latex", wiki.to_doc(:latex))
-    assert_equal_filecontent( "expected/test_wiki_description.wiki", wiki.to_doc(:wiki))
-    assert_equal_filecontent( "expected/test_wiki_description.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_description.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_description.latex", wiki.to_doc(:latex))
+    assert_equal_filecontent( "expected_wiki/test_wiki_description.wiki", wiki.to_doc(:wiki))
+    assert_equal_filecontent( "expected_wiki/test_wiki_description.text", wiki.to_doc(:text))
   end
   
   #~ Die Syntax:
@@ -238,11 +239,11 @@ wiki
   end
   def test_wiki_tab1()
     wiki = Wikitext.new(:content => mk_wiki_tab(Array('A'..'D'), Array(1..5) )    )
-    assert_equal_filecontent( "expected/test_wiki_tab1.html", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki_tab1.latex", wiki.to_doc(:latex))
-    assert_equal_filecontent( "expected/test_wiki_tab1.wiki", wiki.to_doc(:wiki))
+    assert_equal_filecontent( "expected_wiki/test_wiki_tab1.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_tab1.latex", wiki.to_doc(:latex))
+    assert_equal_filecontent( "expected_wiki/test_wiki_tab1.wiki", wiki.to_doc(:wiki))
     $fixmes << "text-output for tables"
-    #~ assert_equal_filecontent( "expected/test_wiki_tab1.text", wiki.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_tab1.text", wiki.to_doc(:text))
   end  
 
   #With >>> you can call ''WikiCollector''
@@ -264,10 +265,10 @@ Beispiel:
 Ende Beispiel
 wiki
     )
-    assert_equal_filecontent( "expected/test_wiki_html_code.html", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki_html_code.latex", wiki.to_doc(:latex))
-    assert_equal_filecontent( "expected/test_wiki_html_code.wiki", wiki.to_doc(:wiki))
-    assert_equal_filecontent( "expected/test_wiki_html_code.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_html_code.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_html_code.latex", wiki.to_doc(:latex))
+    assert_equal_filecontent( "expected_wiki/test_wiki_html_code.wiki", wiki.to_doc(:wiki))
+    assert_equal_filecontent( "expected_wiki/test_wiki_html_code.text", wiki.to_doc(:text))
   end
   #
   #Add File as verbatimtext
@@ -279,9 +280,11 @@ wiki
 {{verbatimfile|#{__FILE__}}}
 wiki
     )
+    
+    escaped_filecontent = File.read(__FILE__).gsub(/</, '&lt;').gsub(/>/, '&gt;')
     #~ puts wiki.to_latex[1..50].inspect
     #~ puts wiki.to_latex[-50..-1].inspect
-    assert_equal( "<p ><pre >#{File.read(__FILE__)}</pre></p>\n", wiki.to_doc(:html))
+    assert_equal( "<p ><pre>#{escaped_filecontent}</pre></p>\n", wiki.to_doc(:html))
     assert_equal( "\n\n\n\\begin{verbatim}#{File.read(__FILE__)}\\end{verbatim}\n\n\n", wiki.to_doc(:latex))
     
     #Add some attributes to the pre-environment.
@@ -289,7 +292,7 @@ wiki
 {{verbatimfile|#{__FILE__}|class=cssklasse}}
 wiki
     )
-    assert_equal( "<p ><pre class = \"cssklasse\" >#{File.read(__FILE__)}</pre></p>\n", 
+    assert_equal( "<p ><pre class = \"cssklasse\" >#{escaped_filecontent}</pre></p>\n", 
                       wiki.to_doc(:html))
   end
   #Add File as verbatimtext
@@ -322,10 +325,11 @@ a second footnote{{footnote|more remarks}}.
 {{footnotes}}
 wiki
     )
-    assert_equal_filecontent( "expected/test_wiki_footnote.html", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki_footnote.latex", wiki.to_doc(:latex))
-    assert_equal_filecontent( "expected/test_wiki_footnote.wiki", wiki.to_doc(:wiki))
-    assert_equal_filecontent( "expected/test_wiki_footnote.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_footnote.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_footnote_2.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_footnote.latex", wiki.to_doc(:latex))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_footnote.wiki", wiki.to_doc(:wiki))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_footnote.text", wiki.to_doc(:text))
   end
   def test_wiki_footnote_groupid()
     wiki = Wikitext.new(:content => <<wiki
@@ -345,10 +349,10 @@ Footnote group 2:
 {{footnotes|group2}}
 wiki
     )
-    assert_equal_filecontent( "expected/test_wiki_footnote_groupid.html", wiki.to_doc(:html))
-    #~ assert_equal_filecontent( "expected/test_wiki_footnote_groupid.latex", wiki.to_doc(:latex))
-    #~ assert_equal_filecontent( "expected/test_wiki_footnote_groupid.wiki", wiki.to_doc(:wiki))
-    #~ assert_equal_filecontent( "expected/test_wiki_footnote_groupid.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_footnote_groupid.html", wiki.to_doc(:html))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_footnote_groupid.latex", wiki.to_doc(:latex))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_footnote_groupid.wiki", wiki.to_doc(:wiki))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_footnote_groupid.text", wiki.to_doc(:text))
   end
   def test_wiki_amazon()
     wiki = Wikitext.new(:content => <<wiki
@@ -357,10 +361,10 @@ wiki
 {{amazon|asin=B000AFEJAM|right}}
 wiki
     )
-    assert_equal_filecontent( "expected/test_wiki_amazon.html", wiki.to_doc(:html))
-    #~ assert_equal_filecontent( "expected/test_wiki_amazon.latex", wiki.to_doc(:latex))
-    #~ assert_equal_filecontent( "expected/test_wiki_amazon.wiki", wiki.to_doc(:wiki))
-    #~ assert_equal_filecontent( "expected/test_wiki_amazon.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_amazon.html", wiki.to_doc(:html))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_amazon.latex", wiki.to_doc(:latex))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_amazon.wiki", wiki.to_doc(:wiki))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_amazon.text", wiki.to_doc(:text))
   end
   #~ Bilder lassen sich mit [ [Bild:Dateiname|Beschreibung]] in Artikel einf�gen. 
   #~ Das Bild wird dann in Originalgr��e links im Artikel angezeigt. 
@@ -388,20 +392,20 @@ wiki
 [[Bild:test.jpg|figureclass=imgclass]]
 wiki
     )
-    assert_equal_filecontent( "expected/test_wiki_picture.html", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki_picture.latex", wiki.to_doc(:latex))
-    #~ assert_equal_filecontent( "expected/test_wiki_picture.wiki", wiki.to_doc(:wiki))
-    #~ assert_equal_filecontent( "expected/test_wiki_picture.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_picture.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_picture.latex", wiki.to_doc(:latex))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_picture.wiki", wiki.to_doc(:wiki))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_picture.text", wiki.to_doc(:text))
     
     wiki = Wikitext.new(:content => <<wiki
 [[Bild:test.jpg|thumb=testthumb.jpg]]
 wiki
     )
     wiki.log.level = Log4r::FATAL #Avoid warning for missing picture
-    assert_equal_filecontent( "expected/test_wiki_picture_thumb.html", wiki.to_doc(:html))
-    #~ assert_equal_filecontent( "expected/test_wiki_picture_thumb.latex", wiki.to_doc(:latex))
-    #~ assert_equal_filecontent( "expected/test_wiki_picture_thumb.wiki", wiki.to_doc(:wiki))
-    #~ assert_equal_filecontent( "expected/test_wiki_picture_thumb.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_picture_thumb.html", wiki.to_doc(:html))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_picture_thumb.latex", wiki.to_doc(:latex))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_picture_thumb.wiki", wiki.to_doc(:wiki))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_picture_thumb.text", wiki.to_doc(:text))
   end  
   def test_wiki_link()
     wiki = Wikitext.new(:content => <<wiki
@@ -415,13 +419,13 @@ text after
 wiki
     )
     wiki.log.level = Log4r::FATAL
-    #~ wiki.log.outputters = Log4r::FileOutputter.new('wiki_link', :filename => "expected/test_wiki_link.log")
+    #~ wiki.log.outputters = Log4r::FileOutputter.new('wiki_link', :filename => "expected_wiki/test_wiki_link.log")
 
-    assert_equal_filecontent( "expected/test_wiki_link.html", wiki.to_doc(:html))
-    #~ assert_equal_filecontent( "expected/test_wiki_link.log", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki_link.latex", wiki.to_doc(:latex))
-    assert_equal_filecontent( "expected/test_wiki_link.wiki", wiki.to_doc(:wiki))
-    #~ assert_equal_filecontent( "expected/test_wiki_link.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_link.html", wiki.to_doc(:html))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_link.log", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_link.latex", wiki.to_doc(:latex))
+    assert_equal_filecontent( "expected_wiki/test_wiki_link.wiki", wiki.to_doc(:wiki))
+    #~ assert_equal_filecontent( "expected_wiki/test_wiki_link.text", wiki.to_doc(:text))
   end  
 end #TestWiki
 
@@ -433,10 +437,10 @@ def newtest(text)
 Text
 wiki
     )
-    assert_equal_filecontent( "expected/test_wiki_??.html", wiki.to_doc(:html))
-    assert_equal_filecontent( "expected/test_wiki_??.latex", wiki.to_doc(:latex))
-    assert_equal_filecontent( "expected/test_wiki_??.wiki", wiki.to_doc(:wiki))
-    assert_equal_filecontent( "expected/test_wiki_??.text", wiki.to_doc(:text))
+    assert_equal_filecontent( "expected_wiki/test_wiki_??.html", wiki.to_doc(:html))
+    assert_equal_filecontent( "expected_wiki/test_wiki_??.latex", wiki.to_doc(:latex))
+    assert_equal_filecontent( "expected_wiki/test_wiki_??.wiki", wiki.to_doc(:wiki))
+    assert_equal_filecontent( "expected_wiki/test_wiki_??.text", wiki.to_doc(:text))
   end
 code
   puts code.gsub(/\?\?/, text)