improve test class

Author: prashantmital

test/test_change_stream.py

@@ -1106,6 +1106,46 @@ def setFailPoint(self, scenario_dict):
             client_context.client.admin.command,
             'configureFailPoint', fail_cmd['configureFailPoint'], mode='off')
 
+    def assert_list_contents_are_subset(self, superlist, sublist):
+        """Check that each element in sublist is a subset of the corresponding
+        element in superlist."""
+        self.assertEqual(len(superlist), len(sublist))
+        for sup, sub in zip(superlist, sublist):
+            if isinstance(sub, dict):
+                self.assert_dict_is_subset(sup, sub)
+                continue
+            if isinstance(sub, (list, tuple)):
+                self.assert_list_contents_are_subset(sup, sub)
+                continue
+            self.assertEqual(sup, sub)
+
+    def assert_dict_is_subset(self, superdict, subdict):
+        """Check that subdict is a subset of superdict."""
+        exempt_fields = ["documentKey", "_id", "getMore"]
+        for key, value in iteritems(subdict):
+            if key not in superdict:
+                self.fail('Key %s not found in %s' % (key, superdict))
+            if isinstance(value, dict):
+                self.assert_dict_is_subset(superdict[key], value)
+                continue
+            if isinstance(value, (list, tuple)):
+                self.assert_list_contents_are_subset(superdict[key], value)
+                continue
+            if key in exempt_fields:
+                # Only check for presence of these exempt fields, but not value.
+                self.assertIn(key, superdict)
+            else:
+                self.assertEqual(superdict[key], value)
+
+    def check_event(self, event, expectation_dict):
+        if event is None:
+            self.fail()
+        for key, value in iteritems(expectation_dict):
+            if isinstance(value, dict):
+                self.assert_dict_is_subset(getattr(event, key), value)
+            else:
+                self.assertEqual(getattr(event, key), value)
+
     def tearDown(self):
         self.listener.results.clear()
 
@@ -1159,49 +1199,6 @@ def run_operation(client, operation):
     return cmd(**arguments)
 
 
-def assert_list_contents_are_subset(superlist, sublist):
-    assert len(superlist) == len(sublist)
-    for super, sub in zip(superlist, sublist):
-        if isinstance(sub, dict):
-            assert_dict_is_subset(super, sub)
-            continue
-        if isinstance(sub, (list, tuple)):
-            assert_list_contents_are_subset(super, sub)
-            continue
-        assert super == sub
-
-
-def assert_dict_is_subset(superdict, subdict):
-    """Check that subdict is a subset of superdict."""
-    exempt_fields = ["documentKey", "_id", "getMore"]
-    for key, value in iteritems(subdict):
-        if key not in superdict:
-            assert False
-        if isinstance(value, dict):
-            assert_dict_is_subset(superdict[key], value)
-            continue
-        if isinstance(value, (list, tuple)):
-            assert_list_contents_are_subset(superdict[key], value)
-            continue
-        if key in exempt_fields:
-            # Only check for presence of these exempt fields, but not value.
-            assert key in superdict
-        else:
-            assert superdict[key] == value
-
-
-def check_event(event, expectation_dict):
-    if event is None:
-        raise AssertionError
-    for key, value in iteritems(expectation_dict):
-        if isinstance(value, dict):
-            assert_dict_is_subset(
-                getattr(event, key), value
-            )
-        else:
-            assert getattr(event, key) == value
-
-
 def create_test(scenario_def, test):
     def run_scenario(self):
         # Set up
@@ -1232,7 +1229,7 @@ def run_scenario(self):
         else:
             # Check for expected output from change streams
             for change, expected_changes in zip(changes, test["result"]["success"]):
-                assert_dict_is_subset(change, expected_changes)
+                self.assert_dict_is_subset(change, expected_changes)
             self.assertEqual(len(changes), len(test["result"]["success"]))
 
         finally:
@@ -1242,7 +1239,7 @@ def run_scenario(self):
                 for event_type, event_desc in iteritems(expectation):
                     results_key = event_type.split("_")[1]
                     event = results[results_key][idx] if len(results[results_key]) > idx else None
-                    check_event(event, event_desc)
+                    self.check_event(event, event_desc)
 
     return run_scenario