search changes

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

diff --git a/apps/search/tests/index.py b/apps/search/tests/index.py
index 5155a84..12f6f7d 100644 (file)
--- 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
 # -*- 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 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(
 
 
 @override_settings(


@@ -16,23 +17,30 @@ class BookSearchTests(WLTestCase):
     def setUp(self):
         WLTestCase.setUp(self)
 
     def setUp(self):
         WLTestCase.setUp(self)
 

-        txt = path.join(path.dirname(__file__), 'files/fraszka-do-anusie.xml')
+        index = Index()
+        index.index.delete_all()
+        index.index.commit()
+

         with self.settings(NO_SEARCH_INDEX=False):
         with self.settings(NO_SEARCH_INDEX=False):

-            self.book = models.Book.from_xml_file(txt)
+            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))
+

         self.search = Search()
 
     def test_search_perfect_book_author(self):
         self.search = Search()
 
     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
 
     def test_search_perfect_book_title(self):
         assert len(books) == 1
         assert books[0].book_id == self.book.id
 
     def test_search_perfect_book_title(self):

-        books = self.search.search_perfect_book("fraszka anusie")
+        books = self.search.search_books(self.search.index.query(u"fraszka anusie"))

         assert len(books) == 1
         assert books[0].book_id == self.book.id
 
     def test_search_perfect_parts(self):
         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ć")
+        books = self.search.search_phrase(u"Jakoż hamować")

         assert len(books) == 2
         for b in books:
             b.book_id == self.book.id
         assert len(books) == 2
         for b in books:
             b.book_id == self.book.id


@@ -41,28 +49,7 @@ class BookSearchTests(WLTestCase):
         assert len(a[0].hits) == 1
 
     def test_search_perfect_author_title(self):
         assert len(a[0].hits) == 1
 
     def test_search_perfect_author_title(self):

-        books = self.search.search_perfect_book("szarzyński anusie")
+        books = self.search.search_books(self.search.index.query(authors=u"szarzyński anusie"))

         assert books == []
 
         assert books == []
 

-        books = self.search.search_book("szarzyński anusie")
-        assert len(books) == 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]
+