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

Cleaned up some parts of the tests

Browse Source
This commit is contained in:
bjmb
2017-05-09 14:12:36 -04:00
parent ffcb70c601
commit d1638b1a04
5 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/cqlengine/columns/test_validation.py
View File

@@ -771,7 +771,7 @@ class TestPythonDoesntDieWhenExtraFieldIsInCassandra(BaseCassEngTestCase):
sync_table(self.TestModel) sync_table(self.TestModel)
self.TestModel.create() self.TestModel.create()
execute("ALTER TABLE {0} add blah int".format(self.TestModel.column_family_name(include_keyspace=True))) execute("ALTER TABLE {0} add blah int".format(self.TestModel.column_family_name(include_keyspace=True)))
self.TestModel.objects().all() self.TestModel.objects.all()
class TestTimeUUIDFromDatetime(BaseCassEngTestCase): class TestTimeUUIDFromDatetime(BaseCassEngTestCase):

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

@@ -210,7 +210,7 @@ class TestModelIO(BaseCassEngTestCase):
m=UUID('067e6162-3b6f-4ae2-a171-2470b63dff00'), n=int(str(2147483647) + '000')) m=UUID('067e6162-3b6f-4ae2-a171-2470b63dff00'), n=int(str(2147483647) + '000'))
self.assertEqual(1, AllDatatypesModel.objects.count()) self.assertEqual(1, AllDatatypesModel.objects.count())
output = AllDatatypesModel.objects().first() output = AllDatatypesModel.objects.first()
for i, i_char in enumerate(range(ord('a'), ord('a') + 14)): for i, i_char in enumerate(range(ord('a'), ord('a') + 14)):
self.assertEqual(input[i], output[chr(i_char)]) self.assertEqual(input[i], output[chr(i_char)])
@@ -263,7 +263,7 @@ class TestModelIO(BaseCassEngTestCase):
v4DatatypesModel.create(id=0, a=date(1970, 1, 1), b=32523, c=time(16, 47, 25, 7), d=123) v4DatatypesModel.create(id=0, a=date(1970, 1, 1), b=32523, c=time(16, 47, 25, 7), d=123)
self.assertEqual(1, v4DatatypesModel.objects.count()) self.assertEqual(1, v4DatatypesModel.objects.count())
output = v4DatatypesModel.objects().first() output = v4DatatypesModel.objects.first()
for i, i_char in enumerate(range(ord('a'), ord('a') + 3)): for i, i_char in enumerate(range(ord('a'), ord('a') + 3)):
self.assertEqual(input[i], output[chr(i_char)]) self.assertEqual(input[i], output[chr(i_char)])
@@ -288,16 +288,16 @@ class TestModelIO(BaseCassEngTestCase):
sync_table(FloatingPointModel) sync_table(FloatingPointModel)
FloatingPointModel.create(id=0, f=2.39) FloatingPointModel.create(id=0, f=2.39)
output = FloatingPointModel.objects().first() output = FloatingPointModel.objects.first()
self.assertEqual(2.390000104904175, output.f) # float loses precision self.assertEqual(2.390000104904175, output.f) # float loses precision
FloatingPointModel.create(id=0, f=3.4028234663852886e+38, d=2.39) FloatingPointModel.create(id=0, f=3.4028234663852886e+38, d=2.39)
output = FloatingPointModel.objects().first() output = FloatingPointModel.objects.first()
self.assertEqual(3.4028234663852886e+38, output.f) self.assertEqual(3.4028234663852886e+38, output.f)
self.assertEqual(2.39, output.d) # double retains precision self.assertEqual(2.39, output.d) # double retains precision
FloatingPointModel.create(id=0, d=3.4028234663852886e+38) FloatingPointModel.create(id=0, d=3.4028234663852886e+38)
output = FloatingPointModel.objects().first() output = FloatingPointModel.objects.first()
self.assertEqual(3.4028234663852886e+38, output.d) self.assertEqual(3.4028234663852886e+38, output.d)

26
tests/integration/cqlengine/model/test_udts.py
View File

