From 351e85d60f8d3115e6bac78f5dd6ec74a20a341e Mon Sep 17 00:00:00 2001
From: Daniel <daniel@harvey>
Date: Wed, 18 Nov 2020 13:26:06 +0100
Subject: [PATCH] STY, ENH: Some stylistic changes and a few additional tests.
The additional tests are for the properties of versioned records.
---
tests/test_query_version.py | 84 +++++++++++++++++++++----------------
1 file changed, 48 insertions(+), 36 deletions(-)
diff --git a/tests/test_query_version.py b/tests/test_query_version.py
index 495fd0c..a351cca 100644
--- a/tests/test_query_version.py
+++ b/tests/test_query_version.py
@@ -241,7 +241,8 @@ def test_normal_find_record():
@pytest.mark.xfail(
- reason="Find queries which respect the version of the references are not supported yet and return false positives.")
+ reason=("Find queries which respect the version of the references are not supported yet and "
+ "return false positives."))
def test_normal_find_with_versioned_reference():
# current version is not referenced
result = query("FIND RECORD WHICH IS REFERENCED BY TestBackRef1")
@@ -253,52 +254,52 @@ def test_find_any_version_of_record():
assert len(result) == 10
assert set(["v3", "v2", "v1", "ref1", "ref2", "ref3", "bref0", "bref1",
"bref2", "bref3"]
- ) == set([r.description for r in result])
+ ) == {r.description for r in result}
def test_find_any_version_of_entity_by_name():
result = query("FIND ANY VERSION OF ENTITY TestRecord1")
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
def test_find_any_version_of_record_by_name():
result = query("FIND ANY VERSION OF RECORD TestRecord1")
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
def test_find_any_version_of_record_by_parent():
result = query("FIND ANY VERSION OF RECORD TestRecordType1")
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
def test_find_any_version_of_named_entity_with_id_filter():
result = query(
"FIND ANY VERSION OF TestRecord1 WITH id = " + str(TEST_REC_1.id))
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
def test_find_any_version_of_entity_with_id_filter():
result = query("FIND ANY VERSION OF ENTITY WITH id = " +
str(TEST_REC_1.id))
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
def test_find_any_version_of_record_with_id_filter():
result = query("FIND ANY VERSION OF RECORD WITH id = " +
str(TEST_REC_1.id))
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
def test_find_any_version_of_record_with_simple_pov_text_filter():
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyText")
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyText = val3")
assert len(result) == 1
@@ -307,6 +308,7 @@ def test_find_any_version_of_record_with_simple_pov_text_filter():
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyText = val2")
assert len(result) == 1
assert result[0].description == "v2"
+ assert result[0].get_property("TestPropertyText").value == "val2"
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyText = val1")
assert len(result) == 1
@@ -316,7 +318,7 @@ def test_find_any_version_of_record_with_simple_pov_text_filter():
def test_find_any_version_of_record_with_simple_pov_name_filter():
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyName")
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyName = Alias3")
assert len(result) == 1
@@ -325,6 +327,7 @@ def test_find_any_version_of_record_with_simple_pov_name_filter():
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyName = Alias2")
assert len(result) == 1
assert result[0].description == "v2"
+ assert result[0].get_property("TestPropertyName").value == "Alias2"
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyName = Alias1")
assert len(result) == 1
@@ -334,7 +337,7 @@ def test_find_any_version_of_record_with_simple_pov_name_filter():
def test_find_any_version_of_record_with_simple_pov_boolean_filter():
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyBoolean")
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF RECORD WITH TestPropertyBoolean = TRUE AND TestPropertyText = val3")
@@ -345,6 +348,7 @@ def test_find_any_version_of_record_with_simple_pov_boolean_filter():
"FIND ANY VERSION OF RECORD WITH TestPropertyBoolean = FALSE")
assert len(result) == 1
assert result[0].description == "v2"
+ assert result[0].get_property("TestPropertyBoolean").value is False
result = query(
"FIND ANY VERSION OF RECORD WITH TestPropertyBoolean = TRUE AND TestPropertyText = val1")
@@ -355,7 +359,7 @@ def test_find_any_version_of_record_with_simple_pov_boolean_filter():
def test_find_any_version_of_record_with_simple_pov_double_filter():
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyDouble")
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyDouble = 3.14")
assert len(result) == 1
@@ -364,6 +368,7 @@ def test_find_any_version_of_record_with_simple_pov_double_filter():
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyDouble = 2.14")
assert len(result) == 1
assert result[0].description == "v2"
+ assert result[0].get_property("TestPropertyDouble").value == 2.14
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyDouble = 1.14")
assert len(result) == 1
@@ -373,7 +378,7 @@ def test_find_any_version_of_record_with_simple_pov_double_filter():
def test_find_any_version_of_record_with_simple_pov_integer_filter():
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyInteger")
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyInteger = 300")
assert len(result) == 1
@@ -382,6 +387,7 @@ def test_find_any_version_of_record_with_simple_pov_integer_filter():
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyInteger = 200")
assert len(result) == 1
assert result[0].description == "v2"
+ assert result[0].get_property("TestPropertyInteger").value == 200
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyInteger = 100")
assert len(result) == 1
@@ -391,7 +397,7 @@ def test_find_any_version_of_record_with_simple_pov_integer_filter():
def test_find_any_version_of_record_with_simple_pov_datetime_filter():
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyDatetime")
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF RECORD WITH TestPropertyDatetime = 2023-12-24T20:15:00")
@@ -402,6 +408,7 @@ def test_find_any_version_of_record_with_simple_pov_datetime_filter():
"FIND ANY VERSION OF RECORD WITH TestPropertyDatetime = 2022-12-24T20:15:00")
assert len(result) == 1
assert result[0].description == "v2"
+ assert result[0].get_property("TestPropertyDatetime").value.startswith("2022")
result = query(
"FIND ANY VERSION OF RECORD WITH TestPropertyDatetime = 2021-12-24T20:15:00")
@@ -417,6 +424,7 @@ def test_find_any_version_of_record_with_simple_pov_datetime_filter():
"FIND ANY VERSION OF RECORD WITH TestPropertyDatetime IN 2022")
assert len(result) == 1
assert result[0].description == "v2"
+ assert result[0].get_property("TestPropertyDatetime").value.startswith("2022")
result = query(
"FIND ANY VERSION OF RECORD WITH TestPropertyDatetime IN 2021")
@@ -427,7 +435,7 @@ def test_find_any_version_of_record_with_simple_pov_datetime_filter():
def test_find_any_version_of_record_with_simple_pov_date_filter():
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyDate")
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF RECORD WITH TestPropertyDate = 2023-12")
@@ -438,6 +446,7 @@ def test_find_any_version_of_record_with_simple_pov_date_filter():
"FIND ANY VERSION OF RECORD WITH TestPropertyDate = 2022-12")
assert len(result) == 1
assert result[0].description == "v2"
+ assert result[0].get_property("TestPropertyDate").value.startswith("2022")
result = query(
"FIND ANY VERSION OF RECORD WITH TestPropertyDate = 2021-12")
@@ -451,6 +460,7 @@ def test_find_any_version_of_record_with_simple_pov_date_filter():
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyDate IN 2022")
assert len(result) == 1
assert result[0].description == "v2"
+ assert result[0].get_property("TestPropertyDate").value.startswith("2022")
result = query("FIND ANY VERSION OF RECORD WITH TestPropertyDate IN 2021")
assert len(result) == 1
@@ -460,7 +470,7 @@ def test_find_any_version_of_record_with_simple_pov_date_filter():
def test_find_any_version_of_record_with_simple_reference_filter():
result = query("FIND ANY VERSION OF RECORD WITH TestRefRecordType")
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF RECORD WITH TestRefRecordType = TestRef3")
@@ -471,6 +481,7 @@ def test_find_any_version_of_record_with_simple_reference_filter():
"FIND ANY VERSION OF RECORD WITH TestRefRecordType = TestRef2")
assert len(result) == 1
assert result[0].description == "v2"
+ assert result[0].get_property("TestRefRecordType").value == TEST_REF_2.id
result = query(
"FIND ANY VERSION OF RECORD WITH TestRefRecordType = TestRef1")
@@ -486,6 +497,7 @@ def test_find_any_version_of_record_with_simple_reference_filter():
"FIND ANY VERSION OF RECORD WITH TestRefRecordType -> TestRef2")
assert len(result) == 1
assert result[0].description == "v2"
+ assert result[0].get_property("TestRefRecordType").value == TEST_REF_2.id
result = query(
"FIND ANY VERSION OF RECORD WITH TestRefRecordType -> TestRef1")
@@ -497,7 +509,7 @@ def test_find_any_version_of_record_with_conjunction_filter():
result = query(
"FIND ANY VERSION OF RECORD WITH TestRefRecordType AND TestPropertyText")
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF RECORD WITH TestRefRecordType = TestRef3 AND TestPropertyText")
@@ -523,17 +535,17 @@ def test_find_any_version_of_record_with_disjunction_filter():
result = query(
"FIND ANY VERSION OF RECORD WITH TestRefRecordType OR TestPropertyText")
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF RECORD WITH TestRefRecordType = TestRef3 OR TestPropertyText")
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF RECORD WITH TestRefRecordType = TestRef2 OR TestPropertyText")
assert len(result) == 3
- assert set(["v3", "v2", "v1"]) == set([r.description for r in result])
+ assert set(["v3", "v2", "v1"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF RECORD WITH TestRefRecordType = TestRef3 OR TestPropertyText = val3")
@@ -553,12 +565,12 @@ def test_find_any_version_of_record_with_disjunction_filter():
result = query(
"FIND ANY VERSION OF RECORD WITH TestRefRecordType = TestRef2 OR TestPropertyText = val3")
assert len(result) == 2
- assert set(["v3", "v2"]) == set([r.description for r in result])
+ assert set(["v3", "v2"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF RECORD WITH TestRefRecordType = TestRef2 OR TestPropertyText = val3 OR TestPropertyInteger = 200")
assert len(result) == 2
- assert set(["v3", "v2"]) == set([r.description for r in result])
+ assert set(["v3", "v2"]) == {r.description for r in result}
def test_find_any_version_of_record_with_negation_filter():
@@ -566,18 +578,18 @@ def test_find_any_version_of_record_with_negation_filter():
"FIND ANY VERSION OF RECORD WHICH DOES NOT HAVE A TestPropertyText")
assert len(result) == 7
assert set(["ref1", "ref2", "ref3", "bref0", "bref1", "bref2",
- "bref3", ]) == set([r.description for r in result])
+ "bref3", ]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF RECORD WHICH DOES NOT HAVE A TestPropertyText=val2")
assert len(result) == 9
assert set(["ref1", "ref2", "ref3", "bref0", "bref1", "bref2", "bref3",
- "v1", "v3"]) == set([r.description for r in result])
+ "v1", "v3"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF RECORD TestRecord1 WHICH DOES NOT HAVE A TestPropertyText=val2")
assert len(result) == 2
- assert set(["v1", "v3"]) == set([r.description for r in result])
+ assert set(["v1", "v3"]) == {r.description for r in result}
def test_find_any_version_of_record_with_complex_filter():
@@ -590,42 +602,42 @@ def test_find_any_version_of_record_with_backref_filter():
result = query(
"FIND ANY VERSION OF RECORD WHICH IS REFERENCED BY TestBackRefRecordType")
assert len(result) == 3
- assert set(["v1", "v2", "v3"]) == set([r.description for r in result])
+ assert set(["v1", "v2", "v3"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF RECORD TestRecord1 WHICH IS REFERENCED BY TestBackRefRecordType")
assert len(result) == 3
- assert set(["v1", "v2", "v3"]) == set([r.description for r in result])
+ assert set(["v1", "v2", "v3"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF TestRecord1 WHICH IS REFERENCED BY TestBackRefRecordType")
assert len(result) == 3
- assert set(["v1", "v2", "v3"]) == set([r.description for r in result])
+ assert set(["v1", "v2", "v3"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF TestRecord1 WHICH IS REFERENCED BY TestBackRef0")
assert len(result) == 3
- assert set(["v1", "v2", "v3"]) == set([r.description for r in result])
+ assert set(["v1", "v2", "v3"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF TestRecord1 WHICH IS REFERENCED BY TestBackRef0")
assert len(result) == 3
- assert set(["v1", "v2", "v3"]) == set([r.description for r in result])
+ assert set(["v1", "v2", "v3"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF TestRecord1 WHICH IS REFERENCED BY TestBackRef1")
assert len(result) == 1
- assert set(["v1"]) == set([r.description for r in result])
+ assert set(["v1"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF TestRecord1 WHICH IS REFERENCED BY TestBackRef2")
assert len(result) == 1
- assert set(["v2"]) == set([r.description for r in result])
+ assert set(["v2"]) == {r.description for r in result}
result = query(
"FIND ANY VERSION OF TestRecord1 WHICH IS REFERENCED BY TestBackRef3")
assert len(result) == 1
- assert set(["v3"]) == set([r.description for r in result])
+ assert set(["v3"]) == {r.description for r in result}
@pytest.mark.xfail(
@@ -634,7 +646,7 @@ def test_find_any_version_of_record_with_backref_and_subquery():
result = query(
"FIND ANY VERSION OF RECORD WHICH IS REFERENCED BY TestBackRefRecordType WITH name = TestBackRef0")
assert len(result) == 1
- assert set(["v3"]) == set([r.description for r in result])
+ assert set(["v3"]) == {r.description for r in result}
@pytest.mark.xfail(
@@ -643,7 +655,7 @@ def test_find_any_version_of_record_with_ref_and_subquery():
result = query(
"FIND ANY VERSION OF RECORD WHICH REFERENCES TestRefRecordType WITH name = TestRef2")
assert len(result) == 1
- assert set(["v3"]) == set([r.description for r in result])
+ assert set(["v3"]) == {r.description for r in result}
@pytest.mark.xfail(
@@ -652,4 +664,4 @@ def test_find_any_version_of_record_with_greatest_filter():
result = query(
"FIND ANY VERSION OF RECORD WITH THE GREATEST TestPropertyInteger")
assert len(result) == 1
- assert set(["v3"]) == set([r.description for r in result])
+ assert set(["v3"]) == {r.description for r in result}
--
GitLab