From 5634580792a3603e2f294aec196595e81d02b428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Fri, 16 Aug 2019 16:03:54 +0200
Subject: [PATCH] MAINT: replace depricated function"
---
tests/test_administration.py | 62 +++---
tests/test_affiliation.py | 46 ++---
tests/test_authentication.py | 2 +-
tests/test_boolean.py | 28 +--
tests/test_data_model_leap.py | 36 ++--
tests/test_datatype.py | 18 +-
tests/test_datatype_inheritance.py | 74 +++----
tests/test_deletion.py | 4 +-
tests/test_error_stuff.py | 34 ++--
tests/test_file.py | 80 ++++----
tests/test_inheritance.py | 26 +--
tests/test_list.py | 124 ++++++------
tests/test_manual.py | 28 +--
tests/test_misc.py | 76 ++++----
tests/test_name_properties.py | 32 +--
tests/test_permissions.py | 160 +++++++--------
tests/test_query.py | 296 ++++++++++++++--------------
tests/test_query_template.py | 76 ++++----
tests/test_records.py | 40 ++--
tests/test_recordtypes.py | 4 +-
tests/test_select.py | 20 +-
tests/test_tenpoints.py | 10 +-
tests/test_tickets.py | 302 ++++++++++++++---------------
tests/test_tickets_200.py | 110 +++++------
tests/test_unit.py | 34 ++--
tests/test_update.py | 10 +-
tests/test_xmlparsing.py | 38 ++--
27 files changed, 885 insertions(+), 885 deletions(-)
diff --git a/tests/test_administration.py b/tests/test_administration.py
index e9b339c..380c3cd 100644
--- a/tests/test_administration.py
+++ b/tests/test_administration.py
@@ -28,7 +28,7 @@
from caosdb import administration as admin
# @UnresolvedImport
-from nose.tools import assert_true, assert_equals, assert_is_not_none, with_setup, assert_raises
+from nose.tools import assert_true, assert_equal, assert_is_not_none, with_setup, assert_raises
from caosdb.exceptions import (ClientErrorException, TransactionError,
AuthorizationException, LoginFailedException)
from caosdb.connection.connection import get_connection, configure_connection
@@ -91,7 +91,7 @@ def test_insert_role_failure_permission():
switch_to_normal_user()
with assert_raises(AuthorizationException) as cm:
admin._insert_role(name=test_role, description=test_role_desc)
- assert_equals(
+ assert_equal(
cm.exception.msg,
"You are not permitted to insert a new role.")
@@ -101,7 +101,7 @@ def test_insert_role_failure_name_duplicates():
test_insert_role_success()
with assert_raises(ClientErrorException) as cm:
admin._insert_role(name=test_role, description=test_role_desc)
- assert_equals(
+ assert_equal(
cm.exception.msg,
"Role name is already in use. Choose a different name.")
@@ -122,7 +122,7 @@ def test_update_role_failure_permissions():
switch_to_normal_user()
with assert_raises(AuthorizationException) as cm:
admin._update_role(name=test_role, description=test_role_desc + "asdf")
- assert_equals(
+ assert_equal(
cm.exception.msg,
"You are not permitted to update this role.")
@@ -131,7 +131,7 @@ def test_update_role_failure_permissions():
def test_update_role_failure_non_existing():
with assert_raises(TransactionError) as cm:
admin._update_role(name=test_role, description=test_role_desc + "asdf")
- assert_equals(cm.exception.msg, "Role does not exist.")
+ assert_equal(cm.exception.msg, "Role does not exist.")
@with_setup(setup, teardown)
@@ -146,7 +146,7 @@ def test_delete_role_failure_permissions():
switch_to_normal_user()
with assert_raises(AuthorizationException) as cm:
admin._delete_role(name=test_role)
- assert_equals(
+ assert_equal(
cm.exception.msg,
"You are not permitted to delete this role.")
@@ -155,7 +155,7 @@ def test_delete_role_failure_permissions():
def test_delete_role_failure_non_existing():
with assert_raises(TransactionError) as cm:
admin._delete_role(name=test_role)
- assert_equals(cm.exception.msg, "Role does not exist.")
+ assert_equal(cm.exception.msg, "Role does not exist.")
@with_setup(setup, teardown)
@@ -171,7 +171,7 @@ def test_retrieve_role_failure_permission():
switch_to_normal_user()
with assert_raises(AuthorizationException) as cm:
admin._retrieve_role(name=test_role)
- assert_equals(
+ assert_equal(
cm.exception.msg,
"You are not permitted to retrieve this role.")
@@ -180,7 +180,7 @@ def test_retrieve_role_failure_permission():
def test_retrieve_role_failure_non_existing():
with assert_raises(TransactionError) as cm:
admin._retrieve_role(name=test_role)
- assert_equals(cm.exception.msg, "Role does not exist.")
+ assert_equal(cm.exception.msg, "Role does not exist.")
@with_setup(setup, teardown)
@@ -204,7 +204,7 @@ def test_set_permissions_failure_permissions():
role=test_role, permission_rules=[
admin.PermissionRule(
"Grant", "BLA:BLA:BLA")])
- assert_equals(
+ assert_equal(
cm.exception.msg,
"You are not permitted to set this role's permissions.")
@@ -216,14 +216,14 @@ def test_set_permissions_failure_non_existing():
role=test_role, permission_rules=[
admin.PermissionRule(
"Grant", "BLA:BLA:BLA")])
- assert_equals(cm.exception.msg, "Role does not exist.")
+ assert_equal(cm.exception.msg, "Role does not exist.")
@with_setup(setup, teardown)
def test_get_permissions_success():
test_set_permissions_success()
r = admin._get_permissions(role=test_role)
- assert_equals({admin.PermissionRule("Grant", "BLA:BLA:BLA")}, r)
+ assert_equal({admin.PermissionRule("Grant", "BLA:BLA:BLA")}, r)
assert_is_not_none(r)
@@ -233,7 +233,7 @@ def test_get_permissions_failure_permissions():
switch_to_normal_user()
with assert_raises(AuthorizationException) as cm:
admin._get_permissions(role=test_role)
- assert_equals(
+ assert_equal(
cm.exception.msg,
"You are not permitted to retrieve this role's permissions.")
@@ -242,7 +242,7 @@ def test_get_permissions_failure_permissions():
def test_get_permissions_failure_non_existing():
with assert_raises(TransactionError) as cm:
admin._get_permissions(role="non-existing-role")
- assert_equals(cm.exception.msg, "Role does not exist.")
+ assert_equal(cm.exception.msg, "Role does not exist.")
@with_setup(setup, teardown)
@@ -259,7 +259,7 @@ def test_get_roles_failure_permissions():
switch_to_normal_user()
with assert_raises(AuthorizationException) as cm:
admin._get_roles(username=test_user)
- assert_equals(
+ assert_equal(
cm.exception.msg,
"You are not permitted to retrieve this user's roles.")
@@ -268,7 +268,7 @@ def test_get_roles_failure_permissions():
def test_get_roles_failure_non_existing():
with assert_raises(TransactionError) as cm:
admin._get_roles(username="non-existing-user")
- assert_equals(cm.exception.msg, "User does not exist.")
+ assert_equal(cm.exception.msg, "User does not exist.")
@with_setup(setup, teardown)
@@ -298,7 +298,7 @@ def test_set_roles_failure_permissions():
switch_to_normal_user()
with assert_raises(AuthorizationException) as cm:
admin._set_roles(username=test_user, roles=roles_old)
- assert_equals(
+ assert_equal(
cm.exception.msg,
"You are not permitted to set this user's roles.")
@@ -307,7 +307,7 @@ def test_set_roles_failure_non_existing_role():
roles = {"non-existing-role"}
with assert_raises(ClientErrorException) as cm:
admin._set_roles(username=test_user, roles=roles)
- assert_equals(cm.exception.msg, "Role does not exist.")
+ assert_equal(cm.exception.msg, "Role does not exist.")
def test_set_roles_failure_non_existing_user():
@@ -315,7 +315,7 @@ def test_set_roles_failure_non_existing_user():
roles = {test_role}
with assert_raises(TransactionError) as cm:
admin._set_roles(username="non-existing-user", roles=roles)
- assert_equals(cm.exception.msg, "User does not exist.")
+ assert_equal(cm.exception.msg, "User does not exist.")
@with_setup(setup, teardown)
@@ -338,7 +338,7 @@ def test_insert_user_failure_permissions():
status="ACTIVE",
email="email@example.com",
entity=None)
- assert_equals(
+ assert_equal(
cm.exception.msg,
"You are not permitted to insert a new user.")
@@ -348,7 +348,7 @@ def test_insert_user_failure_name_in_use():
test_insert_user_success()
with assert_raises(ClientErrorException) as cm:
test_insert_user_success()
- assert_equals(cm.exception.msg, "User name is yet in use.")
+ assert_equal(cm.exception.msg, "User name is yet in use.")
@with_setup(setup, teardown)
@@ -363,7 +363,7 @@ def test_delete_user_failure_permissions():
switch_to_normal_user()
with assert_raises(AuthorizationException) as cm:
admin._delete_user(name="non_existing_user")
- assert_equals(
+ assert_equal(
cm.exception.msg,
"You are not permitted to delete this user.")
@@ -372,7 +372,7 @@ def test_delete_user_failure_permissions():
def test_delete_user_failure_non_existing():
with assert_raises(TransactionError) as cm:
admin._delete_user(name="non_existing_user")
- assert_equals(cm.exception.msg, "User does not exist.")
+ assert_equal(cm.exception.msg, "User does not exist.")
@with_setup(setup, teardown)
@@ -460,7 +460,7 @@ def test_update_user_failure_permissions_status():
status="ACTIVE",
email=None,
entity=None)
- assert_equals(
+ assert_equal(
cm.exception.msg,
"You are not permitted to update this user.")
@@ -483,7 +483,7 @@ def test_update_user_failure_permissions_email():
status=None,
email="newemail@example.com",
entity=None)
- assert_equals(
+ assert_equal(
cm.exception.msg,
"You are not permitted to update this user.")
@@ -506,7 +506,7 @@ def test_update_user_failure_permissions_entity():
status=None,
email=None,
entity=21)
- assert_equals(
+ assert_equal(
cm.exception.msg,
"You are not permitted to update this user.")
@@ -529,7 +529,7 @@ def test_update_user_failure_permissions_password():
status=None,
email=None,
entity=None)
- assert_equals(
+ assert_equal(
cm.exception.msg,
"You are not permitted to update this user.")
@@ -544,7 +544,7 @@ def test_update_user_failure_non_existing_user():
status="ACTIVE",
email="email@example.com",
entity=None)
- assert_equals(cm.exception.msg, "User does not exist.")
+ assert_equal(cm.exception.msg, "User does not exist.")
@with_setup(setup, teardown)
@@ -564,7 +564,7 @@ def test_update_user_failure_non_existing_entity():
status=None,
email=None,
entity=100000)
- assert_equals(cm.exception.msg, "Entity does not exist.")
+ assert_equal(cm.exception.msg, "Entity does not exist.")
@with_setup(setup, teardown)
@@ -579,7 +579,7 @@ def test_retrieve_user_failure_permissions():
switch_to_normal_user()
with assert_raises(AuthorizationException) as cm:
admin._retrieve_user(realm=None, name=test_user + "2")
- assert_equals(
+ assert_equal(
cm.exception.msg,
"You are not permitted to retrieve this user.")
@@ -588,7 +588,7 @@ def test_retrieve_user_failure_permissions():
def test_retrieve_user_failure_non_existing():
with assert_raises(TransactionError) as cm:
admin._retrieve_user(realm=None, name="non_existing")
- assert_equals(cm.exception.msg, "User does not exist.")
+ assert_equal(cm.exception.msg, "User does not exist.")
@with_setup(setup, teardown)
diff --git a/tests/test_affiliation.py b/tests/test_affiliation.py
index 9ad6604..813c6ff 100644
--- a/tests/test_affiliation.py
+++ b/tests/test_affiliation.py
@@ -27,7 +27,7 @@
"""
import caosdb as db
import os
-from nose.tools import nottest, assert_true, assert_raises, assert_equals, with_setup, assert_is_not_none # @UnresolvedImport
+from nose.tools import nottest, assert_true, assert_raises, assert_equal, with_setup, assert_is_not_none # @UnresolvedImport
def setup_module():
@@ -74,21 +74,21 @@ def test_affiliation_there():
def test_rec_rec_is_parthood():
par = db.Record(name="TestRecordChild").add_parent(
name=rec_name).insert().get_parent(rec_name)
- assert_equals(par.affiliation, "PARTHOOD")
+ assert_equal(par.affiliation, "PARTHOOD")
@with_setup(setup, teardown)
def test_rec_rt_is_instantiation():
par = db.Record(name="TestRecordChild").add_parent(
name=recty_name).insert().get_parent(recty_name)
- assert_equals(par.affiliation, "INSTANTIATION")
+ assert_equal(par.affiliation, "INSTANTIATION")
@with_setup(setup, teardown)
def test_rec_prop_is_invalid():
with assert_raises(db.EntityError) as cm:
db.Record(name="TestRecordChild").add_parent(name=prop_name).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Affiliation is not defined for this child-parent constellation.")
@@ -97,7 +97,7 @@ def test_rec_prop_is_invalid():
def test_rec_file_is_invalid():
with assert_raises(db.EntityError) as cm:
db.Record(name="TestRecordChild").add_parent(name=file_name).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Affiliation is not defined for this child-parent constellation.")
@@ -108,7 +108,7 @@ def test_rt_rec_is_invalid():
db.RecordType(
name="TestRecordTypeChild").add_parent(
name=rec_name).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Affiliation is not defined for this child-parent constellation.")
@@ -117,7 +117,7 @@ def test_rt_rec_is_invalid():
def test_rt_rt_is_subtyping():
par = db.RecordType(name="TestRecordTypeChild").add_parent(
name=recty_name).insert().get_parent(recty_name)
- assert_equals(par.affiliation, "SUBTYPING")
+ assert_equal(par.affiliation, "SUBTYPING")
@with_setup(setup, teardown)
@@ -126,7 +126,7 @@ def test_rt_prop_is_invalid():
db.RecordType(
name="TestRecordTypeChild").add_parent(
name=prop_name).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Affiliation is not defined for this child-parent constellation.")
@@ -137,7 +137,7 @@ def test_rt_file_is_invalid():
db.RecordType(
name="TestRecordTypeChild").add_parent(
name=file_name).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Affiliation is not defined for this child-parent constellation.")
@@ -149,7 +149,7 @@ def test_prop_rec_is_invalid():
name="TestPropertyChild",
datatype=db.TEXT).add_parent(
name=rec_name).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Affiliation is not defined for this child-parent constellation.")
@@ -161,7 +161,7 @@ def test_prop_rt_is_invalid():
name="TestPropertyChild",
datatype=db.TEXT).add_parent(
name=recty_name).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Affiliation is not defined for this child-parent constellation.")
@@ -172,7 +172,7 @@ def test_prop_prop_is_subtyping():
name="TestPropertyChild",
datatype=db.TEXT).add_parent(
name=prop_name).insert().get_parent(prop_name)
- assert_equals(par.affiliation, "SUBTYPING")
+ assert_equal(par.affiliation, "SUBTYPING")
@with_setup(setup, teardown)
@@ -182,7 +182,7 @@ def test_prop_file_is_invalid():
name="TestPropertyChild",
datatype=db.TEXT).add_parent(
name=file_name).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Affiliation is not defined for this child-parent constellation.")
@@ -194,7 +194,7 @@ def test_file_rec_is_parthood():
file=file_path,
path="testfilechild.dat").add_parent(
name=rec_name).insert().get_parent(rec_name)
- assert_equals(par.affiliation, "PARTHOOD")
+ assert_equal(par.affiliation, "PARTHOOD")
@with_setup(setup, teardown)
@@ -204,7 +204,7 @@ def test_file_rt_is_instantiation():
file=file_path,
path="testfilechild.dat").add_parent(
name=recty_name).insert().get_parent(recty_name)
- assert_equals(par.affiliation, "INSTANTIATION")
+ assert_equal(par.affiliation, "INSTANTIATION")
@with_setup(setup, teardown)
@@ -215,7 +215,7 @@ def test_file_prop_is_invalid():
file=file_path,
path="testfilechild.dat").add_parent(
name=prop_name).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Affiliation is not defined for this child-parent constellation.")
@@ -228,7 +228,7 @@ def test_file_file_is_invalid():
file=file_path,
path="testfilechild.dat").add_parent(
name=file_name).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Affiliation is not defined for this child-parent constellation.")
@@ -243,25 +243,25 @@ def test_query_party_example():
spd = db.Record(name="SPD").add_parent(name="Partei").insert()
siggi = db.Record(name="SigmarGabriel").add_parent(name="SPD").insert()
- assert_equals(
+ assert_equal(
partei.get_parent("Organisation").affiliation,
"SUBTYPING")
- assert_equals(spd.get_parent("Partei").affiliation, "INSTANTIATION")
- assert_equals(siggi.get_parent("SPD").affiliation, "PARTHOOD")
+ assert_equal(spd.get_parent("Partei").affiliation, "INSTANTIATION")
+ assert_equal(siggi.get_parent("SPD").affiliation, "PARTHOOD")
q = db.execute_query("FIND Organisation")
- assert_equals(len(q), 3)
+ assert_equal(len(q), 3)
assert_is_not_none(q.get_entity_by_id(organisation.id))
assert_is_not_none(q.get_entity_by_id(partei.id))
assert_is_not_none(q.get_entity_by_id(spd.id))
q = db.execute_query("FIND Partei")
- assert_equals(len(q), 2)
+ assert_equal(len(q), 2)
assert_is_not_none(q.get_entity_by_id(partei.id))
assert_is_not_none(q.get_entity_by_id(spd.id))
q = db.execute_query("FIND SPD")
- assert_equals(len(q), 2)
+ assert_equal(len(q), 2)
assert_is_not_none(q.get_entity_by_id(spd.id))
assert_is_not_none(q.get_entity_by_id(siggi.id))
diff --git a/tests/test_authentication.py b/tests/test_authentication.py
index 530e1b8..4e5de36 100644
--- a/tests/test_authentication.py
+++ b/tests/test_authentication.py
@@ -28,7 +28,7 @@
from caosdb.exceptions import LoginFailedException
import caosdb as h
-from nose.tools import assert_false, assert_true, assert_is_none, assert_raises, assert_equals, assert_is_not_none, nottest # @UnresolvedImport
+from nose.tools import assert_false, assert_true, assert_is_none, assert_raises, assert_equal, assert_is_not_none, nottest # @UnresolvedImport
from caosdb.connection.connection import _Connection
diff --git a/tests/test_boolean.py b/tests/test_boolean.py
index dde287a..00b0f68 100644
--- a/tests/test_boolean.py
+++ b/tests/test_boolean.py
@@ -28,7 +28,7 @@
import caosdb as h
# @UnresolvedImport
-from nose.tools import assert_true, assert_equals, assert_false, assert_raises
+from nose.tools import assert_true, assert_equal, assert_false, assert_raises
from caosdb.exceptions import EntityError
@@ -42,11 +42,11 @@ def test_property():
name="SimpleBooleanProperty",
datatype=h.BOOLEAN).insert()
assert_true(p.is_valid())
- assert_equals(p.datatype, h.BOOLEAN)
+ assert_equal(p.datatype, h.BOOLEAN)
p2 = h.Property(id=p.id).retrieve()
assert_true(p2.is_valid)
- assert_equals(p2.datatype, h.BOOLEAN)
+ assert_equal(p2.datatype, h.BOOLEAN)
finally:
try:
p.delete()
@@ -63,13 +63,13 @@ def test_recordType():
rt = h.RecordType(name="SimpleRecordType").add_property(p).insert()
assert_true(rt.is_valid())
- assert_equals(
+ assert_equal(
rt.get_property("SimpleBooleanProperty").datatype,
h.BOOLEAN)
rt2 = h.RecordType(id=rt.id).retrieve()
assert_true(rt2.is_valid())
- assert_equals(
+ assert_equal(
rt2.get_property("SimpleBooleanProperty").datatype,
h.BOOLEAN)
finally:
@@ -96,31 +96,31 @@ def test_record():
rec1 = h.Record(name="SimpleRecord1").add_parent(
rt).add_property(p, value="TRUE").insert()
assert_true(rec1.is_valid())
- assert_equals(
+ assert_equal(
rec1.get_property("SimpleBooleanProperty").datatype,
h.BOOLEAN)
- assert_equals(rec1.get_property("SimpleBooleanProperty").value, "TRUE")
+ assert_equal(rec1.get_property("SimpleBooleanProperty").value, "TRUE")
rec1c = h.Record(id=rec1.id).retrieve()
assert_true(rec1c.is_valid())
- assert_equals(rec1c.get_property(
+ assert_equal(rec1c.get_property(
"SimpleBooleanProperty").datatype, h.BOOLEAN)
- assert_equals(rec1c.get_property(
+ assert_equal(rec1c.get_property(
"SimpleBooleanProperty").value, "TRUE")
rec2 = h.Record(name="SimpleRecord2").add_parent(
rt).add_property(p, value=True).insert()
assert_true(rec2.is_valid())
- assert_equals(
+ assert_equal(
rec2.get_property("SimpleBooleanProperty").datatype,
h.BOOLEAN)
- assert_equals(rec2.get_property("SimpleBooleanProperty").value, "TRUE")
+ assert_equal(rec2.get_property("SimpleBooleanProperty").value, "TRUE")
rec2c = h.Record(id=rec2.id).retrieve()
assert_true(rec2c.is_valid())
- assert_equals(rec2c.get_property(
+ assert_equal(rec2c.get_property(
"SimpleBooleanProperty").datatype, h.BOOLEAN)
- assert_equals(rec2c.get_property(
+ assert_equal(rec2c.get_property(
"SimpleBooleanProperty").value, "TRUE")
rec3 = h.Record(
@@ -129,7 +129,7 @@ def test_record():
assert_raises(EntityError, rec3.insert)
assert_false(rec3.is_valid())
- assert_equals(
+ assert_equal(
rec3.get_property(
"SimpleBooleanProperty").get_errors()[0].description,
"Cannot parse value to boolean (either 'true' or 'false, "
diff --git a/tests/test_data_model_leap.py b/tests/test_data_model_leap.py
index 64d27e6..f8489c8 100644
--- a/tests/test_data_model_leap.py
+++ b/tests/test_data_model_leap.py
@@ -25,7 +25,7 @@
@author: fitschen
"""
-from nose.tools import assert_true, assert_equals, assert_is_not_none # @UnresolvedImport
+from nose.tools import assert_true, assert_equal, assert_is_not_none # @UnresolvedImport
def test_leap_datamodel():
@@ -463,57 +463,57 @@ def test_leap_datamodel():
def check_leap_container(c):
- assert_equals(55, len(c))
+ assert_equal(55, len(c))
assert_is_not_none(c.get_entity_by_name("MultiRecRecording"))
- assert_equals(5, len(c.get_entity_by_name(
+ assert_equal(5, len(c.get_entity_by_name(
"MultiRecRecording").get_properties()))
assert_is_not_none(c.get_entity_by_name("Camera"))
- assert_equals(6, len(c.get_entity_by_name("Camera").get_properties()))
+ assert_equal(6, len(c.get_entity_by_name("Camera").get_properties()))
assert_is_not_none(c.get_entity_by_name("Device"))
- assert_equals(3, len(c.get_entity_by_name("Device").get_properties()))
+ assert_equal(3, len(c.get_entity_by_name("Device").get_properties()))
assert_is_not_none(c.get_entity_by_name("ShockDevice"))
- assert_equals(5, len(c.get_entity_by_name("ShockDevice").get_properties()))
+ assert_equal(5, len(c.get_entity_by_name("ShockDevice").get_properties()))
assert_is_not_none(c.get_entity_by_name("ShockSetup"))
- assert_equals(5, len(c.get_entity_by_name("ShockSetup").get_properties()))
+ assert_equal(5, len(c.get_entity_by_name("ShockSetup").get_properties()))
assert_is_not_none(c.get_entity_by_name("ElectrodeSetup"))
- assert_equals(3, len(c.get_entity_by_name(
+ assert_equal(3, len(c.get_entity_by_name(
"ElectrodeSetup").get_properties()))
assert_is_not_none(c.get_entity_by_name("Location"))
- assert_equals(4, len(c.get_entity_by_name("Location").get_properties()))
+ assert_equal(4, len(c.get_entity_by_name("Location").get_properties()))
assert_is_not_none(c.get_entity_by_name("Person"))
- assert_equals(1, len(c.get_entity_by_name("Person").get_properties()))
+ assert_equal(1, len(c.get_entity_by_name("Person").get_properties()))
assert_is_not_none(c.get_entity_by_name("ExperimentGroup"))
- assert_equals(1, len(c.get_entity_by_name(
+ assert_equal(1, len(c.get_entity_by_name(
"ExperimentGroup").get_properties()))
assert_is_not_none(c.get_entity_by_name("Experiment"))
- assert_equals(6, len(c.get_entity_by_name("Experiment").get_properties()))
+ assert_equal(6, len(c.get_entity_by_name("Experiment").get_properties()))
assert_is_not_none(c.get_entity_by_name("LEAP_Experiment"))
- assert_equals(9, len(c.get_entity_by_name(
+ assert_equal(9, len(c.get_entity_by_name(
"LEAP_Experiment").get_properties()))
assert_is_not_none(c.get_entity_by_name("LEAP_InVivoExperiment"))
- assert_equals(12, len(c.get_entity_by_name(
+ assert_equal(12, len(c.get_entity_by_name(
"LEAP_InVivoExperiment").get_properties()))
assert_is_not_none(c.get_entity_by_name("LEAP_ExVivoExperiment"))
- assert_equals(11, len(c.get_entity_by_name(
+ assert_equal(11, len(c.get_entity_by_name(
"LEAP_ExVivoExperiment").get_properties()))
assert_is_not_none(c.get_entity_by_name("Animal"))
- assert_equals(7, len(c.get_entity_by_name("Animal").get_properties()))
+ assert_equal(7, len(c.get_entity_by_name("Animal").get_properties()))
assert_is_not_none(c.get_entity_by_name("Race"))
- assert_equals(1, len(c.get_entity_by_name("Race").get_properties()))
+ assert_equal(1, len(c.get_entity_by_name("Race").get_properties()))
assert_is_not_none(c.get_entity_by_name("Sex"))
- assert_equals(1, len(c.get_entity_by_name("Sex").get_properties()))
+ assert_equal(1, len(c.get_entity_by_name("Sex").get_properties()))
diff --git a/tests/test_datatype.py b/tests/test_datatype.py
index 43bf3aa..a7b14d3 100644
--- a/tests/test_datatype.py
+++ b/tests/test_datatype.py
@@ -27,7 +27,7 @@
"""
import caosdb as db
# @UnresolvedImport
-from nose.tools import nottest, assert_raises, with_setup, assert_true, assert_equals
+from nose.tools import nottest, assert_raises, with_setup, assert_true, assert_equal
def setup():
@@ -56,7 +56,7 @@ def test_override_with_non_existing_ref():
name="TestProperty",
datatype=rt2,
value="Non-Existing").add_parent(rt1).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Referenced entity does not exist.")
@@ -88,7 +88,7 @@ def test_reference_datatype_sequencial():
assert_true(p.is_valid())
dt = db.execute_query("FIND TestProp", unique=True).datatype
- assert_equals(dt, "TestRT")
+ assert_equal(dt, "TestRT")
rt2 = db.RecordType(
"TestRT2",
@@ -96,8 +96,8 @@ def test_reference_datatype_sequencial():
name="TestProp",
value="TestRT").insert()
assert_true(rt2.is_valid())
- assert_equals(rt2.get_property("TestProp").value, rt.id)
- assert_equals(rt2.get_property("TestProp").datatype, "TestRT")
+ assert_equal(rt2.get_property("TestProp").value, rt.id)
+ assert_equal(rt2.get_property("TestProp").datatype, "TestRT")
@with_setup(setup, teardown)
@@ -153,7 +153,7 @@ def test_unknown_datatype1():
p.insert()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "Unknown datatype.")
+ assert_equal(e.msg, "Unknown datatype.")
@with_setup(setup, teardown)
@@ -163,7 +163,7 @@ def test_unknown_datatype2():
p.insert()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "Unknown datatype.")
+ assert_equal(e.msg, "Unknown datatype.")
@with_setup(setup, teardown)
@@ -173,7 +173,7 @@ def test_unknown_datatype3():
p.insert()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "Unknown datatype.")
+ assert_equal(e.msg, "Unknown datatype.")
@with_setup(setup, teardown)
@@ -197,7 +197,7 @@ def test_wrong_refid():
rec3.insert()
assert_true(False)
except db.TransactionError:
- assert_equals(
+ assert_equal(
rec3.get_property("TestP1").get_errors()[0].description,
'Reference not qualified. The value of this Reference Property is to be a child of its data type.')
diff --git a/tests/test_datatype_inheritance.py b/tests/test_datatype_inheritance.py
index de3c575..eba4176 100644
--- a/tests/test_datatype_inheritance.py
+++ b/tests/test_datatype_inheritance.py
@@ -26,7 +26,7 @@ import caosdb
import caosdb as db
from caosdb.connection.connection import get_connection
# @UnresolvedImport
-from nose.tools import assert_is_not_none, assert_true, assert_equals, with_setup
+from nose.tools import assert_is_not_none, assert_true, assert_equal, with_setup
from caosdb.exceptions import EntityError
@@ -51,14 +51,14 @@ def test_default_datatype_for_recordtypes():
rt1 = db.RecordType(name="TestRT1").insert()
rt2 = db.RecordType(name="TestRT2").add_property(name="TestRT1").insert()
p = db.execute_query("FIND TestRT2", unique=True).get_properties()[0]
- assert_equals(p.id, rt1.id)
- assert_equals(p.name, rt1.name)
- assert_equals(p.datatype, rt1.name)
+ assert_equal(p.id, rt1.id)
+ assert_equal(p.name, rt1.name)
+ assert_equal(p.datatype, rt1.name)
p = rt2.get_properties()[0]
- assert_equals(p.id, rt1.id)
- assert_equals(p.name, rt1.name)
- assert_equals(p.datatype, rt1.name)
+ assert_equal(p.id, rt1.id)
+ assert_equal(p.name, rt1.name)
+ assert_equal(p.datatype, rt1.name)
@with_setup(setup, teardown)
@@ -95,12 +95,12 @@ def test_datatype_overriding():
rt.insert()
assert_true(rt.is_valid())
assert_is_not_none(rt.get_properties())
- assert_equals(1, len(rt.get_properties()))
- assert_equals(
+ assert_equal(1, len(rt.get_properties()))
+ assert_equal(
"DatatypeOverridingDoubleProperty",
rt.get_properties()[0].name)
- assert_equals("DoubleDesc", rt.get_properties()[0].description)
- assert_equals(
+ assert_equal("DoubleDesc", rt.get_properties()[0].description)
+ assert_equal(
str("TEXT").lower(),
rt.get_properties()[0].datatype.lower())
@@ -108,12 +108,12 @@ def test_datatype_overriding():
rt = execute_query("FIND DatatypeOverridingRT", unique=True)
assert_true(rt.is_valid())
assert_is_not_none(rt.get_properties())
- assert_equals(1, len(rt.get_properties()))
- assert_equals(
+ assert_equal(1, len(rt.get_properties()))
+ assert_equal(
"DatatypeOverridingDoubleProperty",
rt.get_properties()[0].name)
- assert_equals("DoubleDesc", rt.get_properties()[0].description)
- assert_equals(
+ assert_equal("DoubleDesc", rt.get_properties()[0].description)
+ assert_equal(
str("TEXT").lower(),
rt.get_properties()[0].datatype.lower())
finally:
@@ -134,9 +134,9 @@ def test_datatype_overriding_update():
rt.insert()
assert_true(rt.is_valid())
assert_is_not_none(rt.get_properties())
- assert_equals(1, len(rt.get_properties()))
- assert_equals("DoubleProperty", rt.get_properties()[0].name)
- assert_equals(
+ assert_equal(1, len(rt.get_properties()))
+ assert_equal("DoubleProperty", rt.get_properties()[0].name)
+ assert_equal(
str("TEXT").lower(),
rt.get_properties()[0].datatype.lower())
@@ -144,9 +144,9 @@ def test_datatype_overriding_update():
rt = execute_query("FIND DatatypeOverridingRT", unique=True)
assert_true(rt.is_valid())
assert_is_not_none(rt.get_properties())
- assert_equals(1, len(rt.get_properties()))
- assert_equals("DoubleProperty", rt.get_properties()[0].name)
- assert_equals(
+ assert_equal(1, len(rt.get_properties()))
+ assert_equal("DoubleProperty", rt.get_properties()[0].name)
+ assert_equal(
str("TEXT").lower(),
rt.get_properties()[0].datatype.lower())
@@ -155,26 +155,26 @@ def test_datatype_overriding_update():
p.update()
raise AssertionError("This should raise an EntityError!")
except EntityError as e:
- assert_equals("Unknown datatype.", e.msg)
+ assert_equal("Unknown datatype.", e.msg)
p.datatype = "INTEGER"
p.update()
assert_true(p.is_valid())
- assert_equals(str("INTEGER").lower(), p.datatype.lower())
+ assert_equal(str("INTEGER").lower(), p.datatype.lower())
# retrieve again:
p = execute_query("FIND DoubleProperty", unique=True)
assert_true(p.is_valid())
- assert_equals(str("INTEGER").lower(), p.datatype.lower())
+ assert_equal(str("INTEGER").lower(), p.datatype.lower())
# retrieve rt again:
rt = execute_query("FIND DatatypeOverridingRT", unique=True)
assert_true(rt.is_valid())
assert_is_not_none(rt.get_properties())
- assert_equals(1, len(rt.get_properties()))
- assert_equals("DoubleProperty", rt.get_properties()[0].name)
+ assert_equal(1, len(rt.get_properties()))
+ assert_equal("DoubleProperty", rt.get_properties()[0].name)
# overriding still ok?
- assert_equals(
+ assert_equal(
str("TEXT").lower(),
rt.get_properties()[0].datatype.lower())
@@ -182,9 +182,9 @@ def test_datatype_overriding_update():
rt.update()
assert_true(rt.is_valid())
assert_is_not_none(rt.get_properties())
- assert_equals(1, len(rt.get_properties()))
- assert_equals("DoubleProperty", rt.get_properties()[0].name)
- assert_equals(
+ assert_equal(1, len(rt.get_properties()))
+ assert_equal("DoubleProperty", rt.get_properties()[0].name)
+ assert_equal(
str("DATETIME").lower(),
rt.get_properties()[0].datatype.lower())
@@ -207,18 +207,18 @@ def test_recordtype_to_record():
rt.insert()
assert_true(rt.is_valid())
assert_is_not_none(rt.datatype)
- assert_equals(str("TEXT").lower(), rt.datatype.lower())
+ assert_equal(str("TEXT").lower(), rt.datatype.lower())
rt = RecordType(id=rt.id).retrieve()
assert_true(rt.is_valid())
assert_is_not_none(rt.datatype)
- assert_equals(str("TEXT").lower(), rt.datatype.lower())
+ assert_equal(str("TEXT").lower(), rt.datatype.lower())
rec = Record().add_parent(name="SimpleTextRecordType").insert()
assert_true(rec.is_valid())
# TODO
# assert_is_not_none(rec.datatype)
- # assert_equals(str("TEXT").lower(),rec.datatype.lower())
+ # assert_equal(str("TEXT").lower(),rec.datatype.lower())
finally:
try:
@@ -234,10 +234,10 @@ def test_concrete_property():
name="DataTypeTestDoubleProperty",
datatype=datatype.upper()).insert()
assert_true(p.is_valid())
- assert_equals(p.datatype.upper(), datatype.upper())
+ assert_equal(p.datatype.upper(), datatype.upper())
p2 = Property(id=p.id).retrieve()
- assert_equals(p.datatype, p2.datatype)
+ assert_equal(p.datatype, p2.datatype)
return p
finally:
@@ -300,11 +300,11 @@ def test_reference_with_null_value():
RT2 = RecordType(name="RT2").add_property(RT1).insert()
assert_true(RT2.is_valid())
- assert_equals(RT2.get_property("RT1").datatype, "RT1")
+ assert_equal(RT2.get_property("RT1").datatype, "RT1")
RT2c = RecordType(name="RT2").retrieve()
assert_true(RT2c.is_valid())
- assert_equals(RT2c.get_property("RT1").datatype, "RT1")
+ assert_equal(RT2c.get_property("RT1").datatype, "RT1")
finally:
try:
diff --git a/tests/test_deletion.py b/tests/test_deletion.py
index 86e45ac..fd2236e 100755
--- a/tests/test_deletion.py
+++ b/tests/test_deletion.py
@@ -26,7 +26,7 @@
# Testcase fuer deletion
# A. Schlemmer, 08/2014
-from nose.tools import with_setup, assert_false, assert_true, assert_raises, assert_equals, assert_is_not_none # @UnresolvedImport
+from nose.tools import with_setup, assert_false, assert_true, assert_raises, assert_equal, assert_is_not_none # @UnresolvedImport
import caosdb as h
@@ -153,7 +153,7 @@ def test_deletion():
c.extend([cr1, sr, d])
assert_raises(h.TransactionError, c.delete)
assert_true(c.has_errors())
- assert_equals(int(c.get_errors()[0].code), 12)
+ assert_equal(int(c.get_errors()[0].code), 12)
c.extend([cr2])
print(c)
diff --git a/tests/test_error_stuff.py b/tests/test_error_stuff.py
index 8c8d3dd..5e2e118 100644
--- a/tests/test_error_stuff.py
+++ b/tests/test_error_stuff.py
@@ -42,7 +42,7 @@ def test_retrieval_no_exception_raised():
def test_retrieval_exception_raised():
import caosdb as h
- from nose.tools import assert_true, assert_is_not_none, assert_equals # @UnresolvedImport
+ from nose.tools import assert_true, assert_is_not_none, assert_equal # @UnresolvedImport
# special error: EntityDoesNotExistError
try:
@@ -62,7 +62,7 @@ def test_retrieval_exception_raised():
except EntityError as e:
print(e)
assert_is_not_none(e.get_entity())
- assert_equals('Non-ExistentProperty', e.get_entity().name)
+ assert_equal('Non-ExistentProperty', e.get_entity().name)
# most general error: TransactionError
try:
@@ -75,8 +75,8 @@ def test_retrieval_exception_raised():
print(e.get_entities())
assert_is_not_none(e.get_entity())
print(e.get_entity())
- assert_equals(1, len(e.get_entities()))
- assert_equals('Non-ExistentProperty', e.get_entities()[0].name)
+ assert_equal(1, len(e.get_entities()))
+ assert_equal('Non-ExistentProperty', e.get_entities()[0].name)
def test_insertion_no_exception_raised():
@@ -116,7 +116,7 @@ def test_insertion_exception_raised():
def test_insertion_with_invalid_parents():
import caosdb as h
# @UnresolvedImport
- from nose.tools import assert_false, assert_true, assert_is_not_none, assert_equals
+ from nose.tools import assert_false, assert_true, assert_is_not_none, assert_equal
try:
p = h.Property(
@@ -129,8 +129,8 @@ def test_insertion_with_invalid_parents():
print(e)
assert_true(isinstance(e, UnqualifiedParentsError))
assert_is_not_none(e.get_entity())
- assert_equals(e.get_entity().name, p.name)
- assert_equals(e.get_entity().id, p.id)
+ assert_equal(e.get_entity().name, p.name)
+ assert_equal(e.get_entity().id, p.id)
assert_true(e.get_entity().has_errors())
assert_false(p.is_valid())
assert_false(e.get_entity().is_valid())
@@ -145,7 +145,7 @@ def test_insertion_with_invalid_parents():
def test_insertion_with_invalid_properties():
import caosdb as h
# @UnresolvedImport
- from nose.tools import assert_false, assert_true, assert_is_not_none, assert_equals
+ from nose.tools import assert_false, assert_true, assert_is_not_none, assert_equal
try:
try:
@@ -162,7 +162,7 @@ def test_insertion_with_invalid_properties():
except EntityError as e:
assert_true(isinstance(e, UnqualifiedPropertiesError))
assert_is_not_none(e.get_entity())
- assert_equals(e.get_entity().name, p.name)
+ assert_equal(e.get_entity().name, p.name)
assert_true(e.get_entity().has_errors())
assert_true(p.has_errors())
assert_false(p.is_valid())
@@ -177,7 +177,7 @@ def test_insertion_with_invalid_properties():
def test_entity_does_not_exist():
import caosdb as h
# @UnresolvedImport
- from nose.tools import assert_true, assert_false, assert_equals, assert_is_not_none
+ from nose.tools import assert_true, assert_false, assert_equal, assert_is_not_none
try:
p1 = h.Property(
@@ -209,7 +209,7 @@ def test_entity_does_not_exist():
try:
c.retrieve()
except EntityDoesNotExistError as e:
- assert_equals(3, len(e.get_entities()))
+ assert_equal(3, len(e.get_entities()))
for entity in e.get_entities():
assert_is_not_none(entity.name)
assert_true(entity.name.startswith("Non-ExistentProperty"))
@@ -223,7 +223,7 @@ def test_entity_does_not_exist():
def test_insert_existent_entity():
import caosdb as h
# @UnresolvedImport
- from nose.tools import assert_true, assert_false, assert_equals, assert_is_not_none
+ from nose.tools import assert_true, assert_false, assert_equal, assert_is_not_none
try:
p1 = h.Property(
@@ -260,10 +260,10 @@ def test_insert_existent_entity():
try:
c.insert(unique=True)
except UniqueNamesError as e:
- assert_equals(1, len(e.get_entities()))
+ assert_equal(1, len(e.get_entities()))
for entity in e.get_entities():
assert_is_not_none(entity.name)
- assert_equals(pe.name, entity.name)
+ assert_equal(pe.name, entity.name)
finally:
try:
@@ -290,7 +290,7 @@ def test_insert_existent_entity():
def test_double_insertion():
import caosdb as h
- from nose.tools import assert_true, assert_equals, assert_is_not_none # @UnresolvedImport
+ from nose.tools import assert_true, assert_equal, assert_is_not_none # @UnresolvedImport
c1 = h.Container()
try:
@@ -370,11 +370,11 @@ def test_double_insertion():
assert_true(hasattr(te, 'get_entities'))
assert_is_not_none(te.get_entities)
assert_is_not_none(te.get_entities())
- assert_equals(5, len(te.get_entities()))
+ assert_equal(5, len(te.get_entities()))
assert_true(hasattr(te, 'get_container'))
assert_is_not_none(te.get_container)
assert_is_not_none(te.get_container())
- assert_equals(c2, te.get_container())
+ assert_equal(c2, te.get_container())
finally:
try:
diff --git a/tests/test_file.py b/tests/test_file.py
index 015d311..379b012 100644
--- a/tests/test_file.py
+++ b/tests/test_file.py
@@ -35,7 +35,7 @@ from caosdb.common import models
from caosdb.exceptions import EntityError
from caosdb.utils.checkFileSystemConsistency import runCheck
from lxml import etree
-from nose.tools import (assert_equals, assert_false, # @UnresolvedImport
+from nose.tools import (assert_equal, assert_false, # @UnresolvedImport
assert_is_not_none, assert_raises, assert_true,
nottest, with_setup)
@@ -85,8 +85,8 @@ def test_file_with_empty_space():
file="test.dat")
file_.insert()
qfile = execute_query("FIND FILE TestFile", unique=True)
- assert_equals(qfile.id, file_.id)
- assert_equals(qfile.path, "/testfiles/test file with spaces.dat")
+ assert_equal(qfile.id, file_.id)
+ assert_equal(qfile.path, "/testfiles/test file with spaces.dat")
qfile.download("test2.dat")
@@ -348,22 +348,22 @@ def test_consistency_file_was_modified():
c = runCheck(None, None)
assert_is_not_none(c.messages["Info", 0])
- assert_equals(c.messages["Info", 0][0], "File system is consistent.")
+ assert_equal(c.messages["Info", 0][0], "File system is consistent.")
c = runCheck(None, "-c FILE_WAS_MODIFIED")
assert_is_not_none(c.messages["Error", 0])
- assert_equals(
+ assert_equal(
c.messages["Error", 0][0],
'debug/test_file_storage_consistency: File was modified.')
d = open(file_.download(target="test.dat.tmp"), "r")
r = d.read()
- assert_equals(r, "hello world\n")
+ assert_equal(r, "hello world\n")
c = runCheck(None, None)
assert_is_not_none(c.messages["Info", 0])
- assert_equals(c.messages["Info", 0][0], "File system is consistent.")
+ assert_equal(c.messages["Info", 0][0], "File system is consistent.")
finally:
try:
@@ -401,23 +401,23 @@ def test_consistency_file_does_not_exist():
c = runCheck(None, "/debug/")
assert_is_not_none(c.messages["Info", 0])
- assert_equals(c.messages["Info", 0][0],
+ assert_equal(c.messages["Info", 0][0],
"File system below debug/ is consistent.")
c = runCheck(None, "-c FILE_DOES_NOT_EXIST")
assert_is_not_none(c.messages["Error", 0])
- assert_equals(
+ assert_equal(
c.messages["Error", 0][0],
'debug/test_file_storage_consistency: File does not exist.')
d = open(file_.download(target="test.dat.tmp"), "r")
r = d.read()
- assert_equals(r, "hello world\n")
+ assert_equal(r, "hello world\n")
c = runCheck(None, None)
assert_is_not_none(c.messages["Info", 0])
- assert_equals(c.messages["Info", 0][0], "File system is consistent.")
+ assert_equal(c.messages["Info", 0][0], "File system is consistent.")
finally:
try:
@@ -442,15 +442,15 @@ def test_consistency_file_does_not_exist():
def test_consistency_unknown_file():
c = runCheck(None, None)
assert_is_not_none(c.messages["Info", 0])
- assert_equals(c.messages["Info", 0][0], "File system is consistent.")
+ assert_equal(c.messages["Info", 0][0], "File system is consistent.")
c = runCheck(None, "-c UNKNOWN_FILE")
assert_is_not_none(c.messages["Warning", 0])
- assert_equals(c.messages["Warning", 0][0], 'debug/: Unknown file.')
+ assert_equal(c.messages["Warning", 0][0], 'debug/: Unknown file.')
c = runCheck(None, None)
assert_is_not_none(c.messages["Info", 0])
- assert_equals(c.messages["Info", 0][0], "File system is consistent.")
+ assert_equal(c.messages["Info", 0][0], "File system is consistent.")
@with_setup(setup, teardown)
@@ -517,7 +517,7 @@ def test_insert_files_in_dir_with_symlink():
"InsertFilesInDir": path +
"linked_subfolder"})
assert_is_not_none(c.messages["Warning", 6])
- assert_equals(c.messages["Warning", 6][0],
+ assert_equal(c.messages["Warning", 6][0],
"Directory or file is symbolic link: " + path +
"linked_subfolder")
@@ -530,10 +530,10 @@ def test_insert_files_in_dir_with_symlink():
path +
"linked_subfolder"})
assert_is_not_none(c.messages["Info", 0])
- assert_equals(c.messages["Info", 0][0],
+ assert_equal(c.messages["Info", 0][0],
"Files count in linked_subfolder/: 1")
- assert_equals(c[0].name, "test2.dat")
- assert_equals(c[0].path, "/linked_subfolder/test2.dat")
+ assert_equal(c[0].name, "test2.dat")
+ assert_equal(c[0].path, "/linked_subfolder/test2.dat")
d = models.Container()
d.insert(
@@ -544,11 +544,11 @@ def test_insert_files_in_dir_with_symlink():
path +
"linked_subfolder"})
assert_is_not_none(c.messages["Info", 0])
- assert_equals(d.messages["Info", 0][0],
+ assert_equal(d.messages["Info", 0][0],
"Files count in linked_subfolder/: 1")
assert_true(d[0].is_valid())
- assert_equals(d[0].name, "test2.dat")
- assert_equals(d[0].path, "/linked_subfolder/test2.dat")
+ assert_equal(d[0].name, "test2.dat")
+ assert_equal(d[0].path, "/linked_subfolder/test2.dat")
finally:
try:
@@ -587,12 +587,12 @@ def test_insert_files_in_dir():
flags={
"InsertFilesInDir": path})
assert_is_not_none(c.messages["Info", 0])
- assert_equals(c.messages["Info", 0][0],
+ assert_equal(c.messages["Info", 0][0],
"Files count in testfolder/: 2")
- #assert_equals(c[0].name, "test.dat")
- #assert_equals(c[0].path, "/testfolder/subfolder/test.dat")
- #assert_equals(c[1].name, "test2.dat")
- #assert_equals(c[1].path, "/testfolder/subfolder/test2.dat")
+ #assert_equal(c[0].name, "test.dat")
+ #assert_equal(c[0].path, "/testfolder/subfolder/test.dat")
+ #assert_equal(c[1].name, "test2.dat")
+ #assert_equal(c[1].path, "/testfolder/subfolder/test2.dat")
d = models.Container()
d.insert(
@@ -601,13 +601,13 @@ def test_insert_files_in_dir():
flags={
"InsertFilesInDir": path})
assert_is_not_none(c.messages["Info", 0])
- assert_equals(d.messages["Info", 0][0],
+ assert_equal(d.messages["Info", 0][0],
"Files count in testfolder/: 2")
assert_true(d[0].is_valid())
- #assert_equals(d[0].name, "test.dat")
- #assert_equals(d[0].path, "/testfolder/subfolder/test.dat")
- #assert_equals(d[1].name, "test2.dat")
- #assert_equals(d[1].path, "/testfolder/subfolder/test2.dat")
+ #assert_equal(d[0].name, "test.dat")
+ #assert_equal(d[0].path, "/testfolder/subfolder/test.dat")
+ #assert_equal(d[1].name, "test2.dat")
+ #assert_equal(d[1].path, "/testfolder/subfolder/test2.dat")
# create a new file and call insertFilesInDir again
upload_file = open(path + "/test3.dat", "w")
@@ -621,14 +621,14 @@ def test_insert_files_in_dir():
flags={
"InsertFilesInDir": path})
assert_is_not_none(e.messages["Info", 0])
- assert_equals(e.messages["Info", 0][0],
+ assert_equal(e.messages["Info", 0][0],
"Files count in testfolder/: 3")
# only the new file is given back...
- assert_equals(1, len(e))
+ assert_equal(1, len(e))
assert_false(e[0].is_valid())
- assert_equals(e[0].name, "test3.dat")
- assert_equals(e[0].path, "/testfolder/test3.dat")
+ assert_equal(e[0].name, "test3.dat")
+ assert_equal(e[0].path, "/testfolder/test3.dat")
f = models.Container()
f.insert(
@@ -637,13 +637,13 @@ def test_insert_files_in_dir():
flags={
"InsertFilesInDir": path})
assert_is_not_none(f.messages["Info", 0])
- assert_equals(f.messages["Info", 0][0],
+ assert_equal(f.messages["Info", 0][0],
"Files count in testfolder/: 3")
# only the new file is given back...
- assert_equals(1, len(f))
+ assert_equal(1, len(f))
assert_true(f[0].is_valid())
- assert_equals(f[0].name, "test3.dat")
- assert_equals(f[0].path, "/testfolder/test3.dat")
+ assert_equal(f[0].name, "test3.dat")
+ assert_equal(f[0].path, "/testfolder/test3.dat")
finally:
try:
@@ -680,5 +680,5 @@ def test_thumbnails():
print(body)
xml = etree.fromstring(body)
# TODO find a better way to check this
- assert_equals(xml[1][0].get("thumbnail")[-41:],
+ assert_equal(xml[1][0].get("thumbnail")[-41:],
"/Thumbnails/testfiles/thumbnails_test.dat")
diff --git a/tests/test_inheritance.py b/tests/test_inheritance.py
index c8413d3..04ba6f8 100644
--- a/tests/test_inheritance.py
+++ b/tests/test_inheritance.py
@@ -28,7 +28,7 @@
import caosdb as h
-from nose.tools import assert_equals, assert_true, assert_is_not_none, with_setup
+from nose.tools import assert_equal, assert_true, assert_is_not_none, with_setup
def test_inheritance_fix_properties():
@@ -40,7 +40,7 @@ def test_inheritance_fix_properties():
p1c = h.Property(id=p1.id).retrieve()
assert_true(p1c.is_valid())
- assert_equals('m', p1c.unit)
+ assert_equal('m', p1c.unit)
'''subtyping with unit inheritance'''
p2 = h.Property(
@@ -50,7 +50,7 @@ def test_inheritance_fix_properties():
p2.insert()
print(p2)
assert_true(p2.is_valid())
- assert_equals('m', p2.unit)
+ assert_equal('m', p2.unit)
finally:
try:
p2.delete()
@@ -112,7 +112,7 @@ def test_inheritance_obl_properties():
name="SimpleRecordType",
inheritance="obligatory")
rt.insert()
- assert_equals(3, len(rt.get_properties()))
+ assert_equal(3, len(rt.get_properties()))
finally:
try:
rt.delete()
@@ -174,7 +174,7 @@ def test_inheritance_all_properties():
name="SimpleRecordType",
inheritance="obligatory")
rt.insert()
- assert_equals(3, len(rt.get_properties()))
+ assert_equal(3, len(rt.get_properties()))
finally:
try:
rt.delete()
@@ -194,30 +194,30 @@ def test_inheritance_unit():
datatype="INTEGER",
unit="m").insert()
assert_true(p.is_valid())
- assert_equals("m", p.unit)
+ assert_equal("m", p.unit)
rt = h.RecordType(
name="SimpleRecordType").add_property(
p, unit="km").insert()
assert_true(rt.is_valid())
- assert_equals("km", rt.get_property("SimpleIntProperty").unit)
+ assert_equal("km", rt.get_property("SimpleIntProperty").unit)
rt2 = h.execute_query("FIND SimpleRecordType", True)
assert_true(rt2.is_valid())
- assert_equals(rt2.id, rt.id)
- assert_equals(rt2.get_property("SimpleIntProperty").unit, "km")
+ assert_equal(rt2.id, rt.id)
+ assert_equal(rt2.get_property("SimpleIntProperty").unit, "km")
rt3 = h.RecordType(
name="SimpleRecordType2").add_parent(
rt, inheritance="ALL").insert()
assert_true(rt3.is_valid())
assert_is_not_none(rt3.get_property("SimpleIntProperty"))
- assert_equals(rt3.get_property("SimpleIntProperty").unit, "km")
+ assert_equal(rt3.get_property("SimpleIntProperty").unit, "km")
rt4 = h.execute_query("FIND SimpleRecordType2", True)
assert_true(rt4.is_valid())
- assert_equals(rt4.id, rt3.id)
- assert_equals(rt4.get_property("SimpleIntProperty").unit, "km")
+ assert_equal(rt4.id, rt3.id)
+ assert_equal(rt4.get_property("SimpleIntProperty").unit, "km")
rec = h.Record(
name="SimpleRecord").add_parent(rt3).add_property(
@@ -225,7 +225,7 @@ def test_inheritance_unit():
value=1).insert()
assert_true(rec.is_valid())
assert_is_not_none(rec.get_property("SimpleIntProperty"))
- assert_equals(rec.get_property("SimpleIntProperty").unit, "km")
+ assert_equal(rec.get_property("SimpleIntProperty").unit, "km")
finally:
try:
diff --git a/tests/test_list.py b/tests/test_list.py
index 30b3104..ee2ff15 100644
--- a/tests/test_list.py
+++ b/tests/test_list.py
@@ -27,7 +27,7 @@
"""
import caosdb as db
# @UnresolvedImport
-from nose.tools import nottest, assert_true, assert_raises, assert_equals, with_setup
+from nose.tools import nottest, assert_true, assert_raises, assert_equal, with_setup
from caosdb.exceptions import TransactionError
@@ -79,7 +79,7 @@ def test_list_of_files():
db.FILE),
value=[
p.id]).insert()
- assert_equals(
+ assert_equal(
cm.exception.errors[0].msg,
"Reference not qualified. The value of this Reference Property is to be a child of its data type.")
@@ -92,12 +92,12 @@ def test_list_datatype_know():
db.INTEGER)).insert()
assert_true(p.is_valid())
- assert_equals(
+ assert_equal(
p.id,
db.execute_query(
"FIND TestListProperty",
unique=True).id)
- assert_equals(
+ assert_equal(
p.datatype,
db.execute_query(
"FIND TestListProperty",
@@ -117,12 +117,12 @@ def test_rt_property_without_value():
name="TestListProperty").insert()
assert_true(rt.is_valid())
- assert_equals(
+ assert_equal(
p.id,
db.execute_query(
"FIND TestRT",
unique=True).get_property("TestListProperty").id)
- assert_equals(
+ assert_equal(
p.datatype,
db.execute_query(
"FIND TestRT",
@@ -142,25 +142,25 @@ def test_concrete_property_with_single_value():
name="TestListProperty",
value=[1]).insert(
sync=False)
- assert_equals("[1]", str(rt.get_property("TestListProperty").value))
- assert_equals([1], rt.get_property("TestListProperty").value)
+ assert_equal("[1]", str(rt.get_property("TestListProperty").value))
+ assert_equal([1], rt.get_property("TestListProperty").value)
assert_true(rt.is_valid())
- assert_equals(
+ assert_equal(
p.id,
db.execute_query(
"FIND TestRT",
unique=True).get_property("TestListProperty").id)
- assert_equals(
+ assert_equal(
p.datatype,
db.execute_query(
"FIND TestRT",
unique=True).get_property("TestListProperty").datatype)
- assert_equals(
+ assert_equal(
"[1]", str(
db.execute_query(
"FIND TestRT", unique=True).get_property("TestListProperty").value))
- assert_equals(
+ assert_equal(
[1],
db.execute_query(
"FIND TestRT",
@@ -181,7 +181,7 @@ def test_query_concrete_property_with_single_value():
value=[1337]).insert()
assert_true(rt.is_valid())
- assert_equals(
+ assert_equal(
rt.id,
db.execute_query(
"FIND TestRT WHICH HAS A TestListProperty=1337",
@@ -202,7 +202,7 @@ def test_query_concrete_property_with_more_values():
1337, 2, 3]).insert()
assert_true(rt.is_valid())
- assert_equals(
+ assert_equal(
rt.id,
db.execute_query(
"FIND TestRT WHICH HAS A TestListProperty=1337",
@@ -222,8 +222,8 @@ def test_error_on_wrong_value():
name="TestRT").add_property(
name="TestListProperty",
value=["this is not an int"]).insert()
- assert_equals(cm.exception.msg, "Entity has unqualified properties.")
- assert_equals(
+ assert_equal(cm.exception.msg, "Entity has unqualified properties.")
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Cannot parse value to integer.")
@@ -233,7 +233,7 @@ def test_data_type_with_non_existing_ref1():
with assert_raises(TransactionError) as cm:
db.Property(name="TestListProperty",
datatype=db.LIST("non_existing")).insert()
- assert_equals(cm.exception.msg, "Unknown datatype.")
+ assert_equal(cm.exception.msg, "Unknown datatype.")
@with_setup(setup, teardown)
@@ -242,14 +242,14 @@ def test_data_type_with_non_existing_ref2():
db.Property(
name="TestListProperty",
datatype=db.LIST(234233234)).insert()
- assert_equals(cm.exception.msg, "Unknown datatype.")
+ assert_equal(cm.exception.msg, "Unknown datatype.")
@with_setup(setup, teardown)
def test_data_type_with_non_existing_ref3():
with assert_raises(TransactionError) as cm:
db.Property(name="TestListProperty", datatype=db.LIST(-2341)).insert()
- assert_equals(cm.exception.msg, "Unknown datatype.")
+ assert_equal(cm.exception.msg, "Unknown datatype.")
@with_setup(setup, teardown)
@@ -306,12 +306,12 @@ def test_rt_ref_property_without_value():
name="TestRT2").add_property(
name="TestListProperty").insert()
assert_true(rt2.is_valid())
- assert_equals(
+ assert_equal(
rt2.get_property("TestListProperty").datatype,
db.LIST(
rt.name))
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestRT2",
unique=True).get_property("TestListProperty").datatype,
@@ -327,8 +327,8 @@ def test_datatype_inheritance1():
name="TestListProperty2").add_parent(
name="TestListProperty").insert()
- assert_equals(p2.datatype, db.LIST(rt.name))
- assert_equals(
+ assert_equal(p2.datatype, db.LIST(rt.name))
+ assert_equal(
db.execute_query(
"FIND TestListProperty2",
unique=True).datatype,
@@ -348,8 +348,8 @@ def test_datatype_inheritance2():
rt2.name)).add_parent(
name="TestListProperty").insert()
- assert_equals(p2.datatype, db.LIST(rt2.name))
- assert_equals(
+ assert_equal(p2.datatype, db.LIST(rt2.name))
+ assert_equal(
db.execute_query(
"FIND TestListProperty2",
unique=True).datatype,
@@ -369,8 +369,8 @@ def test_datatype_inheritance3():
rt2.name)).add_parent(
name="TestListProperty").insert()
- assert_equals(p2.datatype, db.LIST(rt2.name))
- assert_equals(
+ assert_equal(p2.datatype, db.LIST(rt2.name))
+ assert_equal(
db.execute_query(
"FIND TestListProperty2",
unique=True).datatype,
@@ -404,7 +404,7 @@ def test_single_ref_value_scope_error():
name="TestRT3").add_property(
name="TestProp",
value=[rec]).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Reference not qualified. The value of this Reference Property is to be a child of its data type.")
@@ -419,7 +419,7 @@ def test_error_single_non_existing_ref_value():
name="TestRT2").add_property(
name="TestProp",
value=["non_existing"]).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Referenced entity does not exist.")
@@ -428,14 +428,14 @@ def test_error_single_non_existing_ref_value():
name="TestRT2").add_property(
name="TestProp",
value=[213425234234]).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Referenced entity does not exist.")
with assert_raises(TransactionError) as cm:
db.RecordType(name="TestRT2").add_property(
name="TestProp", value=[-1234]).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Referenced entity does not exist.")
@@ -455,7 +455,7 @@ def test_error_multi_non_existing_ref_value():
"TestRec1",
"non_existing",
"TestRec2"]).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Referenced entity does not exist.")
@@ -467,7 +467,7 @@ def test_error_multi_non_existing_ref_value():
213425234234,
"TestRec2",
"TestRec1"]).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Referenced entity does not exist.")
@@ -476,7 +476,7 @@ def test_error_multi_non_existing_ref_value():
name="TestRT2").add_property(
name="TestProp", value=[
"TestRec1", "TestRec2", -1234]).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Referenced entity does not exist.")
@@ -499,7 +499,7 @@ def test_multi_ref_value_scope_error():
rec,
"TestRec1",
"TestRec2"]).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
"Reference not qualified. The value of this Reference Property is to be a child of its data type.")
@@ -518,17 +518,17 @@ def test_multi_ref_value():
rec, rec2.id, "TestRec2"]).insert()
assert_true(rt2.is_valid())
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestRT2 WHICH HAS A TestProp=TestRec2",
unique=True).id,
rt2.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestRT2 WHICH HAS A TestProp=TestRec1",
unique=True).id,
rt2.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestRT2 WHICH HAS A TestProp=" + str(rec.id),
unique=True).id, rt2.id)
@@ -552,19 +552,19 @@ def test_multi_ref_with_doublets():
rec2,
rec1]).insert()
assert_true(rt2.is_valid())
- assert_equals(len(rt2.get_property("TestProp").value), 5)
+ assert_equal(len(rt2.get_property("TestProp").value), 5)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestRT2 WHICH HAS A TestProp=TestRec2",
unique=True).id,
rt2.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestRT2 WHICH HAS A TestProp=TestRec1",
unique=True).id,
rt2.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestRT2 WHICH HAS A TestProp=" + str(rec1.id),
unique=True).id, rt2.id)
@@ -585,23 +585,23 @@ def test_multi_ref_with_null():
rec2,
None]).insert()
assert_true(rt2.is_valid())
- assert_equals(len(rt2.get_property("TestProp").value), 3)
- assert_equals(rt2.get_property("TestProp").value[0], rec1.id)
- assert_equals(rt2.get_property("TestProp").value[1], rec2.id)
- assert_equals(rt2.get_property("TestProp").value[2], None)
+ assert_equal(len(rt2.get_property("TestProp").value), 3)
+ assert_equal(rt2.get_property("TestProp").value[0], rec1.id)
+ assert_equal(rt2.get_property("TestProp").value[1], rec2.id)
+ assert_equal(rt2.get_property("TestProp").value[2], None)
- assert_equals(db.execute_query("FIND TestRT2", unique=True).id, rt2.id)
- assert_equals(
+ assert_equal(db.execute_query("FIND TestRT2", unique=True).id, rt2.id)
+ assert_equal(
db.execute_query(
"FIND TestRT2 WHICH HAS A TestProp=TestRec2",
unique=True).id,
rt2.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestRT2 WHICH HAS A TestProp=TestRec1",
unique=True).id,
rt2.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestRT2 WITH TestProp IS NULL",
unique=True).id,
@@ -621,17 +621,17 @@ def test_rec_with_value():
rec4.insert()
assert_true(rec4.is_valid())
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestRec4 WHICH REFERENCES TestRec3",
unique=True).id,
rec4.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestRec4 WHICH REFERENCES TestRec2",
unique=True).id,
rec4.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestRec4 WHICH REFERENCES TestRec1",
unique=True).id,
@@ -650,12 +650,12 @@ def test_rec_with_null_value():
rec4.insert()
assert_true(rec4.is_valid())
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestRec4 WHICH REFERENCES TestRec1",
unique=True).id,
rec4.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestRec4 WHICH REFERENCES TestRec2",
unique=True).id,
@@ -670,14 +670,14 @@ def test_list_of_references():
name="Test_RT1",
datatype=db.LIST("Test_RT1")).insert()
p = rt2.get_properties()[0]
- assert_equals(p.id, rt1.id)
- assert_equals(p.name, rt1.name)
- assert_equals(p.datatype, db.LIST(rt1.name))
+ assert_equal(p.id, rt1.id)
+ assert_equal(p.name, rt1.name)
+ assert_equal(p.datatype, db.LIST(rt1.name))
p = db.execute_query("FIND Test_RT2", unique=True).get_properties()[0]
- assert_equals(p.id, rt1.id)
- assert_equals(p.name, rt1.name)
- assert_equals(p.datatype, db.LIST(rt1.name))
+ assert_equal(p.id, rt1.id)
+ assert_equal(p.name, rt1.name)
+ assert_equal(p.datatype, db.LIST(rt1.name))
rt1rec1 = db.Record(name="Test_RT1_Rec1").add_parent("Test_RT1").insert()
assert_true(rt1rec1.is_valid())
@@ -687,7 +687,7 @@ def test_list_of_references():
name="Test_RT2_Rec").add_parent("Test_RT2").add_property(
name="Test_RT1",
value=[rt1rec1]).insert()
- assert_equals(
+ assert_equal(
cm.exception.get_errors()[0].msg,
'This datatype does not accept collections of values (e.g. Lists).')
rt2rec = db.Record(name="Test_RT2_Rec").add_parent("Test_RT2").add_property(
diff --git a/tests/test_manual.py b/tests/test_manual.py
index 685e1d0..dc21143 100644
--- a/tests/test_manual.py
+++ b/tests/test_manual.py
@@ -24,7 +24,7 @@
from caosdb import Record, RecordType, Property, Container, File, execute_query
# @UnresolvedImport
-from nose.tools import assert_not_equals, assert_true, assert_is_not_none, assert_equals
+from nose.tools import assert_not_equals, assert_true, assert_is_not_none, assert_equal
from nose.tools.nontrivial import nottest
@@ -111,7 +111,7 @@ def test_name_overriding():
# RecordType "Person"
person = RecordType(name="PersonTestManual").insert()
assert_true(person.is_valid())
- assert_equals("PersonTestManual", person.name)
+ assert_equal("PersonTestManual", person.name)
# RecordType "Experiment" with Property "Person" but overridden name
# "Conductor"
@@ -122,11 +122,11 @@ def test_name_overriding():
description="The person who conducted this experiment.").insert()
assert_true(experiment.is_valid())
assert_is_not_none(experiment.get_properties())
- assert_equals(1, len(experiment.get_properties()))
+ assert_equal(1, len(experiment.get_properties()))
assert_is_not_none(experiment.get_properties()[0])
- assert_equals(person.id, experiment.get_properties()[0].id)
+ assert_equal(person.id, experiment.get_properties()[0].id)
assert_not_equals(person.name, experiment.get_properties()[0].name)
- assert_equals(
+ assert_equal(
"ConductorTestManual",
experiment.get_properties()[0].name)
@@ -134,11 +134,11 @@ def test_name_overriding():
c_experiment = RecordType(name="ExperimentTestManual").retrieve()
assert_true(c_experiment.is_valid())
assert_is_not_none(c_experiment.get_properties())
- assert_equals(1, len(c_experiment.get_properties()))
+ assert_equal(1, len(c_experiment.get_properties()))
assert_is_not_none(c_experiment.get_properties()[0])
- assert_equals(person.id, c_experiment.get_properties()[0].id)
+ assert_equal(person.id, c_experiment.get_properties()[0].id)
assert_not_equals(person.name, c_experiment.get_properties()[0].name)
- assert_equals(
+ assert_equal(
"ConductorTestManual",
c_experiment.get_properties()[0].name)
@@ -155,13 +155,13 @@ def test_name_overriding():
# Does it recognize "Person" as "Condutor"?
assert_is_not_none(sp_experiment_1.get_properties())
- assert_equals(1, len(sp_experiment_1.get_properties()))
+ assert_equal(1, len(sp_experiment_1.get_properties()))
assert_is_not_none(sp_experiment_1.get_properties()[0])
- assert_equals(person.id, sp_experiment_1.get_properties()[0].id)
+ assert_equal(person.id, sp_experiment_1.get_properties()[0].id)
assert_not_equals(
person.name,
sp_experiment_1.get_properties()[0].name)
- assert_equals(
+ assert_equal(
"ConductorTestManual",
sp_experiment_1.get_properties()[0].name)
@@ -169,13 +169,13 @@ def test_name_overriding():
c_sp_experiment_1 = Record(id=sp_experiment_1.id).retrieve()
assert_true(c_sp_experiment_1.is_valid())
assert_is_not_none(c_sp_experiment_1.get_properties())
- assert_equals(1, len(c_sp_experiment_1.get_properties()))
+ assert_equal(1, len(c_sp_experiment_1.get_properties()))
assert_is_not_none(c_sp_experiment_1.get_properties()[0])
- assert_equals(person.id, c_sp_experiment_1.get_properties()[0].id)
+ assert_equal(person.id, c_sp_experiment_1.get_properties()[0].id)
assert_not_equals(
person.name,
c_sp_experiment_1.get_properties()[0].name)
- assert_equals(
+ assert_equal(
"ConductorTestManual",
c_sp_experiment_1.get_properties()[0].name)
diff --git a/tests/test_misc.py b/tests/test_misc.py
index d928f8f..9656c5f 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -29,7 +29,7 @@
import caosdb as db
from caosdb import (Container, Info, Property, Record, RecordType,
execute_query, get_connection)
-from nose.tools import (assert_equals, assert_is_not_none, # @UnresolvedImport
+from nose.tools import (assert_equal, assert_is_not_none, # @UnresolvedImport
assert_not_equals, assert_raises, assert_true, nottest,
with_setup)
@@ -74,52 +74,52 @@ def test_sat_query_with_leading_slash():
path="testfiles/test.dat",
file="test.dat")
file_.insert()
- assert_equals(
+ assert_equal(
file_.id,
db.execute_query(
"FIND FILE WHICH IS STORED testfiles/test.dat",
unique=True).id)
- assert_equals(
+ assert_equal(
file_.id,
db.execute_query(
"FIND FILE WHICH IS STORED /testfiles/test.dat",
unique=True).id)
- assert_equals(
+ assert_equal(
file_.id,
db.execute_query(
"FIND FILE WHICH IS STORED testfiles/test.*",
unique=True).id)
- assert_equals(
+ assert_equal(
file_.id,
db.execute_query(
"FIND FILE WHICH IS STORED /testfiles/test.*",
unique=True).id)
- assert_equals(
+ assert_equal(
file_.id,
db.execute_query(
"FIND FILE WHICH IS STORED testfiles/*",
unique=True).id)
- assert_equals(
+ assert_equal(
file_.id,
db.execute_query(
"FIND FILE WHICH IS STORED /testfiles/*",
unique=True).id)
- assert_equals(
+ assert_equal(
file_.id,
db.execute_query(
"FIND FILE WHICH IS STORED */test.dat",
unique=True).id)
- assert_equals(
+ assert_equal(
file_.id,
db.execute_query(
"FIND FILE WHICH IS STORED /*/test.dat",
unique=True).id)
- assert_equals(
+ assert_equal(
file_.id,
db.execute_query(
"FIND FILE WHICH IS STORED **/test.dat",
unique=True).id)
- assert_equals(
+ assert_equal(
file_.id,
db.execute_query(
"FIND FILE WHICH IS STORED /**/test.dat",
@@ -130,7 +130,7 @@ def test_name_with_slash():
rt1 = db.RecordType("Test/Name").insert()
assert_true(rt1.is_valid())
rt2 = db.RecordType("Test/Name").retrieve()
- assert_equals(rt1.id, rt2.id)
+ assert_equal(rt1.id, rt2.id)
def test_nonsense_flag():
@@ -143,14 +143,14 @@ def test_error_no_such_role():
c = Container._response_to_entities(r)
with assert_raises(db.TransactionError) as cm:
db.raise_errors(c)
- assert_equals(cm.exception.msg, "There is no such role 'Entity'.")
+ assert_equal(cm.exception.msg, "There is no such role 'Entity'.")
xml = "<Insert><ASDF name='test'/></Insert>"
r = db.get_connection().insert(entity_uri_segment=["Entity"], body=xml)
c = Container._response_to_entities(r)
with assert_raises(db.TransactionError) as cm:
db.raise_errors(c)
- assert_equals(cm.exception.msg, "There is no such role 'ASDF'.")
+ assert_equal(cm.exception.msg, "There is no such role 'ASDF'.")
@with_setup(setup, setup)
@@ -162,11 +162,11 @@ def test_parent_duplicate_1():
name="TestRT1").add_parent(
name="TestRT1").add_property(
name="TestProperty")
- assert_equals(len(rt2.get_parents()), 2)
+ assert_equal(len(rt2.get_parents()), 2)
rt2.insert()
- assert_equals(len(rt2.get_parents()), 1)
- assert_equals(len(rt2.get_warnings()), 1)
- assert_equals(
+ assert_equal(len(rt2.get_parents()), 1)
+ assert_equal(len(rt2.get_warnings()), 1)
+ assert_equal(
rt2.get_warnings()[0].description,
"This entity had parent duplicates. That is meaningless and only one parent had been inserted.")
@@ -180,10 +180,10 @@ def test_parent_duplicate_2():
inheritance=db.ALL).add_parent(
name="TestRT1",
inheritance=db.NONE)
- assert_equals(len(rt2.get_parents()), 2)
+ assert_equal(len(rt2.get_parents()), 2)
with assert_raises(db.TransactionError) as cm:
rt2.insert()
- assert_equals(
+ assert_equal(
cm.exception.msg,
"This entity had parent duplicates. Parent duplicates are meaningless and would be ignored (and inserted only once). But these parents had diverging inheritance instructions which cannot be processed.")
@@ -255,7 +255,7 @@ def test_annotation():
"FIND AnnotationTestAnnotation WHICH REFERENCES AnnotationTestSimpleRecordType AS AN AnnotationTestEntity",
unique=True)
assert_true(ann.is_valid())
- assert_equals(rec.id, ann.id)
+ assert_equal(rec.id, ann.id)
finally:
rt = execute_query("FIND AnnotationTest*").delete()
@@ -265,7 +265,7 @@ def test_history():
try:
rt = RecordType(name="SimpleTestProperty").insert()
rt.retrieve(flags={"H": None})
- assert_equals(rt.messages["History"], ('Insert', None))
+ assert_equal(rt.messages["History"], ('Insert', None))
finally:
try:
rt.delete()
@@ -282,9 +282,9 @@ def test_info():
assert_not_equals('-1', i.messages["Counts"]["records"])
assert_not_equals('-1', i.messages["Counts"]["properties"])
assert_not_equals('-1', i.messages["Counts"]["recordTypes"])
- assert_equals('true', i.messages["Counts"]["debug"])
+ assert_equal('true', i.messages["Counts"]["debug"])
# Not necessarily 0, all the temporary directories go here as well.
- # assert_equals('0', i.messages["Counts"]["tmpfiles"])
+ # assert_equal('0', i.messages["Counts"]["tmpfiles"])
def test_long_description():
@@ -299,11 +299,11 @@ def test_long_description():
name="SimpleRecordTypeWithLongDesc",
description=longstr).insert()
assert_true(rt.is_valid())
- assert_equals(rt.description, longstr)
+ assert_equal(rt.description, longstr)
rt2 = RecordType(name="SimpleRecordTypeWithLongDesc").retrieve()
assert_true(rt2.is_valid())
- assert_equals(rt2.description, longstr)
+ assert_equal(rt2.description, longstr)
finally:
try:
rt.delete()
@@ -352,8 +352,8 @@ def test_overrides_with_deletion_in_worst_case_order():
description="descOverride1").insert()
assert_true(rt1.is_valid())
- assert_equals(p.id, rt1.get_property("nameOverride1").id)
- assert_equals(
+ assert_equal(p.id, rt1.get_property("nameOverride1").id)
+ assert_equal(
"descOverride1",
rt1.get_property("nameOverride1").description)
@@ -361,8 +361,8 @@ def test_overrides_with_deletion_in_worst_case_order():
rt1c = RecordType(name="SimpleRT1").retrieve()
assert_true(rt1c.is_valid())
- assert_equals(p.id, rt1c.get_property("nameOverride1").id)
- assert_equals(
+ assert_equal(p.id, rt1c.get_property("nameOverride1").id)
+ assert_equal(
"descOverride1",
rt1c.get_property("nameOverride1").description)
@@ -402,12 +402,12 @@ def test_overrides_with_duplicates():
description="descOverride2").insert()
assert_true(rt1.is_valid())
- assert_equals(p.id, rt1.get_property("nameOverride1").id)
- assert_equals(p.id, rt1.get_property("nameOverride2").id)
- assert_equals(
+ assert_equal(p.id, rt1.get_property("nameOverride1").id)
+ assert_equal(p.id, rt1.get_property("nameOverride2").id)
+ assert_equal(
"descOverride1",
rt1.get_property("nameOverride1").description)
- assert_equals(
+ assert_equal(
"descOverride2",
rt1.get_property("nameOverride2").description)
@@ -415,12 +415,12 @@ def test_overrides_with_duplicates():
rt1c = RecordType(name="SimpleRT1").retrieve()
assert_true(rt1c.is_valid())
- assert_equals(p.id, rt1c.get_property("nameOverride1").id)
- assert_equals(p.id, rt1c.get_property("nameOverride2").id)
- assert_equals(
+ assert_equal(p.id, rt1c.get_property("nameOverride1").id)
+ assert_equal(p.id, rt1c.get_property("nameOverride2").id)
+ assert_equal(
"descOverride1",
rt1c.get_property("nameOverride1").description)
- assert_equals(
+ assert_equal(
"descOverride2",
rt1c.get_property("nameOverride2").description)
diff --git a/tests/test_name_properties.py b/tests/test_name_properties.py
index 4f2494f..c88748e 100644
--- a/tests/test_name_properties.py
+++ b/tests/test_name_properties.py
@@ -27,7 +27,7 @@
"""
import caosdb as db
-from nose.tools import nottest, assert_true, assert_raises, assert_equals, with_setup, assert_is_not_none # @UnresolvedImport
+from nose.tools import nottest, assert_true, assert_raises, assert_equal, with_setup, assert_is_not_none # @UnresolvedImport
def setup_module():
@@ -67,10 +67,10 @@ def test_property_insertion():
@with_setup(setup, teardown)
def test_property_query():
pid = test_property_insertion().id
- assert_equals(db.execute_query("FIND TestShortName", unique=True).id, pid)
+ assert_equal(db.execute_query("FIND TestShortName", unique=True).id, pid)
# the short name does not apply to the property itself!!!
- assert_equals(len(db.execute_query("FIND TestSN")), 0)
+ assert_equal(len(db.execute_query("FIND TestSN")), 0)
@with_setup(setup, teardown)
@@ -90,9 +90,9 @@ def test_recordtype_is_stored_correctly():
rt = db.RecordType(name="TestRecordType").retrieve()
assert_true(rt.is_valid())
- assert_equals(len(rt.get_properties()), 1)
+ assert_equal(len(rt.get_properties()), 1)
assert_is_not_none(rt.get_property("TestShortName"))
- assert_equals(rt.get_property("TestShortName").value, "TestRT")
+ assert_equal(rt.get_property("TestShortName").value, "TestRT")
@with_setup(setup, teardown)
@@ -183,7 +183,7 @@ def do_unique_query_test(call, queries):
setup()
rtid = call().id
for q in queries:
- assert_equals(db.execute_query(q, unique=True).id, rtid)
+ assert_equal(db.execute_query(q, unique=True).id, rtid)
teardown()
@@ -225,22 +225,22 @@ def test_query_with_pov():
name="TestExperiment").add_property(
name="TestRating",
value=4).insert()
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestExperiment WHICH HAS A TestRating=4",
unique=True).id,
rec.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestExperiment WHICH HAS A TestRating>3",
unique=True).id,
rec.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestExperiment WHICH HAS A TestScore=4",
unique=True).id,
rec.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestExperiment WHICH HAS A TestScore>3",
unique=True).id,
@@ -266,12 +266,12 @@ def test_query_with_reference():
name="TestExperiment").add_property(
name="TestConductor",
value="TestJohnDoe").insert()
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestExperiment WHICH HAS A TestConductor=TestJohnDoe",
unique=True).id,
rec.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestExperiment WHICH HAS A TestConductor=John",
unique=True).id,
@@ -296,22 +296,22 @@ def test_query_with_back_reference():
name="TestMeasurement").add_property(
name="TestConductor",
value="TestJohnDoe").insert()
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestPerson WHICH IS REFERENCED BY TestMeasurement",
unique=True).id,
rec.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestPerson WHICH IS REFERENCED BY TestMeasurement AS A TestConductor",
unique=True).id,
rec.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestPerson WHICH IS REFERENCED BY TestObservation",
unique=True).id,
rec.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestPerson WHICH IS REFERENCED BY TestObservation AS A TestConductor",
unique=True).id,
diff --git a/tests/test_permissions.py b/tests/test_permissions.py
index f13801d..7406e1e 100644
--- a/tests/test_permissions.py
+++ b/tests/test_permissions.py
@@ -29,7 +29,7 @@
from __future__ import absolute_import
import caosdb as db
-from nose.tools import (assert_equals, assert_false, # @UnresolvedImport
+from nose.tools import (assert_equal, assert_false, # @UnresolvedImport
assert_is_none, assert_is_not_none, assert_raises,
assert_true, nottest, with_setup)
@@ -182,26 +182,26 @@ def test_query():
name="TestConductor",
value=dan.id).insert()
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestExperiment WHICH HAS A TestConductor->TestPerson",
unique=True).id,
exp.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestExperiment WHICH HAS A TestConductor=TestPerson",
unique=True).id,
exp.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestExperiment WHICH HAS A TestConductor=" + str(dan.id),
unique=True).id, exp.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestExperiment",
unique=True).id,
exp.id)
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestExperiment WHICH HAS A TestConductor WHICH has a TestFirstName=Daniel",
unique=True).id,
@@ -213,7 +213,7 @@ def test_query():
grant_permission(exp, "RETRIEVE:*")
switch_to_test_user()
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestExperiment WHICH HAS A TestConductor WHICH has a TestFirstName=Daniel",
unique=True).id,
@@ -227,15 +227,15 @@ def test_query():
db.execute_query(
"FIND TestExperiment WHICH HAS A TestConductor WHICH has a TestFirstName=Daniel",
unique=True)
- assert_equals(cm.exception.msg, "No such entity found.")
+ assert_equal(cm.exception.msg, "No such entity found.")
'''... but works without the which clause'''
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestExperiment",
unique=True).id,
exp.id)
'''and with the id'''
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestExperiment WHICH HAS A TestConductor=" + str(dan.id),
unique=True).id, exp.id)
@@ -249,11 +249,11 @@ def test_query():
db.execute_query(
"FIND TestExperiment WHICH HAS A TestConductor=TestDaniel",
unique=True)
- assert_equals(cm.exception.msg, "No such entity found.")
+ assert_equal(cm.exception.msg, "No such entity found.")
with assert_raises(db.TransactionError) as cm:
db.execute_query("FIND TestExperiment", unique=True)
- assert_equals(cm.exception.msg, "No such entity found.")
+ assert_equal(cm.exception.msg, "No such entity found.")
@with_setup(setup, teardown)
@@ -336,7 +336,7 @@ def test_update_acl():
p3.update_acl()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
p3 = db.execute_query(
"FIND TestProperty",
@@ -362,7 +362,7 @@ def test_update_acl():
p3.update()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
@with_setup(setup, teardown)
@@ -380,7 +380,7 @@ def test_update_name():
p2 = db.execute_query("FIND Test*", unique=True)
assert_true(p.is_valid())
- assert_equals(p2.name, "TestPropertyNew")
+ assert_equal(p2.name, "TestPropertyNew")
'''Failure'''
deny_permission(p, "UPDATE:NAME")
@@ -393,11 +393,11 @@ def test_update_name():
p.update()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
p2 = db.execute_query("FIND Test*", unique=True)
assert_true(p2.is_valid())
- assert_equals(p2.name, "TestPropertyNew")
+ assert_equal(p2.name, "TestPropertyNew")
@with_setup(setup, teardown)
@@ -413,13 +413,13 @@ def test_update_desc():
'''Success'''
switch_to_test_user()
- assert_equals(p.description, "Description")
+ assert_equal(p.description, "Description")
p.description = "DescriptionNew"
p.update()
p2 = db.execute_query("FIND Test*", unique=True)
assert_true(p.is_valid())
- assert_equals(p2.description, "DescriptionNew")
+ assert_equal(p2.description, "DescriptionNew")
deny_permission(p, "UPDATE:DESCRIPTION")
@@ -429,11 +429,11 @@ def test_update_desc():
p.update()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
p2 = db.execute_query("FIND Test*", unique=True)
assert_true(p2.is_valid())
- assert_equals(p2.description, "DescriptionNew")
+ assert_equal(p2.description, "DescriptionNew")
@with_setup(setup, teardown)
@@ -445,13 +445,13 @@ def test_update_data_type():
grant_permission(p, "UPDATE:DATA_TYPE")
'''Success'''
- assert_equals(p.datatype, db.TEXT)
+ assert_equal(p.datatype, db.TEXT)
p.datatype = db.INTEGER
p.update()
p2 = db.execute_query("FIND Test*", unique=True)
assert_true(p.is_valid())
- assert_equals(p2.datatype, db.INTEGER)
+ assert_equal(p2.datatype, db.INTEGER)
deny_permission(p, "UPDATE:DATA_TYPE")
@@ -461,11 +461,11 @@ def test_update_data_type():
p.update()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
p2 = db.execute_query("FIND Test*", unique=True)
assert_true(p2.is_valid())
- assert_equals(p2.datatype, db.INTEGER)
+ assert_equal(p2.datatype, db.INTEGER)
@with_setup(setup, teardown)
@@ -491,7 +491,7 @@ def test_update_role():
rec.update()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
rt2 = db.execute_query("FIND Test*", unique=True)
assert_true(rt2.is_valid())
@@ -518,7 +518,7 @@ def test_update_move_file():
f.update()
f2 = db.execute_query("FIND TestFile", unique=True)
- assert_equals(f2.path, "/otherpermissiontestfiles/test.dat")
+ assert_equal(f2.path, "/otherpermissiontestfiles/test.dat")
deny_permission(f, "UPDATE:FILE:MOVE")
@@ -528,10 +528,10 @@ def test_update_move_file():
f.update()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
f2 = db.execute_query("FIND TestFile", unique=True)
- assert_equals(f2.path, "/otherpermissiontestfiles/test.dat")
+ assert_equal(f2.path, "/otherpermissiontestfiles/test.dat")
@with_setup(setup, teardown)
@@ -552,7 +552,7 @@ def test_update_add_file():
f.update()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
f2 = db.execute_query("FIND TestFile", unique=True)
assert_is_none(f2.path)
@@ -567,7 +567,7 @@ def test_update_add_file():
assert_true(f2.is_valid())
f2 = db.execute_query("FIND TestFile", unique=True)
- assert_equals(f2.path, "/permissiontestfiles/newtest.dat")
+ assert_equal(f2.path, "/permissiontestfiles/newtest.dat")
@with_setup(setup, teardown)
@@ -596,11 +596,11 @@ def test_update_change_file():
f.update()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
f2 = db.execute_query("FIND TestFile", unique=True)
download_file = f2.download()
- assert_equals(db.File._get_checksum(download_file),
+ assert_equal(db.File._get_checksum(download_file),
db.File._get_checksum(upload_file))
'''SUCCESS'''
@@ -619,7 +619,7 @@ def test_update_change_file():
f2 = db.execute_query("FIND TestFile", unique=True)
download_file = f2.download()
- assert_equals(db.File._get_checksum(download_file),
+ assert_equal(db.File._get_checksum(download_file),
db.File._get_checksum(upload_file2))
@@ -633,7 +633,7 @@ def test_update_add_property():
assert_true(rt.is_valid())
rt = db.execute_query("FIND TestRecordType", unique=True)
- assert_equals(len(rt.get_properties()), 0)
+ assert_equal(len(rt.get_properties()), 0)
grant_permission(p, "RETRIEVE:ENTITY")
grant_permission(p2, "RETRIEVE:ENTITY")
@@ -647,7 +647,7 @@ def test_update_add_property():
rt.add_property(name="TestProperty", id=p.id).update()
rt = db.execute_query("FIND TestRecordType", unique=True)
- assert_equals(len(rt.get_properties()), 1)
+ assert_equal(len(rt.get_properties()), 1)
assert_is_not_none(rt.get_property("TestProperty"))
deny_permission(rt, "UPDATE:PROPERTY:ADD")
@@ -658,10 +658,10 @@ def test_update_add_property():
rt.update()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
rt2 = db.execute_query("FIND TestRecordType", unique=True)
- assert_equals(len(rt2.get_properties()), 1)
+ assert_equal(len(rt2.get_properties()), 1)
assert_is_not_none(rt2.get_property("TestProperty"))
'''Failure - add p2 to rt'''
@@ -670,10 +670,10 @@ def test_update_add_property():
rt.update()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
rt2 = db.execute_query("FIND TestRecordType", unique=True)
- assert_equals(len(rt2.get_properties()), 1)
+ assert_equal(len(rt2.get_properties()), 1)
assert_is_not_none(rt2.get_property("TestProperty"))
@@ -690,7 +690,7 @@ def test_update_remove_property():
assert_true(rt.is_valid())
rt = db.execute_query("FIND TestRecordType", unique=True)
- assert_equals(len(rt.get_properties()), 2)
+ assert_equal(len(rt.get_properties()), 2)
assert_is_not_none(rt.get_property("TestProperty"))
assert_is_not_none(rt.get_property("TestProperty2"))
@@ -706,7 +706,7 @@ def test_update_remove_property():
rt.remove_property("TestProperty2").update()
rt2 = db.execute_query("FIND TestRecordType", unique=True)
- assert_equals(len(rt2.get_properties()), 1)
+ assert_equal(len(rt2.get_properties()), 1)
assert_is_not_none(rt2.get_property("TestProperty"))
assert_is_none(rt2.get_property("TestProperty2"))
@@ -718,10 +718,10 @@ def test_update_remove_property():
rt.update()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
rt2 = db.execute_query("FIND TestRecordType", unique=True)
- assert_equals(len(rt2.get_properties()), 1)
+ assert_equal(len(rt2.get_properties()), 1)
assert_is_not_none(rt2.get_property("TestProperty"))
@@ -735,7 +735,7 @@ def test_update_add_parent():
assert_true(par2.is_valid())
rt = db.execute_query("FIND TestRecordType", unique=True)
- assert_equals(len(rt.get_parents()), 0)
+ assert_equal(len(rt.get_parents()), 0)
grant_permission(rt, "RETRIEVE:ENTITY")
grant_permission(par1, "RETRIEVE:ENTITY")
@@ -748,7 +748,7 @@ def test_update_add_parent():
rt.add_parent(name="TestRecordTypePar1", id=par1.id).update()
rt2 = db.execute_query("FIND TestRecordType", unique=True)
- assert_equals(len(rt2.get_parents()), 1)
+ assert_equal(len(rt2.get_parents()), 1)
assert_is_not_none(rt2.get_parent("TestRecordTypePar1"))
deny_permission(rt, "UPDATE:PARENT:ADD")
@@ -759,10 +759,10 @@ def test_update_add_parent():
rt.update()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
rt2 = db.execute_query("FIND TestRecordType", unique=True)
- assert_equals(len(rt2.get_parents()), 1)
+ assert_equal(len(rt2.get_parents()), 1)
assert_is_not_none(rt2.get_parent("TestRecordTypePar1"))
'''Failure - add par2 to rt'''
@@ -771,10 +771,10 @@ def test_update_add_parent():
rt.update()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
rt2 = db.execute_query("FIND TestRecordType", unique=True)
- assert_equals(len(rt2.get_parents()), 1)
+ assert_equal(len(rt2.get_parents()), 1)
assert_is_not_none(rt2.get_parent("TestRecordTypePar1"))
assert_is_none(rt2.get_parent("TestRecordTypePar2"))
@@ -790,7 +790,7 @@ def test_update_remove_parent():
assert_true(rt.is_valid())
rt = db.execute_query("FIND TestRecordType", unique=True)
- assert_equals(len(rt.get_parents()), 2)
+ assert_equal(len(rt.get_parents()), 2)
assert_is_not_none(rt.get_parent("TestRecordTypePar1"))
assert_is_not_none(rt.get_parent("TestRecordTypePar2"))
@@ -805,7 +805,7 @@ def test_update_remove_parent():
rt.remove_parent("TestRecordTypePar2").update()
rt = db.execute_query("FIND TestRecordType", unique=True)
- assert_equals(len(rt.get_parents()), 1)
+ assert_equal(len(rt.get_parents()), 1)
assert_is_not_none(rt.get_parent("TestRecordTypePar1"))
assert_is_none(rt.get_parent("TestRecordTypePar2"))
@@ -817,10 +817,10 @@ def test_update_remove_parent():
rt.update()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
rt = db.execute_query("FIND TestRecordType", unique=True)
- assert_equals(len(rt.get_parents()), 1)
+ assert_equal(len(rt.get_parents()), 1)
assert_is_not_none(rt.get_parent("TestRecordTypePar1"))
assert_is_none(rt.get_parent("TestRecordTypePar2"))
@@ -835,7 +835,7 @@ def test_update_value():
p = db.execute_query("FIND Test*", unique=True)
assert_true(p.is_valid())
- assert_equals(p.value, "Value")
+ assert_equal(p.value, "Value")
grant_permission(p, "RETRIEVE:ENTITY")
grant_permission(p, "UPDATE:VALUE")
@@ -846,7 +846,7 @@ def test_update_value():
p = db.execute_query("FIND Test*", unique=True)
assert_true(p.is_valid())
- assert_equals(p.value, "NewValue")
+ assert_equal(p.value, "NewValue")
deny_permission(p, "UPDATE:VALUE")
@@ -856,11 +856,11 @@ def test_update_value():
p.update()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
p2 = db.execute_query("FIND Test*", unique=True)
assert_true(p2.is_valid())
- assert_equals(p2.value, "NewValue")
+ assert_equal(p2.value, "NewValue")
@with_setup(setup, teardown)
@@ -877,13 +877,13 @@ def test_deletion():
p.delete()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
'''Success'''
grant_permission(p, "DELETE")
p.delete()
- assert_equals(
+ assert_equal(
p.get_messages()[0].description,
"This entity has been deleted successfully.")
@@ -904,7 +904,7 @@ def test_retrieve_acl():
p.retrieve_acl()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
@with_setup(setup, teardown)
@@ -919,13 +919,13 @@ def test_retrieve_history():
p.retrieve(flags={"H": None})
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
'''Success'''
grant_permission(p, "RETRIEVE:HISTORY")
p.retrieve(flags={"H": None})
- assert_equals(p.messages["History"], ('Insert', None))
+ assert_equal(p.messages["History"], ('Insert', None))
@with_setup(setup, teardown)
@@ -945,7 +945,7 @@ def test_retrieve_entity():
p.retrieve()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
@with_setup(setup, teardown)
@@ -961,7 +961,7 @@ def test_retrieve_owner():
p.retrieve(flags={"owner": None})
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, "You are not allowed to do this.")
+ assert_equal(e.msg, "You are not allowed to do this.")
'''Success'''
grant_permission(p, "RETRIEVE:OWNER")
@@ -990,7 +990,7 @@ def test_download_file():
try:
f.download()
except db.TransactionError as e:
- assert_equals(
+ assert_equal(
e.msg,
"Request failed. The response returned with status 403.")
@@ -999,7 +999,7 @@ def test_download_file():
f2 = db.execute_query("FIND TestFile", unique=True)
download_file = f2.download()
- assert_equals(db.File._get_checksum(download_file),
+ assert_equal(db.File._get_checksum(download_file),
db.File._get_checksum(upload_file))
@@ -1013,7 +1013,7 @@ def test_grant_priority_permission():
p.delete()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, 'You are not allowed to do this.')
+ assert_equal(e.msg, 'You are not allowed to do this.')
deny_permission(p, "DELETE")
@@ -1022,7 +1022,7 @@ def test_grant_priority_permission():
p.delete()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, 'You are not allowed to do this.')
+ assert_equal(e.msg, 'You are not allowed to do this.')
# now its working
grant_permission(p, "DELETE", True)
@@ -1039,7 +1039,7 @@ def test_deny_priority_permission():
p.delete()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, 'You are not allowed to do this.')
+ assert_equal(e.msg, 'You are not allowed to do this.')
deny_permission(p, "DELETE")
@@ -1048,7 +1048,7 @@ def test_deny_priority_permission():
p.delete()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, 'You are not allowed to do this.')
+ assert_equal(e.msg, 'You are not allowed to do this.')
# now its working
grant_permission(p, "DELETE")
@@ -1058,7 +1058,7 @@ def test_deny_priority_permission():
p.delete()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, 'You are not allowed to do this.')
+ assert_equal(e.msg, 'You are not allowed to do this.')
@with_setup(setup, teardown)
@@ -1077,7 +1077,7 @@ def test_change_priority_permission():
entity.update_acl()
assert_true(False)
except db.TransactionError as e:
- assert_equals(e.msg, 'You are not allowed to do this.')
+ assert_equal(e.msg, 'You are not allowed to do this.')
@with_setup(setup, teardown)
@@ -1121,8 +1121,8 @@ def test_use_as_property():
with assert_raises(db.TransactionError) as cm:
rt.insert()
ex = cm.exception
- assert_equals(ex.msg, "Entity has unqualified properties.")
- assert_equals(rt.get_property("TestProperty").get_errors()[0].code, "403")
+ assert_equal(ex.msg, "Entity has unqualified properties.")
+ assert_equal(rt.get_property("TestProperty").get_errors()[0].code, "403")
'''Success'''
grant_permission(p, "USE:AS_PROPERTY")
@@ -1145,7 +1145,7 @@ def test_use_as_data_type():
deny_permission(dt, "USE:AS_DATA_TYPE")
with assert_raises(db.TransactionError) as cm:
db.Property(name="TestConductorProperty2", datatype=dt_name).insert()
- assert_equals(cm.exception.msg, "You are not allowed to do this.")
+ assert_equal(cm.exception.msg, "You are not allowed to do this.")
@with_setup(setup, teardown)
@@ -1172,8 +1172,8 @@ def test_use_as_reference():
value=rec)
with assert_raises(db.TransactionError) as cm:
rt2.insert()
- assert_equals(cm.exception.msg, "Entity has unqualified properties.")
- assert_equals(rt2.get_property(p.name).get_errors()[0].code, "403")
+ assert_equal(cm.exception.msg, "Entity has unqualified properties.")
+ assert_equal(rt2.get_property(p.name).get_errors()[0].code, "403")
@with_setup(setup, teardown)
@@ -1191,8 +1191,8 @@ def test_use_as_parent():
deny_permission(p, "USE:AS_PARENT")
with assert_raises(db.TransactionError) as cm:
p2.insert()
- assert_equals(cm.exception.msg, "Entity has unqualified parents.")
- assert_equals(p2.get_parent("TestProperty").get_errors()[0].code, "403")
+ assert_equal(cm.exception.msg, "Entity has unqualified parents.")
+ assert_equal(p2.get_parent("TestProperty").get_errors()[0].code, "403")
'''Success'''
grant_permission(p, "USE:AS_PARENT")
diff --git a/tests/test_query.py b/tests/test_query.py
index 1aeeddd..1101128 100644
--- a/tests/test_query.py
+++ b/tests/test_query.py
@@ -30,7 +30,7 @@
import caosdb as h
# @UnresolvedImport
-from nose.tools import assert_true, assert_equals, assert_is_not_none, with_setup
+from nose.tools import assert_true, assert_equal, assert_is_not_none, with_setup
from caosdb.connection.connection import get_connection
from lxml import etree # @UnresolvedImport
@@ -69,47 +69,47 @@ def test_query_with_reference_by_parent():
datatype=h.LIST("TestProtocolLog"),
value=[
sp_rec.id]).insert()
- assert_equals(2, len(h.execute_query("FIND TestExperiment")))
- assert_equals(
+ assert_equal(2, len(h.execute_query("FIND TestExperiment")))
+ assert_equal(
exp_rec.id,
h.execute_query(
"FIND TestExperiment WHICH HAS A TestProtocolLog",
unique=True).id)
- assert_equals(
+ assert_equal(
exp_rec.id,
h.execute_query(
"FIND TestExperiment.TestProtocolLog",
unique=True).id)
- assert_equals(
+ assert_equal(
exp_rec.id, h.execute_query(
"FIND TestExperiment WHICH REFERENCES " + str(sp_rec.id),
unique=True).id)
- assert_equals(
+ assert_equal(
exp_rec.id,
h.execute_query(
"FIND TestExperiment WHICH REFERENCES TestSpecialProtocolLog1",
unique=True).id)
- assert_equals(
+ assert_equal(
exp_rec.id,
h.execute_query(
"FIND TestExperiment WHICH REFERENCES TestSpecialProtocolLog",
unique=True).id)
- assert_equals(exp_rec.id, h.execute_query(
+ assert_equal(exp_rec.id, h.execute_query(
"FIND TestExperiment .-> " + str(sp_rec.id), unique=True).id)
- assert_equals(
+ assert_equal(
exp_rec.id,
h.execute_query(
"FIND TestExperiment .-> TestSpecialProtocolLog1",
unique=True).id)
- assert_equals(
+ assert_equal(
exp_rec.id,
h.execute_query(
"FIND TestExperiment .-> TestSpecialProtocolLog",
unique=True).id)
- assert_equals(0, len(h.execute_query(
+ assert_equal(0, len(h.execute_query(
"FIND TestExperiment WHICH HAS A TestProtocolLog1")))
- assert_equals(0, len(h.execute_query(
+ assert_equal(0, len(h.execute_query(
"FIND TestExperiment.TestProtocolLog1")))
@@ -130,26 +130,26 @@ def test_query_with_domains():
datatype=person,
value=dan.id).insert()
- assert_equals(
+ assert_equal(
h.execute_query(
"FIND TestExperiment WHICH HAS A TestConductor->TestPerson",
unique=True).id,
exp.id)
- assert_equals(
+ assert_equal(
h.execute_query(
"FIND TestExperiment WHICH HAS A TestConductor=TestPerson",
unique=True).id,
exp.id)
- assert_equals(
+ assert_equal(
h.execute_query(
"FIND TestExperiment WHICH HAS A TestConductor=" + str(dan.id),
unique=True).id, exp.id)
- assert_equals(
+ assert_equal(
h.execute_query(
"FIND TestExperiment",
unique=True).id,
exp.id)
- assert_equals(
+ assert_equal(
h.execute_query(
"FIND TestExperiment WHICH HAS A TestConductor WHICH has a TestFirstName=Daniel",
unique=True).id,
@@ -166,8 +166,8 @@ def test_query1():
p.insert()
assert_true(int(p.id) >= 100)
- assert_equals(p.id, h.execute_query("FIND TestTextProperty")[0].id)
- assert_equals(
+ assert_equal(p.id, h.execute_query("FIND TestTextProperty")[0].id)
+ assert_equal(
p.id,
h.execute_query(
"FIND TestTextProperty",
@@ -189,13 +189,13 @@ def test_query2():
f2.insert()
assert_true(int(f.id) >= 100)
- assert_equals(2, len(h.execute_query("FIND FILE")))
- assert_equals(
+ assert_equal(2, len(h.execute_query("FIND FILE")))
+ assert_equal(
f.id,
h.execute_query(
"FIND FILE WHICH IS STORED AT testfiles/testfile",
unique=True).id)
- assert_equals(f.id, h.File(path='testfiles/testfile').retrieve().id)
+ assert_equal(f.id, h.File(path='testfiles/testfile').retrieve().id)
def test_query3():
@@ -204,9 +204,9 @@ def test_query3():
"query": None}, reconnect=True).read()
print(body)
xml = etree.fromstring(body)
- assert_equals(3, len(xml))
- assert_equals("query", xml[1].tag.lower())
- assert_equals("transactionbenchmark", xml[2].tag.lower())
+ assert_equal(3, len(xml))
+ assert_equal("query", xml[1].tag.lower())
+ assert_equal("transactionbenchmark", xml[2].tag.lower())
@with_setup(setup, teardown)
@@ -251,52 +251,52 @@ def test_conjunction():
c = h.Container().extend([ra, rb, rab, rn]).insert()
assert_true(c.is_valid())
- assert_equals(5, len(h.execute_query("FIND TestConjunctionTest")))
+ assert_equal(5, len(h.execute_query("FIND TestConjunctionTest")))
- assert_equals(4, len(h.execute_query("FIND Record TestConjunctionTest")))
+ assert_equal(4, len(h.execute_query("FIND Record TestConjunctionTest")))
- assert_equals(4, len(h.execute_query(
+ assert_equal(4, len(h.execute_query(
"FIND TestConjunctionTest . TestConjunctionTestPropertyA")))
- assert_equals(4, len(h.execute_query(
+ assert_equal(4, len(h.execute_query(
"FIND TestConjunctionTest . TestConjunctionTestPropertyB")))
- assert_equals(2, len(h.execute_query(
+ assert_equal(2, len(h.execute_query(
"FIND TestConjunctionTest . TestConjunctionTestPropertyB=1")))
- assert_equals(2, len(h.execute_query(
+ assert_equal(2, len(h.execute_query(
"FIND TestConjunctionTest . TestConjunctionTestPropertyB=0")))
- assert_equals(2, len(h.execute_query(
+ assert_equal(2, len(h.execute_query(
"FIND TestConjunctionTest . TestConjunctionTestPropertyA=1")))
- assert_equals(2, len(h.execute_query(
+ assert_equal(2, len(h.execute_query(
"FIND TestConjunctionTest . TestConjunctionTestPropertyA=0")))
- assert_equals(1, len(h.execute_query(
+ assert_equal(1, len(h.execute_query(
"FIND TestConjunctionTest . TestConjunctionTestPropertyA=1 AND TestConjunctionTestPropertyB=1")))
- assert_equals(1, len(h.execute_query(
+ assert_equal(1, len(h.execute_query(
"FIND TestConjunctionTest . TestConjunctionTestPropertyA=0 AND TestConjunctionTestPropertyB=0")))
- assert_equals(1, len(h.execute_query(
+ assert_equal(1, len(h.execute_query(
"FIND TestConjunctionTest . TestConjunctionTestPropertyA=0 AND TestConjunctionTestPropertyB=1")))
- assert_equals(1, len(h.execute_query(
+ assert_equal(1, len(h.execute_query(
"FIND TestConjunctionTest . TestConjunctionTestPropertyA=1 AND TestConjunctionTestPropertyB=0")))
- assert_equals(4, len(h.execute_query(
+ assert_equal(4, len(h.execute_query(
"FIND Record . TestConjunctionTestPropertyA")))
- assert_equals(4, len(h.execute_query(
+ assert_equal(4, len(h.execute_query(
"FIND Record . TestConjunctionTestPropertyB")))
- assert_equals(2, len(h.execute_query(
+ assert_equal(2, len(h.execute_query(
"FIND Record . TestConjunctionTestPropertyB=1")))
- assert_equals(2, len(h.execute_query(
+ assert_equal(2, len(h.execute_query(
"FIND Record . TestConjunctionTestPropertyB=0")))
- assert_equals(2, len(h.execute_query(
+ assert_equal(2, len(h.execute_query(
"FIND Record . TestConjunctionTestPropertyA=1")))
- assert_equals(2, len(h.execute_query(
+ assert_equal(2, len(h.execute_query(
"FIND Record . TestConjunctionTestPropertyA=0")))
- assert_equals(1, len(h.execute_query(
+ assert_equal(1, len(h.execute_query(
"FIND RECORD . TestConjunctionTestPropertyA=1 AND TestConjunctionTestPropertyB=1")))
- assert_equals(1, len(h.execute_query(
+ assert_equal(1, len(h.execute_query(
"FIND RECORD . TestConjunctionTestPropertyA=0 AND TestConjunctionTestPropertyB=0")))
- assert_equals(1, len(h.execute_query(
+ assert_equal(1, len(h.execute_query(
"FIND RECORD . TestConjunctionTestPropertyA=0 AND TestConjunctionTestPropertyB=1")))
- assert_equals(1, len(h.execute_query(
+ assert_equal(1, len(h.execute_query(
"FIND RECORD . TestConjunctionTestPropertyA=1 AND TestConjunctionTestPropertyB=0")))
@@ -342,46 +342,46 @@ def test_disjunction():
c = h.Container().extend([ra, rb, rab, rn]).insert()
assert_true(c.is_valid())
- assert_equals(5, len(h.execute_query("FIND TestDisjunctionTest")))
+ assert_equal(5, len(h.execute_query("FIND TestDisjunctionTest")))
- assert_equals(4, len(h.execute_query("FIND Record TestDisjunctionTest")))
+ assert_equal(4, len(h.execute_query("FIND Record TestDisjunctionTest")))
- assert_equals(4, len(h.execute_query(
+ assert_equal(4, len(h.execute_query(
"FIND TestDisjunctionTest . TestDisjunctionTestPropertyA")))
- assert_equals(4, len(h.execute_query(
+ assert_equal(4, len(h.execute_query(
"FIND TestDisjunctionTest . TestDisjunctionTestPropertyB")))
- assert_equals(2, len(h.execute_query(
+ assert_equal(2, len(h.execute_query(
"FIND TestDisjunctionTest . TestDisjunctionTestPropertyB=1")))
- assert_equals(2, len(h.execute_query(
+ assert_equal(2, len(h.execute_query(
"FIND TestDisjunctionTest . TestDisjunctionTestPropertyB=0")))
- assert_equals(2, len(h.execute_query(
+ assert_equal(2, len(h.execute_query(
"FIND TestDisjunctionTest . TestDisjunctionTestPropertyA=1")))
- assert_equals(2, len(h.execute_query(
+ assert_equal(2, len(h.execute_query(
"FIND TestDisjunctionTest . TestDisjunctionTestPropertyA=0")))
- assert_equals(3, len(h.execute_query(
+ assert_equal(3, len(h.execute_query(
"FIND TestDisjunctionTest . TestDisjunctionTestPropertyA=1 OR TestDisjunctionTestPropertyB=1")))
- assert_equals(3, len(h.execute_query(
+ assert_equal(3, len(h.execute_query(
"FIND TestDisjunctionTest . TestDisjunctionTestPropertyA=0 OR TestDisjunctionTestPropertyB=0")))
- assert_equals(3, len(h.execute_query(
+ assert_equal(3, len(h.execute_query(
"FIND TestDisjunctionTest . TestDisjunctionTestPropertyA=0 OR TestDisjunctionTestPropertyB=1")))
- assert_equals(3, len(h.execute_query(
+ assert_equal(3, len(h.execute_query(
"FIND TestDisjunctionTest . TestDisjunctionTestPropertyA=1 OR TestDisjunctionTestPropertyB=0")))
- assert_equals(2, len(h.execute_query(
+ assert_equal(2, len(h.execute_query(
"FIND TestDisjunctionTest . THE GREATEST TestDisjunctionTestPropertyB")))
- assert_equals(3, len(h.execute_query(
+ assert_equal(3, len(h.execute_query(
"FIND TestDisjunctionTest . TestDisjunctionTestPropertyA=1 OR THE GREATEST TestDisjunctionTestPropertyB")))
- assert_equals(
+ assert_equal(
rn.id,
h.execute_query(
"FIND TestDisjunctionTest . TestDisjunctionTestPropertyA='-1' OR ( TestDisjunctionTestPropertyB=0 AND TestDisjunctionTestPropertyA=0)",
unique=True).id)
- assert_equals(3, len(h.execute_query(
+ assert_equal(3, len(h.execute_query(
"FIND TestDisjunctionTest . TestDisjunctionTestPropertyA=0 OR ( TestDisjunctionTestPropertyB=0 AND TestDisjunctionTestPropertyA=1)")))
- assert_equals(2, len(h.execute_query(
+ assert_equal(2, len(h.execute_query(
"FIND TestDisjunctionTest . TestDisjunctionTestPropertyA=1 OR ( TestDisjunctionTestPropertyB=0 AND TestDisjunctionTestPropertyA=1)")))
@@ -394,7 +394,7 @@ def test_greatest():
datatype=h.DOUBLE).add_parent(pAB).insert()
assert_true(pA.is_valid())
pB = h.Property(name="TestPropertyB", datatype=h.DOUBLE).add_parent(pAB)
- assert_equals(len(pB.get_parents()), 1)
+ assert_equal(len(pB.get_parents()), 1)
print(pB)
print(pB)
pB.insert()
@@ -410,22 +410,22 @@ def test_greatest():
c = h.execute_query(
"FIND TestRecord1 WHICH HAS THE GREATEST TestPropertyA",
unique=True)
- assert_equals(c.id, rec1.id)
+ assert_equal(c.id, rec1.id)
c = h.execute_query(
"FIND TestRecordType WHICH HAS THE GREATEST TestPropertyA",
unique=True)
- assert_equals(c.id, rec1.id)
+ assert_equal(c.id, rec1.id)
c = h.execute_query(
"FIND TestRecord1 WHICH HAS THE GREATEST TestPropertyAB",
unique=True)
- assert_equals(c.id, rec1.id)
+ assert_equal(c.id, rec1.id)
c = h.execute_query(
"FIND TestRecordType WHICH HAS THE GREATEST TestPropertyAB",
unique=True)
- assert_equals(c.id, rec1.id)
+ assert_equal(c.id, rec1.id)
rec2 = h.Record(name="TestRecord2").add_parent(
rt).add_property(pA, value=2.0).insert()
@@ -434,27 +434,27 @@ def test_greatest():
c = h.execute_query(
"FIND TestRecord2 WHICH HAS THE GREATEST TestPropertyA",
unique=True)
- assert_equals(c.id, rec2.id)
+ assert_equal(c.id, rec2.id)
c = h.execute_query(
"FIND TestRecord1 WHICH HAS THE GREATEST TestPropertyA",
unique=True)
- assert_equals(c.id, rec1.id)
+ assert_equal(c.id, rec1.id)
c = h.execute_query(
"FIND TestRecordType WHICH HAS THE GREATEST TestPropertyA",
unique=True)
- assert_equals(c.id, rec2.id)
+ assert_equal(c.id, rec2.id)
c = h.execute_query(
"FIND TestRecord2 WHICH HAS THE GREATEST TestPropertyAB",
unique=True)
- assert_equals(c.id, rec2.id)
+ assert_equal(c.id, rec2.id)
c = h.execute_query(
"FIND TestRecordType WHICH HAS THE GREATEST TestPropertyAB",
unique=True)
- assert_equals(c.id, rec2.id)
+ assert_equal(c.id, rec2.id)
rec3 = h.Record(name="TestRecord3").add_parent(
rt).add_property(pA, value=1.5).insert()
@@ -463,42 +463,42 @@ def test_greatest():
c = h.execute_query(
"FIND TestRecord3 WHICH HAS THE GREATEST TestPropertyA",
unique=True)
- assert_equals(c.id, rec3.id)
+ assert_equal(c.id, rec3.id)
c = h.execute_query(
"FIND TestRecord2 WHICH HAS THE GREATEST TestPropertyA",
unique=True)
- assert_equals(c.id, rec2.id)
+ assert_equal(c.id, rec2.id)
c = h.execute_query(
"FIND TestRecord1 WHICH HAS THE GREATEST TestPropertyA",
unique=True)
- assert_equals(c.id, rec1.id)
+ assert_equal(c.id, rec1.id)
c = h.execute_query(
"FIND TestRecordType WHICH HAS THE GREATEST TestPropertyA",
unique=True)
- assert_equals(c.id, rec2.id)
+ assert_equal(c.id, rec2.id)
c = h.execute_query(
"FIND TestRecord3 WHICH HAS THE GREATEST TestPropertyAB",
unique=True)
- assert_equals(c.id, rec3.id)
+ assert_equal(c.id, rec3.id)
c = h.execute_query(
"FIND TestRecord2 WHICH HAS THE GREATEST TestPropertyAB",
unique=True)
- assert_equals(c.id, rec2.id)
+ assert_equal(c.id, rec2.id)
c = h.execute_query(
"FIND TestRecord1 WHICH HAS THE GREATEST TestPropertyAB",
unique=True)
- assert_equals(c.id, rec1.id)
+ assert_equal(c.id, rec1.id)
c = h.execute_query(
"FIND TestRecordType WHICH HAS THE GREATEST TestPropertyAB",
unique=True)
- assert_equals(c.id, rec2.id)
+ assert_equal(c.id, rec2.id)
rec4 = h.Record(name="TestRecord4").add_parent(
rt).add_property(pB, value=0.1).insert()
@@ -506,22 +506,22 @@ def test_greatest():
c = h.execute_query(
"FIND TestRecord4 WHICH HAS THE GREATEST TestPropertyA")
- assert_equals(len(c), 0)
+ assert_equal(len(c), 0)
c = h.execute_query(
"FIND TestRecord4 WHICH HAS THE GREATEST TestPropertyB",
unique=True)
- assert_equals(c.id, rec4.id)
+ assert_equal(c.id, rec4.id)
c = h.execute_query(
"FIND TestRecordType WHICH HAS THE GREATEST TestPropertyB",
unique=True)
- assert_equals(c.id, rec4.id)
+ assert_equal(c.id, rec4.id)
c = h.execute_query(
"FIND TestRecordType WHICH HAS THE GREATEST TestPropertyAB",
unique=True)
- assert_equals(c.id, rec2.id)
+ assert_equal(c.id, rec2.id)
rec5 = h.Record(
name="TestRecord5").add_parent(rt).add_property(
@@ -534,17 +534,17 @@ def test_greatest():
c = h.execute_query(
"FIND TestRecordType WHICH HAS THE GREATEST TestPropertyAB",
unique=True)
- assert_equals(c.id, rec5.id)
+ assert_equal(c.id, rec5.id)
c = h.execute_query(
"FIND TestRecordType WHICH HAS THE GREATEST TestPropertyB",
unique=True)
- assert_equals(c.id, rec5.id)
+ assert_equal(c.id, rec5.id)
c = h.execute_query(
"FIND TestRecordType WHICH HAS THE GREATEST TestPropertyA",
unique=True)
- assert_equals(c.id, rec2.id)
+ assert_equal(c.id, rec2.id)
rec6 = h.Record(
name="TestRecord6").add_parent(rt).add_property(
@@ -559,17 +559,17 @@ def test_greatest():
c = h.execute_query(
"FIND TestRecordType WHICH HAS THE GREATEST TestPropertyAB",
unique=True)
- assert_equals(c.id, rec6.id)
+ assert_equal(c.id, rec6.id)
c = h.execute_query(
"FIND TestRecordType WHICH HAS THE GREATEST TestPropertyB",
unique=True)
- assert_equals(c.id, rec5.id)
+ assert_equal(c.id, rec5.id)
c = h.execute_query(
"FIND TestRecordType WHICH HAS THE GREATEST TestPropertyA")
- assert_equals(c[0].id, rec2.id)
- assert_equals(c[1].id, rec6.id)
+ assert_equal(c[0].id, rec2.id)
+ assert_equal(c[1].id, rec6.id)
@with_setup(setup, teardown)
@@ -583,68 +583,68 @@ def test_wildcard_values():
rt2 = h.execute_query(
'FIND TestRecordType WHICH HAS A TestTextProperty LIKE "abc*"',
unique=True)
- assert_equals(rt2.id, rt.id)
+ assert_equal(rt2.id, rt.id)
rt2 = h.execute_query(
'FIND TestRecordType WHICH HAS A TestTextProperty LIKE abc*',
unique=True)
- assert_equals(rt2.id, rt.id)
+ assert_equal(rt2.id, rt.id)
rt2 = h.execute_query(
'FIND TestRecordType WHICH HAS A TestTextProperty LIKE abc*efg',
unique=True)
- assert_equals(rt2.id, rt.id)
+ assert_equal(rt2.id, rt.id)
rt2 = h.execute_query(
'FIND TestRecordType WHICH HAS A TestTextProperty LIKE abc*g',
unique=True)
- assert_equals(rt2.id, rt.id)
+ assert_equal(rt2.id, rt.id)
rt2 = h.execute_query(
'FIND TestRecordType WHICH HAS A TestTextProperty LIKE *',
unique=True)
- assert_equals(rt2.id, rt.id)
+ assert_equal(rt2.id, rt.id)
rt2 = h.execute_query(
'FIND TestRecordType WHICH HAS A TestTextProperty LIKE a*',
unique=True)
- assert_equals(rt2.id, rt.id)
+ assert_equal(rt2.id, rt.id)
rt2 = h.execute_query(
'FIND TestRecordType WHICH HAS A TestTextProperty LIKE *abc*',
unique=True)
- assert_equals(rt2.id, rt.id)
+ assert_equal(rt2.id, rt.id)
rt2 = h.execute_query(
'FIND TestRecordType WHICH HAS A TestTextProperty LIKE *fg',
unique=True)
- assert_equals(rt2.id, rt.id)
+ assert_equal(rt2.id, rt.id)
rt2 = h.execute_query(
'FIND TestRecordType WHICH HAS A TestTextProperty LIKE a*f*g',
unique=True)
- assert_equals(rt2.id, rt.id)
+ assert_equal(rt2.id, rt.id)
rt2 = h.execute_query(
'FIND TestRecordType WHICH HAS A TestTextProperty LIKE a*d*g',
unique=True)
- assert_equals(rt2.id, rt.id)
+ assert_equal(rt2.id, rt.id)
c = h.execute_query(
'FIND TestRecordType WHICH HAS A TestTextProperty LIKE abc')
- assert_equals(0, len(c))
+ assert_equal(0, len(c))
c = h.execute_query(
'FIND TestRecordType WHICH HAS A TestTextProperty = abc*')
- assert_equals(0, len(c))
+ assert_equal(0, len(c))
c = h.execute_query(
'FIND TestRecordType WHICH HAS A TestTextProperty = *abc*')
- assert_equals(0, len(c))
+ assert_equal(0, len(c))
c = h.execute_query(
'FIND TestRecordType WHICH HAS A TestTextProperty LIKE *f')
- assert_equals(0, len(c))
+ assert_equal(0, len(c))
def test_stored_at_wildcards():
@@ -683,7 +683,7 @@ def test_stored_at_wildcards():
file8 = store_file("rootdir/subdir1/test%8.dat")
c = h.execute_query("FIND FILE WHICH IS STORED AT /**/subdir*/*.dat")
- assert_equals(len(c), 4)
+ assert_equal(len(c), 4)
assert_is_not_none(c.get_entity_by_id(file3.id))
assert_is_not_none(c.get_entity_by_id(file4.id))
assert_is_not_none(c.get_entity_by_id(file7.id))
@@ -692,128 +692,128 @@ def test_stored_at_wildcards():
# Currently, this is implemented differently. See issue: #27 in
# caosdb-server
#c = h.execute_query("FIND FILE WHICH IS STORED AT /*.dat")
- #assert_equals(len(c), 2)
+ #assert_equal(len(c), 2)
# assert_is_not_none(c.get_entity_by_id(file1.id))
# assert_is_not_none(c.get_entity_by_id(file5.id))
c = h.execute_query("FIND FILE WHICH IS STORED AT *subdir**.dat")
- assert_equals(len(c), 4)
+ assert_equal(len(c), 4)
assert_is_not_none(c.get_entity_by_id(file3.id))
assert_is_not_none(c.get_entity_by_id(file4.id))
assert_is_not_none(c.get_entity_by_id(file7.id))
assert_is_not_none(c.get_entity_by_id(file8.id))
c = h.execute_query("FIND FILE WHICH IS STORED AT *subdir1**.dat")
- assert_equals(len(c), 4)
+ assert_equal(len(c), 4)
assert_is_not_none(c.get_entity_by_id(file3.id))
assert_is_not_none(c.get_entity_by_id(file4.id))
assert_is_not_none(c.get_entity_by_id(file7.id))
assert_is_not_none(c.get_entity_by_id(file8.id))
c = h.execute_query("FIND FILE WHICH IS STORED AT *subdir2**.dat")
- assert_equals(len(c), 1)
+ assert_equal(len(c), 1)
assert_is_not_none(c.get_entity_by_id(file4.id))
c = h.execute_query("FIND FILE WHICH IS STORED AT /rootdir/*.dat")
- assert_equals(len(c), 2)
+ assert_equal(len(c), 2)
assert_is_not_none(c.get_entity_by_id(file2.id))
assert_is_not_none(c.get_entity_by_id(file6.id))
f = h.execute_query("FIND FILE WHICH IS STORED AT test1.dat", unique=True)
- assert_equals(f.id, file1.id)
+ assert_equal(f.id, file1.id)
f = h.execute_query("FIND FILE WHICH IS STORED AT /test1.dat", unique=True)
- assert_equals(f.id, file1.id)
+ assert_equal(f.id, file1.id)
f = h.execute_query("FIND FILE WHICH IS STORED AT *test1.dat", unique=True)
- assert_equals(f.id, file1.id)
+ assert_equal(f.id, file1.id)
f = h.execute_query(
"FIND FILE WHICH IS STORED AT /*test1.dat",
unique=True)
- assert_equals(f.id, file1.id)
+ assert_equal(f.id, file1.id)
f = h.execute_query("FIND FILE WHICH IS STORED AT *1.dat", unique=True)
- assert_equals(f.id, file1.id)
+ assert_equal(f.id, file1.id)
f = h.execute_query("FIND FILE WHICH IS STORED AT /*1.dat", unique=True)
- assert_equals(f.id, file1.id)
+ assert_equal(f.id, file1.id)
f = h.execute_query(
"FIND FILE WHICH IS STORED AT **test1.dat",
unique=True)
- assert_equals(f.id, file1.id)
+ assert_equal(f.id, file1.id)
f = h.execute_query(
"FIND FILE WHICH IS STORED AT /**test1.dat",
unique=True)
- assert_equals(f.id, file1.id)
+ assert_equal(f.id, file1.id)
f = h.execute_query(
"FIND FILE WHICH IS STORED AT rootdir/test2.dat",
unique=True)
- assert_equals(f.id, file2.id)
+ assert_equal(f.id, file2.id)
f = h.execute_query(
"FIND FILE WHICH IS STORED AT /rootdir/test2.dat",
unique=True)
- assert_equals(f.id, file2.id)
+ assert_equal(f.id, file2.id)
f = h.execute_query(
"FIND FILE WHICH IS STORED AT *rootdir/test2.dat",
unique=True)
- assert_equals(f.id, file2.id)
+ assert_equal(f.id, file2.id)
f = h.execute_query(
"FIND FILE WHICH IS STORED AT /*rootdir/test2.dat",
unique=True)
- assert_equals(f.id, file2.id)
+ assert_equal(f.id, file2.id)
f = h.execute_query(
"FIND FILE WHICH IS STORED AT **rootdir/test2.dat",
unique=True)
- assert_equals(f.id, file2.id)
+ assert_equal(f.id, file2.id)
f = h.execute_query(
"FIND FILE WHICH IS STORED AT /**rootdir/test2.dat",
unique=True)
- assert_equals(f.id, file2.id)
+ assert_equal(f.id, file2.id)
f = h.execute_query(
"FIND FILE WHICH IS STORED AT *dir/test2.dat",
unique=True)
- assert_equals(f.id, file2.id)
+ assert_equal(f.id, file2.id)
f = h.execute_query(
"FIND FILE WHICH IS STORED AT /*dir/test2.dat",
unique=True)
- assert_equals(f.id, file2.id)
+ assert_equal(f.id, file2.id)
f = h.execute_query(
"FIND FILE WHICH IS STORED AT **dir/test2.dat",
unique=True)
- assert_equals(f.id, file2.id)
+ assert_equal(f.id, file2.id)
f = h.execute_query(
"FIND FILE WHICH IS STORED AT /**dir/test2.dat",
unique=True)
- assert_equals(f.id, file2.id)
+ assert_equal(f.id, file2.id)
c = h.execute_query("FIND FILE WHICH IS STORED AT *.dat")
- assert_equals(len(c), 8)
+ assert_equal(len(c), 8)
c = h.execute_query("FIND FILE WHICH IS STORED AT *test*.dat")
- assert_equals(len(c), 8)
+ assert_equal(len(c), 8)
c = h.execute_query("FIND FILE WHICH IS STORED AT *test%*.dat")
- assert_equals(len(c), 2)
+ assert_equal(len(c), 2)
assert_is_not_none(c.get_entity_by_id(file7.id))
assert_is_not_none(c.get_entity_by_id(file8.id))
f = h.execute_query(
r"FIND FILE WHICH IS STORED AT *test\**.dat",
unique=True)
- assert_equals(f.id, file6.id)
+ assert_equal(f.id, file6.id)
@with_setup(setup, teardown)
@@ -849,15 +849,15 @@ def test_int():
"FIND TestRecordType WITH TestIntegerProperty<200",
unique=True)
- assert_equals(0, len(h.execute_query(
+ assert_equal(0, len(h.execute_query(
"FIND TestRecordType WITH TestIntegerProperty>200")))
- assert_equals(0, len(h.execute_query(
+ assert_equal(0, len(h.execute_query(
"FIND TestRecordType WITH TestIntegerProperty>=200")))
- assert_equals(0, len(h.execute_query(
+ assert_equal(0, len(h.execute_query(
"FIND TestRecordType WITH TestIntegerProperty=200")))
- assert_equals(0, len(h.execute_query(
+ assert_equal(0, len(h.execute_query(
"FIND TestRecordType WITH TestIntegerProperty<50")))
- assert_equals(0, len(h.execute_query(
+ assert_equal(0, len(h.execute_query(
"FIND TestRecordType WITH TestIntegerProperty<=50")))
h.execute_query("FIND TestRecordType WITH TestDoubleProperty", unique=True)
@@ -883,15 +883,15 @@ def test_int():
"FIND TestRecordType WITH TestDoubleProperty<200",
unique=True)
- assert_equals(0, len(h.execute_query(
+ assert_equal(0, len(h.execute_query(
"FIND TestRecordType WITH TestDoubleProperty>200")))
- assert_equals(0, len(h.execute_query(
+ assert_equal(0, len(h.execute_query(
"FIND TestRecordType WITH TestDoubleProperty>=200")))
- assert_equals(0, len(h.execute_query(
+ assert_equal(0, len(h.execute_query(
"FIND TestRecordType WITH TestDoubleProperty=200")))
- assert_equals(0, len(h.execute_query(
+ assert_equal(0, len(h.execute_query(
"FIND TestRecordType WITH TestDoubleProperty<50")))
- assert_equals(0, len(h.execute_query(
+ assert_equal(0, len(h.execute_query(
"FIND TestRecordType WITH TestDoubleProperty<=50")))
@@ -907,8 +907,8 @@ def test_query_benchmark():
print(body)
xml = etree.fromstring(body)
# see #4
- #assert_equals(3, len(xml))
- #assert_equals("query", xml[0].tag.lower())
- #assert_equals("transactionbenchmark", xml[0][3].tag.lower())
+ #assert_equal(3, len(xml))
+ #assert_equal("query", xml[0].tag.lower())
+ #assert_equal("transactionbenchmark", xml[0][3].tag.lower())
#benchmark = xml[0][3]
#assert_true(len(benchmark) > 0)
diff --git a/tests/test_query_template.py b/tests/test_query_template.py
index cab6237..7af29bc 100644
--- a/tests/test_query_template.py
+++ b/tests/test_query_template.py
@@ -26,7 +26,7 @@
@author: tf
"""
import caosdb as db
-from nose.tools import with_setup, assert_true, assert_is_none, assert_equals, assert_is_not_none, nottest, assert_raises # @UnresolvedImport
+from nose.tools import with_setup, assert_true, assert_is_none, assert_equal, assert_is_not_none, nottest, assert_raises # @UnresolvedImport
def setup_module():
@@ -110,7 +110,7 @@ def test_insertion_failure_syntax():
with assert_raises(db.TransactionError) as cm:
q.insert()
print(cm.exception)
- assert_equals(
+ assert_equal(
cm.exception.msg,
"An error occured during the parsing of this query. Maybe you use a wrong syntax?")
@@ -123,7 +123,7 @@ def test_insertion_failure_count_query_not_allowed():
query="COUNT something")
with assert_raises(db.TransactionError) as cm:
q.insert()
- assert_equals(
+ assert_equal(
cm.exception.msg,
"QueryTemplates may not be defined by 'COUNT...' queries for consistency reasons.")
@@ -137,7 +137,7 @@ def test_insertion_failure_select_query_not_allowed():
query=query_def)
with assert_raises(db.TransactionError) as cm:
q.insert()
- assert_equals(
+ assert_equal(
cm.exception.msg,
"QueryTemplates may not be defined by 'SELECT... FROM...' queries for consistency reasons.")
@@ -154,7 +154,7 @@ def test_deletion_failure_non_existing():
q = db.QueryTemplate(id="12342")
with assert_raises(db.TransactionError) as cm:
q.delete()
- assert_equals(cm.exception.msg, "Entity does not exist.")
+ assert_equal(cm.exception.msg, "Entity does not exist.")
@with_setup(setup, teardown)
@@ -163,7 +163,7 @@ def test_retrieve_success():
q = db.QueryTemplate(name="TestQueryTemplate").retrieve(sync=False)
assert_true(q.is_valid())
assert_is_not_none(q.query)
- assert_equals(q.query, "FIND RECORD Experiment WHICH HAS A animal=Pig")
+ assert_equal(q.query, "FIND RECORD Experiment WHICH HAS A animal=Pig")
@with_setup(setup, teardown)
@@ -171,7 +171,7 @@ def test_retrieve_failure_non_existing():
q = db.QueryTemplate(id="12342")
with assert_raises(db.TransactionError) as cm:
q.retrieve()
- assert_equals(cm.exception.msg, "Entity does not exist.")
+ assert_equal(cm.exception.msg, "Entity does not exist.")
@with_setup(setup, teardown)
@@ -187,7 +187,7 @@ def test_update_failure_syntax():
q.query = "ashdjfkasjdf"
with assert_raises(db.TransactionError) as cm:
q.update()
- assert_equals(
+ assert_equal(
cm.exception.msg,
"An error occured during the parsing of this query. Maybe you use a wrong syntax?")
@@ -198,7 +198,7 @@ def test_update_failure_count_query_not_allowed():
q.query = "COUNT somethingNew"
with assert_raises(db.TransactionError) as cm:
q.update()
- assert_equals(
+ assert_equal(
cm.exception.msg,
"QueryTemplates may not be defined by 'COUNT...' queries for consistency reasons.")
@@ -209,7 +209,7 @@ def test_update_failure_select_query_not_allowed():
q.query = "SELECT TestAnimal FROM TestExperiment WHICH HAS A TestAnimal = Pig"
with assert_raises(db.TransactionError) as cm:
q.update()
- assert_equals(
+ assert_equal(
cm.exception.msg,
"QueryTemplates may not be defined by 'SELECT... FROM...' queries for consistency reasons.")
@@ -220,34 +220,34 @@ def test_update_failure_non_existing():
q.query = "FIND NewStuff"
with assert_raises(db.TransactionError) as cm:
q.update()
- assert_equals(cm.exception.msg, "Entity does not exist.")
+ assert_equal(cm.exception.msg, "Entity does not exist.")
@with_setup(setup, teardown)
def test_retrieve_as_entity_success():
q = test_insertion_success()
e = db.Entity(id=q.id).retrieve()
- assert_equals(e.id, q.id)
+ assert_equal(e.id, q.id)
@with_setup(setup, teardown)
def test_query_simple_find():
query_def = "FIND TestExperiment WHICH HAS A TestAnimal = Pig"
r = db.execute_query(query_def, unique=True)
- assert_equals(r.name, "TestRecord")
- assert_equals(len(r.get_properties()), 3)
+ assert_equal(r.name, "TestRecord")
+ assert_equal(len(r.get_properties()), 3)
db.QueryTemplate(name="TestPigExperiment", query=query_def).insert()
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND QUERYTEMPLATE TestPigExperiment",
unique=True).name,
"TestPigExperiment")
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND QUERYTEMPLATE",
unique=True).name,
"TestPigExperiment")
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestPigExperiment",
unique=True).name,
@@ -258,20 +258,20 @@ def test_query_simple_find():
def test_query_with_select_in_outer_query():
query_def = "FIND TestExperiment WHICH HAS A TestAnimal = Pig"
r = db.execute_query(query_def, unique=True)
- assert_equals(r.name, "TestRecord")
- assert_equals(len(r.get_properties()), 3)
+ assert_equal(r.name, "TestRecord")
+ assert_equal(len(r.get_properties()), 3)
db.QueryTemplate(name="TestPigExperiment", query=query_def).insert()
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND QUERYTEMPLATE TestPigExperiment",
unique=True).name,
"TestPigExperiment")
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND QUERYTEMPLATE",
unique=True).name,
"TestPigExperiment")
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestPigExperiment",
unique=True).name,
@@ -279,8 +279,8 @@ def test_query_with_select_in_outer_query():
r = db.execute_query(
"SELECT TestAnimal FROM TestPigExperiment",
unique=True)
- assert_equals(r.name, "TestRecord")
- assert_equals(len(r.get_properties()), 1)
+ assert_equal(r.name, "TestRecord")
+ assert_equal(len(r.get_properties()), 1)
@with_setup(setup, teardown)
@@ -289,12 +289,12 @@ def test_query_with_other_filters():
db.QueryTemplate(name="TestAnimalExperiment", query=query_def).insert()
r = db.execute_query("FIND TestAnimalExperiment")
- assert_equals(len(r), 2)
+ assert_equal(len(r), 2)
r = db.execute_query(
"FIND TestAnimalExperiment WHICH HAS A TestAnimal=Pig",
unique=True)
- assert_equals(r.name, "TestRecord")
+ assert_equal(r.name, "TestRecord")
@with_setup(setup, teardown)
@@ -303,12 +303,12 @@ def test_query_simple_find_with_wildcard():
db.QueryTemplate(name="TestAnimalExperiment", query=query_def).insert()
r = db.execute_query("FIND TestAnimal*")
- assert_equals(len(r), 2)
+ assert_equal(len(r), 2)
r = db.execute_query(
"FIND TestAnimal* WHICH HAS A TestAnimal=Pig",
unique=True)
- assert_equals(r.name, "TestRecord")
+ assert_equal(r.name, "TestRecord")
@with_setup(setup, teardown)
@@ -317,9 +317,9 @@ def test_query_select_from_with_wildcard():
db.QueryTemplate(name="TestAnimalExperiment", query=query_def).insert()
r = db.execute_query("SELECT TestAnimal FROM TestAnimal*")
- assert_equals(len(r), 2)
- assert_equals(len(r.get_entity_by_name("TestRecord").get_properties()), 1)
- assert_equals(len(r.get_entity_by_name("TestAnimal").get_properties()), 0)
+ assert_equal(len(r), 2)
+ assert_equal(len(r.get_entity_by_name("TestRecord").get_properties()), 1)
+ assert_equal(len(r.get_entity_by_name("TestAnimal").get_properties()), 0)
@with_setup(setup, teardown)
@@ -333,9 +333,9 @@ def test_query_without_permission():
db.configure_connection(username="test_user", password="secret_1q!Q")
r = db.execute_query(query_def, unique=True)
- assert_equals(r.name, "TestRecord")
+ assert_equal(r.name, "TestRecord")
r = db.execute_query("FIND TestPigExperiment", unique=True)
- assert_equals(r.name, "TestRecord")
+ assert_equal(r.name, "TestRecord")
db.get_connection()._logout()
db.configure_connection()
@@ -350,23 +350,23 @@ def test_query_without_permission():
db.configure_connection(username="test_user", password="secret_1q!Q")
r = db.execute_query(query_def, unique=True)
- assert_equals(r.name, "TestRecord")
+ assert_equal(r.name, "TestRecord")
r = db.execute_query("FIND TestPigExperiment")
- assert_equals(len(r), 0)
+ assert_equal(len(r), 0)
@with_setup(setup, teardown)
def test_query_with_subquery_referenced_by():
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestPerson WHICH IS REFERENCED BY A TestExperiment AS A TestConductor",
unique=True).name,
"TestJohnDoe")
query_def = "FIND TestExperiment WHICH HAS A TestAnimal=Pig"
- assert_equals(db.execute_query(query_def, unique=True).name, "TestRecord")
+ assert_equal(db.execute_query(query_def, unique=True).name, "TestRecord")
db.QueryTemplate(name="TestPigExperiment", query=query_def).insert()
- assert_equals(
+ assert_equal(
db.execute_query(
"FIND TestPigExperiment",
unique=True).name,
diff --git a/tests/test_records.py b/tests/test_records.py
index 823e251..851090e 100644
--- a/tests/test_records.py
+++ b/tests/test_records.py
@@ -23,7 +23,7 @@
#
from random import randint
from sys import maxsize as maxint
-from nose.tools import nottest, assert_is_not_none, assert_equals, assert_true, assert_false
+from nose.tools import nottest, assert_is_not_none, assert_equal, assert_true, assert_false
from caosdb import Record
from caosdb.exceptions import CaosDBException
import caosdb
@@ -71,7 +71,7 @@ def test_records():
rec_id = rec.id
rec2 = caosdb.Record(name=rname)
rec2.retrieve()
- assert_equals(rec_id, rec2.id)
+ assert_equal(rec_id, rec2.id)
''' assign value '''
rec2.get_properties().get_by_name(pname).value = 2.5
@@ -152,7 +152,7 @@ def test_property_doublette1():
assert_is_not_none(rec.id)
assert_true(rec.is_valid())
- assert_equals(3, len(rec.get_properties()))
+ assert_equal(3, len(rec.get_properties()))
found = {"instance1": False, "instance2": False, "empty": False}
for p in rec.get_properties():
print(p.value)
@@ -168,7 +168,7 @@ def test_property_doublette1():
assert_is_not_none(rec2.id)
assert_true(rec2.is_valid())
- assert_equals(3, len(rec2.get_properties()))
+ assert_equal(3, len(rec2.get_properties()))
found = {"instance1": False, "instance2": False, "empty": False}
for p in rec2.get_properties():
print(p.value)
@@ -231,7 +231,7 @@ def test_property_doublette2():
assert_is_not_none(rec.id)
assert_true(rec.is_valid())
- assert_equals(3, len(rec.get_properties()))
+ assert_equal(3, len(rec.get_properties()))
found = {"instance1": False, "empty": False}
for p in rec.get_properties():
print(p.value)
@@ -247,7 +247,7 @@ def test_property_doublette2():
assert_is_not_none(rec2.id)
assert_true(rec2.is_valid())
- assert_equals(3, len(rec2.get_properties()))
+ assert_equal(3, len(rec2.get_properties()))
found = {"instance1": False, "empty": False}
for p in rec2.get_properties():
print(p.value)
@@ -321,7 +321,7 @@ def test_property_doublette3():
assert_is_not_none(rec.id)
assert_true(rec.is_valid())
- assert_equals(3, len(rec.get_properties()))
+ assert_equal(3, len(rec.get_properties()))
found = 0
for p in rec.get_properties():
print(p)
@@ -330,20 +330,20 @@ def test_property_doublette3():
print(p)
print(subp)
found += 1
- assert_equals(1, found)
+ assert_equal(1, found)
rec2 = caosdb.Record(id=rec.id).retrieve()
assert_is_not_none(rec2.id)
assert_true(rec2.is_valid())
- assert_equals(3, len(rec2.get_properties()))
+ assert_equal(3, len(rec2.get_properties()))
found = 0
for p in rec2.get_properties():
for subp in p.get_properties():
print(subp)
found += 1
- assert_equals(1, found)
+ assert_equal(1, found)
finally:
try:
@@ -412,19 +412,19 @@ def test_property_doublette4():
assert_is_not_none(rec.id)
assert_true(rec.is_valid())
- assert_equals(3, len(rec.get_properties()))
+ assert_equal(3, len(rec.get_properties()))
found = {"instance1": False, "instance2": False, "empty": False}
for p in rec.get_properties():
if p.value == "instance1":
found["instance1"] = True
- assert_equals(1, len(p.get_properties()))
- assert_equals("subinstance1", p.get_properties()[0].value)
+ assert_equal(1, len(p.get_properties()))
+ assert_equal("subinstance1", p.get_properties()[0].value)
elif p.value == "instance2":
found["instance2"] = True
- assert_equals(0, len(p.get_properties()))
+ assert_equal(0, len(p.get_properties()))
else:
found["empty"] = True
- assert_equals(0, len(p.get_properties()))
+ assert_equal(0, len(p.get_properties()))
for v in found.items():
print(v)
assert_true(v[1])
@@ -433,19 +433,19 @@ def test_property_doublette4():
assert_is_not_none(rec2.id)
assert_true(rec2.is_valid())
- assert_equals(3, len(rec2.get_properties()))
+ assert_equal(3, len(rec2.get_properties()))
found = {"instance1": False, "instance2": False, "empty": False}
for p in rec2.get_properties():
if p.value == "instance1":
found["instance1"] = True
- assert_equals(1, len(p.get_properties()))
- assert_equals("subinstance1", p.get_properties()[0].value)
+ assert_equal(1, len(p.get_properties()))
+ assert_equal("subinstance1", p.get_properties()[0].value)
elif p.value == "instance2":
found["instance2"] = True
- assert_equals(0, len(p.get_properties()))
+ assert_equal(0, len(p.get_properties()))
else:
found["empty"] = True
- assert_equals(0, len(p.get_properties()))
+ assert_equal(0, len(p.get_properties()))
for v in found.items():
print(v)
assert_true(v[1])
diff --git a/tests/test_recordtypes.py b/tests/test_recordtypes.py
index ffae42b..67c5b5a 100644
--- a/tests/test_recordtypes.py
+++ b/tests/test_recordtypes.py
@@ -99,7 +99,7 @@ def test_recordtypes():
def test_record_types_as_reference_properties():
- from nose.tools import assert_is_not_none, assert_true, assert_equals # @UnresolvedImport
+ from nose.tools import assert_is_not_none, assert_true, assert_equal # @UnresolvedImport
try:
"""recordtype without any property."""
@@ -125,7 +125,7 @@ def test_record_types_as_reference_properties():
assert_is_not_none(
recty2.get_properties().get_by_name(
recty1.name).datatype)
- assert_equals(
+ assert_equal(
recty1.name.lower(), str(
recty2.get_properties().get_by_name(
recty1.name).datatype).lower())
diff --git a/tests/test_select.py b/tests/test_select.py
index 4922073..748b85d 100644
--- a/tests/test_select.py
+++ b/tests/test_select.py
@@ -28,7 +28,7 @@
import caosdb as h
# @UnresolvedImport
-from nose.tools import assert_true, assert_equals, assert_is_not_none, assert_is_none
+from nose.tools import assert_true, assert_equal, assert_is_not_none, assert_is_none
def setup_module():
@@ -63,7 +63,7 @@ def test_id1():
p1_c = h.execute_query("SELECT id FROM TestPropertyOne", unique=True)
assert_true(p1_c.is_valid())
- assert_equals(p1_c.id, p1.id)
+ assert_equal(p1_c.id, p1.id)
assert_is_none(p1_c.name)
assert_is_none(p1_c.datatype)
assert_is_none(p1_c.description)
@@ -78,7 +78,7 @@ def test_id2():
p2_c = h.execute_query("SELECT id FROM TestPropertyTwo", unique=True)
assert_true(p2_c.is_valid())
- assert_equals(p2_c.id, p2.id)
+ assert_equal(p2_c.id, p2.id)
assert_is_none(p2_c.name)
assert_is_none(p2_c.datatype)
assert_is_none(p2_c.description)
@@ -86,21 +86,21 @@ def test_id2():
def test_id3():
p3s = h.execute_query("SELECT description FROM TestProperty*")
- assert_equals(len(p3s), 2)
+ assert_equal(len(p3s), 2)
for e in p3s:
assert_is_not_none(e.id)
def test_name1():
p3s = h.execute_query("SELECT description FROM TestProperty*")
- assert_equals(len(p3s), 2)
+ assert_equal(len(p3s), 2)
for e in p3s:
assert_is_not_none(e.name)
def test_name2():
p3s = h.execute_query("SELECT name FROM TestProperty*")
- assert_equals(len(p3s), 2)
+ assert_equal(len(p3s), 2)
for e in p3s:
assert_is_not_none(e.name)
assert_is_none(e.description)
@@ -111,15 +111,15 @@ def test_multi1():
"SELECT id, name, description FROM TestPropertyOne",
unique=True)
assert_is_not_none(p1.id)
- assert_equals(p1.name, "TestPropertyOne")
+ assert_equal(p1.name, "TestPropertyOne")
assert_is_none(p1.description)
p2 = h.execute_query(
"SELECT id, name, description FROM TestPropertyTwo",
unique=True)
assert_is_not_none(p2.id)
- assert_equals(p2.name, "TestPropertyTwo")
- assert_equals(p2.description, "Desc2")
+ assert_equal(p2.name, "TestPropertyTwo")
+ assert_equal(p2.description, "Desc2")
def test_sub1():
@@ -143,5 +143,5 @@ def test_sub2():
assert_is_not_none(rt.id)
assert_is_not_none(rt.name)
assert_is_not_none(rt.get_property("TestPropertyTwo"))
- assert_equals(rt.get_property("TestPropertyTwo").description, "Desc2")
+ assert_equal(rt.get_property("TestPropertyTwo").description, "Desc2")
assert_is_none(rt.get_property("TestPropertyTwo").datatype)
diff --git a/tests/test_tenpoints.py b/tests/test_tenpoints.py
index a2156bf..f9c3aab 100644
--- a/tests/test_tenpoints.py
+++ b/tests/test_tenpoints.py
@@ -25,7 +25,7 @@
@author: fitschen
"""
-from nose.tools import assert_equals, assert_is_not_none, assert_true # @UnresolvedImport
+from nose.tools import assert_equal, assert_is_not_none, assert_true # @UnresolvedImport
import caosdb as h
import os
from caosdb.exceptions import CaosDBException
@@ -457,7 +457,7 @@ def test_tenpoints2_1AND2_2():
assert_true(fr.is_valid())
assert_is_not_none(fr.id)
- assert_equals(int(fp.value), fr.id)
+ assert_equal(int(fp.value), fr.id)
print(d)
finally:
try:
@@ -501,7 +501,7 @@ def test_tenpoints2_3():
'''subtyping with unit inheritance'''
p2 = h.Property(name='SubTypeOfUnitTestProperty').add_parent(id=p1.id)
p2.insert()
- assert_equals('m', p2.unit)
+ assert_equal('m', p2.unit)
'''implement property'''
rt = h.RecordType(
@@ -513,9 +513,9 @@ def test_tenpoints2_3():
rtid = rt.id
rt = h.RecordType(id=rtid).retrieve()
print(rt)
- assert_equals(p2.id, rt.get_properties()[0].id)
+ assert_equal(p2.id, rt.get_properties()[0].id)
- assert_equals('m', rt.get_properties()[0].unit)
+ assert_equal('m', rt.get_properties()[0].unit)
finally:
try:
rt.delete()
diff --git a/tests/test_tickets.py b/tests/test_tickets.py
index 3e0cd72..a77053f 100644
--- a/tests/test_tickets.py
+++ b/tests/test_tickets.py
@@ -32,7 +32,7 @@ from caosdb.exceptions import (AmbiguityException, CaosDBException,
EntityDoesNotExistError, EntityError,
TransactionError, UniqueNamesError)
from nose import with_setup
-from nose.tools import (assert_equals, assert_false, assert_is_none,
+from nose.tools import (assert_equal, assert_false, assert_is_none,
assert_is_not_none, assert_raises, assert_true,
nottest)
@@ -89,7 +89,7 @@ def test_ticket_103a():
assert_true(False, "This should have raised an 128-Error (strict)")
except TransactionError as exc:
print(exc)
- assert_equals(128, int(exc.get_code()))
+ assert_equal(128, int(exc.get_code()))
rt = exc.get_entities()[0]
assert_false(rt.is_valid())
@@ -194,7 +194,7 @@ def test_ticket_102():
except CaosDBException as e:
assert_true(isinstance(e, EntityDoesNotExistError))
assert_is_not_none(e.get_entity())
- assert_equals(e.get_entity().name, p.name)
+ assert_equal(e.get_entity().name, p.name)
assert_true(e.get_entity().has_errors())
assert_false(p.has_errors())
assert_false(p.is_valid())
@@ -206,19 +206,19 @@ def test_ticket_101():
rec = db.Record("some_name")
assert_is_not_none(rec.name)
- assert_equals("some_name", rec.name)
+ assert_equal("some_name", rec.name)
assert_is_none(rec.id)
rt = db.RecordType("some_name")
assert_is_not_none(rt.name)
- assert_equals("some_name", rt.name)
+ assert_equal("some_name", rt.name)
assert_is_none(rt.id)
p = db.Property("some_name")
assert_is_not_none(p.name)
- assert_equals("some_name", p.name)
+ assert_equal("some_name", p.name)
assert_is_none(p.id)
f = db.File("some_name")
assert_is_not_none(f.name)
- assert_equals("some_name", f.name)
+ assert_equal("some_name", f.name)
assert_is_none(f.id)
@@ -244,7 +244,7 @@ def test_ticket_96():
c = db.Container().append(
db.RecordType(name="a_b")).retrieve(unique=False)
- assert_equals(len(c), 2)
+ assert_equal(len(c), 2)
try:
c = db.Container().append(
@@ -310,7 +310,7 @@ def test_ticket_120():
cp = db.Query("FIND PROPERTY SimpleDoubleProperty").execute(
unique=True)
- assert_equals(p.id, cp.id)
+ assert_equal(p.id, cp.id)
crt123 = db.Query("FIND RECORDTYPE SimpleRT1").execute(unique=False)
assert_true(crt123.get_entity_by_id(rt1.id).is_valid())
@@ -319,22 +319,22 @@ def test_ticket_120():
cr1 = db.Query("FIND RECORD . SimpleDoubleProperty='3.14'").execute(
unique=True)
- assert_equals(r1.id, cr1.id)
+ assert_equal(r1.id, cr1.id)
cr23 = db.Query("FIND RECORD . SimpleRT1").execute(unique=False)
assert_true(cr23.get_entity_by_id(r2.id).is_valid())
assert_true(cr23.get_entity_by_id(r3.id).is_valid())
cr3 = db.Query("FIND RECORD . SimpleRT2").execute(unique=True)
- assert_equals(r3.id, cr3.id)
+ assert_equal(r3.id, cr3.id)
cr2 = db.Query("FIND RECORD . SimpleRT1->" + str(r1.id)).execute(
unique=True)
- assert_equals(r2.id, cr2.id)
+ assert_equal(r2.id, cr2.id)
cr3 = db.Query("FIND RECORD . SimpleRT1->" + str(r2.id)).execute(
unique=True)
- assert_equals(r3.id, cr3.id)
+ assert_equal(r3.id, cr3.id)
cr3 = db.Query(
"FIND RECORD WHICH HAS A PROPERTY blabla=4 OR SimpleRT1->SimpleRT2"
@@ -343,23 +343,23 @@ def test_ticket_120():
r1.id) +
"").execute(
unique=True)
- assert_equals(r3.id, cr3.id)
+ assert_equal(r3.id, cr3.id)
cr3 = db.Query(
"FIND SimpleRT1 . SimpleRT1.SimpleRT1.SimpleDoubleProperty='3.14'"
).execute(unique=True)
- assert_equals(r3.id, cr3.id)
+ assert_equal(r3.id, cr3.id)
cr3 = db.Query(
"FIND RECORD SimpleRT1 . "
"SimpleRT1.SimpleRT1.SimpleDoubleProperty='3.14'"
).execute(unique=True)
- assert_equals(r3.id, cr3.id)
+ assert_equal(r3.id, cr3.id)
cr3 = db.Query(
"FIND RECORD . SimpleRT1.SimpleRT1.SimpleDoubleProperty='3.14'"
).execute(unique=True)
- assert_equals(r3.id, cr3.id)
+ assert_equal(r3.id, cr3.id)
finally:
r3.delete()
r2.delete()
@@ -400,7 +400,7 @@ def test_ticket_117():
# retrieve it
r = db.RecordType(id=id_rt1).retrieve()
assert_true(r.is_valid())
- assert_equals(id_rt1, r.id)
+ assert_equal(id_rt1, r.id)
# create property
p.insert()
@@ -412,13 +412,13 @@ def test_ticket_117():
r.update()
assert_is_not_none(r.name)
- assert_equals('TestRT1update', r.name)
+ assert_equal('TestRT1update', r.name)
assert_true(r.is_valid())
assert_is_not_none(r.get_properties())
assert_is_not_none(r.get_properties().get_by_name('TestwaveVelocity'))
assert_is_not_none(
r.get_properties().get_by_name('TestwaveVelocity').datatype)
- assert_equals(
+ assert_equal(
str("DOUBLE").lower(),
r.get_properties().get_by_name('TestwaveVelocity').datatype.lower())
@@ -506,30 +506,30 @@ def test_ticket_83():
assert_true(crt2.is_valid())
c = db.Container().extend([crt1, crt2]).retrieve()
- assert_equals(2, len(c))
+ assert_equal(2, len(c))
def test_ticket_139():
rt1 = db.RecordType(name="TestRT1").insert()
assert_true(rt1.is_valid())
- assert_equals("TestRT1", rt1.name)
- assert_equals(1, len(db.execute_query("FIND TestRT1")))
+ assert_equal("TestRT1", rt1.name)
+ assert_equal(1, len(db.execute_query("FIND TestRT1")))
rt1.delete()
assert_false(rt1.is_valid())
- assert_equals(0, len(db.execute_query("FIND TestRT1")))
+ assert_equal(0, len(db.execute_query("FIND TestRT1")))
rt1.insert()
assert_true(rt1.is_valid())
- assert_equals("TestRT1", rt1.name)
- assert_equals(1, len(db.execute_query("FIND TestRT1")))
+ assert_equal("TestRT1", rt1.name)
+ assert_equal(1, len(db.execute_query("FIND TestRT1")))
rt1.delete()
assert_false(rt1.is_valid())
- assert_equals(0, len(db.execute_query("FIND TestRT1")))
+ assert_equal(0, len(db.execute_query("FIND TestRT1")))
- assert_equals("TestRT1", rt1.name)
+ assert_equal("TestRT1", rt1.name)
def test_ticket_138():
@@ -539,19 +539,19 @@ def test_ticket_138():
rt_person_x.add_property(rt_person)
rt_person_x.insert()
- assert_equals(1, len(rt_person_x.get_properties()))
+ assert_equal(1, len(rt_person_x.get_properties()))
rt_person_x.delete()
- assert_equals(1, len(rt_person_x.get_properties()))
+ assert_equal(1, len(rt_person_x.get_properties()))
rt_person_x.insert()
- assert_equals(1, len(rt_person_x.get_properties()))
+ assert_equal(1, len(rt_person_x.get_properties()))
rt_person_x.delete()
- assert_equals(1, len(rt_person_x.get_properties()))
+ assert_equal(1, len(rt_person_x.get_properties()))
rt_person_x.insert()
- assert_equals(1, len(rt_person_x.get_properties()))
+ assert_equal(1, len(rt_person_x.get_properties()))
finally:
if len(db.execute_query("FIND Person_x")) > 0:
@@ -567,11 +567,11 @@ def test_ticket_137():
crt1 = db.execute_query("FIND TestRT1", unique=True)
assert_true(crt1.is_valid())
- assert_equals(rt1.id, crt1.id)
+ assert_equal(rt1.id, crt1.id)
crt1.delete()
assert_false(crt1.is_valid())
- assert_equals(0, len(db.execute_query("FIND TestRT1")))
+ assert_equal(0, len(db.execute_query("FIND TestRT1")))
try:
rt1.insert()
@@ -625,7 +625,7 @@ def test_ticket_39():
f = db.File(
path="testfiles/file1", from_location=testfile).insert()
except EntityError as e:
- assert_equals(
+ assert_equal(
"Insufficient read permission for this file. "
"Please make it readable.",
e.msg)
@@ -646,7 +646,7 @@ def test_ticket_128():
try:
db.execute_query(r"FIND 5\#):xw;;-`;BY6~PjsI^*g.$+eY#n.aA9zm")
except TransactionError as e:
- assert_equals(13, int(e.get_error().code))
+ assert_equal(13, int(e.get_error().code))
def test_ticket_123a():
@@ -656,27 +656,27 @@ def test_ticket_123a():
name="SimpleDoubleProperty", datatype="Double").insert()
assert_true(p.is_valid())
- assert_equals(p.id,
+ assert_equal(p.id,
db.execute_query(
"FIND SimpleDoubleProperty", unique=True).id)
- assert_equals(p.id,
+ assert_equal(p.id,
db.execute_query("FIND SimpleDouble*", unique=True).id)
- assert_equals(p.id,
+ assert_equal(p.id,
db.execute_query("FIND SimpleD*Property",
unique=True).id)
- assert_equals(p.id,
+ assert_equal(p.id,
db.execute_query("FIND *leDoubleProperty",
unique=True).id)
- assert_equals(p.id,
+ assert_equal(p.id,
db.execute_query(
"FIND SimpleDoubleProperty*", unique=True).id)
- assert_equals(p.id,
+ assert_equal(p.id,
db.execute_query(
"FIND SimpleDouble*Property", unique=True).id)
- assert_equals(p.id,
+ assert_equal(p.id,
db.execute_query(
"FIND *Simpl*eDoublePr*operty", unique=True).id)
- assert_equals(p.id,
+ assert_equal(p.id,
db.execute_query("FIND *Simp*oubl*oper*",
unique=True).id)
finally:
@@ -690,28 +690,28 @@ def test_ticket_123():
name="SimpleDoubleProperty", datatype="Double").insert()
assert_true(p.is_valid())
- assert_equals(p.id,
+ assert_equal(p.id,
db.execute_query(
"FIND <<SimpleDoubleProperty>>", unique=True).id)
- assert_equals(p.id,
+ assert_equal(p.id,
db.execute_query("FIND <<SimpleDouble>>",
unique=True).id)
- assert_equals(p.id,
+ assert_equal(p.id,
db.execute_query(
"FIND <<SimpleD.*Property>>", unique=True).id)
- assert_equals(p.id,
+ assert_equal(p.id,
db.execute_query(
"FIND <<leDoubleProperty>>", unique=True).id)
- assert_equals(p.id,
+ assert_equal(p.id,
db.execute_query(
"FIND <<SimpleDoubleProperty>>", unique=True).id)
- assert_equals(p.id,
+ assert_equal(p.id,
db.execute_query(
"FIND <<SimpleDoubleProperty>>", unique=True).id)
- assert_equals(p.id,
+ assert_equal(p.id,
db.execute_query(
"FIND <<SimpleDoubleProperty>>", unique=True).id)
- assert_equals(p.id,
+ assert_equal(p.id,
db.execute_query(
"FIND <<Simp[asdfgjkle]eDoubl.*oper>>",
unique=True).id)
@@ -733,43 +733,43 @@ def test_ticket_143():
assert_true(r2.is_valid())
s = db.execute_query("FIND SimpleRecordType")
- assert_equals(3, len(s))
+ assert_equal(3, len(s))
assert_true(s.is_valid())
s = db.execute_query("FIND RECORD SimpleRecordType")
- assert_equals(2, len(s))
+ assert_equal(2, len(s))
assert_true(s.is_valid())
s = db.execute_query("FIND SimpleRecordType WITH SimpleDoubleProperty")
- assert_equals(3, len(s))
+ assert_equal(3, len(s))
assert_true(s.is_valid())
s = db.execute_query(
"FIND RECORD SimpleRecordType WITH SimpleDoubleProperty")
- assert_equals(2, len(s))
+ assert_equal(2, len(s))
assert_true(s.is_valid())
s = db.execute_query(
"FIND SimpleRecordType WITH SimpleDoubleProperty>0")
- assert_equals(2, len(s))
+ assert_equal(2, len(s))
assert_true(s.is_valid())
s = db.execute_query(
"FIND SimpleRecordType WITH THE GREATEST SimpleDoubleProperty>0")
- assert_equals(1, len(s))
+ assert_equal(1, len(s))
assert_true(s.is_valid())
- assert_equals(
+ assert_equal(
r2.id,
db.execute_query(
"FIND SimpleRecordType WITH THE GREATEST SimpleDoubleProperty>0",
unique=True).id)
- assert_equals(
+ assert_equal(
r2.id,
db.execute_query(
"FIND SimpleRecordType WITH THE GREATEST SimpleDoubleProperty",
unique=True).id)
- assert_equals(
+ assert_equal(
r1.id,
db.execute_query(
"FIND SimpleRecordType WITH THE SMALLEST SimpleDoubleProperty",
@@ -849,106 +849,106 @@ def test_ticket_147():
'''
s = db.execute_query("FIND ticket147*")
assert_true(s.is_valid())
- assert_equals(14, len(s))
+ assert_equal(14, len(s))
s = db.execute_query("FIND ticket147_Bar*")
assert_true(s.is_valid())
- assert_equals(6, len(s))
+ assert_equal(6, len(s))
s = db.execute_query("FIND RECORD ticket147_Bar*")
assert_true(s.is_valid())
- assert_equals(5, len(s))
+ assert_equal(5, len(s))
s = db.execute_query("FIND ticket147_Fre*")
assert_true(s.is_valid())
- assert_equals(6, len(s))
+ assert_equal(6, len(s))
s = db.execute_query("FIND RECORD ticket147_Fre*")
assert_true(s.is_valid())
- assert_equals(5, len(s))
+ assert_equal(5, len(s))
s = db.execute_query("FIND ticket147_Fre* WHICH HAS A PROPERTY ticket147_ObstacleRadius=2.0")
assert_true(s.is_valid())
- assert_equals(2, len(s))
+ assert_equal(2, len(s))
s = db.execute_query("FIND ticket147_Fre* WHICH HAS A PROPERTY ticket147_ObstacleRadius='2.0'")
assert_true(s.is_valid())
- assert_equals(2, len(s))
+ assert_equal(2, len(s))
s = db.execute_query("FIND ticket147_Fre* WHICH HAS A PROPERTY ticket147_BarkleyModelSimulation")
assert_true(s.is_valid())
- assert_equals(6, len(s))
+ assert_equal(6, len(s))
s = db.execute_query("FIND Record ticket147_Fre* WHICH HAS A PROPERTY ticket147_BarkleyModelSimulation")
assert_true(s.is_valid())
- assert_equals(5, len(s))'''
+ assert_equal(5, len(s))'''
s = db.execute_query(
"FIND Record ticket147_Fre* WHICH HAS A PROPERTY ticket147_BarkleyModelSimulation WHICH HAS A ticket147_TimeStep"
)
assert_true(s.is_valid())
- assert_equals(5, len(s))
+ assert_equal(5, len(s))
s = db.execute_query(
"FIND ticket147_Fre* WHICH HAS A PROPERTY ticket147_ObstacleRadius='2.0' AND A PROPERTY ( ticket147_BarkleyModelSimulation )"
)
assert_true(s.is_valid())
- assert_equals(2, len(s))
+ assert_equal(2, len(s))
s = db.execute_query(
"FIND ticket147_Fre* WHICH HAS A PROPERTY ticket147_ObstacleRadius='2.0' AND A PROPERTY ( ticket147_BarkleyModelSimulation WHICH HAS A ticket147_TimeStep)"
)
assert_true(s.is_valid())
- assert_equals(2, len(s))
+ assert_equal(2, len(s))
s = db.execute_query(
"FIND ticket147_Fre* WHICH HAS A PROPERTY ticket147_ObstacleRadius='2.0' AND A PROPERTY ( ticket147_BarkleyModelSimulation WHICH HAS A ticket147_TimeStep<='0.0021')"
)
assert_true(s.is_valid())
- assert_equals(2, len(s))
- assert_equals(r22.id, s[0].id)
- assert_equals(r23.id, s[1].id)
+ assert_equal(2, len(s))
+ assert_equal(r22.id, s[0].id)
+ assert_equal(r23.id, s[1].id)
s = db.execute_query(
"FIND ticket147_Fre* WHICH HAS A PROPERTY ticket147_ObstacleRadius='2.0' AND A PROPERTY ( ticket147_BarkleyModelSimulation WHICH HAS A ticket147_TimeStep='0.002')"
)
assert_true(s.is_valid())
- assert_equals(1, len(s))
- assert_equals(r23.id, s[0].id)
+ assert_equal(1, len(s))
+ assert_equal(r23.id, s[0].id)
s = db.execute_query(
"FIND ticket147_Fre* WHICH HAS A PROPERTY ticket147_ObstacleRadius>='2.0' AND A PROPERTY ( ticket147_BarkleyModelSimulation WHICH HAS A ticket147_TimeStep>='0.002')"
)
assert_true(s.is_valid())
- assert_equals(3, len(s))
+ assert_equal(3, len(s))
s = db.execute_query(
"FIND ticket147_Fre* WHICH HAS A PROPERTY ticket147_ObstacleRadius='2.0' AND A PROPERTY ( ticket147_BarkleyModelSimulation WHICH HAS A ticket147_TimeStep='0.001')"
)
assert_true(s.is_valid())
- assert_equals(1, len(s))
- assert_equals(r22.id, s[0].id)
+ assert_equal(1, len(s))
+ assert_equal(r22.id, s[0].id)
s = db.execute_query(
"FIND ticket147_Fre* WHICH HAS A PROPERTY ticket147_ObstacleRadius='2.0' AND A PROPERTY ( ticket147_BarkleyModelSimulation WHICH HAS ticket147_TimeStep='0.001')"
)
assert_true(s.is_valid())
- assert_equals(1, len(s))
- assert_equals(r22.id, s[0].id)
+ assert_equal(1, len(s))
+ assert_equal(r22.id, s[0].id)
s = db.execute_query(
"FIND ticket147_Fre* WHICH HAS A PROPERTY ticket147_ObstacleRadius='2.0' AND A PROPERTY ( ticket147_BarkleyModelSimulation WHICH HAS THE SMALLEST ticket147_TimeStep)"
)
assert_true(s.is_valid())
- assert_equals(1, len(s))
- assert_equals(r22.id, s[0].id)
+ assert_equal(1, len(s))
+ assert_equal(r22.id, s[0].id)
s = db.execute_query(
"FIND ticket147_Fre* WHICH HAS THE SMALLEST ticket147_ObstacleRadius AND A PROPERTY ( ticket147_BarkleyModelSimulation WHICH HAS THE SMALLEST ticket147_TimeStep)"
)
assert_true(s.is_valid())
- assert_equals(1, len(s))
- assert_equals(r21.id, s[0].id)
+ assert_equal(1, len(s))
+ assert_equal(r21.id, s[0].id)
# typo: SMALLES
try:
@@ -997,7 +997,7 @@ def test_ticket_89():
nt_data.insert()
assert_true(nt_data.is_valid())
- assert_equals(0, len(nt_data.get_properties()))
+ assert_equal(0, len(nt_data.get_properties()))
# nt_data =
# <File id="318" cuid="c0c28bad-fb30-4e74-94ad-10934363e755" name="NT_testfile" path="testfiles/NT_test.txt" checksum="cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e" size="0">
# <Warning code="106" description="Entity has no description."/>
@@ -1006,7 +1006,7 @@ def test_ticket_89():
nt_data.add_property(nt_user, value="user1")
nt_data.update()
assert_true(nt_data.is_valid())
- assert_equals(1, len(nt_data.get_properties()))
+ assert_equal(1, len(nt_data.get_properties()))
# nt_data =
# <File id="318" cuid="c0c28bad-fb30-4e74-94ad-10934363e755" name="NT_testfile" path="testfiles/NT_test.txt" checksum="cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e" size="0">
@@ -1017,7 +1017,7 @@ def test_ticket_89():
nt_data.add_property(nt_user, value="user2")
nt_data.update()
assert_true(nt_data.is_valid())
- assert_equals(2, len(nt_data.get_properties()))
+ assert_equal(2, len(nt_data.get_properties()))
# nt_data =
# <File id="318" cuid="c0c28bad-fb30-4e74-94ad-10934363e755" name="NT_testfile" path="testfiles/NT_test.txt" checksum="cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e" size="0">
@@ -1029,7 +1029,7 @@ def test_ticket_89():
nt_data.retrieve()
assert_true(nt_data.is_valid())
- assert_equals(2, len(nt_data.get_properties()))
+ assert_equal(2, len(nt_data.get_properties()))
# response:
# <Entities>
# <File id="318" name="NT_testfile" path="testfiles/NT_test.txt" checksum="CF83E1357EEFB8BDF1542850D66D8007D620E4050B5715DC83F4A921D36CE9CE47D0D13C5D85F2B0FF8318D2877EEC2F63B931BD47417A81A538327AF927DA3E" size="0">
@@ -1062,7 +1062,7 @@ def test_ticket_89():
def test_ticket_173():
try:
- assert_equals(0, db.execute_query("COUNT SimpleTextProperty"))
+ assert_equal(0, db.execute_query("COUNT SimpleTextProperty"))
p = db.Property(
name="SimpleTextProperty",
@@ -1071,7 +1071,7 @@ def test_ticket_173():
p.insert()
assert_true(p.is_valid())
- assert_equals(1, db.execute_query("COUNT SimpleTextProperty"))
+ assert_equal(1, db.execute_query("COUNT SimpleTextProperty"))
finally:
try:
p.delete()
@@ -1129,23 +1129,23 @@ def test_ticket_166():
# retrieve all 10
q = db.Query("FIND RECORD ticket166*")
- assert_equals(10, len(q.execute()))
+ assert_equal(10, len(q.execute()))
# retrieve first 5
q.putFlag("P", "0L5")
ret = q.execute()
- assert_equals(5, len(ret))
+ assert_equal(5, len(ret))
for e in ret:
- assert_equals(bmsim.id, e.get_parents()[0].id)
+ assert_equal(bmsim.id, e.get_parents()[0].id)
# retrieve from 5 to 9 (4 entities)
q.putFlag("P", "5L4")
ret = q.execute()
- assert_equals(4, len(ret))
+ assert_equal(4, len(ret))
for e in ret:
- assert_equals(frm.id, e.get_parents()[0].id)
+ assert_equal(frm.id, e.get_parents()[0].id)
finally:
try:
@@ -1201,7 +1201,7 @@ def test_ticket_178():
# lxml umlaut
xml = etree.Element("Björn")
- assert_equals(xml.tag, "Björn")
+ assert_equal(xml.tag, "Björn")
try:
rt = db.RecordType(name="Person")
@@ -1262,7 +1262,7 @@ def test_ticket_124():
r2 = db.execute_query("Find Person WITH 'First name'=Björn")[0]
assert_true(r2.is_valid())
- assert_equals(r2.id, r.id)
+ assert_equal(r2.id, r.id)
finally:
try:
@@ -1295,7 +1295,7 @@ def test_ticket_163():
"FIND Entity . SomePropertyTest=blabla", unique=True)
assert_true(rt2.is_valid())
- assert_equals(rt2.id, rt.id)
+ assert_equal(rt2.id, rt.id)
finally:
try:
@@ -1333,78 +1333,78 @@ def test_ticket_165():
for e in c:
assert_true(e.is_valid())
- assert_equals(
+ assert_equal(
rt_b.id,
db.execute_query(
"FIND TestEntity WHICH IS REFERENCED BY TestAnnotation",
unique=True).id)
- assert_equals(rt_b.id,
+ assert_equal(rt_b.id,
db.execute_query(
"FIND Entity WHICH IS REFERENCED BY TestAnnotation",
unique=True).id)
- assert_equals(
+ assert_equal(
rt_b.id,
db.execute_query(
"FIND RecordType WHICH IS REFERENCED BY TestAnnotation",
unique=True).id)
- assert_equals(
+ assert_equal(
0,
len(
db.execute_query(
"FIND Record WHICH IS REFERENCED BY TestAnnotation")))
- assert_equals(
+ assert_equal(
rt_b.id,
db.execute_query(
"FIND TestEntity WHICH IS REFERENCED WITH TestComment",
unique=True).id)
- assert_equals(
+ assert_equal(
rt_b.id,
db.execute_query(
"FIND Entity WHICH IS REFERENCED BY TestAnnotation WITH TestComment",
unique=True).id)
- assert_equals(
+ assert_equal(
rt_b.id,
db.execute_query(
"FIND RecordType WHICH IS REFERENCED BY TestAnnotation WITH TestComment",
unique=True).id)
- assert_equals(0, len(db.execute_query(
+ assert_equal(0, len(db.execute_query(
"FIND Record WHICH IS REFERENCED BY TestAnnotation WITH TestComment")))
- assert_equals(
+ assert_equal(
rt_b.id,
db.execute_query(
"FIND TestEntity WHICH IS REFERENCED BY TestAnnotation WITH TestComment",
unique=True).id)
- assert_equals(
+ assert_equal(
rt_b.id,
db.execute_query(
"FIND Entity WHICH IS REFERENCED BY TestAnnotation WITH TestComment",
unique=True).id)
- assert_equals(
+ assert_equal(
rt_b.id,
db.execute_query(
"FIND RecordType WHICH IS REFERENCED BY TestAnnotation WITH TestComment",
unique=True).id)
- assert_equals(0, len(db.execute_query(
+ assert_equal(0, len(db.execute_query(
"FIND Record WHICH IS REFERENCED BY TestAnnotation WITH TestComment")))
- assert_equals(
+ assert_equal(
rt_b.id,
db.execute_query(
"FIND TestEntity WHICH IS REFERENCED BY TestAnnotation WITH TestComment='blablabla'",
unique=True).id)
- assert_equals(
+ assert_equal(
rt_b.id,
db.execute_query(
"FIND Entity WHICH IS REFERENCED BY TestAnnotation WITH TestComment='blablabla'",
unique=True).id)
- assert_equals(
+ assert_equal(
rt_b.id,
db.execute_query(
"FIND RecordType WHICH IS REFERENCED BY TestAnnotation WITH TestComment='blablabla'",
unique=True).id)
- assert_equals(0, len(db.execute_query(
+ assert_equal(0, len(db.execute_query(
"FIND Record WHICH IS REFERENCED BY TestAnnotation WITH TestComment='blablabla'")))
c.delete()
@@ -1465,22 +1465,22 @@ def test_ticket_174():
assert_true(rt1.is_valid())
for i in range(len(rt1.get_properties())):
- assert_equals(i + 1.0, float(rt1.get_properties()[i].value))
+ assert_equal(i + 1.0, float(rt1.get_properties()[i].value))
assert_true(rt2.is_valid())
for i in range(len(rt2.get_properties())):
- assert_equals(i + 1.0, float(rt2.get_properties()[i].value))
+ assert_equal(i + 1.0, float(rt2.get_properties()[i].value))
assert_true(rt3.is_valid())
for i in range(len(rt3.get_properties())):
- assert_equals(i + 1.0, float(rt3.get_properties()[i].value))
+ assert_equal(i + 1.0, float(rt3.get_properties()[i].value))
assert_true(rt4.is_valid())
for i in range(len(rt4.get_properties())):
- assert_equals(i + 1.0, float(rt4.get_properties()[i].value))
+ assert_equal(i + 1.0, float(rt4.get_properties()[i].value))
# change order:
rt4_i1 = rt4.get_properties()[1]
@@ -1491,18 +1491,18 @@ def test_ticket_174():
assert_true(rt4.is_valid())
- assert_equals(1.0, float(rt4.get_properties()[0].value))
- assert_equals(3.0, float(rt4.get_properties()[1].value))
- assert_equals(2.0, float(rt4.get_properties()[2].value))
- assert_equals(4.0, float(rt4.get_properties()[3].value))
+ assert_equal(1.0, float(rt4.get_properties()[0].value))
+ assert_equal(3.0, float(rt4.get_properties()[1].value))
+ assert_equal(2.0, float(rt4.get_properties()[2].value))
+ assert_equal(4.0, float(rt4.get_properties()[3].value))
# retrieve again:
rt42 = db.execute_query("FIND Ticket174_RecordType4", unique=True)
- assert_equals(1.0, float(rt42.get_properties()[0].value))
- assert_equals(3.0, float(rt42.get_properties()[1].value))
- assert_equals(2.0, float(rt42.get_properties()[2].value))
- assert_equals(4.0, float(rt42.get_properties()[3].value))
+ assert_equal(1.0, float(rt42.get_properties()[0].value))
+ assert_equal(3.0, float(rt42.get_properties()[1].value))
+ assert_equal(2.0, float(rt42.get_properties()[2].value))
+ assert_equal(4.0, float(rt42.get_properties()[3].value))
c.delete()
finally:
@@ -1540,22 +1540,22 @@ def test_ticket_192():
rt = db.RecordType(name="SimulationTestRecordType").insert()
rec = db.Record().add_parent(rt).insert()
- assert_equals(
+ assert_equal(
rec.id,
db.execute_query(
"FIND Record SimulationTestRecordType WHICH WAS CREATED BY ME",
unique=True).id)
- assert_equals(
+ assert_equal(
rec.id,
db.execute_query(
"FIND Record SimulationTestRecordType WHICH WAS CREATED TODAY",
unique=True).id)
- assert_equals(
+ assert_equal(
rec.id,
db.execute_query(
"FIND Record SimulationTestRecordType WHICH WAS CREATED TODAY BY ME",
unique=True).id)
- assert_equals(rec.id,
+ assert_equal(rec.id,
db.execute_query(
"FIND Record WHICH WAS CREATED TODAY BY ME",
unique=True).id)
@@ -1592,16 +1592,16 @@ def test_ticket_200():
property=Email).insert()
assert_true(Person2.is_valid())
- assert_equals(Email.id, Person2.get_property("EmailAddressTest").id)
- assert_equals(Fname.id, Person2.get_property("FirstNameTest").id)
- assert_equals(Lname.id, Person2.get_property("LastNameTest").id)
+ assert_equal(Email.id, Person2.get_property("EmailAddressTest").id)
+ assert_equal(Fname.id, Person2.get_property("FirstNameTest").id)
+ assert_equal(Lname.id, Person2.get_property("LastNameTest").id)
p2 = db.execute_query(
"FIND RecordType PersonWithEmailTestRecordType", unique=True)
- assert_equals(p2.id, Person2.id)
- assert_equals(Email.id, p2.get_property("EmailAddressTest").id)
- assert_equals(Fname.id, p2.get_property("FirstNameTest").id)
- assert_equals(Lname.id, p2.get_property("LastNameTest").id)
+ assert_equal(p2.id, Person2.id)
+ assert_equal(Email.id, p2.get_property("EmailAddressTest").id)
+ assert_equal(Fname.id, p2.get_property("FirstNameTest").id)
+ assert_equal(Lname.id, p2.get_property("LastNameTest").id)
finally:
try:
@@ -1636,33 +1636,33 @@ def test_ticket_155():
description="standard desc",
datatype="TEXT").insert()
assert_true(p.is_valid())
- assert_equals(p.description, "standard desc")
+ assert_equal(p.description, "standard desc")
p2 = db.execute_query("FIND SimpleTextProperty", True)
assert_true(p2.is_valid())
- assert_equals(p2.description, "standard desc")
+ assert_equal(p2.description, "standard desc")
rt = db.RecordType(name="SimpleRecordType").add_property(
p, description="overridden standard desc").insert()
assert_true(rt.is_valid())
- assert_equals(
+ assert_equal(
rt.get_property("SimpleTextProperty").description,
"overridden standard desc")
rt2 = db.execute_query("FIND SimpleRecordType", True)
assert_true(rt2.is_valid())
- assert_equals(
+ assert_equal(
rt2.get_property("SimpleTextProperty").description,
"overridden standard desc")
rt3 = db.RecordType(name="SimpleRecordType2").add_parent(
rt, inheritance="all").insert()
assert_true(rt3.is_valid())
- assert_equals(
+ assert_equal(
rt3.get_property("SimpleTextProperty").description,
"overridden standard desc")
rt4 = db.execute_query("FIND SimpleRecordType2", True)
assert_true(rt4.is_valid())
- assert_equals(
+ assert_equal(
rt4.get_property("SimpleTextProperty").description,
"overridden standard desc")
@@ -1688,7 +1688,7 @@ def test_ticket_191():
c = db.Container().retrieve(
[rt.id, rt.id], raise_exception_on_error=False, sync=False)
print(c)
- assert_equals(len(c), 1)
+ assert_equal(len(c), 1)
finally:
try:
rt.delete()
@@ -1732,14 +1732,14 @@ def test_ticket_115():
assert_true(c.is_valid())
rtc = db.execute_query("FIND SimpleRecordType", unique=True)
- assert_equals(len(rtc.get_properties()), 2)
+ assert_equal(len(rtc.get_properties()), 2)
rtc.get_properties().remove("SimpleDoubleProperty1")
- assert_equals(len(rtc.get_properties()), 1)
+ assert_equal(len(rtc.get_properties()), 1)
rtc.update()
assert_true(c.is_valid())
- assert_equals(len(rtc.get_properties()), 1)
+ assert_equal(len(rtc.get_properties()), 1)
finally:
try:
diff --git a/tests/test_tickets_200.py b/tests/test_tickets_200.py
index 477e49a..9cfe643 100644
--- a/tests/test_tickets_200.py
+++ b/tests/test_tickets_200.py
@@ -26,7 +26,7 @@
from __future__ import unicode_literals, print_function
import caosdb as h
from caosdb.common.models import RecordType, Container, Property
-from nose.tools import assert_true, assert_is_not_none, assert_equals, assert_is_none, assert_raises, nottest # @UnresolvedImport
+from nose.tools import assert_true, assert_is_not_none, assert_equal, assert_is_none, assert_raises, nottest # @UnresolvedImport
def setup_module():
@@ -56,24 +56,24 @@ def test_ticket_208():
q = h.Query("FIND SimpleRecordType")
rs = q.execute()
assert_true(rs.is_valid())
- assert_equals(len(rs), 11)
+ assert_equal(len(rs), 11)
q = h.Query("FIND Record SimpleRecordType")
rs = q.execute()
assert_true(rs.is_valid())
- assert_equals(len(rs), 10)
+ assert_equal(len(rs), 10)
q.putFlag("P", "0L3")
rs = q.execute()
assert_true(rs.is_valid())
- assert_equals(len(rs), 3)
+ assert_equal(len(rs), 3)
for i in range(3):
assert_is_not_none(rs.get_entity_by_name("SimpleRecord" + str(i)))
q.putFlag("P", "5L3")
rs = q.execute()
assert_true(rs.is_valid())
- assert_equals(len(rs), 3)
+ assert_equal(len(rs), 3)
for i in range(5, 8):
assert_is_not_none(rs.get_entity_by_name("SimpleRecord" + str(i)))
@@ -148,7 +148,7 @@ def test_ticket_201():
rt1, inheritance=h.OBLIGATORY).add_property(
p2, importance=h.OBLIGATORY).insert()
assert_true(rt2.is_valid())
- assert_equals(len(rt2.get_properties()), 2)
+ assert_equal(len(rt2.get_properties()), 2)
assert_is_not_none(rt2.get_property("FirstName"))
assert_is_not_none(rt2.get_property("LastName"))
@@ -175,12 +175,12 @@ def test_ticket_204():
RT1 = h.RecordType(name="one")
RT2 = h.RecordType(name="two").add_property(RT1, name="one_and_only")
- assert_equals(
+ assert_equal(
RT2.__str__(),
'<RecordType name="two">\n <Property name="one_and_only" datatype="one" importance="RECOMMENDED" flag="inheritance:FIX"/>\n</RecordType>\n')
- assert_equals(RT2.get_properties()[0].__str__(),
+ assert_equal(RT2.get_properties()[0].__str__(),
'<Property name="one_and_only" datatype="one"/>\n')
- assert_equals(RT2.get_properties()[0].datatype.__str__(),
+ assert_equal(RT2.get_properties()[0].datatype.__str__(),
'<RecordType name="one"/>\n')
@@ -193,7 +193,7 @@ def test_ticket_232():
assert_raises(h.URITooLongException, h.get_connection().retrieve, uri)
c = h.Container().extend(uri).retrieve(raise_exception_on_error=False)
- assert_equals(len(c), 1000)
+ assert_equal(len(c), 1000)
def test_ticket_216():
@@ -202,7 +202,7 @@ def test_ticket_216():
try:
RT = RecordType(name="RT")
p = Property(name="refProperty", datatype=RT)
- assert_equals(str(p), '<Property name="refProperty" datatype="RT"/>\n')
+ assert_equal(str(p), '<Property name="refProperty" datatype="RT"/>\n')
RT = RecordType()
p = Property(name="refProperty", datatype=RT)
@@ -221,7 +221,7 @@ def test_ticket_221():
RT2.add_property(
property=h.Property(name="test_property_with_RT1", datatype=RT1))
- assert_equals(
+ assert_equal(
repr(RT2),
'<RecordType name="TestRT2">\n <Property name="test_property_with_RT1" datatype="TestRT1" importance="RECOMMENDED" flag="inheritance:FIX"/>\n</RecordType>\n'
)
@@ -235,14 +235,14 @@ def test_ticket_237():
pickup="pickup1",
file="file1",
thumbnail="thumbnail1")
- assert_equals(f1.name, "name1")
- assert_equals(f1.path, "path1")
- assert_equals(f1.pickup, "pickup1")
- assert_equals(f1.file, "file1")
- assert_equals(f1.thumbnail, "thumbnail1")
+ assert_equal(f1.name, "name1")
+ assert_equal(f1.path, "path1")
+ assert_equal(f1.pickup, "pickup1")
+ assert_equal(f1.file, "file1")
+ assert_equal(f1.thumbnail, "thumbnail1")
f2 = h.File(name="name2")
- assert_equals(f2.name, "name2")
+ assert_equal(f2.name, "name2")
assert_is_none(f2.path)
assert_is_none(f2.pickup)
assert_is_none(f2.file)
@@ -250,28 +250,28 @@ def test_ticket_237():
f2._wrap(f1)
- assert_equals(f2.name, "name2")
- assert_equals(f2.path, "path1")
- assert_equals(f2.pickup, "pickup1")
- assert_equals(f2.file, "file1")
- assert_equals(f2.thumbnail, "thumbnail1")
+ assert_equal(f2.name, "name2")
+ assert_equal(f2.path, "path1")
+ assert_equal(f2.pickup, "pickup1")
+ assert_equal(f2.file, "file1")
+ assert_equal(f2.thumbnail, "thumbnail1")
f2.path = "path2"
f2.pickup = "pickup2"
f2.file = "file2"
f2.thumbnail = "thumbnail2"
- assert_equals(f2.name, "name2")
- assert_equals(f2.path, "path2")
- assert_equals(f2.pickup, "pickup2")
- assert_equals(f2.file, "file2")
- assert_equals(f2.thumbnail, "thumbnail2")
+ assert_equal(f2.name, "name2")
+ assert_equal(f2.path, "path2")
+ assert_equal(f2.pickup, "pickup2")
+ assert_equal(f2.file, "file2")
+ assert_equal(f2.thumbnail, "thumbnail2")
- assert_equals(f1.name, "name1")
- assert_equals(f1.path, "path1")
- assert_equals(f1.pickup, "pickup1")
- assert_equals(f1.file, "file1")
- assert_equals(f1.thumbnail, "thumbnail1")
+ assert_equal(f1.name, "name1")
+ assert_equal(f1.path, "path1")
+ assert_equal(f1.pickup, "pickup1")
+ assert_equal(f1.file, "file1")
+ assert_equal(f1.thumbnail, "thumbnail1")
def test_ticket_238():
@@ -281,16 +281,16 @@ def test_ticket_238():
p2 = h.Property(id=-1)
p3 = h.Property()
c.append(p1)
- assert_equals(len(c), 1)
+ assert_equal(len(c), 1)
c.remove(p1)
- assert_equals(len(c), 0)
+ assert_equal(len(c), 0)
c.extend([p1, p2, p3])
- assert_equals(len(c), 3)
+ assert_equal(len(c), 3)
c.remove(p3)
- assert_equals(len(c), 2)
+ assert_equal(len(c), 2)
assert_is_not_none(c.get_entity_by_id(-1))
assert_is_not_none(c.get_entity_by_name("bla"))
@@ -323,7 +323,7 @@ def test_ticket_239():
c = h.Container().extend([rec4])
assert_raises(h.TransactionError, c.insert)
- assert_equals(c[0].get_property(
+ assert_equal(c[0].get_property(
"SimpleReferenceProperty").get_errors()[0].description,
"Referenced entity does not exist.")
@@ -336,7 +336,7 @@ def test_ticket_239():
rec5 = h.Record(name="SimpleRecord5").add_parent(rt).add_property(
p, value="SimpleRecord3").insert()
assert_true(rec5.is_valid())
- assert_equals(
+ assert_equal(
int(rec5.get_property("SimpleReferenceProperty").value), rec3.id)
finally:
@@ -393,27 +393,27 @@ def test_ticket_240():
c = h.execute_query(
"FIND Record SimpleRecordType WHICH HAS A SimpleProperty='2.0'",
unique=True)
- assert_equals(c.id, rec2.id)
+ assert_equal(c.id, rec2.id)
c = h.execute_query(
"FIND Record SimpleRecordType WHICH HAS A SimpleProperty='1.0'",
unique=True)
- assert_equals(c.id, rec3.id)
+ assert_equal(c.id, rec3.id)
c = h.execute_query(
"FIND Record SimpleRecordType WHICH HAS A SimpleProperty!='1.0'",
unique=True)
- assert_equals(c.id, rec2.id)
+ assert_equal(c.id, rec2.id)
c = h.execute_query(
"FIND Record SimpleRecordType WHICH HAS A SimpleProperty!='2.0'",
unique=True)
- assert_equals(c.id, rec3.id)
+ assert_equal(c.id, rec3.id)
c = h.execute_query(
"FIND Record SimpleRecordType WHICH DOESN'T HAVE A SimpleProperty='1.0'"
)
- assert_equals(len(c), 2)
+ assert_equal(len(c), 2)
assert_is_not_none(c.get_entity_by_id(rec1.id))
assert_is_not_none(c.get_entity_by_id(rec2.id))
@@ -478,11 +478,11 @@ def test_ticket_256():
ret = h.execute_query(
"FIND FILE WHICH IS STORED AT testfiles/testfilewithcolon:initsname.dat",
unique=True)
- assert_equals(ret.id, file_.id)
+ assert_equal(ret.id, file_.id)
ret = h.execute_query(
"FIND FILE WHICH IS STORED AT *colon:initsname.dat", unique=True)
- assert_equals(ret.id, file_.id)
+ assert_equal(ret.id, file_.id)
finally:
try:
import os
@@ -504,16 +504,16 @@ def test_ticket_228():
assert_true(p2.is_valid())
assert_true(p3.is_valid())
- assert_equals(h.execute_query("FIND *_*", unique=True).id, p2.id)
- assert_equals(
+ assert_equal(h.execute_query("FIND *_*", unique=True).id, p2.id)
+ assert_equal(
len(h.execute_query("FIND *.*", raise_exception_on_error=False)),
0)
- assert_equals(h.execute_query("FIND '*.*'", unique=True).id, p3.id)
+ assert_equal(h.execute_query("FIND '*.*'", unique=True).id, p3.id)
p4 = h.Property(name="^.^", datatype=h.DOUBLE).insert()
assert_true(p4.is_valid())
- assert_equals(len(h.execute_query("FIND ^.^")), 0)
- assert_equals(h.execute_query("FIND '^.^'", unique=True).id, p4.id)
+ assert_equal(len(h.execute_query("FIND ^.^")), 0)
+ assert_equal(h.execute_query("FIND '^.^'", unique=True).id, p4.id)
finally:
try:
@@ -538,10 +538,10 @@ def test_ticket_231():
try:
p1 = h.Property(name="Publication", datatype=h.TEXT).insert()
- assert_equals(
+ assert_equal(
h.execute_query("FIND publication", unique=True).id, p1.id)
- assert_equals(h.Property("publication").retrieve().id, p1.id)
- assert_equals(h.Entity("publication").retrieve().id, p1.id)
+ assert_equal(h.Property("publication").retrieve().id, p1.id)
+ assert_equal(h.Entity("publication").retrieve().id, p1.id)
finally:
try:
@@ -555,7 +555,7 @@ def test_ticket_241():
q = h.Query("FIND RECORD WHICH HAS been created by some*")
q.execute(raise_exception_on_error=False)
assert_is_not_none(q.messages["Info"])
- assert_equals(
+ assert_equal(
q.messages["Info"],
("Regular expression and like patterns are not implemented for transactor names yet.",
None))
diff --git a/tests/test_unit.py b/tests/test_unit.py
index 9f4f9a6..e02ccdc 100644
--- a/tests/test_unit.py
+++ b/tests/test_unit.py
@@ -27,7 +27,7 @@
"""
from __future__ import unicode_literals
import caosdb as h
-from nose.tools import assert_true, assert_equals # @UnresolvedImport
+from nose.tools import assert_true, assert_equal # @UnresolvedImport
def setup_module():
@@ -62,8 +62,8 @@ def test_km_1():
rt2 = h.execute_query("FIND SimpleRecordType", True)
assert_true(rt2.is_valid())
assert_true(rt2.id, rt.id)
- assert_equals(rt2.get_property("SimpleDoubleProperty").unit, "m")
- assert_equals(rt2.get_property("SimpleDoubleProperty").value, 3140.0)
+ assert_equal(rt2.get_property("SimpleDoubleProperty").unit, "m")
+ assert_equal(rt2.get_property("SimpleDoubleProperty").value, 3140.0)
rt2 = h.execute_query(
"FIND SimpleRecordType.SimpleDoubleProperty='3140.0m'", True)
@@ -149,8 +149,8 @@ def test_celsius_1():
rt2 = h.execute_query("FIND SimpleRecordType", True)
assert_true(rt2.is_valid())
assert_true(rt2.id, rt.id)
- assert_equals(rt2.get_property("SimpleDoubleProperty").unit, "K")
- assert_equals(rt2.get_property("SimpleDoubleProperty").value, 0.0)
+ assert_equal(rt2.get_property("SimpleDoubleProperty").unit, "K")
+ assert_equal(rt2.get_property("SimpleDoubleProperty").value, 0.0)
rt2 = h.execute_query(
"FIND SimpleRecordType.SimpleDoubleProperty='0.0K'", True)
@@ -235,8 +235,8 @@ def test_int():
rt2 = h.execute_query("FIND SimpleRecordType", True)
assert_true(rt2.is_valid())
assert_true(rt2.id, rt.id)
- assert_equals(rt2.get_property("SimpleIntegerProperty").unit, "m")
- assert_equals(rt2.get_property("SimpleIntegerProperty").value, 3140)
+ assert_equal(rt2.get_property("SimpleIntegerProperty").unit, "m")
+ assert_equal(rt2.get_property("SimpleIntegerProperty").value, 3140)
rt2 = h.execute_query(
"FIND SimpleRecordType.SimpleIntegerProperty='3140m'", True)
@@ -284,8 +284,8 @@ def test_unknown_unit():
unit="my_unit")
p.insert()
assert_true(p.is_valid())
- assert_equals(len(p.get_warnings()), 1)
- assert_equals(
+ assert_equal(len(p.get_warnings()), 1)
+ assert_equal(
p.get_warnings()[0].description,
"Unknown unit. Values with this unit cannot be converted to other units when used in search queries.")
@@ -297,10 +297,10 @@ def test_unknown_unit():
rt2 = h.execute_query("FIND SimpleRecordType", True)
assert_true(rt2.is_valid())
assert_true(rt2.id, rt.id)
- assert_equals(
+ assert_equal(
rt2.get_property("SimpleIntegerProperty").unit,
"my_unit")
- assert_equals(rt2.get_property("SimpleIntegerProperty").value, 3140)
+ assert_equal(rt2.get_property("SimpleIntegerProperty").value, 3140)
rt2 = h.execute_query(
"FIND SimpleRecordType.SimpleIntegerProperty='3140'", True)
@@ -360,12 +360,12 @@ def test_greatest():
c = h.execute_query(
"FIND SimpleRecord* WHICH HAS THE GREATEST SimpleDoubleProperty",
unique=True)
- assert_equals(c.id, rec2.id)
+ assert_equal(c.id, rec2.id)
c = h.execute_query(
"FIND SimpleRecord* WHICH HAS THE SMALLEST SimpleDoubleProperty",
unique=True)
- assert_equals(c.id, rec3.id)
+ assert_equal(c.id, rec3.id)
rec4 = h.Record(
name="SimpleRecord4").add_parent(rt).add_property(
@@ -374,16 +374,16 @@ def test_greatest():
c = h.execute_query(
"FIND SimpleRecord* WHICH HAS THE GREATEST SimpleDoubleProperty")
- assert_equals(c[0].id, rec3.id)
- assert_equals(
+ assert_equal(c[0].id, rec3.id)
+ assert_equal(
c.get_warnings()[0].description,
"The filter POV(SimpleDoubleProperty,NULL,NULL) with the aggregate function 'max' could not match the values against each other with their units. The values had different base units. Only their numric value had been taken into account.")
c = h.execute_query(
"FIND SimpleRecord* WHICH HAS THE SMALLEST SimpleDoubleProperty",
unique=True)
- assert_equals(c.id, rec1.id)
- assert_equals(
+ assert_equal(c.id, rec1.id)
+ assert_equal(
c.get_warnings()[0].description,
"The filter POV(SimpleDoubleProperty,NULL,NULL) with the aggregate function 'min' could not match the values against each other with their units. The values had different base units. Only their numric value had been taken into account.")
diff --git a/tests/test_update.py b/tests/test_update.py
index 10d1a39..c64833f 100644
--- a/tests/test_update.py
+++ b/tests/test_update.py
@@ -26,7 +26,7 @@
@author: tf
"""
-from nose.tools import assert_true, assert_equals, nottest # @UnresolvedImport
+from nose.tools import assert_true, assert_equal, nottest # @UnresolvedImport
import caosdb as db
from caosdb.connection.connection import get_connection
@@ -47,7 +47,7 @@ def test_property_no_id():
rt1 = db.RecordType(name="RT1").insert()
rt1.add_property(name="P1").update(raise_exception_on_error=False)
- assert_equals(rt1.get_property("P1").get_errors()[
+ assert_equal(rt1.get_property("P1").get_errors()[
0].description, "Entity has no ID.")
@@ -56,7 +56,7 @@ def test_parent_no_id():
parent = db.RecordType(name="RTP").insert()
child.add_parent(name="RTP").update(raise_exception_on_error=False)
- assert_equals(child.get_parent("RTP").get_errors()
+ assert_equal(child.get_parent("RTP").get_errors()
[0].description, "Entity has no ID.")
@@ -78,7 +78,7 @@ def test_update_1():
p2,
importance='OBLIGATORY').insert()
assert_true(rt1.is_valid())
- assert_equals(2, len(rt1.get_properties()))
+ assert_equal(2, len(rt1.get_properties()))
rt1_xml = rt1.to_xml()
p3_xml = etree.Element("Property")
@@ -96,7 +96,7 @@ def test_update_1():
rt1.retrieve()
assert_true(rt1.is_valid())
- assert_equals(3, len(rt1.get_properties()))
+ assert_equal(3, len(rt1.get_properties()))
finally:
try:
diff --git a/tests/test_xmlparsing.py b/tests/test_xmlparsing.py
index 4ca7bb6..9b91aae 100644
--- a/tests/test_xmlparsing.py
+++ b/tests/test_xmlparsing.py
@@ -29,7 +29,7 @@
def test_parse_xml():
from lxml import etree
- from nose.tools import assert_equals # @UnresolvedImport
+ from nose.tools import assert_equal # @UnresolvedImport
from caosdb.common.models import File
from caosdb.common.models import parse_xml
from caosdb.common.models import Parent
@@ -93,28 +93,28 @@ def test_parse_xml():
filerec = parse_xml(xml)
assert isinstance(filerec, File)
- assert_equals(filerec.name, tmp_name)
- assert_equals(filerec.id, tmp_id)
- assert_equals(filerec.description, tmp_desc)
- assert_equals(filerec.path, tmp_path)
- assert_equals(filerec._checksum, tmp_checksum)
- assert_equals(filerec._size, tmp_size)
- assert_equals(filerec.datatype, tmp_type)
+ assert_equal(filerec.name, tmp_name)
+ assert_equal(filerec.id, tmp_id)
+ assert_equal(filerec.description, tmp_desc)
+ assert_equal(filerec.path, tmp_path)
+ assert_equal(filerec._checksum, tmp_checksum)
+ assert_equal(filerec._size, tmp_size)
+ assert_equal(filerec.datatype, tmp_type)
for par in filerec.get_parents():
assert isinstance(par, Parent)
- assert_equals(par.name, tmp_par_name)
- assert_equals(par.id, int(tmp_par_id))
- assert_equals(par.description, tmp_par_desc)
+ assert_equal(par.name, tmp_par_name)
+ assert_equal(par.id, int(tmp_par_id))
+ assert_equal(par.description, tmp_par_desc)
for prop in filerec.get_properties():
assert isinstance(prop, Property)
- assert_equals(prop.name, tmp_prop_name)
- assert_equals(prop.id, int(tmp_prop_id))
- assert_equals(prop.description, tmp_prop_desc)
- assert_equals(prop.unit, tmp_prop_unit)
- assert_equals(prop.value, tmp_prop_value)
- assert_equals(filerec.get_importance(prop), tmp_prop_imp)
+ assert_equal(prop.name, tmp_prop_name)
+ assert_equal(prop.id, int(tmp_prop_id))
+ assert_equal(prop.description, tmp_prop_desc)
+ assert_equal(prop.unit, tmp_prop_unit)
+ assert_equal(prop.value, tmp_prop_value)
+ assert_equal(filerec.get_importance(prop), tmp_prop_imp)
for msg in filerec.get_messages():
assert isinstance(msg, Message)
- assert_equals(msg.type.lower(), tmp_msg_type.lower())
- assert_equals(msg.body, tmp_msg_body)
+ assert_equal(msg.type.lower(), tmp_msg_type.lower())
+ assert_equal(msg.body, tmp_msg_body)
--
GitLab