From dd704c670543edc4672cc6114fe3d8da0dfbed7a Mon Sep 17 00:00:00 2001 From: Baptiste Mispelon Date: Fri, 13 Mar 2020 10:20:34 +0100 Subject: Refs #31340 -- Simplified SearchQuery by making it subclass Func. --- tests/postgres_tests/test_search.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'tests/postgres_tests') diff --git a/tests/postgres_tests/test_search.py b/tests/postgres_tests/test_search.py index 04adef4f17..86a409afc2 100644 --- a/tests/postgres_tests/test_search.py +++ b/tests/postgres_tests/test_search.py @@ -449,22 +449,26 @@ class SearchVectorIndexTests(PostgreSQLTestCase): class SearchQueryTests(PostgreSQLSimpleTestCase): def test_str(self): tests = ( - (~SearchQuery('a'), '~SearchQuery(a)'), + (~SearchQuery('a'), '~SearchQuery(Value(a))'), ( (SearchQuery('a') | SearchQuery('b')) & (SearchQuery('c') | SearchQuery('d')), - '((SearchQuery(a) || SearchQuery(b)) && (SearchQuery(c) || SearchQuery(d)))', + '((SearchQuery(Value(a)) || SearchQuery(Value(b))) && ' + '(SearchQuery(Value(c)) || SearchQuery(Value(d))))', ), ( SearchQuery('a') & (SearchQuery('b') | SearchQuery('c')), - '(SearchQuery(a) && (SearchQuery(b) || SearchQuery(c)))', + '(SearchQuery(Value(a)) && (SearchQuery(Value(b)) || ' + 'SearchQuery(Value(c))))', ), ( (SearchQuery('a') | SearchQuery('b')) & SearchQuery('c'), - '((SearchQuery(a) || SearchQuery(b)) && SearchQuery(c))' + '((SearchQuery(Value(a)) || SearchQuery(Value(b))) && ' + 'SearchQuery(Value(c)))' ), ( SearchQuery('a') & (SearchQuery('b') & (SearchQuery('c') | SearchQuery('d'))), - '(SearchQuery(a) && (SearchQuery(b) && (SearchQuery(c) || SearchQuery(d))))', + '(SearchQuery(Value(a)) && (SearchQuery(Value(b)) && ' + '(SearchQuery(Value(c)) || SearchQuery(Value(d)))))', ), ) for query, expected_str in tests: -- cgit v1.3