[test] Add and use common resource dir path

Author: mpsonntag

test/test_doc.py

@@ -12,7 +12,7 @@
 from odml import Document, Section, Property
 from odml.doc import BaseDocument
 from odml.dtypes import FORMAT_DATE
-from .util import ODML_CACHE_DIR as CACHE_DIR
+from .util import ODML_CACHE_DIR as CACHE_DIR, TEST_RESOURCES_DIR as RES_DIR
 
 
 class TestSection(unittest.TestCase):
@@ -109,8 +109,7 @@ def test_date(self):
             doc.date = "some format"
 
     def test_get_terminology_equivalent(self):
-        dir_path = os.path.dirname(os.path.realpath(__file__))
-        repo_file = os.path.join(dir_path, "resources", self.local_repo_file)
+        repo_file = os.path.join(RES_DIR, self.local_repo_file)
         local_url = "file://%s" % pathname2url(repo_file)
 
         doc = Document(repository=local_url)

test/test_fileio.py

@@ -1,40 +1,44 @@
-import unittest
-import sys
 import os
-import odml
+import sys
+import unittest
 
 try:
     from StringIO import StringIO
 except ImportError:
     from io import StringIO
 
+import odml
+
+from .util import TEST_RESOURCES_DIR as RES_DIR
+
 
 class TestTypes(unittest.TestCase):
 
     def setUp(self):
-        self.dir_path = os.path.dirname(os.path.realpath(__file__))
-        self.file = os.path.join(self.dir_path, 'resources', 'example.odml')
+        self.file = os.path.join(RES_DIR, "example.odml")
         # Do not allow anything to be printed on STDOUT
         self.captured_stdout = StringIO()
         sys.stdout = self.captured_stdout
 
     def test_load_save(self):
         doc = odml.load(self.file)
         self.assertTrue(isinstance(doc, odml.doc.BaseDocument))
-        odml.save(doc, self.file + '_copy')
-        os.remove(self.file + '_copy')
+        file_name = "%s_copy" % self.file
+        odml.save(doc, file_name)
+        os.remove(file_name)
 
     def test_display(self):
         doc = odml.load(self.file)
         odml.display(doc)
 
     def test_invalid_parser(self):
         with self.assertRaises(NotImplementedError):
-            odml.load(self.file, 'html')
+            odml.load(self.file, "html")
 
         doc = odml.load(self.file)
         with self.assertRaises(NotImplementedError):
-            odml.save(doc, self.file + '_copy_html', 'html')
+            file_name = "%s_copy_html" % self.file
+            odml.save(doc, file_name, "html")
 
         with self.assertRaises(NotImplementedError):
-            odml.display(doc, 'html')
+            odml.display(doc, "html")

test/test_parser_json.py

@@ -10,7 +10,7 @@
 
 from odml.tools import dict_parser
 from odml.tools.parser_utils import ParserException, InvalidVersionException
