Merge pull request #100 from bobleesj/tests-folder

Move tests folder to top dir level

Author: sbillinge

news/folder.rst

@@ -0,0 +1,23 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* tests folder at the root of the repo
+
+**Security:**
+
+* <news item>

pyproject.toml

@@ -45,7 +45,7 @@ dirty_template = "{tag}"
 [tool.setuptools.packages.find]
 where = ["src"]  # list of folders that contain the packages (["."] by default)
 include = ["*"]  # package names should match these glob patterns (["*"] by default)
-exclude = ["diffpy.structure.tests*"]  # exclude packages matching these glob patterns (empty by default)
+exclude = []  # exclude packages matching these glob patterns (empty by default)
 namespaces = false  # to disable scanning PEP 420 namespaces (true by default)
 
 [tool.setuptools.dynamic]

src/diffpy/structure/tests/__init__.py

@@ -17,3 +17,13 @@ def user_filesystem(tmp_path):
         json.dump(home_config_data, f)
 
     yield tmp_path
+
+
+@pytest.fixture
+def datafile():
+    """Fixture to dynamically load any test file."""
+
+    def _load(filename):
+        return "tests/testdata/" + filename
+
+    return _load

src/diffpy/structure/tests/debug.py

@@ -5,53 +5,57 @@
 
 import unittest
 
+import pytest
+
 from diffpy.structure import PDFFitStructure, Structure, loadStructure
 from diffpy.structure.structureerrors import StructureFormatError
-from diffpy.structure.tests.testutils import datafile
 
 
 ##############################################################################
 class TestLoadStructure(unittest.TestCase):
+    @pytest.fixture(autouse=True)
+    def prepare_fixture(self, datafile):
+        self.datafile = datafile
 
     def test_xcfg(self):
         """check loading of atomeye xcfg format"""
-        f = datafile("BubbleRaftShort.xcfg")
+        f = self.datafile("BubbleRaftShort.xcfg")
         stru = loadStructure(f)
         self.assertTrue(type(stru) is Structure)
         self.assertRaises(StructureFormatError, loadStructure, f, "xyz")
         return
 
     def test_discus(self):
         """check loading of discus file format"""
-        f = datafile("Ni-discus.stru")
+        f = self.datafile("Ni-discus.stru")
         stru = loadStructure(f)
         self.assertTrue(type(stru) is PDFFitStructure)
         return
 
     def test_cif(self):
         """check loading of CIF file format"""
-        f = datafile("PbTe.cif")
+        f = self.datafile("PbTe.cif")
         stru = loadStructure(f)
         self.assertTrue(isinstance(stru, Structure))
         self.assertFalse(isinstance(stru, PDFFitStructure))
         return
 
     def test_badfile(self):
         """check loading of CIF file format"""
-        f = datafile("Ni-bad.stru")
+        f = self.datafile("Ni-bad.stru")
         self.assertRaises(StructureFormatError, loadStructure, f)
         return
 
     def test_goodkwarg(self):
         """check loading of CIF file and passing of parser keyword argument."""
-        f = datafile("graphite.cif")
+        f = self.datafile("graphite.cif")
         stru = loadStructure(f, eps=1e-10)
         self.assertEqual(8, len(stru))
         return
 
     def test_badkwarg(self):
         """check loading of xyz file format with invalid keyword argument"""
-        f = datafile("bucky.xyz")
+        f = self.datafile("bucky.xyz")
         self.assertRaises(TypeError, loadStructure, f, eps=1e-10)
         return