pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor renaming in test classes

Browse Source
This commit is contained in:
Bastien Gerard 2021-08-01 14:12:27 +02:00
parent 88642eb021
commit c32b308730
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/document/test_instance.py
View File

@ -66,12 +66,12 @@ class TestDocumentInstance(MongoDBTestCase):
for collection in list_collection_names(self.db): for collection in list_collection_names(self.db):
self.db.drop_collection(collection) self.db.drop_collection(collection)
def assertDbEqual(self, docs): def _assert_db_equal(self, docs):
assert list(self.Person._get_collection().find().sort("id")) == sorted( assert list(self.Person._get_collection().find().sort("id")) == sorted(
docs, key=lambda doc: doc["_id"] docs, key=lambda doc: doc["_id"]
) )
def assertHasInstance(self, field, instance): def _assert_has_instance(self, field, instance):
assert hasattr(field, "_instance") assert hasattr(field, "_instance")
assert field._instance is not None assert field._instance is not None
if isinstance(field._instance, weakref.ProxyType): if isinstance(field._instance, weakref.ProxyType):
@ -749,11 +749,11 @@ class TestDocumentInstance(MongoDBTestCase):
Doc.drop_collection() Doc.drop_collection()
doc = Doc(embedded_field=Embedded(string="Hi")) doc = Doc(embedded_field=Embedded(string="Hi"))
self.assertHasInstance(doc.embedded_field, doc) self._assert_has_instance(doc.embedded_field, doc)
doc.save() doc.save()
doc = Doc.objects.get() doc = Doc.objects.get()
self.assertHasInstance(doc.embedded_field, doc) self._assert_has_instance(doc.embedded_field, doc)
def test_embedded_document_complex_instance(self): def test_embedded_document_complex_instance(self):
"""Ensure that embedded documents in complex fields can reference """Ensure that embedded documents in complex fields can reference
@ -768,11 +768,11 @@ class TestDocumentInstance(MongoDBTestCase):
Doc.drop_collection() Doc.drop_collection()
doc = Doc(embedded_field=[Embedded(string="Hi")]) doc = Doc(embedded_field=[Embedded(string="Hi")])
self.assertHasInstance(doc.embedded_field[0], doc) self._assert_has_instance(doc.embedded_field[0], doc)
doc.save() doc.save()
doc = Doc.objects.get() doc = Doc.objects.get()
self.assertHasInstance(doc.embedded_field[0], doc) self._assert_has_instance(doc.embedded_field[0], doc)
def test_embedded_document_complex_instance_no_use_db_field(self): def test_embedded_document_complex_instance_no_use_db_field(self):
"""Ensure that use_db_field is propagated to list of Emb Docs.""" """Ensure that use_db_field is propagated to list of Emb Docs."""
@ -801,11 +801,11 @@ class TestDocumentInstance(MongoDBTestCase):
acc = Account() acc = Account()
acc.email = Email(email="test@example.com") acc.email = Email(email="test@example.com")
self.assertHasInstance(acc._data["email"], acc) self._assert_has_instance(acc._data["email"], acc)
acc.save() acc.save()
acc1 = Account.objects.first() acc1 = Account.objects.first()
self.assertHasInstance(acc1._data["email"], acc1) self._assert_has_instance(acc1._data["email"], acc1)
def test_instance_is_set_on_setattr_on_embedded_document_list(self): def test_instance_is_set_on_setattr_on_embedded_document_list(self):
class Email(EmbeddedDocument): class Email(EmbeddedDocument):
@ -817,11 +817,11 @@ class TestDocumentInstance(MongoDBTestCase):
Account.drop_collection() Account.drop_collection()
acc = Account() acc = Account()
acc.emails = [Email(email="test@example.com")] acc.emails = [Email(email="test@example.com")]
self.assertHasInstance(acc._data["emails"][0], acc) self._assert_has_instance(acc._data["emails"][0], acc)
acc.save() acc.save()
acc1 = Account.objects.first() acc1 = Account.objects.first()
self.assertHasInstance(acc1._data["emails"][0], acc1) self._assert_has_instance(acc1._data["emails"][0], acc1)
def test_save_checks_that_clean_is_called(self): def test_save_checks_that_clean_is_called(self):
class CustomError(Exception): class CustomError(Exception):
@ -930,7 +930,7 @@ class TestDocumentInstance(MongoDBTestCase):
with pytest.raises(InvalidDocumentError): with pytest.raises(InvalidDocumentError):
self.Person().modify(set__age=10) self.Person().modify(set__age=10)
self.assertDbEqual([dict(doc.to_mongo())]) self._assert_db_equal([dict(doc.to_mongo())])
def test_modify_invalid_query(self): def test_modify_invalid_query(self):
doc1 = self.Person(name="bob", age=10).save() doc1 = self.Person(name="bob", age=10).save()
@ -940,7 +940,7 @@ class TestDocumentInstance(MongoDBTestCase):
with pytest.raises(InvalidQueryError): with pytest.raises(InvalidQueryError):
doc1.modify({"id": doc2.id}, set__value=20) doc1.modify({"id": doc2.id}, set__value=20)
self.assertDbEqual(docs) self._assert_db_equal(docs)
def test_modify_match_another_document(self): def test_modify_match_another_document(self):
doc1 = self.Person(name="bob", age=10).save() doc1 = self.Person(name="bob", age=10).save()
@ -950,7 +950,7 @@ class TestDocumentInstance(MongoDBTestCase):
n_modified = doc1.modify({"name": doc2.name}, set__age=100) n_modified = doc1.modify({"name": doc2.name}, set__age=100)
assert n_modified == 0 assert n_modified == 0
self.assertDbEqual(docs) self._assert_db_equal(docs)
def test_modify_not_exists(self): def test_modify_not_exists(self):
doc1 = self.Person(name="bob", age=10).save() doc1 = self.Person(name="bob", age=10).save()
@ -960,7 +960,7 @@ class TestDocumentInstance(MongoDBTestCase):
n_modified = doc2.modify({"name": doc2.name}, set__age=100) n_modified = doc2.modify({"name": doc2.name}, set__age=100)
assert n_modified == 0 assert n_modified == 0
self.assertDbEqual(docs) self._assert_db_equal(docs)
def test_modify_update(self): def test_modify_update(self):
other_doc = self.Person(name="bob", age=10).save() other_doc = self.Person(name="bob", age=10).save()
@ -986,7 +986,7 @@ class TestDocumentInstance(MongoDBTestCase):
assert doc.to_json() == doc_copy.to_json() assert doc.to_json() == doc_copy.to_json()
assert doc._get_changed_fields() == [] assert doc._get_changed_fields() == []
self.assertDbEqual([dict(other_doc.to_mongo()), dict(doc.to_mongo())]) self._assert_db_equal([dict(other_doc.to_mongo()), dict(doc.to_mongo())])
def test_modify_with_positional_push(self): def test_modify_with_positional_push(self):
class Content(EmbeddedDocument): class Content(EmbeddedDocument):

