Refactors textile formatting tests.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3568 e93f8b46-1217-0410-a6f0-8f06a7374b81

Refactors textile formatting tests.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3568 e93f8b46-1217-0410-a6f0-8f06a7374b81
7adf0581 · Jean-Philippe Lang · 054ff0db · 7adf0581
Commit 7adf0581 authored Mar 12, 2010 by Jean-Philippe Lang
Show whitespace changes
Inline Side-by-side

Showing with 15 additions and 16 deletions

textile_formatter_test.rb ...nit/lib/redmine/wiki_formatting/textile_formatter_test.rb +15 -16

No files found.
--- a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
@@ -33,7 +33,7 @@ class Redmine::WikiFormatting::TextileFormatterTest < HelperTestCase
  }
  def test_modifiers
-    to_test = {
+    assert_html_output(
      '*bold*'                => '<strong>bold</strong>',
      'before *bold*'         => 'before <strong>bold</strong>',
      '*bold* after'          => '<strong>bold</strong> after',
@@ -43,11 +43,8 @@ class Redmine::WikiFormatting::TextileFormatterTest < HelperTestCase
      '*two* *words*'         => '<strong>two</strong> <strong>words</strong>',
      '*(two)* *(words)*'     => '<strong>(two)</strong> <strong>(words)</strong>',
      # with class
-      '*(foo)two words*'      => '<strong class="foo">two words</strong>',
+      '*(foo)two words*'      => '<strong class="foo">two words</strong>'
-    }
+    )
-    to_test.each do |text, expected|
-      assert_equal "<p>#{expected}</p>", @formatter.new(text).to_html
-    end
  end
  def test_modifiers_combination
@@ -56,25 +53,27 @@ class Redmine::WikiFormatting::TextileFormatterTest < HelperTestCase
        next if m1 == m2
        text = "#{m2}#{m1}Phrase modifiers#{m1}#{m2}"
        html = "<p><#{tag2}><#{tag1}>Phrase modifiers</#{tag1}></#{tag2}></p>"
-        assert_equal html, @formatter.new(text).to_html
+        assert_html_output text => html
      end
    end
  end
  def test_inline_code
-    to_test = {
+    assert_html_output(
      'this is @some code@'      => 'this is <code>some code</code>',
-      '@<Location /redmine>@'    => '<code>&lt;Location /redmine&gt;</code>',
+      '@<Location /redmine>@'    => '<code>&lt;Location /redmine&gt;</code>'
-    }
+    )
-    to_test.each do |text, expected|
-      assert_equal "<p>#{expected}</p>", @formatter.new(text).to_html
-    end
  end
  def test_escaping
-    to_test = {
+    assert_html_output(
-      'this is a <script>'      => 'this is a &lt;script&gt;',
+      'this is a <script>'      => 'this is a &lt;script&gt;'
-    }
+    )
+  end
+  private
+  def assert_html_output(to_test)
    to_test.each do |text, expected|
      assert_equal "<p>#{expected}</p>", @formatter.new(text).to_html
    end