From 837ce2bce2dea6e17dc9dce89669db9a4b7ede4e Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 17 Feb 2014 10:15:21 +0000 Subject: [PATCH] Search: Test cleanup --- wagtail/wagtailsearch/tests/test_backends.py | 4 +++ wagtail/wagtailsearch/tests/test_queries.py | 29 +++++++++++++------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/wagtail/wagtailsearch/tests/test_backends.py b/wagtail/wagtailsearch/tests/test_backends.py index c009639645..0df6417142 100644 --- a/wagtail/wagtailsearch/tests/test_backends.py +++ b/wagtail/wagtailsearch/tests/test_backends.py @@ -183,6 +183,10 @@ class TestDBBackend(TestCase, BackendTests): def test_callable_indexed_field(self): super(TestDBBackend, self).test_callable_indexed_field() + @unittest.skip("") + def test_searcher_len(self): + super(TestDBBackend, self).test_searcher_len() + class TestElasticSearchBackend(TestCase, BackendTests): def find_elasticsearch_backend(self): diff --git a/wagtail/wagtailsearch/tests/test_queries.py b/wagtail/wagtailsearch/tests/test_queries.py index 06ed0cca3f..6acfd7e135 100644 --- a/wagtail/wagtailsearch/tests/test_queries.py +++ b/wagtail/wagtailsearch/tests/test_queries.py @@ -26,23 +26,31 @@ class TestHitCounter(TestCase): class TestQueryStringNormalisation(TestCase): - base_query = "Hello World!" - base_query_normalised = "hello world" - equivilant_queries = ["Hello World", "Hello World!!", "hello world", "Hello' world"] - different_queries = ["HelloWorld", "Hello orld!!", "Hello"] - def setUp(self): - self.query = models.Query.get(self.base_query) + self.query = models.Query.get("Hello World!") def test_normalisation(self): - self.assertEqual(str(self.query), self.base_query_normalised) + self.assertEqual(str(self.query), "hello world") def test_equivilant_queries(self): - for query in self.equivilant_queries: + queries = [ + "Hello World", + "Hello World!!", + "hello world", + "Hello' world", + ] + + for query in queries: self.assertEqual(self.query, models.Query.get(query)) def test_different_queries(self): - for query in self.different_queries: + queries = [ + "HelloWorld", + "Hello orld!!", + "Hello", + ] + + for query in queries: self.assertNotEqual(self.query, models.Query.get(query)) @@ -84,7 +92,6 @@ class TestQueryPopularity(TestCase): self.assertEqual(popular_queries[1], models.Query.get("popular query")) self.assertEqual(popular_queries[2], models.Query.get("little popular query")) - @unittest.expectedFailure # Time based popularity isn't implemented yet def test_query_popularity_over_time(self): today = timezone.now().date() @@ -128,3 +135,5 @@ class TestQueryPopularity(TestCase): class TestGarbageCollectCommand(TestCase): def test_garbage_collect_command(self): management.call_command('search_garbage_collect', interactive=False, stdout=StringIO()) + + # TODO: Test that this command is acctually doing its job