Fixes.

[librarian.git] / tests / test_html.py

diff --git a/tests/test_html.py b/tests/test_html.py
index 36651fa..1d698fd 100644 (file)
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -1,16 +1,12 @@
-# -*- coding: utf-8 -*-
-#

 # This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
 # This file is part of Librarian, licensed under GNU Affero GPLv3 or later.

-# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.

 #
 #

-from __future__ import unicode_literals
-
-import io
+import re

 from unittest import TestCase
 from librarian import NoDublinCore
 from unittest import TestCase
 from librarian import NoDublinCore

+from librarian.builders import builders

 from librarian.document import WLDocument
 from librarian.parser import WLDocument as LegacyWLDocument
 from librarian.document import WLDocument
 from librarian.parser import WLDocument as LegacyWLDocument

-from nose.tools import *

 from .utils import get_fixture
 
 
 from .utils import get_fixture
 
 


@@ -24,34 +20,36 @@ class TransformTest(TestCase):
             get_fixture('text', 'miedzy-nami-nic-nie-bylo.xml')
         ).as_html().get_bytes().decode('utf-8')
 
             get_fixture('text', 'miedzy-nami-nic-nie-bylo.xml')
         ).as_html().get_bytes().decode('utf-8')
 

-        self.assertEqual(html, io.open(expected_output_file_path).read())
+        html = re.sub(r'idm\d+', 'idmNNN', html)
+        with open(expected_output_file_path) as f:
+            self.assertEqual(f.read(), html)

 
     def test_transform(self):
         expected_output_file_path = get_fixture('text', 'asnyk_miedzy_nami_expected.html')
         html = WLDocument(
             filename=get_fixture('text', 'miedzy-nami-nic-nie-bylo.xml')
 
     def test_transform(self):
         expected_output_file_path = get_fixture('text', 'asnyk_miedzy_nami_expected.html')
         html = WLDocument(
             filename=get_fixture('text', 'miedzy-nami-nic-nie-bylo.xml')

-        ).build('html').get_bytes().decode('utf-8')
-
-        self.assertEqual(html, io.open(expected_output_file_path).read())
-
+        ).build(builders['html']).get_bytes().decode('utf-8')

 
 

-@raises(NoDublinCore)
-def test_no_dublincore():
-    LegacyWLDocument.from_file(
-            get_fixture('text', 'asnyk_miedzy_nami_nodc.xml')
-        ).as_html()
+        with open(expected_output_file_path) as f:
+            self.assertEqual(html, f.read())

 
 

+    def test_no_dublincore(self):
+        with self.assertRaises(NoDublinCore):
+            LegacyWLDocument.from_file(
+                get_fixture('text', 'asnyk_miedzy_nami_nodc.xml')
+            ).as_html()

 
 

-def test_passing_parse_dublincore_to_transform():
-    """Passing parse_dublincore=False to transform omits DublinCore parsing."""
-    LegacyWLDocument.from_file(
+    def test_passing_parse_dublincore_to_transform(self):
+        """Passing parse_dublincore=False to transform omits DublinCore parsing."""
+        LegacyWLDocument.from_file(

             get_fixture('text', 'asnyk_miedzy_nami_nodc.xml'),
             parse_dublincore=False,
         ).as_html()
 
             get_fixture('text', 'asnyk_miedzy_nami_nodc.xml'),
             parse_dublincore=False,
         ).as_html()
 

-
-def test_empty():
-    assert not LegacyWLDocument.from_bytes(
-            b'<utwor />',
-            parse_dublincore=False,
-        ).as_html()
+    def test_empty(self):
+        self.assertIsNone(
+            LegacyWLDocument.from_bytes(
+                b'<utwor />',
+                parse_dublincore=False,
+            ).as_html()
+        )