images in HTML

[librarian.git] / tests / test_picture.py

diff --git a/tests/test_picture.py b/tests/test_picture.py
index 71a77dc..00b03ce 100644 (file)
--- a/tests/test_picture.py
+++ b/tests/test_picture.py
@@ -4,16 +4,14 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from librarian import picture, dcparser
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from librarian import picture, dcparser

-from lxml import etree
-from nose.tools import *
-from os.path import splitext

 from tests.utils import get_all_fixtures, get_fixture
 from tests.utils import get_all_fixtures, get_fixture

-import codecs

 from os import path
 
 from os import path
 

+

 def test_wlpictureuri():
     uri = picture.WLPictureURI('http://wolnelektury.pl/katalog/obraz/angelus-novus')
 
 def test_wlpictureuri():
     uri = picture.WLPictureURI('http://wolnelektury.pl/katalog/obraz/angelus-novus')
 

+

 def check_load(xml_file):
     pi = dcparser.parse(xml_file, picture.PictureInfo)
     assert pi is not None
 def check_load(xml_file):
     pi = dcparser.parse(xml_file, picture.PictureInfo)
     assert pi is not None


@@ -31,7 +29,7 @@ def test_wlpicture():
 
     #    from nose.tools import set_trace; set_trace()
     assert pi.type[0] == u"Image"
 
     #    from nose.tools import set_trace; set_trace()
     assert pi.type[0] == u"Image"

-    assert pi.mime_type == u'image/png' == wlp.mime_type
+    assert pi.mime_type == u'image/jpeg' == wlp.mime_type

     assert wlp.slug == 'angelus-novus'
 
     assert path.exists(wlp.image_path)
     assert wlp.slug == 'angelus-novus'
 
     assert path.exists(wlp.image_path)


@@ -39,10 +37,12 @@ def test_wlpicture():
     f = wlp.image_file('r')
     f.close()
 
     f = wlp.image_file('r')
     f.close()
 

+

 def test_picture_parts():
     wlp = picture.WLPicture.from_file(open(get_fixture('picture', 'angelus-novus.xml')))
     parts = list(wlp.partiter())
 def test_picture_parts():
     wlp = picture.WLPicture.from_file(open(get_fixture('picture', 'angelus-novus.xml')))
     parts = list(wlp.partiter())

-    assert len(parts) == 5, "there should be %d parts of the picture" % 5
+    expect_parts = 4
+    assert len(parts) == expect_parts, "there should be %d parts of the picture" % expect_parts

     motifs = set()
     names = set()
 
     motifs = set()
     names = set()
 


@@ -54,7 +54,5 @@ def test_picture_parts():
         if p['object']:
             names.add(p['object'])
 
         if p['object']:
             names.add(p['object'])
 

-    assert motifs == set([u'anioł historii', u'spojrzenie']), "missing motifs, got: %s" % motifs
-    assert names == set([u'obraz cały', u'skrzydło']), 'missing objects, got: %s' % names
-    
-        
+    assert motifs == {u'anioł historii', u'spojrzenie'}, "missing motifs, got: %s" % motifs
+    assert names == {u'obraz cały', u'skrzydło'}, 'missing objects, got: %s' % names