1 files changed, 19 insertions, 35 deletions
diff --git a/tests/docx/xmlparser_tests.py b/tests/docx/xmlparser_tests.py
index 65a2f25..8c960eb 100644
--- a/tests/docx/xmlparser_tests.py
+++ b/tests/docx/xmlparser_tests.py
@@ -1,89 +1,73 @@
 import io
 
-from nose.tools import istest, assert_equal
-
 from mammoth.docx.xmlparser import parse_xml, element as xml_element, text as xml_text
+from ..testing import assert_equal
 
 
-@istest
-def can_parse_self_closing_element():
+def test_can_parse_self_closing_element():
     xml = _parse_xml_string(b"<body/>")
     assert_equal(xml_element("body", {}, []), xml)
 
 
-@istest
-def can_parse_empty_element_with_separate_closing_tag():
+def test_can_parse_empty_element_with_separate_closing_tag():
     xml = _parse_xml_string(b"<body></body>")
     assert_equal(xml_element("body", {}, []), xml)
 
 
-@istest
-def can_parse_attributes_of_tag():
+def test_can_parse_attributes_of_tag():
     xml = _parse_xml_string(b"<body name='bob'></body>")
     assert_equal(xml_element("body", {"name": "bob"}, []), xml)
 
 
-@istest
-def can_parse_text_element():
+def test_can_parse_text_element():
     xml = _parse_xml_string(b"<body>Hello!</body>")
     assert_equal(xml_element("body", {}, [xml_text("Hello!")]), xml)
 
 
-@istest
-def can_parse_text_element_before_new_tag():
+def test_can_parse_text_element_before_new_tag():
     xml = _parse_xml_string(b"<body>Hello!<br/></body>")
     assert_equal(xml_element("body", {}, [xml_text("Hello!"), xml_element("br", {}, [])]), xml)
 
 
-@istest
-def can_parse_element_with_children():
+def test_can_parse_element_with_children():
     xml = _parse_xml_string(b"<body><a/><b/></body>")
     assert_equal([xml_element("a", {}, []), xml_element("b", {}, [])], xml.children)
 
 
-@istest
-def unmapped_namespaces_uris_are_included_in_braces_as_prefix():
+def test_unmapped_namespaces_uris_are_included_in_braces_as_prefix():
     xml = _parse_xml_string(b'<w:body xmlns:w="word"/>')
     assert_equal("{word}body", xml.name)
 
 
-@istest
-def mapped_namespaces_uris_are_translated_using_namespace_map():
+def test_mapped_namespaces_uris_are_translated_using_namespace_map():
     xml = _parse_xml_string(b'<w:body xmlns:w="word"/>', [("x", "word")])
     assert_equal("x:body", xml.name)
 
 
-@istest
-def namespace_of_attributes_is_mapped_to_prefix():
+def test_namespace_of_attributes_is_mapped_to_prefix():
     xml = _parse_xml_string(b'<w:body xmlns:w="word" w:val="Hello!"/>', [("x", "word")])
     assert_equal("Hello!", xml.attributes["x:val"])
 
 
-@istest
-def whitespace_between_xml_declaration_and_root_tag_is_ignored():
+def test_whitespace_between_xml_declaration_and_root_tag_is_ignored():
     xml = _parse_xml_string(b'<?xml version="1.0" ?>\n<body/>')
     assert_equal("body", xml.name)
-    
 
-@istest
+
 class FindChildTests(object):
-    @istest
-    def returns_none_if_no_children(self):
+    def test_returns_none_if_no_children(self):
         xml = xml_element("a")
         assert_equal(None, xml.find_child("b"))
-        
-    @istest
-    def returns_none_if_no_matching_children(self):
+
+    def test_returns_none_if_no_matching_children(self):
         xml = xml_element("a", {}, [xml_element("c")])
         assert_equal(None, xml.find_child("b"))
-        
-    @istest
-    def returns_first_matching_child(self):
+
+    def test_returns_first_matching_child(self):
         xml = xml_element("a", {}, [xml_element("b", {"id": 1}), xml_element("b", {"id": 2})])
         assert_equal(1, xml.find_child("b").attributes["id"])
-        
-    @istest
-    def ignores_text_nodes(self):
+
+    def test_ignores_text_nodes(self):
         xml = xml_element("a", {}, [xml_text("Hello!")])
         assert_equal(None, xml.find_child("b"))