2 files changed, 155 insertions, 6 deletions

diff --git a/src/mailman/utilities/tests/test_templates.py b/src/mailman/utilities/tests/test_templates.py
index 2de43ae3c..e21b44544 100644
--- a/src/mailman/utilities/tests/test_templates.py
+++ b/src/mailman/utilities/tests/test_templates.py
@@ -258,17 +258,15 @@ It will not be wrapped.
 
     def test_no_substitutions(self):
         self.assertEqual(make('nosub.txt', self.mlist), """\
-This is a global template. It has no substitutions. It will be
-wrapped.
-""")
+This is a global template.  It has no substitutions.  It will be
+wrapped.""")
 
     def test_substitutions(self):
         self.assertEqual(make('subs.txt', self.mlist,
                               kind='very nice',
                               howmany='a few'), """\
-This is a very nice template. It has a few substitutions. It will be
-wrapped.
-""")
+This is a very nice template.  It has a few substitutions.  It will be
+wrapped.""")
 
     def test_substitutions_no_wrap(self):
         self.assertEqual(make('nowrap.txt', self.mlist, wrap=False,
diff --git a/src/mailman/utilities/tests/test_wrap.py b/src/mailman/utilities/tests/test_wrap.py
new file mode 100644
index 000000000..2fc6c6ccf
--- /dev/null
+++ b/src/mailman/utilities/tests/test_wrap.py
@@ -0,0 +1,151 @@
+# Copyright (C) 2011 by the Free Software Foundation, Inc.
+#
+# This file is part of GNU Mailman.
+#
+# GNU Mailman 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 3 of the License, or (at your option)
+# any later version.
+#
+# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Test text wrapping."""
+
+from __future__ import absolute_import, unicode_literals
+
+__metaclass__ = type
+__all__ = [
+    'test_suite',
+    ]
+
+
+import unittest
+
+from mailman.utilities.string import wrap
+
+
+
+class TestWrap(unittest.TestCase):
+    """Test text wrapping."""
+
+    def test_simple_wrap(self):
+        text = """\
+This is a single
+paragraph.  It consists
+of several sentences
+none of
+which are
+very long.
+"""
+        self.assertEqual(wrap(text), """\
+This is a single paragraph.  It consists of several sentences none of
+which are very long.""")
+
+    def test_two_paragraphs(self):
+        text = """\
+This is a single
+paragraph.  It consists
+of several sentences
+none of
+which are
+very long.
+
+And here is a second paragraph which
+also consists
+of several sentences. None of
+these are very long
+either.
+"""
+        self.assertEqual(wrap(text), """\
+This is a single paragraph.  It consists of several sentences none of
+which are very long.
+
+And here is a second paragraph which also consists of several
+sentences.  None of these are very long either.""")
+
+    def test_honor_ws(self):
+        text = """\
+This is a single
+paragraph.  It consists
+of several sentences
+none of
+which are
+very long.
+
+    This paragraph is
+    indented so it
+    won't be filled.
+
+And here is a second paragraph which
+also consists
+of several sentences. None of
+these are very long
+either.
+"""
+        self.assertEqual(wrap(text), """\
+This is a single paragraph.  It consists of several sentences none of
+which are very long.
+
+    This paragraph is
+    indented so it
+    won't be filled.
+
+And here is a second paragraph which also consists of several
+sentences.  None of these are very long either.""")
+
+    def test_dont_honor_ws(self):
+        text = """\
+This is a single
+paragraph.  It consists
+of several sentences
+none of
+which are
+very long.
+
+    This paragraph is
+    indented but we don't
+    honor whitespace so it
+    will be filled.
+
+And here is a second paragraph which
+also consists
+of several sentences. None of
+these are very long
+either.
+"""
+        self.assertEqual(wrap(text, honor_leading_ws=False), """\
+This is a single paragraph.  It consists of several sentences none of
+which are very long.
+
+    This paragraph is indented but we don't honor whitespace so it
+    will be filled.
+
+And here is a second paragraph which also consists of several
+sentences.  None of these are very long either.""")
+
+    def test_indentation_boundary(self):
+        text = """\
+This is a single paragraph
+that consists of one sentence.
+    And another one that breaks
+    because it is indented.
+Followed by one more paragraph.
+"""
+        self.assertEqual(wrap(text), """\
+This is a single paragraph that consists of one sentence.
+    And another one that breaks
+    because it is indented.
+Followed by one more paragraph.""")
+
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(TestWrap))
+    return suite