From 7dc0c80bf840d3d93da01ab061f27dee29ce0d1e Mon Sep 17 00:00:00 2001
From: jlgijsbers <jlgijsbers@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Sat, 25 Oct 2003 12:02:37 +0000
Subject: [PATCH] Move tests to test_mailsplit, which I hadn't seen before
 (insert the sound of one hand slapping here).

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1938 57a73879-2fb5-44c3-a270-3262357dd7e2
---
 test/test_mailgw.py    | 22 ++--------------------
 test/test_mailsplit.py | 10 +++++++++-
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/test/test_mailgw.py b/test/test_mailgw.py
index 4adbad5..5f0ca24 100644
--- a/test/test_mailgw.py
+++ b/test/test_mailgw.py
@@ -8,7 +8,7 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# $Id: test_mailgw.py,v 1.55 2003-10-24 15:01:11 jlgijsbers Exp $
+# $Id: test_mailgw.py,v 1.56 2003-10-25 12:02:36 jlgijsbers Exp $
 
 import unittest, tempfile, os, shutil, errno, imp, sys, difflib, rfc822
 
@@ -994,26 +994,8 @@ This is a test confirmation of registration.
 
         self.db.user.lookup('johannes')
 
-
-class ParseContentTestCase(unittest.TestCase):
-    def testSignatureRemoval(self):
-        summary, content = parseContent('''Testing, testing.
-
--- 
-Signature''', 1, 0)
-        self.assertEqual(content, 'Testing, testing.')
-
-    def testKeepMultipleHyphens(self):
-        body = '''Testing, testing.
-
-----
-Testing, testing.'''
-        summary, content = parseContent(body, 1, 0)
-        self.assertEqual(body, content)
-
 def suite():
-    l = [unittest.makeSuite(MailgwTestCase),
-         unittest.makeSuite(ParseContentTestCase)]
+    l = [unittest.makeSuite(MailgwTestCase)]
     return unittest.TestSuite(l)
 
 
diff --git a/test/test_mailsplit.py b/test/test_mailsplit.py
index 1eda501..a50e2d4 100644
--- a/test/test_mailsplit.py
+++ b/test/test_mailsplit.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: test_mailsplit.py,v 1.13 2003-09-30 23:55:54 richard Exp $
+# $Id: test_mailsplit.py,v 1.14 2003-10-25 12:02:37 jlgijsbers Exp $
 
 import unittest, cStringIO
 
@@ -219,6 +219,14 @@ userfoo@foo.com
         self.assertEqual(summary, 'This is a long sentence that would '
             'normally\nbe split.')
 
+    def testKeepMultipleHyphens(self):
+        body = '''Testing, testing.
+
+----
+Testing, testing.'''
+        summary, content = parseContent(body, 1, 0)
+        self.assertEqual(body, content)
+
 def suite():
    return unittest.makeSuite(MailsplitTestCase, 'test')
 
-- 
2.30.2