22
tests/queryset/test_modify.py
View File

@ -19,7 +19,7 @@ class TestFindAndModify(unittest.TestCase):
connect(db="mongoenginetest") connect(db="mongoenginetest")
Doc.drop_collection() Doc.drop_collection()
def assertDbEqual(self, docs): def _assert_db_equal(self, docs):
assert list(Doc._collection.find().sort("id")) == docs assert list(Doc._collection.find().sort("id")) == docs
def test_modify(self): def test_modify(self):
@ -28,7 +28,7 @@ class TestFindAndModify(unittest.TestCase):
old_doc = Doc.objects(id=1).modify(set__value=-1) old_doc = Doc.objects(id=1).modify(set__value=-1)
assert old_doc.to_json() == doc.to_json() assert old_doc.to_json() == doc.to_json()
self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}]) self._assert_db_equal([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
def test_modify_with_new(self): def test_modify_with_new(self):
Doc(id=0, value=0).save() Doc(id=0, value=0).save()
@ -37,18 +37,18 @@ class TestFindAndModify(unittest.TestCase):
new_doc = Doc.objects(id=1).modify(set__value=-1, new=True) new_doc = Doc.objects(id=1).modify(set__value=-1, new=True)
doc.value = -1 doc.value = -1
assert new_doc.to_json() == doc.to_json() assert new_doc.to_json() == doc.to_json()
self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}]) self._assert_db_equal([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
def test_modify_not_existing(self): def test_modify_not_existing(self):
Doc(id=0, value=0).save() Doc(id=0, value=0).save()
assert Doc.objects(id=1).modify(set__value=-1) is None assert Doc.objects(id=1).modify(set__value=-1) is None
self.assertDbEqual([{"_id": 0, "value": 0}]) self._assert_db_equal([{"_id": 0, "value": 0}])
def test_modify_with_upsert(self): def test_modify_with_upsert(self):
Doc(id=0, value=0).save() Doc(id=0, value=0).save()
old_doc = Doc.objects(id=1).modify(set__value=1, upsert=True) old_doc = Doc.objects(id=1).modify(set__value=1, upsert=True)
assert old_doc is None assert old_doc is None
self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": 1}]) self._assert_db_equal([{"_id": 0, "value": 0}, {"_id": 1, "value": 1}])
def test_modify_with_upsert_existing(self): def test_modify_with_upsert_existing(self):
Doc(id=0, value=0).save() Doc(id=0, value=0).save()
@ -56,13 +56,13 @@ class TestFindAndModify(unittest.TestCase):
old_doc = Doc.objects(id=1).modify(set__value=-1, upsert=True) old_doc = Doc.objects(id=1).modify(set__value=-1, upsert=True)
assert old_doc.to_json() == doc.to_json() assert old_doc.to_json() == doc.to_json()
self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}]) self._assert_db_equal([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
def test_modify_with_upsert_with_new(self): def test_modify_with_upsert_with_new(self):
Doc(id=0, value=0).save() Doc(id=0, value=0).save()
new_doc = Doc.objects(id=1).modify(upsert=True, new=True, set__value=1) new_doc = Doc.objects(id=1).modify(upsert=True, new=True, set__value=1)
assert new_doc.to_mongo() == {"_id": 1, "value": 1} assert new_doc.to_mongo() == {"_id": 1, "value": 1}
self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": 1}]) self._assert_db_equal([{"_id": 0, "value": 0}, {"_id": 1, "value": 1}])
def test_modify_with_remove(self): def test_modify_with_remove(self):
Doc(id=0, value=0).save() Doc(id=0, value=0).save()
@ -70,12 +70,12 @@ class TestFindAndModify(unittest.TestCase):
old_doc = Doc.objects(id=1).modify(remove=True) old_doc = Doc.objects(id=1).modify(remove=True)
assert old_doc.to_json() == doc.to_json() assert old_doc.to_json() == doc.to_json()
self.assertDbEqual([{"_id": 0, "value": 0}]) self._assert_db_equal([{"_id": 0, "value": 0}])
def test_find_and_modify_with_remove_not_existing(self): def test_find_and_modify_with_remove_not_existing(self):
Doc(id=0, value=0).save() Doc(id=0, value=0).save()
assert Doc.objects(id=1).modify(remove=True) is None assert Doc.objects(id=1).modify(remove=True) is None
self.assertDbEqual([{"_id": 0, "value": 0}]) self._assert_db_equal([{"_id": 0, "value": 0}])
def test_modify_with_order_by(self): def test_modify_with_order_by(self):
Doc(id=0, value=3).save() Doc(id=0, value=3).save()
@ -85,7 +85,7 @@ class TestFindAndModify(unittest.TestCase):
old_doc = Doc.objects().order_by("-id").modify(set__value=-1) old_doc = Doc.objects().order_by("-id").modify(set__value=-1)
assert old_doc.to_json() == doc.to_json() assert old_doc.to_json() == doc.to_json()
self.assertDbEqual( self._assert_db_equal(
[ [
{"_id": 0, "value": 3}, {"_id": 0, "value": 3},
{"_id": 1, "value": 2}, {"_id": 1, "value": 2},
@ -100,7 +100,7 @@ class TestFindAndModify(unittest.TestCase):
old_doc = Doc.objects(id=1).only("id").modify(set__value=-1) old_doc = Doc.objects(id=1).only("id").modify(set__value=-1)
assert old_doc.to_mongo() == {"_id": 1} assert old_doc.to_mongo() == {"_id": 1}
self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}]) self._assert_db_equal([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
def test_modify_with_push(self): def test_modify_with_push(self):
class BlogPost(Document): class BlogPost(Document):