From 7c1438034be1e0d587c31db4c6bb9746ae0db2c2 Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Fri, 26 Sep 2014 17:15:38 -0400
Subject: [PATCH] Fix BulkAssertionMixin so that it actually asserts the
 truth/falsity of the contained assertions

---
 common/lib/xmodule/xmodule/tests/__init__.py  |  3 +-
 .../xmodule/tests/test_bulk_assertions.py     | 77 +++++++++++++++++++
 2 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 common/lib/xmodule/xmodule/tests/test_bulk_assertions.py

diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py
index a0107a5476..9581d4451d 100644
--- a/common/lib/xmodule/xmodule/tests/__init__.py
+++ b/common/lib/xmodule/xmodule/tests/__init__.py
@@ -193,7 +193,7 @@ class BulkAssertionManager(object):
             self._equal_actual.append((description, actual))
 
     def run_assertions(self):
-        self._test_case.assertEqual(self._equal_expected, self._equal_actual)
+        super(BulkAssertionTest, self._test_case).assertEqual(self._equal_expected, self._equal_actual)
 
 
 class BulkAssertionTest(unittest.TestCase):
@@ -224,6 +224,7 @@ class BulkAssertionTest(unittest.TestCase):
             self._manager.assertEqual(expected, actual, message)
         else:
             super(BulkAssertionTest, self).assertEqual(expected, actual, message)
+    assertEquals = assertEqual
 
 
 class CourseComparisonTest(BulkAssertionTest):
diff --git a/common/lib/xmodule/xmodule/tests/test_bulk_assertions.py b/common/lib/xmodule/xmodule/tests/test_bulk_assertions.py
new file mode 100644
index 0000000000..d796b6b546
--- /dev/null
+++ b/common/lib/xmodule/xmodule/tests/test_bulk_assertions.py
@@ -0,0 +1,77 @@
+import ddt
+from xmodule.tests import BulkAssertionTest
+
+@ddt.ddt
+class TestBulkAssertionTestCase(BulkAssertionTest):
+
+    @ddt.data(
+        ('assertTrue', True),
+        ('assertFalse', False),
+        ('assertIs', 1, 1),
+        ('assertIsNot', 1, 2),
+        ('assertIsNone', None),
+        ('assertIsNotNone', 1),
+        ('assertIn', 1, (1, 2, 3)),
+        ('assertNotIn', 5, (1, 2, 3)),
+        ('assertIsInstance', 1, int),
+        ('assertNotIsInstance', '1', int),
+        ('assertRaises', KeyError, {}.__getitem__, '1'),
+    )
+    @ddt.unpack
+    def test_passing_asserts_passthrough(self, assertion, *args):
+        getattr(self, assertion)(*args)
+
+
+    @ddt.data(
+        ('assertTrue', False),
+        ('assertFalse', True),
+        ('assertIs', 1, 2),
+        ('assertIsNot', 1, 1),
+        ('assertIsNone', 1),
+        ('assertIsNotNone', None),
+        ('assertIn', 5, (1, 2, 3)),
+        ('assertNotIn', 1, (1, 2, 3)),
+        ('assertIsInstance', '1', int),
+        ('assertNotIsInstance', 1, int),
+        ('assertRaises', ValueError, lambda: None),
+    )
+    @ddt.unpack
+    def test_failing_asserts_passthrough(self, assertion, *args):
+        # Use super(BulkAssertionTest) to make sure we get un-adulturated assertions
+        with super(BulkAssertionTest, self).assertRaises(AssertionError):
+            getattr(self, assertion)(*args)
+
+    def test_no_bulk_assert_equals(self):
+        # Use super(BulkAssertionTest) to make sure we get un-adulturated assertions
+        with super(BulkAssertionTest, self).assertRaises(AssertionError):
+            self.assertEquals(1, 2)
+
+    @ddt.data(
+        'assertEqual', 'assertEquals'
+    )
+    def test_bulk_assert_equals(self, asserterFn):
+        asserter = getattr(self, asserterFn)
+        contextmanager = self.bulk_assertions()
+
+        contextmanager.__enter__()
+        super(BulkAssertionTest, self).assertIsNotNone(self._manager)
+        asserter(1, 2)
+        asserter(3, 4)
+
+        # Use super(BulkAssertionTest) to make sure we get un-adulturated assertions
+        with super(BulkAssertionTest, self).assertRaises(AssertionError):
+            contextmanager.__exit__(None, None, None)
+
+    @ddt.data(
+        'assertEqual', 'assertEquals'
+    )
+    def test_bulk_assert_closed(self, asserterFn):
+        asserter = getattr(self, asserterFn)
+
+        with self.bulk_assertions():
+            asserter(1, 1)
+            asserter(2, 2)
+
+        # Use super(BulkAssertionTest) to make sure we get un-adulturated assertions
+        with super(BulkAssertionTest, self).assertRaises(AssertionError):
+            asserter(1, 2)