Changeset 199:b796e986ac3b

Timestamp:

01/25/11 17:48:43 (16 months ago)

Author:

Menno Smits <menno@…>

Branch:

default

Message:

Take advantage of unittest2 functionality in response parser tests

Less of our own scaffolding required.

Files:

• imapclient/test/test_response_parser.py (modified) (6 diffs)

imapclient/test/test_response_parser.py

@@ -24 +24 @@
 from imapclient.response_parser import parse_response, parse_fetch_response, ParseError
 from imapclient.test.util import unittest
-from pprint import pformat
 
 #TODO: tokenising tests
@@ -161 +160 @@
 
     def test_incomplete_tuple(self):
-        self._test_parse_error('abc (1 2', 'Tuple incomplete before "(1 2"')
+        self._test_parse_error('abc (1 2', 'Tuple incomplete before "\(1 2"')
 
     def test_incomplete_juxtaposed_tuples(self):
         self._test_parse_error('(1 2)(3 4',
-                               'Juxtaposed tuples incomplete before "(1 2)(3 4"')
+                               'Juxtaposed tuples incomplete before "\(1 2\)\(3 4"')
 
     def test_bad_literal(self):
@@ -173 +172 @@
 
     def test_bad_quoting(self):
-        self._test_parse_error('"abc next', "No closing '\"'")
+        self._test_parse_error('"abc next', """No closing '"'""")
 
 
@@ -183 +182 @@
             to_parse = [to_parse]
         output = parse_response(to_parse)
-        self.assert_(output == expected,
-                     format_error(to_parse, output, expected))
+        self.assertSequenceEqual(output, expected)
 
     def _test_parse_error(self, to_parse, expected_msg):
         if not isinstance(to_parse, list):
             to_parse = [to_parse]
-        try:
-            parse_response(to_parse)
-            self.fail("didn't raise an exception")
-        except ParseError, err:
-            actual_msg = str(err)
-            self.assert_(expected_msg == actual_msg[:len(expected_msg)],
-                         'got ParseError with wrong msg: %r' % actual_msg)
-
+        self.assertRaisesRegexp(ParseError, expected_msg,
+                                parse_response, to_parse)
 
 
@@ -332 +324 @@
 
 
-
-def format_error(input_, output, expected):
-    return 'failed for:\n%s\ngot:\n%s\nexpected:\n%s' % (
-                pformat(input_),
-                pformat(output),
-                pformat(expected))
-
-
 def add_crlf(text):
     return CRLF.join(text.splitlines()) + CRLF
@@ -349 +333 @@
 
 
-if __name__ == '__main__':
-    unittest.main()