diff --git a/test/unit/lib/redmine/wiki_formatting/null_formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/null_formatter_test.rb
new file mode 100644
index 0000000000000000000000000000000000000000..70c1b783f0d9c7f1e74f4878b26ecd621bd09711
--- /dev/null
+++ b/test/unit/lib/redmine/wiki_formatting/null_formatter_test.rb
@@ -0,0 +1,43 @@
+#-- copyright
+# ChiliProject is a project management system.
+#
+# Copyright (C) 2010-2011 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+require File.expand_path('../../../../../test_helper', __FILE__)
+
+class Redmine::WikiFormatting::NullFormatterTest < HelperTestCase
+
+  def setup
+    @formatter = Redmine::WikiFormatting::NullFormatter::Formatter
+  end
+
+  def test_plain_text
+    assert_html_output("This is some input" => "This is some input")
+  end
+
+  def test_escaping
+    assert_html_output(
+      'this is a <script>'      => 'this is a &lt;script&gt;'
+    )
+  end
+
+private
+
+  def assert_html_output(to_test, expect_paragraph = true)
+    to_test.each do |text, expected|
+      assert_equal(( expect_paragraph ? "<p>#{expected}</p>" : expected ), @formatter.new(text).to_html, "Formatting the following text failed:\n===\n#{text}\n===\n")
+    end
+  end
+
+  def to_html(text)
+    @formatter.new(text).to_html
+  end
+end