1 files changed, 59 insertions, 1 deletions
diff --git a/test/test_testing.py b/test/test_testing.py
index 1cae9310..9943b65c 100644
--- a/test/test_testing.py
+++ b/test/test_testing.py
@@ -1,11 +1,13 @@
+# -*- coding: utf-8 -*-
 """Tests that our test infrastructure is really working!"""
 
 import os, sys
 sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
+from coverage.backward import to_bytes
 from backunittest import TestCase
 from coveragetest import CoverageTest
 
-from coverage.backward import set                   # pylint: disable-msg=W0622
+from coverage.backward import set                   # pylint: disable=W0622
 
 class TestingTest(TestCase):
     """Tests of helper methods on `backunittest.TestCase`."""
@@ -92,10 +94,42 @@ class TestingTest(TestCase):
         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`."""
 
+    def file_text(self, fname):
+        """Return the text read from a file."""
+        return open(fname, "rb").read().decode('ascii')
+
     def test_make_file(self):
         # A simple file.
         self.make_file("fooey.boo", "Hello there")
@@ -109,3 +143,27 @@ class CoverageTestTest(CoverageTest):
         # A deeper directory
         self.make_file("sub/deeper/evenmore/third.txt")
         self.assertEqual(open("sub/deeper/evenmore/third.txt").read(), "")
+
+    def test_make_file_newline(self):
+        self.make_file("unix.txt", "Hello\n")
+        self.assertEqual(self.file_text("unix.txt"), "Hello\n")
+        self.make_file("dos.txt", "Hello\n", newline="\r\n")
+        self.assertEqual(self.file_text("dos.txt"), "Hello\r\n")
+        self.make_file("mac.txt", "Hello\n", newline="\r")
+        self.assertEqual(self.file_text("mac.txt"), "Hello\r")
+
+    def test_make_file_non_ascii(self):
+        self.make_file("unicode.txt", "tabblo: «ταБЬℓσ»")
+        self.assertEqual(
+            open("unicode.txt", "rb").read(),
+            to_bytes("tabblo: «ταБЬℓσ»")
+            )
+
+    def test_file_exists(self):
+        self.make_file("whoville.txt", "We are here!")
+        self.assert_exists("whoville.txt")
+        self.assert_doesnt_exist("shadow.txt")
+        self.assertRaises(
+            AssertionError, self.assert_doesnt_exist, "whoville.txt"
+            )
+        self.assertRaises(AssertionError, self.assert_exists, "shadow.txt")