changes from server

[wolnelektury.git] / apps / picture / tests / picture_import.py

diff --git a/apps/picture/tests/picture_import.py b/apps/picture/tests/picture_import.py
index e1bbd16..1e17289 100644 (file)
--- a/apps/picture/tests/picture_import.py
+++ b/apps/picture/tests/picture_import.py
@@ -10,12 +10,19 @@ from catalogue.test_utils import WLTestCase
 
 
 class PictureTest(WLTestCase):
 
 
 class PictureTest(WLTestCase):

-    
+

     def test_import(self):
         picture = Picture.from_xml_file(path.join(path.dirname(__file__), "files/kandinsky-composition-viii.xml"))
 
     def test_import(self):
         picture = Picture.from_xml_file(path.join(path.dirname(__file__), "files/kandinsky-composition-viii.xml"))
 

-        motifs = set([tag.name for tag in picture.tags if tag.category == 'theme'])
-        assert motifs == set([u'nieporządek']), 'theme tags are wrong. %s' % motifs
+        themes = set()
+        for area in picture.areas.all():
+            themes.update([(tag.category, tag.name)
+                for tag in area.tags if tag.category in (u'theme', u'thing')])
+        assert themes == set([(u'theme', u'nieporządek'), (u'thing', u'Kosmos')]), \
+            'Bad themes on Picture areas: %s' % themes
+
+        pic_themes = set([tag.name for tag in picture.tags if tag.category in ('theme', 'thing')])
+        assert not pic_themes, 'Unwanted themes set on Pictures: %s' % pic_themes

 
         picture.delete()
 
 
         picture.delete()
 


@@ -24,13 +31,13 @@ class PictureTest(WLTestCase):
                                         path.join(path.dirname(__file__), "files/kandinsky-composition-viii.png"))
 
         picture.delete()
                                         path.join(path.dirname(__file__), "files/kandinsky-composition-viii.png"))
 
         picture.delete()

-        
+

 
     def test_import_2(self):
 
     def test_import_2(self):

-        picture = Picture.from_xml_file(path.join(path.dirname(__file__), "files/pejzaz-i-miasto-krzyzanowski-chmury.xml"),
-                                        path.join(path.dirname(__file__), "files/pejzaz-i-miasto-krzyzanowski-chmury.jpg"),
+        picture = Picture.from_xml_file(path.join(path.dirname(__file__), "files/kandinsky-composition-viii.xml"),
+                                        path.join(path.dirname(__file__), "files/kandinsky-composition-viii.png"),

                                         overwrite=True)
         cats = set([t.category for t in picture.tags])
                                         overwrite=True)
         cats = set([t.category for t in picture.tags])

-        assert 'genre' in cats
+        assert 'epoch' in cats

         assert 'kind' in cats
 
         assert 'kind' in cats