fix tests

[librarian.git] / tests / test_dcparser.py

diff --git a/tests/test_dcparser.py b/tests/test_dcparser.py
index a0845a0..9e2b3ef 100644 (file)
--- a/tests/test_dcparser.py
+++ b/tests/test_dcparser.py
@@ -1,52 +1,48 @@
-# -*- 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.

 #
 #

+import unittest

 from librarian import dcparser
 from lxml import etree
 from librarian import dcparser
 from lxml import etree

-from nose.tools import *

 from os.path import splitext
 from tests.utils import get_all_fixtures
 from os.path import splitext
 from tests.utils import get_all_fixtures

-import codecs
-from datetime import date
-
-def check_dcparser(xml_file, result_file):
-    xml = file(xml_file).read()
-    result = codecs.open(result_file, encoding='utf-8').read()
-    info = dcparser.BookInfo.from_string(xml).to_dict()
-    should_be = eval(result)
-    for key in should_be:
-        assert_equals(info[key], should_be[key])
-
-
-def test_dcparser():
-    for fixture in get_all_fixtures('dcparser', '*.xml'):
-        base_name = splitext(fixture)[0]
-        yield check_dcparser, fixture, base_name + '.out'
-
-
-def check_serialize(xml_file):
-    xml = file(xml_file).read()
-    info = dcparser.BookInfo.from_string(xml)
-
-    # serialize
-    serialized = etree.tostring(info.to_etree(), encoding=unicode).encode('utf-8')
-    # then parse again
-    info_bis = dcparser.BookInfo.from_string(serialized)
-
-    # check if they are the same
-    for key in vars(info):
-        assert_equals(getattr(info, key), getattr(info_bis, key))
-    for key in vars(info_bis):
-        assert_equals(getattr(info, key), getattr(info_bis, key))
-

 
 

-def test_serialize():
-    for fixture in get_all_fixtures('dcparser', '*.xml'):
-        yield check_serialize, fixture

 
 

-def test_as_date():
-    assert_equals(dcparser.as_date(u"2010-10-03"), date(2010, 10, 03))
-    assert_equals(dcparser.as_date("2011"), date(2011, 1, 1))
-    assert_equals(dcparser.as_date("2 poł. XIX w."), date(1950, 1, 1))
+class MetaTests(unittest.TestCase):
+    def check_dcparser(self, xml_file, result_file):
+        with open(xml_file, 'rb') as f:
+            xml = f.read()
+        with open(result_file) as f:
+            result = f.read()
+        info = dcparser.BookInfo.from_bytes(xml).to_dict()
+        should_be = eval(result)
+        for key in should_be:
+            self.assertEqual(info[key], should_be[key])
+
+
+    def test_dcparser(self):
+        for fixture in get_all_fixtures('dcparser', '*.xml'):
+            base_name = splitext(fixture)[0]
+            with self.subTest(name=base_name):
+                self.check_dcparser(fixture, base_name + '.out')
+
+    def check_serialize(self, xml_file):
+        with open(xml_file, 'rb') as f:
+            xml = f.read()
+        info = dcparser.BookInfo.from_bytes(xml)
+
+        # serialize
+        serialized = etree.tostring(info.to_etree(), encoding='unicode').encode('utf-8')
+        # then parse again
+        info_bis = dcparser.BookInfo.from_bytes(serialized)
+
+        # check if they are the same
+        for key in vars(info):
+            self.assertEqual(getattr(info, key), getattr(info_bis, key))
+        for key in vars(info_bis):
+            self.assertEqual(getattr(info, key), getattr(info_bis, key))
+
+    def test_serialize(self):
+        for fixture in get_all_fixtures('dcparser', '*.xml'):
+            with self.subTest(name=fixture):
+                self.check_serialize(fixture)