Better management of manually-set members.

[wolnelektury.git] / src / search / tests / index.py

diff --git a/src/search/tests/index.py b/src/search/tests/index.py
index b8d4472..34d9586 100644 (file)
--- a/src/search/tests/index.py
+++ b/src/search/tests/index.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -6,19 +5,16 @@ from unittest import skipIf
 from django.conf import settings
 from django.test.utils import override_settings
 from catalogue.test_utils import WLTestCase, get_fixture
 from django.conf import settings
 from django.test.utils import override_settings
 from catalogue.test_utils import WLTestCase, get_fixture

-from os import path

 import tempfile
 import tempfile

-from catalogue.models import Book, Tag
-from search.index import Index, Search, SearchResult
+from catalogue.models import Book
+from search.index import Index, Search

 import catalogue
 import opds
 
 
 import catalogue
 import opds
 
 

-@override_settings(
-    SEARCH_INDEX = tempfile.mkdtemp(prefix='djangotest_search_'),
-)
+@override_settings(SEARCH_INDEX=tempfile.mkdtemp(prefix='djangotest_search_'))

 @skipIf(getattr(settings, 'NO_SEARCH_INDEX', False),
 @skipIf(getattr(settings, 'NO_SEARCH_INDEX', False),

-    u'Requires search server and NO_SEARCH_INDEX=False.')
+        'Requires search server and NO_SEARCH_INDEX=False.')

 class BookSearchTests(WLTestCase):
     def setUp(self):
         WLTestCase.setUp(self)
 class BookSearchTests(WLTestCase):
     def setUp(self):
         WLTestCase.setUp(self)


@@ -33,24 +29,12 @@ class BookSearchTests(WLTestCase):
         self.do_anusie = Book.from_xml_file(
             get_fixture('fraszka-do-anusie.xml', catalogue))
 
         self.do_anusie = Book.from_xml_file(
             get_fixture('fraszka-do-anusie.xml', catalogue))
 

-    def test_search_perfect_book_author(self):
-        books = self.search.search_books(self.search.index.query(authors=u"sęp szarzyński"))
-        assert len(books) == 1
-        assert books[0].id == self.do_anusie.id
-
-        # here we lack slop functionality as well
-    def test_search_perfect_book_title(self):
-        books = self.search.search_books(self.search.index.query(title=u"fraszka do anusie"))
-        assert len(books) == 1
-        assert books[0].id == self.do_anusie.id
-

     # TODO: Add slop option to sunburnt
     # def test_search_perfect_parts(self):
     # TODO: Add slop option to sunburnt
     # def test_search_perfect_parts(self):

-    #     books = self.search.search_phrase(u"Jakoż hamować")
+    #     books = self.search.search_phrase("Jakoż hamować")

     #     assert len(books) == 2
     #     for b in books:
     #         b.book_id == self.book.id
     #     a = SearchResult.aggregate(books)
     #     # just one fragment hit.
     #     assert len(a[0].hits) == 1
     #     assert len(books) == 2
     #     for b in books:
     #         b.book_id == self.book.id
     #     a = SearchResult.aggregate(books)
     #     # just one fragment hit.
     #     assert len(a[0].hits) == 1

-