-from .util import create_test_dir
+from .util import create_test_dir, TEST_RESOURCES_DIR as RES_DIR
 
 
 _INVALID_ATTRIBUTE_HANDLING_DOC = """
@@ -110,11 +110,8 @@
 class TestJSONParser(unittest.TestCase):
 
     def setUp(self):
-        dir_path = os.path.dirname(os.path.realpath(__file__))
-        self.basepath = os.path.join(dir_path, "resources")
-
+        self.base_path = RES_DIR
         self.json_reader = dict_parser.DictReader(show_warnings=False)
-
         self.tmp_dir_path = create_test_dir(__file__)
 
     def tearDown(self):
@@ -136,7 +133,7 @@ def test_missing_root(self):
         filename = "missing_root.json"
         message = "Missing root element"
 
-        with open(os.path.join(self.basepath, filename)) as json_data:
+        with open(os.path.join(self.base_path, filename)) as json_data:
             parsed_doc = json.load(json_data)
 
         with self.assertRaises(ParserException) as exc:
@@ -148,7 +145,7 @@ def test_missing_version(self):
         filename = "missing_version.json"
         message = "Could not find odml-version"
 
-        with open(os.path.join(self.basepath, filename)) as json_data:
+        with open(os.path.join(self.base_path, filename)) as json_data:
             parsed_doc = json.load(json_data)
 
         with self.assertRaises(ParserException) as exc:
@@ -159,7 +156,7 @@ def test_missing_version(self):
     def test_invalid_version(self):
         filename = "invalid_version.json"
 
-        with open(os.path.join(self.basepath, filename)) as json_data:
+        with open(os.path.join(self.base_path, filename)) as json_data:
             parsed_doc = json.load(json_data)
 
         with self.assertRaises(InvalidVersionException):

test/test_parser_odml.py

@@ -9,16 +9,14 @@
 
 from odml import Document, Section, Property
 from odml.tools import odmlparser
-from .util import create_test_dir
+from .util import create_test_dir, TEST_RESOURCES_DIR as RES_DIR
 
 
 class TestOdmlParser(unittest.TestCase):
 
     def setUp(self):
         # Set up test environment
-        dir_path = os.path.dirname(os.path.realpath(__file__))
-        self.basefile = os.path.join(dir_path, "resources", "example.odml")
-
+        base_file = os.path.join(RES_DIR, "example.odml")
         self.tmp_dir = create_test_dir(__file__)
 
         self.json_file = os.path.join(self.tmp_dir, "test.json")
@@ -36,7 +34,7 @@ def setUp(self):
         self.json_writer = odmlparser.ODMLWriter(parser='JSON')
         self.rdf_writer = odmlparser.ODMLWriter(parser='RDF')
 
-        self.odml_doc = self.xml_reader.from_file(self.basefile)
+        self.odml_doc = self.xml_reader.from_file(base_file)
 
     def tearDown(self):
         if os.path.exists(self.tmp_dir):

test/test_parser_xml.py

@@ -3,13 +3,13 @@
 
 from odml.tools import xmlparser
 from odml.tools.parser_utils import ParserException, InvalidVersionException
+from .util import TEST_RESOURCES_DIR as RES_DIR
 
 
 class TestXMLParser(unittest.TestCase):
 
     def setUp(self):
-        dir_path = os.path.dirname(os.path.realpath(__file__))
-        self.basepath = os.path.join(dir_path, "resources")
+        self.base_path = RES_DIR
 
         self.xml_reader = xmlparser.XMLReader()
         self.xml_reader_ignore = xmlparser.XMLReader(ignore_errors=True)
@@ -19,7 +19,7 @@ def test_invalid_root(self):
         message = "Expecting <odML>"
 
         with self.assertRaises(ParserException) as exc:
-            _ = self.xml_reader.from_file(os.path.join(self.basepath, filename))
+            _ = self.xml_reader.from_file(os.path.join(self.base_path, filename))
 
         self.assertIn(message, str(exc.exception))
 
@@ -28,21 +28,21 @@ def test_missing_version(self):
         message = "Could not find format version attribute"
 
         with self.assertRaises(ParserException) as exc:
-            _ = self.xml_reader.from_file(os.path.join(self.basepath, filename))
+            _ = self.xml_reader.from_file(os.path.join(self.base_path, filename))
 
         self.assertIn(message, str(exc.exception))
 
     def test_invalid_version(self):
         filename = "invalid_version.xml"
 
         with self.assertRaises(InvalidVersionException):
-            _ = self.xml_reader.from_file(os.path.join(self.basepath, filename))
+            _ = self.xml_reader.from_file(os.path.join(self.base_path, filename))
 
     def test_ignore_errors(self):
         filename = "ignore_errors.xml"
 
         with self.assertRaises(ParserException):
-            _ = self.xml_reader.from_file(os.path.join(self.basepath, filename))
+            _ = self.xml_reader.from_file(os.path.join(self.base_path, filename))
 
-        doc = self.xml_reader_ignore.from_file(os.path.join(self.basepath, filename))
+        doc = self.xml_reader_ignore.from_file(os.path.join(self.base_path, filename))
         doc.pprint()

test/test_parser_yaml.py

@@ -10,7 +10,7 @@
 
 from odml.tools import dict_parser
 from odml.tools.parser_utils import ParserException, InvalidVersionException
-from .util import create_test_dir
+from .util import create_test_dir, TEST_RESOURCES_DIR as RES_DIR
 
 
 _INVALID_ATTRIBUTE_HANDLING_DOC = """
@@ -70,11 +70,8 @@
 class TestYAMLParser(unittest.TestCase):
 
     def setUp(self):
