From 660f7a369020ba547593f6e0a56d044620545bf6 Mon Sep 17 00:00:00 2001
From: florian <f.spreckelsen@inidscale.com>
Date: Mon, 21 Sep 2020 14:43:48 +0200
Subject: [PATCH] WIP: Remove get_entity() function
---
tests/test_error_stuff.py | 32 ++++++++++++++++----------------
tests/test_permissions.py | 2 +-
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/tests/test_error_stuff.py b/tests/test_error_stuff.py
index b4cf934..971bca8 100644
--- a/tests/test_error_stuff.py
+++ b/tests/test_error_stuff.py
@@ -80,10 +80,10 @@ def test_retrieval_exception_raised():
assert isinstance(ee, EntityError)
assert isinstance(ee, TransactionError)
# Correct entity causing the error:
- assert not (ee.get_entity() is None)
- assert ee.get_entity().name == propname
- assert not ee.get_entity().is_valid()
- assert ee.get_entity().has_errors()
+ assert ee.entity is not None
+ assert ee.entity.name == propname
+ assert not ee.entity.is_valid()
+ assert ee.entity.has_errors()
def test_insertion_no_exception_raised():
@@ -112,13 +112,13 @@ def test_insertion_with_invalid_parents():
upe = te.value.get_errors()[0]
print(upe)
assert isinstance(upe, UnqualifiedParentsError)
- assert not upe.get_entity() is None
- assert upe.get_entity().name == p.name
- assert upe.get_entity().id == p.id
- assert upe.get_entity().has_errors()
+ assert upe.entity is not None
+ assert upe.entity.name == p.name
+ assert upe.entity.id == p.id
+ assert upe.entity.has_errors()
assert not p.is_valid()
- assert not upe.get_entity().is_valid()
- assert not upe.get_entities() is None
+ assert not upe.entity.is_valid()
+ assert upe.entities is not None
def test_insertion_with_invalid_properties():
@@ -130,12 +130,12 @@ def test_insertion_with_invalid_properties():
p.insert(raise_exception_on_error=True)
upe = te.value.get_errors()[0]
assert isinstance(upe, UnqualifiedPropertiesError)
- assert not upe.get_entity() is None
- assert upe.get_entity().name == p.name
- assert upe.get_entity().has_errors()
+ assert upe.entity is not None
+ assert upe.entity.name == p.name
+ assert upe.entity.has_errors()
assert p.has_errors()
assert not p.is_valid()
- assert not upe.get_entity().is_valid()
+ assert not upe.entity.is_valid()
def test_entity_does_not_exist():
@@ -223,8 +223,8 @@ def test_insert_existent_entity():
te = te.value
assert te.has_error(UniqueNamesError)
une = te.get_errors()[0]
- assert not une.get_entity() is None
- assert pe.name == une.get_entity().name
+ assert une.entity is not None
+ assert pe.name == une.entity.name
for p in (p1, p2, p3):
assert not p in te.get_all_entities()
diff --git a/tests/test_permissions.py b/tests/test_permissions.py
index b036f92..2281a5a 100644
--- a/tests/test_permissions.py
+++ b/tests/test_permissions.py
@@ -1210,7 +1210,7 @@ def test_check_entity_acl_roles():
with raises(db.TransactionError) as cm:
grant_permission(p, "USE:AS_PARENT", username="asdf-non-existing",
switch=False)
- errors = cm.value.get_entity().get_errors()
+ errors = cm.value.entity.get_errors()
assert errors[0].description == "User Role does not exist."
db.administration.set_server_property(
"CHECK_ENTITY_ACL_ROLES_MODE", "SHOULD")
--
GitLab