Remove self assert

tests/integration/__init__.py

@@ -937,13 +937,6 @@ def tearDown(self):
         self.cluster.shutdown()
 
 
-def assert_startswith(s, prefix):
-    if not s.startswith(prefix):
-        raise AssertionError(
-            '{} does not start with {}'.format(repr(s), repr(prefix))
-        )
-
-
 class TestCluster(object):
     __test__ = False
 

tests/integration/cqlengine/__init__.py

@@ -77,12 +77,7 @@ def wrapped_function(*args, **kwargs):
             # DeMonkey Patch our code
             cassandra.cqlengine.connection.execute = original_function
             # Check to see if we have a pre-existing test case to work from.
-            if args:
-                test_case = args[0]
-            else:
-                test_case = unittest.TestCase("__init__")
-            # Check to see if the count is what you expect
-            test_case.assertEqual(count.get_counter(), expected, msg="Expected number of cassandra.cqlengine.connection.execute calls ({0}) doesn't match actual number invoked ({1})".format(expected, count.get_counter()))
+            assert count.get_counter() == expected, "Expected number of cassandra.cqlengine.connection.execute calls ({0}) doesn't match actual number invoked ({1})".format(expected, count.get_counter())
             return to_return
         # Name of the wrapped function must match the original or unittest will error out.
         wrapped_function.__name__ = fn.__name__
@@ -94,5 +89,3 @@ def wrapped_function(*args, **kwargs):
             return wrapped_function
 
     return innerCounter
-
-

tests/integration/cqlengine/base.py

@@ -40,15 +40,3 @@ class BaseCassEngTestCase(unittest.TestCase):
 
     def setUp(self):
         self.session = get_session()
-
-    def assertHasAttr(self, obj, attr):
-        self.assertTrue(hasattr(obj, attr),
-                "{0} doesn't have attribute: {1}".format(obj, attr))
-
-    def assertNotHasAttr(self, obj, attr):
-        self.assertFalse(hasattr(obj, attr),
-                "{0} shouldn't have the attribute: {1}".format(obj, attr))
-
-    if sys.version_info > (3, 0):
-        def assertItemsEqual(self, first, second, msg=None):
-            return self.assertCountEqual(first, second, msg)