@@ -115,7 +115,7 @@ class UserDefinedTypeTests(BaseCassEngTestCase):
self.assertEqual(1, UserModel.objects.count()) self.assertEqual(1, UserModel.objects.count())
john = UserModel.objects().first() john = UserModel.objects.first()
self.assertEqual(0, john.id) self.assertEqual(0, john.id)
self.assertTrue(type(john.info) is User) self.assertTrue(type(john.info) is User)
self.assertEqual(42, john.info.age) self.assertEqual(42, john.info.age)
@@ -128,14 +128,14 @@ class UserDefinedTypeTests(BaseCassEngTestCase):
user = User(age=42, name="John") user = User(age=42, name="John")
created_user = UserModel.create(id=0, info=user) created_user = UserModel.create(id=0, info=user)
john_info = UserModel.objects().first().info john_info = UserModel.objects.first().info
self.assertEqual(42, john_info.age) self.assertEqual(42, john_info.age)
self.assertEqual("John", john_info.name) self.assertEqual("John", john_info.name)
created_user.info = User(age=22, name="Mary") created_user.info = User(age=22, name="Mary")
created_user.update() created_user.update()
mary_info = UserModel.objects().first().info mary_info = UserModel.objects.first().info
self.assertEqual(22, mary_info["age"]) self.assertEqual(22, mary_info["age"])
self.assertEqual("Mary", mary_info["name"]) self.assertEqual("Mary", mary_info["name"])
@@ -146,14 +146,14 @@ class UserDefinedTypeTests(BaseCassEngTestCase):
user = User(age=42, name="John") user = User(age=42, name="John")
created_user = UserModel.create(id=0, info=user) created_user = UserModel.create(id=0, info=user)
john_info = UserModel.objects().first().info john_info = UserModel.objects.first().info
self.assertEqual(42, john_info.age) self.assertEqual(42, john_info.age)
self.assertEqual("John", john_info.name) self.assertEqual("John", john_info.name)
created_user.info = None created_user.info = None
created_user.update() created_user.update()
john_info = UserModel.objects().first().info john_info = UserModel.objects.first().info
self.assertIsNone(john_info) self.assertIsNone(john_info)
def test_can_create_same_udt_different_keyspaces(self): def test_can_create_same_udt_different_keyspaces(self):
@@ -179,7 +179,7 @@ class UserDefinedTypeTests(BaseCassEngTestCase):
user = UserGender(age=42, name="John") user = UserGender(age=42, name="John")
UserModelGender.create(id=0, info=user) UserModelGender.create(id=0, info=user)
john_info = UserModelGender.objects().first().info john_info = UserModelGender.objects.first().info
self.assertEqual(42, john_info.age) self.assertEqual(42, john_info.age)
self.assertEqual("John", john_info.name) self.assertEqual("John", john_info.name)
self.assertIsNone(john_info.gender) self.assertIsNone(john_info.gender)
@@ -187,7 +187,7 @@ class UserDefinedTypeTests(BaseCassEngTestCase):
user = UserGender(age=42) user = UserGender(age=42)
UserModelGender.create(id=0, info=user) UserModelGender.create(id=0, info=user)
john_info = UserModelGender.objects().first().info john_info = UserModelGender.objects.first().info
self.assertEqual(42, john_info.age) self.assertEqual(42, john_info.age)
self.assertIsNone(john_info.name) self.assertIsNone(john_info.name)
self.assertIsNone(john_info.gender) self.assertIsNone(john_info.gender)
@@ -222,7 +222,7 @@ class UserDefinedTypeTests(BaseCassEngTestCase):
udts.append(Depth_3(value=udts[2])) udts.append(Depth_3(value=udts[2]))
DepthModel.create(id=0, v_0=udts[0], v_1=udts[1], v_2=udts[2], v_3=udts[3]) DepthModel.create(id=0, v_0=udts[0], v_1=udts[1], v_2=udts[2], v_3=udts[3])
output = DepthModel.objects().first() output = DepthModel.objects.first()
self.assertEqual(udts[0], output.v_0) self.assertEqual(udts[0], output.v_0)
self.assertEqual(udts[1], output.v_1) self.assertEqual(udts[1], output.v_1)
@@ -253,7 +253,7 @@ class UserDefinedTypeTests(BaseCassEngTestCase):
self.assertEqual(1, AllDatatypesModel.objects.count()) self.assertEqual(1, AllDatatypesModel.objects.count())
output = AllDatatypesModel.objects().first().data output = AllDatatypesModel.objects.first().data
self.assertEqual(input, output) self.assertEqual(input, output)
def test_can_insert_udts_with_all_datatypes(self): def test_can_insert_udts_with_all_datatypes(self):
@@ -282,7 +282,7 @@ class UserDefinedTypeTests(BaseCassEngTestCase):
AllDatatypesModel.create(id=0, data=input) AllDatatypesModel.create(id=0, data=input)
self.assertEqual(1, AllDatatypesModel.objects.count()) self.assertEqual(1, AllDatatypesModel.objects.count())
output = AllDatatypesModel.objects().first().data output = AllDatatypesModel.objects.first().data
for i in range(ord('a'), ord('a') + 14): for i in range(ord('a'), ord('a') + 14):
self.assertEqual(input[chr(i)], output[chr(i)]) self.assertEqual(input[chr(i)], output[chr(i)])
@@ -324,7 +324,7 @@ class UserDefinedTypeTests(BaseCassEngTestCase):
Allv4DatatypesModel.create(id=0, data=input) Allv4DatatypesModel.create(id=0, data=input)
self.assertEqual(1, Allv4DatatypesModel.objects.count()) self.assertEqual(1, Allv4DatatypesModel.objects.count())
output = Allv4DatatypesModel.objects().first().data output = Allv4DatatypesModel.objects.first().data
for i in range(ord('a'), ord('a') + 3): for i in range(ord('a'), ord('a') + 3):
self.assertEqual(input[chr(i)], output[chr(i)]) self.assertEqual(input[chr(i)], output[chr(i)])
@@ -368,7 +368,7 @@ class UserDefinedTypeTests(BaseCassEngTestCase):
# Validate input and output matches # Validate input and output matches
self.assertEqual(1, Container.objects.count()) self.assertEqual(1, Container.objects.count())
names_output = Container.objects().first().names names_output = Container.objects.first().names
self.assertEqual(names_output, names) self.assertEqual(names_output, names)
def test_udts_with_unicode(self): def test_udts_with_unicode(self):
@@ -458,7 +458,7 @@ class UserDefinedTypeTests(BaseCassEngTestCase):
self.assertEqual(1, TheModel.objects.count()) self.assertEqual(1, TheModel.objects.count())
john = TheModel.objects().first() john = TheModel.objects.first()
self.assertEqual(john.id, id) self.assertEqual(john.id, id)
info = john.info info = john.info
self.assertIsInstance(info, db_field_different) self.assertIsInstance(info, db_field_different)

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

