Use unittest2 to get rid of a bunch of our own test assertion implementations.

1 files changed, 0 insertions, 98 deletions

diff --git a/tests/test_testing.py b/tests/test_testing.py
index 6222db9a..9f5dfb34 100644
--- a/tests/test_testing.py
+++ b/tests/test_testing.py
@@ -12,14 +12,6 @@ class TestingTest(TestCase):
 
     run_in_temp_dir = False
 
-    def please_raise(self, exc, msg):
-        """Raise an exception for testing assertRaisesRegexp."""
-        raise exc(msg)
-
-    def please_succeed(self):
-        """A simple successful method for testing assertRaisesRegexp."""
-        return "All is well"
-
     def test_assert_same_elements(self):
         self.assertSameElements(set(), set())
         self.assertSameElements(set([1,2,3]), set([3,1,2]))
@@ -30,96 +22,6 @@ class TestingTest(TestCase):
             set([1,2,3]), set([4,5,6])
             )
 
-    def test_assert_regexp_matches(self):
-        self.assertRegexpMatches("hello", "hel*o")
-        self.assertRegexpMatches("Oh, hello there!", "hel*o")
-        self.assertRaises(AssertionError, self.assertRegexpMatches,
-            "hello there", "^hello$"
-            )
-
-    def test_assert_multiline_equal(self):
-        self.assertMultiLineEqual("hello", "hello")
-        self.assertRaises(AssertionError, self.assertMultiLineEqual,
-            "hello there", "Hello there"
-            )
-        self.assertRaises(AssertionError, self.assertMultiLineEqual,
-            "hello\nthere", "hello\nThere"
-            )
-        # With messages also.
-        self.assertMultiLineEqual("hi", "hi", "it's ok")
-        self.assertRaisesRegexp(
-            AssertionError, "my message",
-            self.assertMultiLineEqual, "xyz", "abc", "my message"
-        )
-
-    def test_assert_raises_regexp(self):
-        # Raising the right error with the right message passes.
-        self.assertRaisesRegexp(
-            ZeroDivisionError, "Wow! Zero!",
-            self.please_raise, ZeroDivisionError, "Wow! Zero!"
-            )
-        # Raising the right error with a match passes.
-        self.assertRaisesRegexp(
-            ZeroDivisionError, "Zero",
-            self.please_raise, ZeroDivisionError, "Wow! Zero!"
-            )
-        # Raising the right error with a mismatch fails.
-        self.assertRaises(AssertionError,
-            self.assertRaisesRegexp, ZeroDivisionError, "XYZ",
-            self.please_raise, ZeroDivisionError, "Wow! Zero!"
-            )
-        # Raising the right error with a mismatch fails.
-        self.assertRaises(AssertionError,
-            self.assertRaisesRegexp, ZeroDivisionError, "XYZ",
-            self.please_raise, ZeroDivisionError, "Wow! Zero!"
-            )
-        # Raising the wrong error raises the error itself.
-        self.assertRaises(ZeroDivisionError,
-            self.assertRaisesRegexp, IOError, "Wow! Zero!",
-            self.please_raise, ZeroDivisionError, "Wow! Zero!"
-            )
-        # Raising no error fails.
-        self.assertRaises(AssertionError,
-            self.assertRaisesRegexp, ZeroDivisionError, "XYZ",
-            self.please_succeed
-            )
-
-    def test_assert_true(self):
-        self.assertTrue(True)
-        self.assertRaises(AssertionError, self.assertTrue, False)
-
-    def test_assert_false(self):
-        self.assertFalse(False)
-        self.assertRaises(AssertionError, self.assertFalse, True)
-
-    def test_assert_in(self):
-        self.assertIn("abc", "hello abc")
-        self.assertIn("abc", ["xyz", "abc", "foo"])
-        self.assertIn("abc", {'abc': 1, 'xyz': 2})
-        self.assertRaises(AssertionError, self.assertIn, "abc", "xyz")
-        self.assertRaises(AssertionError, self.assertIn, "abc", ["x", "xabc"])
-        self.assertRaises(AssertionError, self.assertIn, "abc", {'x':'abc'})
-
-    def test_assert_not_in(self):
-        self.assertRaises(AssertionError, self.assertNotIn, "abc", "hello abc")
-        self.assertRaises(AssertionError,
-            self.assertNotIn, "abc", ["xyz", "abc", "foo"]
-            )
-        self.assertRaises(AssertionError,
-            self.assertNotIn, "abc", {'abc': 1, 'xyz': 2}
-            )
-        self.assertNotIn("abc", "xyz")
-        self.assertNotIn("abc", ["x", "xabc"])
-        self.assertNotIn("abc", {'x':'abc'})
-
-    def test_assert_greater(self):
-        self.assertGreater(10, 9)
-        self.assertGreater("xyz", "abc")
-        self.assertRaises(AssertionError, self.assertGreater, 9, 10)
-        self.assertRaises(AssertionError, self.assertGreater, 10, 10)
-        self.assertRaises(AssertionError, self.assertGreater, "abc", "xyz")
-        self.assertRaises(AssertionError, self.assertGreater, "xyz", "xyz")
-
 
 class CoverageTestTest(CoverageTest):
     """Test the methods in `CoverageTest`."""