From 777584ac035f84e0f567adede8c36a8aa2672192 Mon Sep 17 00:00:00 2001 From: Avalon Hope <96471977+avalonhope@users.noreply.github.com> Date: Tue, 21 Jun 2022 12:23:49 +0100 Subject: [PATCH 1/5] Update test_search.py --- evennia/utils/tests/test_search.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evennia/utils/tests/test_search.py b/evennia/utils/tests/test_search.py index 6bacfb4cb3..ae9b9a9694 100644 --- a/evennia/utils/tests/test_search.py +++ b/evennia/utils/tests/test_search.py @@ -21,9 +21,16 @@ class TestSearch(EvenniaTest): self.assertEqual(script.key, found[0].key, errors) def test_search_script_tag_wrong_category(self): - """Check that a script can be found by its tag and category.""" + """Check that a script cannot be found by the wrong category.""" script, errors = DefaultScript.create("a-script") script.tags.add("a-tag", category="a-category") found = search_script_tag("a-tag", category="wrong-category") self.assertEqual(len(found), 0, errors) + + def test_search_script_tag_wrong(self): + """Check that a script cannot be found by the wrong tag.""" + script, errors = DefaultScript.create("a-script") + script.tags.add("a-tag", category="a-category") + found = search_script_tag("wrong-tag", category="a-category") + self.assertEqual(len(found), 0, errors) From ac40b637fa6f8c766c947dee556ac22fd00a3c95 Mon Sep 17 00:00:00 2001 From: Avalon Hope <96471977+avalonhope@users.noreply.github.com> Date: Wed, 22 Jun 2022 09:38:57 +0100 Subject: [PATCH 2/5] Unit test for search_script_attribute --- evennia/utils/tests/test_search.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/evennia/utils/tests/test_search.py b/evennia/utils/tests/test_search.py index ae9b9a9694..f9ab2e2e4a 100644 --- a/evennia/utils/tests/test_search.py +++ b/evennia/utils/tests/test_search.py @@ -1,6 +1,6 @@ from evennia.scripts.scripts import DefaultScript from evennia.utils.test_resources import EvenniaTest -from evennia.utils.search import search_script_tag +from evennia.utils.search import search_script_attribute, search _script_tag class TestSearch(EvenniaTest): @@ -33,4 +33,21 @@ class TestSearch(EvenniaTest): script.tags.add("a-tag", category="a-category") found = search_script_tag("wrong-tag", category="a-category") self.assertEqual(len(found), 0, errors) + + def test_search_script_attribute(self): + """Check that a script can be found by its attributes.""" + script, errors = DefaultScript.create("a-script") + script.db.an_attribute = "some value" + found = search_script_attribute(key="an_attribute", value="some value") + self.assertEqual(len(found), 1, errors) + self.assertEqual(script.key, found[0].key, errors) + + def test_search_script_attribute_wrong(self): + """Check that a script can be found by its attributes.""" + script, errors = DefaultScript.create("a-script") + script.db.an_attribute = "some value" + found = search_script_attribute(key="an_attribute", value="wrong value") + self.assertEqual(len(found), 1, errors) + self.assertEqual(script.key, found[0].key, errors) + From a2573a8829d3cf1320824dac16307f05d16f22bb Mon Sep 17 00:00:00 2001 From: Avalon Hope <96471977+avalonhope@users.noreply.github.com> Date: Wed, 22 Jun 2022 09:39:45 +0100 Subject: [PATCH 3/5] Update test_search.py --- evennia/utils/tests/test_search.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/evennia/utils/tests/test_search.py b/evennia/utils/tests/test_search.py index f9ab2e2e4a..e1380f5402 100644 --- a/evennia/utils/tests/test_search.py +++ b/evennia/utils/tests/test_search.py @@ -43,11 +43,9 @@ class TestSearch(EvenniaTest): self.assertEqual(script.key, found[0].key, errors) def test_search_script_attribute_wrong(self): - """Check that a script can be found by its attributes.""" + """Check that a script cannot be found by wrong value of its attributes.""" script, errors = DefaultScript.create("a-script") script.db.an_attribute = "some value" found = search_script_attribute(key="an_attribute", value="wrong value") self.assertEqual(len(found), 1, errors) self.assertEqual(script.key, found[0].key, errors) - - From f052ec262f9d8e8d4addca88a9177358c601d020 Mon Sep 17 00:00:00 2001 From: Avalon Hope <96471977+avalonhope@users.noreply.github.com> Date: Wed, 22 Jun 2022 10:06:31 +0100 Subject: [PATCH 4/5] Update test_search.py --- evennia/utils/tests/test_search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/utils/tests/test_search.py b/evennia/utils/tests/test_search.py index e1380f5402..55b57d0add 100644 --- a/evennia/utils/tests/test_search.py +++ b/evennia/utils/tests/test_search.py @@ -1,6 +1,6 @@ from evennia.scripts.scripts import DefaultScript from evennia.utils.test_resources import EvenniaTest -from evennia.utils.search import search_script_attribute, search _script_tag +from evennia.utils.search import search_script_attribute, search_script_tag class TestSearch(EvenniaTest): From 60a05b5dc378d0fa81006ae7b2c9c633c363b507 Mon Sep 17 00:00:00 2001 From: Avalon Hope <96471977+avalonhope@users.noreply.github.com> Date: Wed, 22 Jun 2022 10:30:13 +0100 Subject: [PATCH 5/5] Update test_search.py --- evennia/utils/tests/test_search.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/evennia/utils/tests/test_search.py b/evennia/utils/tests/test_search.py index 55b57d0add..63515d6754 100644 --- a/evennia/utils/tests/test_search.py +++ b/evennia/utils/tests/test_search.py @@ -47,5 +47,4 @@ class TestSearch(EvenniaTest): script, errors = DefaultScript.create("a-script") script.db.an_attribute = "some value" found = search_script_attribute(key="an_attribute", value="wrong value") - self.assertEqual(len(found), 1, errors) - self.assertEqual(script.key, found[0].key, errors) + self.assertEqual(len(found), 0, errors)