-        dir_path = os.path.dirname(os.path.realpath(__file__))
-        self.basepath = os.path.join(dir_path, "resources")
-
+        self.base_path = RES_DIR
         self.yaml_reader = dict_parser.DictReader(show_warnings=False)
-
         self.tmp_dir_path = create_test_dir(__file__)
 
     def tearDown(self):
@@ -96,7 +93,7 @@ def test_missing_root(self):
         filename = "missing_root.yaml"
         message = "Missing root element"
 
-        with open(os.path.join(self.basepath, filename)) as raw_data:
+        with open(os.path.join(self.base_path, filename)) as raw_data:
             parsed_doc = yaml.safe_load(raw_data)
 
         with self.assertRaises(ParserException) as exc:
@@ -108,7 +105,7 @@ def test_missing_version(self):
         filename = "missing_version.yaml"
         message = "Could not find odml-version"
 
-        with open(os.path.join(self.basepath, filename)) as raw_data:
+        with open(os.path.join(self.base_path, filename)) as raw_data:
             parsed_doc = yaml.safe_load(raw_data)
 
         with self.assertRaises(ParserException) as exc:
@@ -119,7 +116,7 @@ def test_missing_version(self):
     def test_invalid_version(self):
         filename = "invalid_version.yaml"
 
-        with open(os.path.join(self.basepath, filename)) as raw_data:
+        with open(os.path.join(self.base_path, filename)) as raw_data:
             parsed_doc = yaml.safe_load(raw_data)
 
         with self.assertRaises(InvalidVersionException):

test/test_validation.py

@@ -6,6 +6,7 @@
 import odml.validation
 import odml.terminology
 from . import test_samplefile as samplefile
+from .util import TEST_RESOURCES_DIR as RES_DIR
 
 try:
     from StringIO import StringIO
@@ -19,7 +20,6 @@ class TestValidation(unittest.TestCase):
 
     def setUp(self):
         self.doc = samplefile.SampleFileCreator().create_document()
-        self.dir_path = os.path.dirname(os.path.realpath(__file__))
 
     @staticmethod
     def filter_repository_errors(errors):
@@ -405,7 +405,7 @@ def test_load_section_xml(self):
         Test if loading xml document raises validation errors for Sections with undefined type.
         """
 
-        path = os.path.join(self.dir_path, "resources", "validation_section.xml")
+        path = os.path.join(RES_DIR, "validation_section.xml")
         doc = odml.load(path)
 
         self.load_section_validation(doc)
@@ -415,7 +415,7 @@ def test_load_section_json(self):
         Test if loading json document raises validation errors for Sections with undefined type.
         """
 
-        path = os.path.join(self.dir_path, "resources", "validation_section.json")
+        path = os.path.join(RES_DIR, "validation_section.json")
         doc = odml.load(path, "JSON")
 
         self.load_section_validation(doc)
@@ -425,7 +425,7 @@ def test_load_section_yaml(self):
         Test if loading yaml document raises validation errors for Sections with undefined type.
         """
 
-        path = os.path.join(self.dir_path, "resources", "validation_section.yaml")
+        path = os.path.join(RES_DIR, "validation_section.yaml")
         doc = odml.load(path, "YAML")
 
         self.load_section_validation(doc)
@@ -459,7 +459,7 @@ def test_load_dtypes_xml(self):
         for Properties with undefined dtypes.
         """
 
-        path = os.path.join(self.dir_path, "resources", "validation_dtypes.xml")
+        path = os.path.join(RES_DIR, "validation_dtypes.xml")
         doc = odml.load(path)
         self.load_dtypes_validation(doc)
 
@@ -469,7 +469,7 @@ def test_load_dtypes_json(self):
         for Properties with undefined dtypes.
         """
 
-        path = os.path.join(self.dir_path, "resources", "validation_dtypes.json")
+        path = os.path.join(RES_DIR, "validation_dtypes.json")
         doc = odml.load(path, "JSON")
         self.load_dtypes_validation(doc)
 
@@ -479,6 +479,6 @@ def test_load_dtypes_yaml(self):
         for Properties with undefined dtypes.
         """
 
-        path = os.path.join(self.dir_path, "resources", "validation_dtypes.yaml")
+        path = os.path.join(RES_DIR, "validation_dtypes.yaml")
         doc = odml.load(path, "YAML")
         self.load_dtypes_validation(doc)