X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/215503e15ca9d6d1e8a053f7bfa359af1af102f3..37e7d9e4f5de0efd1f2d1568d8a455905843cc80:/tests/test_text.py

diff --git a/tests/test_text.py b/tests/test_text.py
old mode 100755
new mode 100644
index da7e4ab..4cb2b7b
--- a/tests/test_text.py
+++ b/tests/test_text.py
@@ -1,61 +1,58 @@
 # -*- coding: utf-8 -*-
 #
-#    This file is part of Librarian.
+# This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
-#    Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>
-#    
-#    For full list of contributors see AUTHORS file. 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-from librarian import text, NoDublinCore
+from __future__ import unicode_literals
+
+from librarian import NoDublinCore
+from librarian.builders import builders
+from librarian.parser import WLDocument as LegacyWLDocument
+from librarian.document import WLDocument
 from nose.tools import *
-from utils import get_fixture, remove_output_file
+from .utils import get_fixture
+
+
+def test_transform_legacy():
+    expected_output_file_path = get_fixture('text', 'asnyk_miedzy_nami_expected.txt')
 
+    text = LegacyWLDocument.from_file(
+            get_fixture('text', 'miedzy-nami-nic-nie-bylo.xml')
+        ).as_text().get_bytes()
 
-def teardown_transform():
-    remove_output_file('text', 'asnyk_miedzy_nami.txt')
+    assert_equal(text, open(expected_output_file_path, 'rb').read())
 
 
-@with_setup(None, teardown_transform)
 def test_transform():
-    output_file_path = get_fixture('text', 'asnyk_miedzy_nami.txt')
     expected_output_file_path = get_fixture('text', 'asnyk_miedzy_nami_expected.txt')
+
+    text = WLDocument(
+        filename=get_fixture('text', 'miedzy-nami-nic-nie-bylo.xml')
+    ).build(builders['txt']).get_bytes()
+
+    assert_equal(text, open(expected_output_file_path, 'rb').read())
+
     
-    text.transform(
-        get_fixture('text', 'asnyk_miedzy_nami.xml'),
-        output_file_path,
-    )
-    
-    assert_equal(file(output_file_path).read(), file(expected_output_file_path).read())
+def test_transform_raw():
+    expected_output_file_path = get_fixture('text', 'asnyk_miedzy_nami_expected_raw.txt')
+
+    text = LegacyWLDocument.from_file(
+            get_fixture('text', 'miedzy-nami-nic-nie-bylo.xml')
+        ).as_text(flags=['raw-text']).get_bytes()
+
+    assert_equal(text, open(expected_output_file_path, 'rb').read())
 
 
-@with_setup(None, teardown_transform)
 @raises(NoDublinCore)
 def test_no_dublincore():
-    text.transform(
-        get_fixture('text', 'asnyk_miedzy_nami_nodc.xml'),
-        get_fixture('text', 'asnyk_miedzy_nami_nodc.txt'),
-    )
+    LegacyWLDocument.from_file(
+            get_fixture('text', 'asnyk_miedzy_nami_nodc.xml')
+        ).as_text()
 
 
-@with_setup(None, teardown_transform)
 def test_passing_parse_dublincore_to_transform():
-    """Passing parse_dublincore=False to transform omits DublinCore parsing."""
-    text.transform(
-        get_fixture('text', 'asnyk_miedzy_nami_nodc.xml'),
-        get_fixture('text', 'asnyk_miedzy_nami.txt'),
-        parse_dublincore=False,
-    )
-    
\ No newline at end of file
+    """Passing parse_dublincore=False to the constructor omits DublinCore parsing."""
+    LegacyWLDocument.from_file(
+            get_fixture('text', 'asnyk_miedzy_nami_nodc.xml'),
+            parse_dublincore=False,
+        ).as_text()