cleanup

[wolnelektury.git] / src / opds / tests / test_opds.py

diff --git a/src/opds/tests/test_opds.py b/src/opds/tests/test_opds.py
index 339bfaa..e86b865 100644 (file)
--- a/src/opds/tests/test_opds.py
+++ b/src/opds/tests/test_opds.py
@@ -1,27 +1,20 @@
-# -*- 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.
 #

-from unittest import skipIf

 from lxml import etree
 from django.conf import settings
 import catalogue
 from catalogue.test_utils import WLTestCase, get_fixture
 from catalogue.models import Book
 from librarian import WLURI, XMLNamespace
 from lxml import etree
 from django.conf import settings
 import catalogue
 from catalogue.test_utils import WLTestCase, get_fixture
 from catalogue.models import Book
 from librarian import WLURI, XMLNamespace

-from search.index import Index

 
 AtomNS = XMLNamespace("http://www.w3.org/2005/Atom")
 
 
 
 AtomNS = XMLNamespace("http://www.w3.org/2005/Atom")
 
 

-@skipIf(getattr(settings, 'NO_SEARCH_INDEX', False), u'Requires search server and NO_SEARCH_INDEX=False.')

 class OpdsSearchTests(WLTestCase):
     """Tests search feed in OPDS.."""
     def setUp(self):
         WLTestCase.setUp(self)
 class OpdsSearchTests(WLTestCase):
     """Tests search feed in OPDS.."""
     def setUp(self):
         WLTestCase.setUp(self)

-        index = Index()
-        index.index.delete_all()
-        index.index.commit()

 
         self.do_doktora = Book.from_xml_file(
             get_fixture('do-doktora.xml'))
 
         self.do_doktora = Book.from_xml_file(
             get_fixture('do-doktora.xml'))


@@ -33,8 +26,8 @@ class OpdsSearchTests(WLTestCase):
         tree = etree.fromstring(
             self.client.get('/opds/search/?%s' % query).content)
         elem_ids = tree.findall('.//%s/%s' % (AtomNS('entry'), AtomNS('id')))
         tree = etree.fromstring(
             self.client.get('/opds/search/?%s' % query).content)
         elem_ids = tree.findall('.//%s/%s' % (AtomNS('entry'), AtomNS('id')))

-        slugs = [WLURI(elem.text).slug for elem in elem_ids]
-        self.assertEqual(set(slugs), set(b.slug for b in books), u"OPDS search '%s' failed." % query)
+        slugs = [WLURI.from_text(elem.text).slug for elem in elem_ids]
+        self.assertEqual(set(slugs), set(b.slug for b in books), "OPDS search '%s' failed." % query)

 
     def test_opds_search_simple(self):
         """Do a simple q= test, also emulate dumb OPDS clients."""
 
     def test_opds_search_simple(self):
         """Do a simple q= test, also emulate dumb OPDS clients."""