mirror of
https://github.com/Hopiu/xapian-haystack.git
synced 2026-04-20 06:41:02 +00:00
Removed commented code block
This commit is contained in:
David Sauve
parent
617f623b6b
commit
8ed2e9196e
1 changed files with 0 additions and 192 deletions
|
|
@ -314,16 +314,6 @@ class XapianSearchBackendTestCase(TestCase):
|
|||
results = self.sb.search(xapian.Query(''), sort_by=['flag', '-id'])
|
||||
self.assertEqual([result.pk for result in results['results']], [2, 3, 1])
|
||||
|
||||
# def test_boost(self):
|
||||
# self.sb.update(self.msi, self.sample_objs)
|
||||
#
|
||||
# # TODO: Need a better test case here. Possibly better test data?
|
||||
# results = self.sb.search('*', boost={'true': 2})
|
||||
# self.assertEqual([result.pk for result in results['results']], [1, 3, 2])
|
||||
#
|
||||
# results = self.sb.search('*', boost={'true': 1.5})
|
||||
# self.assertEqual([result.pk for result in results['results']], [1, 3, 2])
|
||||
|
||||
def test__marshal_value(self):
|
||||
self.assertEqual(_marshal_value('abc'), u'abc')
|
||||
self.assertEqual(_marshal_value(1), '000000000001')
|
||||
|
|
@ -350,185 +340,3 @@ class XapianSearchBackendTestCase(TestCase):
|
|||
{'column': 5, 'field_name': 'flag', 'type': 'boolean', 'multi_valued': 'false'},
|
||||
{'column': 6, 'field_name': 'pub_date', 'type': 'date', 'multi_valued': 'false'},
|
||||
])
|
||||
|
||||
|
||||
# class LiveXapianSearchQueryTestCase(TestCase):
|
||||
# fixtures = ['initial_data.json']
|
||||
#
|
||||
# def setUp(self):
|
||||
# super(LiveXapianSearchQueryTestCase, self).setUp()
|
||||
#
|
||||
# self.sq = SearchQuery(backend=SearchBackend())
|
||||
#
|
||||
# # Force indexing of the content.
|
||||
# for mock in MockModel.objects.all():
|
||||
# mock.save()
|
||||
#
|
||||
# def test_get_spelling(self):
|
||||
# self.sq.add_filter(SQ(content='Indexy'))
|
||||
# self.assertEqual(self.sq.get_spelling_suggestion(), u'index')
|
||||
# self.assertEqual(self.sq.get_spelling_suggestion('indexy'), u'index')
|
||||
#
|
||||
# def test_log_query(self):
|
||||
# from django.conf import settings
|
||||
# from haystack import backends
|
||||
# backends.reset_search_queries()
|
||||
# self.assertEqual(len(backends.queries), 0)
|
||||
#
|
||||
# # Stow.
|
||||
# old_debug = settings.DEBUG
|
||||
# settings.DEBUG = False
|
||||
#
|
||||
# len(self.sq.get_results())
|
||||
# self.assertEqual(len(backends.queries), 0)
|
||||
#
|
||||
# settings.DEBUG = True
|
||||
# # Redefine it to clear out the cached results.
|
||||
# self.sq = SearchQuery(backend=SearchBackend())
|
||||
# self.sq.add_filter(SQ(name='bar'))
|
||||
# len(self.sq.get_results())
|
||||
# self.assertEqual(len(backends.queries), 1)
|
||||
# self.assertEqual(backends.queries[0]['query_string'], 'xapian::Query(XNAMEbar)')
|
||||
#
|
||||
# # And again, for good measure.
|
||||
# self.sq = SearchQuery(backend=SearchBackend())
|
||||
# self.sq.add_filter(SQ(name='bar'))
|
||||
# self.sq.add_filter(SQ(text='moof'))
|
||||
# len(self.sq.get_results())
|
||||
# self.assertEqual(len(backends.queries), 2)
|
||||
# self.assertEqual(backends.queries[0]['query_string'].get_description(), u'xapian::Query(XNAMEbar)')
|
||||
# self.assertEqual(backends.queries[1]['query_string'].get_description(), u'xapian::Query(XNAMEbar AND XTEXTmoof)')
|
||||
#
|
||||
# # Restore.
|
||||
# settings.DEBUG = old_debug
|
||||
#
|
||||
#
|
||||
# class LiveXapianSearchQuerySetTestCase(TestCase):
|
||||
# """Used to test actual implementation details of the SearchQuerySet."""
|
||||
# fixtures = ['bulk_data.json']
|
||||
#
|
||||
# def setUp(self):
|
||||
# super(LiveXapianSearchQuerySetTestCase, self).setUp()
|
||||
#
|
||||
# # With the models registered, you get the proper bits.
|
||||
# import haystack
|
||||
# from haystack.sites import SearchSite
|
||||
#
|
||||
# # Stow.
|
||||
# self.old_debug = settings.DEBUG
|
||||
# settings.DEBUG = True
|
||||
# self.old_site = haystack.site
|
||||
# test_site = SearchSite()
|
||||
# test_site.register(MockModel)
|
||||
# haystack.site = test_site
|
||||
#
|
||||
# self.sqs = SearchQuerySet()
|
||||
#
|
||||
# # Force indexing of the content.
|
||||
# for mock in MockModel.objects.all():
|
||||
# mock.save()
|
||||
#
|
||||
# def tearDown(self):
|
||||
# # Restore.
|
||||
# import haystack
|
||||
# haystack.site = self.old_site
|
||||
# settings.DEBUG = self.old_debug
|
||||
# super(LiveXapianSearchQuerySetTestCase, self).tearDown()
|
||||
#
|
||||
# def test_load_all(self):
|
||||
# sqs = self.sqs.load_all()
|
||||
# self.assert_(isinstance(sqs, SearchQuerySet))
|
||||
# self.assert_(len(sqs) > 0)
|
||||
# self.assertEqual(sqs[0].object.foo, u"Registering indexes in Haystack is very similar to registering models and ``ModelAdmin`` classes in the `Django admin site`_. If you want to override the default indexing behavior for your model you can specify your own ``SearchIndex`` class. This is useful for ensuring that future-dated or non-live content is not indexed and searchable. Our ``Note`` model has a ``pub_date`` field, so let's update our code to include our own ``SearchIndex`` to exclude indexing future-dated notes:")
|
||||
#
|
||||
# def test_load_all_queryset(self):
|
||||
# sqs = self.sqs.load_all()
|
||||
# self.assertRaises(HaystackError, sqs.load_all_queryset, MockModel, MockModel.objects.filter(id__gt=1))
|
||||
#
|
||||
# def test_iter(self):
|
||||
# backends.reset_search_queries()
|
||||
# self.assertEqual(len(backends.queries), 0)
|
||||
# sqs = self.sqs.all()
|
||||
# results = [int(result.pk) for result in sqs]
|
||||
# self.assertEqual(results, range(1, 24))
|
||||
# self.assertEqual(len(backends.queries), 3)
|
||||
#
|
||||
# def test_slice(self):
|
||||
# backends.reset_search_queries()
|
||||
# self.assertEqual(len(backends.queries), 0)
|
||||
# results = self.sqs.all()
|
||||
# self.assertEqual([int(result.pk) for result in results[1:11]], [2, 3, 4, 5, 6, 7, 8, 9, 10, 11])
|
||||
# self.assertEqual(len(backends.queries), 1)
|
||||
#
|
||||
# backends.reset_search_queries()
|
||||
# self.assertEqual(len(backends.queries), 0)
|
||||
# results = self.sqs.all()
|
||||
# self.assertEqual(int(results[21].pk), 22)
|
||||
# self.assertEqual(len(backends.queries), 1)
|
||||
#
|
||||
# def test_manual_iter(self):
|
||||
# results = self.sqs.all()
|
||||
#
|
||||
# backends.reset_search_queries()
|
||||
# self.assertEqual(len(backends.queries), 0)
|
||||
# results = [int(result.pk) for result in results._manual_iter()]
|
||||
# self.assertEqual(results, range(1, 24))
|
||||
# self.assertEqual(len(backends.queries), 3)
|
||||
#
|
||||
# def test_fill_cache(self):
|
||||
# backends.reset_search_queries()
|
||||
# self.assertEqual(len(backends.queries), 0)
|
||||
# results = self.sqs.all()
|
||||
# self.assertEqual(len(results._result_cache), 0)
|
||||
# self.assertEqual(len(backends.queries), 0)
|
||||
# results._fill_cache(0, 10)
|
||||
# self.assertEqual(len([result for result in results._result_cache if result is not None]), 10)
|
||||
# self.assertEqual(len(backends.queries), 1)
|
||||
# results._fill_cache(10, 20)
|
||||
# self.assertEqual(len([result for result in results._result_cache if result is not None]), 20)
|
||||
# self.assertEqual(len(backends.queries), 2)
|
||||
#
|
||||
# def test_cache_is_full(self):
|
||||
# backends.reset_search_queries()
|
||||
# self.assertEqual(len(backends.queries), 0)
|
||||
# self.assertEqual(self.sqs._cache_is_full(), False)
|
||||
# results = self.sqs.all()
|
||||
# fire_the_iterator_and_fill_cache = [result for result in results]
|
||||
# self.assertEqual(results._cache_is_full(), True)
|
||||
# self.assertEqual(len(backends.queries), 3)
|
||||
#
|
||||
# def test___and__(self):
|
||||
# sqs1 = self.sqs.filter(content='foo')
|
||||
# sqs2 = self.sqs.filter(content='bar')
|
||||
# sqs = sqs1 & sqs2
|
||||
#
|
||||
# self.assert_(isinstance(sqs, SearchQuerySet))
|
||||
# self.assertEqual(len(sqs.query.query_filter), 2)
|
||||
# self.assertEqual(sqs.query.build_query().get_description(), u'Xapian::Query((foo AND bar))')
|
||||
#
|
||||
# # Now for something more complex...
|
||||
# sqs3 = self.sqs.exclude(title='moof').filter(SQ(content='foo') | SQ(content='baz'))
|
||||
# sqs4 = self.sqs.filter(content='bar')
|
||||
# sqs = sqs3 & sqs4
|
||||
#
|
||||
# self.assert_(isinstance(sqs, SearchQuerySet))
|
||||
# self.assertEqual(len(sqs.query.query_filter), 3)
|
||||
# self.assertEqual(sqs.query.build_query().get_description(), u'Xapian::Query(((<alldocuments> AND_NOT XTITLEmoof) AND (foo OR baz) AND bar))')
|
||||
#
|
||||
# def test___or__(self):
|
||||
# sqs1 = self.sqs.filter(content='foo')
|
||||
# sqs2 = self.sqs.filter(content='bar')
|
||||
# sqs = sqs1 | sqs2
|
||||
#
|
||||
# self.assert_(isinstance(sqs, SearchQuerySet))
|
||||
# self.assertEqual(len(sqs.query.query_filter), 2)
|
||||
# self.assertEqual(sqs.query.build_query().get_description(), u'Xapian::Query((foo OR bar))')
|
||||
#
|
||||
# # Now for something more complex...
|
||||
# sqs3 = self.sqs.exclude(title='moof').filter(SQ(content='foo') | SQ(content='baz'))
|
||||
# sqs4 = self.sqs.filter(content='bar').models(MockModel)
|
||||
# sqs = sqs3 | sqs4
|
||||
#
|
||||
# self.assert_(isinstance(sqs, SearchQuerySet))
|
||||
# self.assertEqual(len(sqs.query.query_filter), 2)
|
||||
# self.assertEqual(sqs.query.build_query().get_description(), u'Xapian::Query((((<alldocuments> AND_NOT XTITLEmoof) AND (foo OR baz)) OR bar))')
|
||||
|
|
|
|||
Loading…
Reference in a new issue