X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ddaff853c515ef7d188523d9ef17d271901dd581..334e476e48d0e34cf2c3cc940eeb9e5b52b3103b:/apps/search/tests/index.py?ds=sidebyside

diff --git a/apps/search/tests/index.py b/apps/search/tests/index.py
index 5155a84e4..3e3d290e2 100644
--- a/apps/search/tests/index.py
+++ b/apps/search/tests/index.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 from django.conf import settings
 from django.test.utils import override_settings
-from catalogue.test_utils import WLTestCase
-from lucene import PolishAnalyzer, Version
+from catalogue.test_utils import WLTestCase, get_fixture
 from os import path
 import tempfile
-from catalogue import models
-from search import Search, SearchResult
+from catalogue.models import Book, Tag
+from search import Index, Search, SearchResult
+import catalogue
+import opds
 
 
 @override_settings(
@@ -16,53 +17,35 @@ class BookSearchTests(WLTestCase):
     def setUp(self):
         WLTestCase.setUp(self)
 
-        txt = path.join(path.dirname(__file__), 'files/fraszka-do-anusie.xml')
-        with self.settings(NO_SEARCH_INDEX=False):
-            self.book = models.Book.from_xml_file(txt)
+        index = Index()
         self.search = Search()
+        index.delete_query(self.search.index.query(uid="*"))
+        index.index.commit()
+
+        with self.settings(NO_SEARCH_INDEX=False):
+            self.do_doktora = Book.from_xml_file(
+                get_fixture('do-doktora.xml', opds))
+            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_perfect_book("sęp szarzyński")
+        books = self.search.search_books(self.search.index.query(authors=u"sęp szarzyński"))
         assert len(books) == 1
-        assert books[0].book_id == self.book.id
+        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_perfect_book("fraszka anusie")
-        assert len(books) == 1
-        assert books[0].book_id == self.book.id
-
-    def test_search_perfect_parts(self):
-        books = self.search.search_perfect_parts("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
-
-    def test_search_perfect_author_title(self):
-        books = self.search.search_perfect_book("szarzyński anusie")
-        assert books == []
-
-        books = self.search.search_book("szarzyński anusie")
+        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):
+    #     books = self.search.search_phrase(u"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
 
-        books = self.search.search_book("szarzyński fraszka")
-        assert len(books) == 1
-
-    def test_search_everywhere(self):
-        books = self.search.search_everywhere("szarzyński kochanek")
-        print 'szarzyński kochanek %s' % [b.hits for b in books]
-
-        books = self.search.search_everywhere("szarzyński narcyz")
-        print 'szarzyński narcyz %s' % [b.hits for b in books]
-
-        books = self.search.search_everywhere("anusie narcyz")
-        print 'anusie narcyz %s' % [b.hits for b in books]
-
-        # theme content cross
-        books = self.search.search_everywhere("wzrok  boginie")
-        print 'wzrok boginie %s' % [b.hits for b in books]
-
-        books = self.search.search_everywhere("anusie płynęły zdroje")
-        print 'anusie płynęły zdroje %s' % [b.hits for b in books]