Merge branch 'master' into rwd

[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 9e965f9..68c8753 100644 (file)
--- a/apps/picture/tests/picture_import.py
+++ b/apps/picture/tests/picture_import.py
@@ -1,22 +1,33 @@
 # -*- coding: utf-8 -*-
 from __future__ import with_statement
 
 # -*- coding: utf-8 -*-
 from __future__ import with_statement
 

-from django.core.files.base import ContentFile, File
-from catalogue.test_utils import *
-from catalogue import models
-from librarian import WLURI
+from os import path

 from picture.models import Picture
 from picture.models import Picture

+from catalogue.test_utils import WLTestCase

 
 

-from nose.tools import raises
-import tempfile
-from os import unlink, path, makedirs

 
 

-
-class PictureTest(TestCase):
+class PictureTest(WLTestCase):

     
     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
     
     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

-    
+
+        picture.delete()
+
+    def test_import_with_explicit_image(self):
+        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"))
+
+        picture.delete()
+        
+
+    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"),
+                                        overwrite=True)
+        cats = set([t.category for t in picture.tags])
+        assert 'genre' in cats
+        assert 'kind' in cats
+