openstack/deb-python-cassandra-driver
Code Issues Proposed changes

assertEquals --> assertEqual in cqlengine (deprecated)

Browse Source
This commit is contained in:
Adam Holmberg
2015-03-17 11:22:27 -05:00
parent 3fa3f8daaf
commit fa49e9e26e
5 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/integration/cqlengine/model/test_class_construction.py
View File

@@ -61,8 +61,8 @@ class TestModelClassFunction(BaseCassEngTestCase):
numbers = columns.Integer(db_field='integers_etc')
db_map = WildDBNames._db_map
self.assertEquals(db_map['words_and_whatnot'], 'content')
self.assertEquals(db_map['integers_etc'], 'numbers')
self.assertEqual(db_map['words_and_whatnot'], 'content')
self.assertEqual(db_map['integers_etc'], 'numbers')
def test_attempting_to_make_duplicate_column_names_fails(self):
"""
@@ -86,7 +86,7 @@ class TestModelClassFunction(BaseCassEngTestCase):
content = columns.Text()
numbers = columns.Integer()
self.assertEquals([x for x in Stuff._columns.keys()], ['id', 'words', 'content', 'numbers'])
self.assertEqual([x for x in Stuff._columns.keys()], ['id', 'words', 'content', 'numbers'])
def test_exception_raised_when_creating_class_without_pk(self):
with self.assertRaises(ModelDefinitionException):
@@ -109,8 +109,8 @@ class TestModelClassFunction(BaseCassEngTestCase):
inst2 = Stuff(num=7)
self.assertNotEquals(inst1.num, inst2.num)
self.assertEquals(inst1.num, 5)
self.assertEquals(inst2.num, 7)
self.assertEqual(inst1.num, 5)
self.assertEqual(inst2.num, 7)
def test_superclass_fields_are_inherited(self):
"""
@@ -183,7 +183,7 @@ class TestModelClassFunction(BaseCassEngTestCase):
self.assertTrue(cols['p2'].partition_key)
obj = ModelWithPartitionKeys(p1='a', p2='b')
self.assertEquals(obj.pk, ('a', 'b'))
self.assertEqual(obj.pk, ('a', 'b'))
def test_del_attribute_is_assigned_properly(self):
""" Tests that columns that can be deleted have the del attribute """

12
tests/integration/cqlengine/model/test_model_io.py
View File

@@ -56,7 +56,7 @@ class TestModelIO(BaseCassEngTestCase):
self.assertIsInstance(tm2, TestModel)
for cname in tm._columns.keys():
self.assertEquals(getattr(tm, cname), getattr(tm2, cname))
self.assertEqual(getattr(tm, cname), getattr(tm2, cname))
def test_model_read_as_dict(self):
"""
@@ -69,13 +69,13 @@ class TestModelIO(BaseCassEngTestCase):
'text': tm.text,
'a_bool': tm.a_bool,
}
self.assertEquals(sorted(tm.keys()), sorted(column_dict.keys()))
self.assertEqual(sorted(tm.keys()), sorted(column_dict.keys()))
self.assertItemsEqual(tm.values(), column_dict.values())
self.assertEquals(
self.assertEqual(
sorted(tm.items(), key=itemgetter(0)),
sorted(column_dict.items(), key=itemgetter(0)))
self.assertEquals(len(tm), len(column_dict))
self.assertEqual(len(tm), len(column_dict))
for column_id in column_dict.keys():
self.assertEqual(tm[column_id], column_dict[column_id])
@@ -93,8 +93,8 @@ class TestModelIO(BaseCassEngTestCase):
tm.save()
tm2 = TestModel.objects(id=tm.pk).first()
self.assertEquals(tm.count, tm2.count)
self.assertEquals(tm.a_bool, tm2.a_bool)
self.assertEqual(tm.count, tm2.count)
self.assertEqual(tm.a_bool, tm2.a_bool)
def test_model_deleting_works_properly(self):
"""

4
tests/integration/cqlengine/model/test_value_lists.py
View File

