Merge pull request #96 from bobleesj/move-folder

Move tests folder to top and use pytest to run all tests

Author: sbillinge

pytest.ini

@@ -1,3 +1 @@
 [pytest]
-testpaths= src/diffpy/utils/tests
-python_files = test_*.py

src/diffpy/utils/tests/__init__.py

@@ -1,4 +1,5 @@
 import json
+from importlib.resources import as_file, files
 from pathlib import Path
 
 import pytest
@@ -17,3 +18,20 @@ def user_filesystem(tmp_path):
         json.dump(home_config_data, f)
 
     yield tmp_path
+
+
+def get_datafile(filename):
+    """Helper function to retrieve the file path for test data."""
+    ref = files(__package__) / f"testdata/{filename}"
+    with as_file(ref) as rv:
+        return rv
+
+
+@pytest.fixture
+def datafile():
+    """Fixture to dynamically load any test file."""
+
+    def _load(filename):
+        return get_datafile(filename)
+
+    return _load

src/diffpy/utils/tests/debug.py

@@ -6,18 +6,20 @@
 import unittest
 
 import numpy
+import pytest
 
 from diffpy.utils.parsers import loadData
-from diffpy.utils.tests.testhelpers import datafile
-
-loaddata01 = datafile("loaddata01.txt")
-loaddatawithheaders = datafile("loaddatawithheaders.txt")
 
 
 ##############################################################################
 class TestLoadData(unittest.TestCase):
+    @pytest.fixture(autouse=True)
+    def prepare_fixture(self, datafile):
+        self.datafile = datafile
+
     def test_loadData_default(self):
         """check loadData() with default options"""
+        loaddata01 = self.datafile("loaddata01.txt")
         d2c = numpy.array([[3, 31], [4, 32], [5, 33]])
         self.assertRaises(IOError, loadData, "doesnotexist")
         # the default minrows=10 makes it read from the third line
@@ -35,6 +37,7 @@ def test_loadData_default(self):
 
     def test_loadData_1column(self):
         """check loading of one-column data."""
+        loaddata01 = self.datafile("loaddata01.txt")
         d1c = numpy.arange(1, 6)
         d = loadData(loaddata01, usecols=[0], minrows=1)
         self.assertTrue(numpy.array_equal(d1c, d))
@@ -46,6 +49,7 @@ def test_loadData_1column(self):
 
     def test_loadData_headers(self):
         """check loadData() with headers options enabled"""
+        loaddatawithheaders = self.datafile("loaddatawithheaders.txt")
         hignore = ["# ", "// ", "["]  # ignore lines beginning with these strings
         delimiter = ": "  # what our data should be separated by
         hdata = loadData(loaddatawithheaders, headers=True, hdel=delimiter, hignore=hignore)

src/diffpy/utils/tests/run.py

@@ -5,21 +5,15 @@
 
 from diffpy.utils.parsers import deserialize_data, loadData, serialize_data
 from diffpy.utils.parsers.custom_exceptions import ImproperSizeError, UnsupportedTypeError
-from diffpy.utils.tests.testhelpers import datafile
 
 tests_dir = os.path.dirname(os.path.abspath(locals().get("__file__", "file.py")))
 
-targetjson = datafile("targetjson.json")
-schemaname = datafile("strumining.json")
-wrongtype = datafile("wrong.type")
-loadfile = datafile("loadfile.txt")
-warningfile = datafile("generatewarnings.txt")
-nodt = datafile("loaddatawithheaders.txt")
 
-
-def test_load_multiple(tmp_path):
-    # generate json and apply schema
+def test_load_multiple(tmp_path, datafile):
+    # Load test data
+    targetjson = datafile("targetjson.json")
     generatedjson = tmp_path / "generated_serialization.json"
+
     tlm_list = os.listdir(os.path.join(tests_dir, "testdata", "dbload"))
     tlm_list.sort()
     generated_data = None
@@ -50,7 +44,12 @@ def test_load_multiple(tmp_path):
     assert target_data == deserialize_data(generatedjson, filetype=".json")
 
 
-def test_exceptions():
+def test_exceptions(datafile):
+    # Load test data
+    wrongtype = datafile("wrong.type")
+    loadfile = datafile("loadfile.txt")
+    warningfile = datafile("generatewarnings.txt")
+    nodt = datafile("loaddatawithheaders.txt")
     hdata = loadData(loadfile, headers=True)
     data_table = loadData(loadfile)