@@ -205,14 +205,14 @@ class ModelWithDefaultTests(BaseCassEngTestCase):
initial = ModelWithDefault(id=1, mf={0: 0}, dummy=0, udt=first_udt, udt_default=first_udt) initial = ModelWithDefault(id=1, mf={0: 0}, dummy=0, udt=first_udt, udt_default=first_udt)
initial.save() initial.save()
self.assertEqual(ModelWithDefault.all().get()._as_dict(), self.assertEqual(ModelWithDefault.get()._as_dict(),
{'id': 1, 'dummy': 0, 'mf': {0: 0}, "udt": first_udt, "udt_default": first_udt}) {'id': 1, 'dummy': 0, 'mf': {0: 0}, "udt": first_udt, "udt_default": first_udt})
second_udt = UDT(age=1, mf={3: 3}, dummy_udt=12) second_udt = UDT(age=1, mf={3: 3}, dummy_udt=12)
second = ModelWithDefault(id=1) second = ModelWithDefault(id=1)
second.update(mf={0: 1}, udt=second_udt) second.update(mf={0: 1}, udt=second_udt)
self.assertEqual(ModelWithDefault.all().get()._as_dict(), self.assertEqual(ModelWithDefault.get()._as_dict(),
{'id': 1, 'dummy': 0, 'mf': {0: 1}, "udt": second_udt, "udt_default": first_udt}) {'id': 1, 'dummy': 0, 'mf': {0: 1}, "udt": second_udt, "udt_default": first_udt})
def test_value_is_written_if_is_default(self): def test_value_is_written_if_is_default(self):
@@ -230,7 +230,7 @@ class ModelWithDefaultTests(BaseCassEngTestCase):
initial.udt_default = self.udt_default initial.udt_default = self.udt_default
initial.update() initial.update()
self.assertEqual(ModelWithDefault.all().get()._as_dict(), self.assertEqual(ModelWithDefault.get()._as_dict(),
{'id': 1, 'dummy': 42, 'mf': {0: 0}, "udt": None, "udt_default": self.udt_default}) {'id': 1, 'dummy': 42, 'mf': {0: 0}, "udt": None, "udt_default": self.udt_default})
def test_null_update_is_respected(self): def test_null_update_is_respected(self):
@@ -252,7 +252,7 @@ class ModelWithDefaultTests(BaseCassEngTestCase):
updated_udt = UDT(age=1, mf={2:2}, dummy_udt=None) updated_udt = UDT(age=1, mf={2:2}, dummy_udt=None)
obj.update(dummy=None, udt_default=updated_udt) obj.update(dummy=None, udt_default=updated_udt)
self.assertEqual(ModelWithDefault.all().get()._as_dict(), self.assertEqual(ModelWithDefault.get()._as_dict(),
{'id': 1, 'dummy': None, 'mf': {0: 0}, "udt": None, "udt_default": updated_udt}) {'id': 1, 'dummy': None, 'mf': {0: 0}, "udt": None, "udt_default": updated_udt})
def test_only_set_values_is_updated(self): def test_only_set_values_is_updated(self):
@@ -275,7 +275,7 @@ class ModelWithDefaultTests(BaseCassEngTestCase):
item.udt, item.udt_default = udt, udt_default item.udt, item.udt_default = udt, udt_default
item.save() item.save()
self.assertEqual(ModelWithDefault.all().get()._as_dict(), self.assertEqual(ModelWithDefault.get()._as_dict(),
{'id': 1, 'dummy': None, 'mf': {1: 2}, "udt": udt, "udt_default": udt_default}) {'id': 1, 'dummy': None, 'mf': {1: 2}, "udt": udt, "udt_default": udt_default})
def test_collections(self): def test_collections(self):
@@ -295,7 +295,7 @@ class ModelWithDefaultTests(BaseCassEngTestCase):
udt, udt_default = UDT(age=1, mf={2: 1}), UDT(age=1, mf={2: 1}) udt, udt_default = UDT(age=1, mf={2: 1}), UDT(age=1, mf={2: 1})
item.update(mf={2:1}, udt=udt, udt_default=udt_default) item.update(mf={2:1}, udt=udt, udt_default=udt_default)
self.assertEqual(ModelWithDefault.all().get()._as_dict(), self.assertEqual(ModelWithDefault.get()._as_dict(),
{'id': 1, 'dummy': 1, 'mf': {2: 1}, "udt": udt, "udt_default": udt_default}) {'id': 1, 'dummy': 1, 'mf': {2: 1}, "udt": udt, "udt_default": udt_default})
def test_collection_with_default(self): def test_collection_with_default(self):

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

@@ -75,10 +75,10 @@ class TestTokenFunction(BaseCassEngTestCase):
@execute_count(15) @execute_count(15)
def test_token_function(self): def test_token_function(self):
""" Tests that token functions work properly """ """ Tests that token functions work properly """
assert TokenTestModel.objects().count() == 0 assert TokenTestModel.objects.count() == 0
for i in range(10): for i in range(10):
TokenTestModel.create(key=i, val=i) TokenTestModel.create(key=i, val=i)
assert TokenTestModel.objects().count() == 10 assert TokenTestModel.objects.count() == 10
seen_keys = set() seen_keys = set()
last_token = None last_token = None
for instance in TokenTestModel.objects().limit(5): for instance in TokenTestModel.objects().limit(5):