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

Acknowledged review for PYTHON-657 tests

Browse Source
This commit is contained in:
bjmb
2017-04-05 13:56:50 -04:00
parent 1999f6da6b
commit fba89cea8a
1 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,9 +155,6 @@ class ModelWithDefaultTests(BaseCassEngTestCase):
def tearDown(self):
drop_table(ModelWithDefault)
def _assert_model_with_default_row(self, obj, expected):
self.assertListEqual([obj.id, obj.dummy, obj.mf], expected)
def test_value_override_with_default(self):
"""
Updating a row with a new Model instance shouldn't set columns to defaults
@@ -171,14 +168,14 @@ class ModelWithDefaultTests(BaseCassEngTestCase):
initial = ModelWithDefault(id=1, mf={0: 0}, dummy=0)
initial.save()
self._assert_model_with_default_row(ModelWithDefault.objects.all().get(),
[1, 0, {0: 0}])
self.assertEqual(ModelWithDefault.objects().all().get()._as_dict(),
{'id': 1, 'dummy': 0, 'mf': {0: 0}})
second = ModelWithDefault(id=1)
second.update(mf={0: 1})
self._assert_model_with_default_row(ModelWithDefault.objects.all().get(),
[1, 0, {0: 1}])
self.assertEqual(ModelWithDefault.objects().all().get()._as_dict(),
{'id': 1, 'dummy': 0, 'mf': {0: 1}})
def test_value_is_written_if_is_default(self):
"""
@@ -196,14 +193,13 @@ class ModelWithDefaultTests(BaseCassEngTestCase):
initial.dummy = 42
initial.update()
self._assert_model_with_default_row(ModelWithDefault.objects.all().get(),
[1, 42, {0: 0}])
self.assertEqual(ModelWithDefault.objects().all().get()._as_dict(),
{'id': 1, 'dummy': 42, 'mf': {0: 0}})
def test_null_update_is_respected(self):
"""
Check if the we try to update with None under particular
circumstances, ir works correctly
circumstances, it works correctly
@since 3.9
@jira_ticket PYTHON-657
@expected_result column value should be updated to None
@@ -218,9 +214,8 @@ class ModelWithDefaultTests(BaseCassEngTestCase):
obj.update(dummy=None)
self._assert_model_with_default_row(ModelWithDefault.objects.all().get(),
[1, None, {0: 0}])
self.assertEqual(ModelWithDefault.objects().all().get()._as_dict(),
{'id': 1, 'dummy': None, 'mf': {0: 0}})
def test_only_set_values_is_updated(self):
"""
@@ -241,8 +236,8 @@ class ModelWithDefaultTests(BaseCassEngTestCase):
item.save()
self._assert_model_with_default_row(ModelWithDefault.objects.all().get(),
[1, None, {1: 2}])
self.assertEqual(ModelWithDefault.objects().all().get()._as_dict(),
{'id': 1, 'dummy': None, 'mf': {1: 2}})
def test_collections(self):
"""
@@ -258,8 +253,8 @@ class ModelWithDefaultTests(BaseCassEngTestCase):
item = ModelWithDefault.filter(id=1).first()
item.update(mf={2:1})
self._assert_model_with_default_row(ModelWithDefault.objects.all().get(),
[1, 1, {2: 1}])
self.assertEqual(ModelWithDefault.objects().all().get()._as_dict(),
{'id': 1, 'dummy': 1, 'mf': {2: 1}})
def test_collection_with_default(self):
"""
@@ -273,23 +268,23 @@ class ModelWithDefaultTests(BaseCassEngTestCase):
"""
sync_table(ModelWithDefaultCollection)
item = ModelWithDefaultCollection.create(id=1, mf={1: 1}, dummy=1).save()
self._assert_model_with_default_row(ModelWithDefaultCollection.objects.all().get(),
[1, 1, {1: 1}])
self.assertEqual(ModelWithDefaultCollection.objects().all().get()._as_dict(),
{'id': 1, 'dummy': 1, 'mf': {1: 1}})
item.update(mf={2: 2})
self._assert_model_with_default_row(ModelWithDefaultCollection.objects.all().get(),
[1, 1, {2: 2}])
self.assertEqual(ModelWithDefaultCollection.objects().all().get()._as_dict(),
{'id': 1, 'dummy': 1, 'mf': {2: 2}})
item.update(mf=None)
self._assert_model_with_default_row(ModelWithDefaultCollection.objects.all().get(),
[1, 1, {}])
self.assertEqual(ModelWithDefaultCollection.objects().all().get()._as_dict(),
{'id': 1, 'dummy': 1, 'mf': {}})
item = ModelWithDefaultCollection.create(id=2, dummy=2).save()
self._assert_model_with_default_row(ModelWithDefaultCollection.objects.all().get(id=2),
[2, 2, {2: 2}])
self.assertEqual(ModelWithDefaultCollection.objects().all().get(id=2)._as_dict(),
{'id': 2, 'dummy': 2, 'mf': {2: 2}})
item.update(mf={1: 1, 4: 4})
self._assert_model_with_default_row(ModelWithDefaultCollection.objects.all().get(id=2),
[2, 2, {1: 1, 4: 4}])
self.assertEqual(ModelWithDefaultCollection.objects().all().get(id=2)._as_dict(),
{'id': 2, 'dummy': 2, 'mf': {1: 1, 4: 4}})
drop_table(ModelWithDefaultCollection)