From 5fdb0f486329e4ea3296298e734c4baf14c96436 Mon Sep 17 00:00:00 2001 From: asdf Date: Tue, 24 Dec 2019 23:33:28 +1100 Subject: [PATCH] Search now matches if the keyword is a substring of any element --- data.py | 2 +- tests/data_test.py | 3 ++- tests/{view_tests.py => view_test.py} | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) rename tests/{view_tests.py => view_test.py} (98%) diff --git a/data.py b/data.py index 1457b80..552990e 100644 --- a/data.py +++ b/data.py @@ -190,7 +190,7 @@ class LinkData: if keyword == "": raise ValueError("a search keyword must be specified") - query = (record for record in self.link_data if keyword in record) + query = (record for record in self.link_data if keyword in str(record)) if query: search_results: set = set() diff --git a/tests/data_test.py b/tests/data_test.py index febec99..179906b 100644 --- a/tests/data_test.py +++ b/tests/data_test.py @@ -180,7 +180,7 @@ class TestLinkDataSearch(unittest.TestCase): [65, "poster6", "1576461367.5580268", "", "keyword", "c", "c"], [64, "poster7", "1576461368.5580268", "", "c", "keyword", "c"], [63, "poster8", "1576461369.5580268", "", "c", "c", "keyword"], - [63, "poster9", "1576461370.5580268", "", "c", "c", "z8keyworddui3"], + [62, "poster9", "1576461370.5580268", "", "c", "c", "z8keyworddui3"], ] test_results = [ @@ -206,6 +206,7 @@ class TestLinkDataSearch(unittest.TestCase): (65, "poster6", "1576461367.5580268", "", "keyword", "c", "c"), (64, "poster7", "1576461368.5580268", "", "c", "keyword", "c"), (63, "poster8", "1576461369.5580268", "", "c", "c", "keyword"), + (62, "poster9", "1576461370.5580268", "", "c", "c", "z8keyworddui3"), ] self.assertEqual(link_data.search("keyword"), test_results) diff --git a/tests/view_tests.py b/tests/view_test.py similarity index 98% rename from tests/view_tests.py rename to tests/view_test.py index 85799d2..ad29f29 100644 --- a/tests/view_tests.py +++ b/tests/view_test.py @@ -22,10 +22,10 @@ class TestPrintSearchResults(unittest.TestCase): call( "\nShowing results for keyword\n\n ID# DATE AUTHOR DESC " ), - call(" 1 2019-12-16 keyword c \n"), - call(" 2 2019-12-16 poster6 c \n"), - call(" 3 2019-12-16 poster7 c \n"), - call(" 4 2019-12-16 poster8 keyword \n"), + call(" 1 2019-12-16 keyword c "), + call(" 2 2019-12-16 poster6 c "), + call(" 3 2019-12-16 poster7 c "), + call(" 4 2019-12-16 poster8 keyword "), ] linkulator.print_search_results(test_keyword, test_search_results)