X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/a04f11baee3eb7d090867c2d5639a120ec3217b8..74dd02ea5d106d125877b16cd8b5712c5361714f:/tests/test_html_annotations.py

diff --git a/tests/test_html_annotations.py b/tests/test_html_annotations.py
index f269042..234f297 100644
--- a/tests/test_html_annotations.py
+++ b/tests/test_html_annotations.py
@@ -1,11 +1,8 @@
 # -*- coding: utf-8
 from __future__ import unicode_literals
 
-from StringIO import StringIO
-import tempfile
 from librarian.parser import WLDocument
 from librarian.html import extract_annotations
-from lxml import etree
 from nose.tools import eq_
 
 
@@ -13,26 +10,26 @@ def _test_annotation(expected, got, name):
     assert got[0].startswith('anchor-'), "%s: Unexpected anchor: '%s', should begin with 'anchor-'" % (name, got[0])
     eq_(expected[0], got[1], "%s: Unexpected type, expected '%s', got '%s'" % (name, expected[0], got[1]))
     eq_(expected[1], got[2], "%s: Unexpected qualifier, expected '%s', got '%s'" % (name, expected[1], got[2]))
-    eq_(expected[2], got[3], "%s: Unexpected text representation, expected '%s', got '%s'" % (name, expected[2], got[3]))
+    eq_(expected[2], got[3], "%s: Unexpected text representation, expected '%s', got '%s'" %
+        (name, expected[2], got[3]))
     exp_html = '<div class="fn-%s">%s</div>' % (expected[0], expected[3])
     eq_(exp_html, got[4], "%s: Unexpected html representation, expected '%s', got '%s'" % (name, exp_html, got[4]))
-    
+
 
 def test_annotations():
     annotations = (
 
         ('<pe/>', (
             'pe',
-            None, 
+            [], 
             '',
             '<p></p>'
             ),
             'Empty footnote'),
 
-        (
-         '<pr>Definiendum --- definiens.</pr>', (
+        ('<pr>Definiendum --- definiens.</pr>', (
             'pr',
-            None, 
+            [], 
             'Definiendum \u2014 definiens.', 
             '<p>Definiendum \u2014 definiens.</p>'
             ),
@@ -40,7 +37,7 @@ def test_annotations():
 
         ('<pt><slowo_obce>Definiendum</slowo_obce> --- definiens.</pt>', (
             'pt',
-            None, 
+            [], 
             'Definiendum \u2014 definiens.', 
             '<p><em class="foreign-word">Definiendum</em> \u2014 definiens.</p>'
             ),
@@ -48,7 +45,7 @@ def test_annotations():
 
         ('<pr>Definiendum (łac.) --- definiens.</pr>', (
             'pr',
-            'łac.', 
+            ['łac.'], 
             'Definiendum (łac.) \u2014 definiens.', 
             '<p>Definiendum (łac.) \u2014 definiens.</p>'
             ),
@@ -56,7 +53,7 @@ def test_annotations():
 
         ('<pe><slowo_obce>Definiendum</slowo_obce> (łac.) --- definiens.</pe>', (
             'pe',
-            'łac.', 
+            ['łac.'], 
             'Definiendum (łac.) \u2014 definiens.', 
             '<p><em class="foreign-word">Definiendum</em> (łac.) \u2014 definiens.</p>'
             ),
@@ -64,7 +61,7 @@ def test_annotations():
 
         ('<pt> <slowo_obce>Definiendum</slowo_obce> (daw.) --- definiens.</pt>', (
             'pt',
-            'daw.', 
+            ['daw.'], 
             'Definiendum (daw.) \u2014 definiens.', 
             '<p> <em class="foreign-word">Definiendum</em> (daw.) \u2014 definiens.</p>'
             ),
@@ -72,7 +69,7 @@ def test_annotations():
 
         ('<pr>Definiendum (łac.) --- <slowo_obce>definiens</slowo_obce>.</pr>', (
             'pr',
-            'łac.', 
+            ['łac.'], 
             'Definiendum (łac.) \u2014 definiens.', 
             '<p>Definiendum (łac.) \u2014 <em class="foreign-word">definiens</em>.</p>'
             ),
@@ -80,7 +77,7 @@ def test_annotations():
 
         ('<pe><slowo_obce>Definiendum</slowo_obce> (łac.) --- <slowo_obce>definiens</slowo_obce>.</pe>', (
             'pe',
-            'łac.',
+            ['łac.'],
             'Definiendum (łac.) \u2014 definiens.',
             '<p><em class="foreign-word">Definiendum</em> (łac.) \u2014 <em class="foreign-word">definiens</em>.</p>'
             ),
@@ -88,12 +85,23 @@ def test_annotations():
 
         ('<pe>Definiendum (łac.) --- definiens (some) --- more text.</pe>', (
             'pe',
-            'łac.',
+            ['łac.'],
             'Definiendum (łac.) \u2014 definiens (some) \u2014 more text.',
             '<p>Definiendum (łac.) \u2014 definiens (some) \u2014 more text.</p>',
             ),
             'Footnote with a second parentheses and mdash.'),
 
+        ('<pe><slowo_obce>gemajna</slowo_obce> (daw., z niem. <slowo_obce>gemein</slowo_obce>: zwykły) --- '
+         'częściej: gemajn, szeregowiec w wojsku polskim cudzoziemskiego autoramentu.</pe>', (
+            'pe',
+            ['daw.', 'niem.'],
+            'gemajna (daw., z niem. gemein: zwykły) \u2014 częściej: gemajn, '
+            'szeregowiec w wojsku polskim cudzoziemskiego autoramentu.',
+            '<p><em class="foreign-word">gemajna</em> (daw., z niem. <em class="foreign-word">gemein</em>: zwykły) '
+            '\u2014 częściej: gemajn, szeregowiec w wojsku polskim cudzoziemskiego autoramentu.</p>'
+            ),
+            'Footnote with multiple and qualifiers and emphasis.'),
+
     )
 
     xml_src = '''<utwor><akap> %s </akap></utwor>''' % "".join(