Skip to content

Commit dea2ebc

Browse files
committed
Revert "Fixed tests that search_results of boolean attribute value is boolean type"
This reverts commit 2043b89.
1 parent 35301f6 commit dea2ebc

File tree

4 files changed

+7
-38
lines changed

4 files changed

+7
-38
lines changed

api_v1/tests/entry/test_api.py

-31
Original file line numberDiff line numberDiff line change
@@ -482,34 +482,3 @@ def test_search_with_invalid_entity_param(self):
482482
resp = self.client.post("/api/v1/entry/search", json.dumps(params), "application/json")
483483
self.assertEqual(resp.status_code, 400)
484484
self.assertEqual(resp.content, b'"The entities parameters are required"')
485-
486-
def test_search_boolean_type_value(self):
487-
user = self.guest_login()
488-
489-
test_entity = self.create_entity(
490-
user,
491-
"TestEntity",
492-
attrs=[
493-
{
494-
"name": "boolean",
495-
"type": AttrTypeValue["boolean"],
496-
}
497-
],
498-
)
499-
500-
entry = self.add_entry(user, "Entry", test_entity)
501-
attr = entry.attrs.last()
502-
503-
# This checks boolean typed results of advanced search are expected value and expected type
504-
for value in [True, False]:
505-
attr.add_value(user, value)
506-
entry.register_es()
507-
508-
params = {
509-
"entities": [test_entity.id],
510-
"attrinfo": [{"name": "boolean"}],
511-
}
512-
resp = self.client.post("/api/v1/entry/search", json.dumps(params), "application/json")
513-
self.assertEqual(
514-
resp.json()["result"]["ret_values"][0]["attrs"]["boolean"]["value"], value
515-
)

entry/tests/test_api_v2.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2222,7 +2222,7 @@ def test_import_create_entry(self):
22222222
self.assertEqual(result["ret_values"][0]["entry"]["name"], "test-entry")
22232223
self.assertEqual(result["ret_values"][0]["entity"]["name"], "test-entity")
22242224
attrs = {
2225-
"bool": True,
2225+
"bool": "True",
22262226
"date": "2018-12-31",
22272227
"group": {"id": self.group.id, "name": "group0"},
22282228
"groups": [{"id": self.group.id, "name": "group0"}],
@@ -2267,7 +2267,7 @@ def test_import_update_entry(self):
22672267
"names": [{"foo": {"id": self.ref_entry.id, "name": "r-0"}}],
22682268
"group": {"id": self.group.id, "name": "group0"},
22692269
"groups": [{"id": self.group.id, "name": "group0"}],
2270-
"bool": True,
2270+
"bool": "True",
22712271
"text": "foo\nbar",
22722272
"date": "2018-12-31",
22732273
"role": {"id": self.role.id, "name": "role0"},
@@ -2312,7 +2312,7 @@ def test_import_update_entry(self):
23122312
"names": [],
23132313
"group": {"id": "", "name": ""},
23142314
"groups": [],
2315-
"bool": False,
2315+
"bool": "False",
23162316
# "text": None,
23172317
"date": None,
23182318
"role": {"id": "", "name": ""},

entry/tests/test_model.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2063,7 +2063,7 @@ def test_search_entries(self):
20632063
self.assertEqual(attrinfo["value"][key]["name"], attrv.referral.name)
20642064

20652065
elif attrname == "bool":
2066-
self.assertEqual(attrinfo["value"], attrv.boolean)
2066+
self.assertEqual(attrinfo["value"], str(attrv.boolean))
20672067

20682068
elif attrname == "date":
20692069
self.assertEqual(attrinfo["value"], str(attrv.date))
@@ -2621,7 +2621,7 @@ def test_register_entry_to_elasticsearch(self):
26212621

26222622
elif k == "bool":
26232623
self.assertEqual(len(value), 1)
2624-
self.assertEqual(value[0]["value"], False)
2624+
self.assertEqual(value[0]["value"], "False")
26252625

26262626
elif k == "date":
26272627
self.assertEqual(len(value), 1)
@@ -4423,7 +4423,7 @@ def test_get_es_document(self):
44234423
"value": [ref_entry.name],
44244424
"referral_id": [ref_entry.id],
44254425
},
4426-
"bool": {"key": [""], "value": [False], "referral_id": [""]},
4426+
"bool": {"key": [""], "value": ["False"], "referral_id": [""]},
44274427
"group": {
44284428
"key": [""],
44294429
"value": [test_group.name],

entry/tests/test_view.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4491,7 +4491,7 @@ def test_revert_attrv(self, mock_task):
44914491

44924492
value = attr_info[attr_name]["values"][0]
44934493
if data["type"] == AttrTypeValue["boolean"]:
4494-
self.assertEqual(data["value"], value)
4494+
self.assertEqual(data["value"], str(value))
44954495

44964496
elif data["type"] == AttrTypeValue["group"]:
44974497
self.assertEqual(data["value"], {"name": value.name, "id": value.id})

0 commit comments

Comments
 (0)