@@ -55,7 +55,7 @@ class TestClusteringOrder(BaseCassEngTestCase):
values = list(TestModel.objects.values_list('clustering_key', flat=True))
# [19L, 18L, 17L, 16L, 15L, 14L, 13L, 12L, 11L, 10L, 9L, 8L, 7L, 6L, 5L, 4L, 3L, 2L, 1L, 0L]
self.assertEquals(values, sorted(items, reverse=True))
self.assertEqual(values, sorted(items, reverse=True))
def test_clustering_order_more_complex(self):
"""
@@ -70,6 +70,6 @@ class TestClusteringOrder(BaseCassEngTestCase):
values = list(TestClusteringComplexModel.objects.values_list('some_value', flat=True))
self.assertEquals([2] * 20, values)
self.assertEqual([2] * 20, values)
drop_table(TestClusteringComplexModel)

4
tests/integration/cqlengine/query/test_queryoperators.py
View File

@@ -99,7 +99,7 @@ class TestTokenFunction(BaseCassEngTestCase):
q = TestModel.objects.filter(pk__token__gt=func)
where = q._where[0]
where.set_context_id(1)
self.assertEquals(str(where), 'token("p1", "p2") > token(%({})s, %({})s)'.format(1, 2))
self.assertEqual(str(where), 'token("p1", "p2") > token(%({})s, %({})s)'.format(1, 2))
# Verify that a SELECT query can be successfully generated
str(q._select_query())
@@ -111,7 +111,7 @@ class TestTokenFunction(BaseCassEngTestCase):
q = TestModel.objects.filter(pk__token__gt=func)
where = q._where[0]
where.set_context_id(1)
self.assertEquals(str(where), 'token("p1", "p2") > token(%({})s, %({})s)'.format(1, 2))
self.assertEqual(str(where), 'token("p1", "p2") > token(%({})s, %({})s)'.format(1, 2))
str(q._select_query())
# The 'pk__token' virtual column may only be compared to a Token

20
tests/integration/cqlengine/test_ifnotexists.py
View File

@@ -85,8 +85,8 @@ class IfNotExistsInsertTests(BaseIfNotExistsTest):
self.assertEqual(len(q), 1)
tm = q.first()
self.assertEquals(tm.count, 8)
self.assertEquals(tm.text, '123456789')
self.assertEqual(tm.count, 8)
self.assertEqual(tm.text, '123456789')
def test_insert_if_not_exists_failure(self):
""" tests that insertion with if_not_exists failure """
@@ -97,11 +97,11 @@ class IfNotExistsInsertTests(BaseIfNotExistsTest):
TestIfNotExistsModel.create(id=id, count=9, text='111111111111')
q = TestIfNotExistsModel.objects(id=id)
self.assertEquals(len(q), 1)
self.assertEqual(len(q), 1)
tm = q.first()
self.assertEquals(tm.count, 9)
self.assertEquals(tm.text, '111111111111')
self.assertEqual(tm.count, 9)
self.assertEqual(tm.text, '111111111111')
@skipUnless(PROTOCOL_VERSION >= 2, "only runs against the cql3 protocol v2.0")
def test_batch_insert_if_not_exists_success(self):
@@ -121,8 +121,8 @@ class IfNotExistsInsertTests(BaseIfNotExistsTest):
self.assertEqual(len(q), 1)
tm = q.first()
self.assertEquals(tm.count, 8)
self.assertEquals(tm.text, '123456789')
self.assertEqual(tm.count, 8)
self.assertEqual(tm.text, '123456789')
def test_batch_insert_if_not_exists_failure(self):
""" tests that batch insertion with if_not_exists failure """
@@ -134,11 +134,11 @@ class IfNotExistsInsertTests(BaseIfNotExistsTest):
TestIfNotExistsModel.batch(b).create(id=id, count=9, text='111111111111')
q = TestIfNotExistsModel.objects(id=id)
self.assertEquals(len(q), 1)
self.assertEqual(len(q), 1)
tm = q.first()
self.assertEquals(tm.count, 9)
self.assertEquals(tm.text, '111111111111')
self.assertEqual(tm.count, 9)
self.assertEqual(tm.text, '111111111111')
class IfNotExistsModelTest(BaseIfNotExistsTest):