From bc63eb5e2a2eb84911b5955d41c8484204a51990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20R=2E=20Sede=C3=B1o?= Date: Mon, 14 Jan 2019 17:35:38 -0500 Subject: [PATCH] Update test expected queries This commit could use scrutiny. --- tests/xapian_tests/tests/test_backend.py | 25 +++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/tests/xapian_tests/tests/test_backend.py b/tests/xapian_tests/tests/test_backend.py index 1f8f353..8e108ff 100644 --- a/tests/xapian_tests/tests/test_backend.py +++ b/tests/xapian_tests/tests/test_backend.py @@ -618,7 +618,10 @@ class BackendFeaturesTestCase(HaystackBackendTestCase, TestCase): # todo: why `SYNONYM WILDCARD OR XNAMEda`? self.assertExpectedQuery( self.backend.parse_query('name:da*'), - '(SYNONYM WILDCARD OR XNAMEda)', + [ + '(SYNONYM WILDCARD OR XNAMEda)', + 'WILDCARD SYNONYM XNAMEda', + ], xapian12string='(XNAMEdavid1:(pos=1) SYNONYM ' 'XNAMEdavid2:(pos=1) SYNONYM ' 'XNAMEdavid3:(pos=1))') @@ -631,16 +634,28 @@ class BackendFeaturesTestCase(HaystackBackendTestCase, TestCase): def test_parse_query_range(self): self.assertExpectedQuery(self.backend.parse_query('name:david1..david2'), - '0 * VALUE_RANGE 9 david1 david2', + [ + '0 * VALUE_RANGE 9 david1 david2', + 'VALUE_RANGE 9 david1 david2', + ], xapian12string='VALUE_RANGE 9 david1 david2') self.assertExpectedQuery(self.backend.parse_query('number:0..10'), - '0 * VALUE_RANGE 11 000000000000 000000000010', + [ + '0 * VALUE_RANGE 11 000000000000 000000000010', + 'VALUE_RANGE 11 000000000000 000000000010', + ], xapian12string='VALUE_RANGE 11 000000000000 000000000010') self.assertExpectedQuery(self.backend.parse_query('number:..10'), - '0 * VALUE_RANGE 11 %012d 000000000010' % (-sys.maxsize - 1), + [ + '0 * VALUE_RANGE 11 %012d 000000000010' % (-sys.maxsize - 1), + 'VALUE_RANGE 11 %012d 000000000010' % (-sys.maxsize - 1), + ], xapian12string='VALUE_RANGE 11 %012d 000000000010' % (-sys.maxsize - 1)) self.assertExpectedQuery(self.backend.parse_query('number:10..*'), - '0 * VALUE_RANGE 11 000000000010 %012d' % sys.maxsize, + [ + '0 * VALUE_RANGE 11 000000000010 %012d' % sys.maxsize, + 'VALUE_RANGE 11 000000000010 %012d' % sys.maxsize, + ], xapian12string='VALUE_RANGE 11 000000000010 %012d' % sys.maxsize) def test_order_by_django_id(self):