shadowing filter is not a good idea

[wolnelektury.git] / apps / catalogue / test_utils.py

diff --git a/apps/catalogue/test_utils.py b/apps/catalogue/test_utils.py
index 70aae02..b3e2bc2 100644 (file)
--- a/apps/catalogue/test_utils.py
+++ b/apps/catalogue/test_utils.py
@@ -11,12 +11,18 @@ class WLTestCase(TestCase):
     """
     def setUp(self):
         self._MEDIA_ROOT, settings.MEDIA_ROOT = settings.MEDIA_ROOT, tempfile.mkdtemp(prefix='djangotest_')
     """
     def setUp(self):
         self._MEDIA_ROOT, settings.MEDIA_ROOT = settings.MEDIA_ROOT, tempfile.mkdtemp(prefix='djangotest_')

-        settings.NO_BUILD_PDF = settings.NO_BUILD_MOBI = settings.NO_BUILD_EPUB = settings.NO_BUILD_TXT = True
+        settings.NO_SEARCH_INDEX = settings.NO_BUILD_PDF = settings.NO_BUILD_MOBI = settings.NO_BUILD_EPUB = settings.NO_BUILD_TXT = True

         settings.CELERY_ALWAYS_EAGER = True
         settings.CELERY_ALWAYS_EAGER = True

+        self._CACHES, settings.CACHES = settings.CACHES, {
+            'default': {
+                'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
+            }
+        }

 
     def tearDown(self):
         shutil.rmtree(settings.MEDIA_ROOT, True)
         settings.MEDIA_ROOT = self._MEDIA_ROOT
 
     def tearDown(self):
         shutil.rmtree(settings.MEDIA_ROOT, True)
         settings.MEDIA_ROOT = self._MEDIA_ROOT

+        settings.CACHES = self._CACHES

 
 class PersonStub(object):
 
 
 class PersonStub(object):
 


@@ -24,8 +30,16 @@ class PersonStub(object):
         self.first_names = first_names
         self.last_name = last_name
 
         self.first_names = first_names
         self.last_name = last_name
 

+    def readable(self):
+        return " ".join(self.first_names + (self.last_name,))
+

 
 class BookInfoStub(object):
 
 class BookInfoStub(object):

+    _empty_fields = ['cover_url', 'variant_of']
+    # allow single definition for multiple-value fields
+    _salias = {
+        'authors': 'author',
+    }

 
     def __init__(self, **kwargs):
         self.__dict = kwargs
 
     def __init__(self, **kwargs):
         self.__dict = kwargs


@@ -36,7 +50,15 @@ class BookInfoStub(object):
         return object.__setattr__(self, key, value)
 
     def __getattr__(self, key):
         return object.__setattr__(self, key, value)
 
     def __getattr__(self, key):

-        return self.__dict[key]
+        try:
+            return self.__dict[key]
+        except KeyError:
+            if key in self._empty_fields:
+                return None
+            elif key in self._salias:
+                return [getattr(self, self._salias[key])]
+            else:
+                raise

 
     def to_dict(self):
         return dict((key, unicode(value)) for key, value in self.__dict.items())
 
     def to_dict(self):
         return dict((key, unicode(value)) for key, value in self.__dict.items())


@@ -49,7 +71,7 @@ def info_args(title, language=None):
         language = u'pol'
     return {
         'title': unicode(title),
         language = u'pol'
     return {
         'title': unicode(title),

-        'url': WLURI.from_slug_and_lang(slug, language),
+        'url': WLURI.from_slug(slug),

         'about': u"http://wolnelektury.pl/example/URI/%s" % slug,
         'language': language,
     }
         'about': u"http://wolnelektury.pl/example/URI/%s" % slug,
         'language': language,
     }