Revert "edited tests based on fixed file and function names"

This reverts commit 9c4e33c.

Author: Alison Wu

tests/test_diffraction_objects.py

@@ -4,7 +4,7 @@
 import pytest
 from freezegun import freeze_time
 
-from diffpy.utils.scattering_objects.diffraction_objects import DiffractionObject
+from diffpy.utils.scattering_objects.diffraction_objects import Diffraction_object
 
 params = [
     (  # Default
@@ -222,8 +222,8 @@
 
 @pytest.mark.parametrize("inputs1, inputs2, expected", params)
 def test_diffraction_objects_equality(inputs1, inputs2, expected):
-    diffraction_object1 = DiffractionObject()
-    diffraction_object2 = DiffractionObject()
+    diffraction_object1 = Diffraction_object()
+    diffraction_object2 = Diffraction_object()
     diffraction_object1_attributes = [key for key in diffraction_object1.__dict__ if not key.startswith("_")]
     for i, attribute in enumerate(diffraction_object1_attributes):
         setattr(diffraction_object1, attribute, inputs1[i])
@@ -235,7 +235,7 @@ def test_dump(tmp_path, mocker):
     x, y = np.linspace(0, 5, 6), np.linspace(0, 5, 6)
     directory = Path(tmp_path)
     file = directory / "testfile"
-    test = DiffractionObject()
+    test = Diffraction_object()
     test.wavelength = 1.54
     test.name = "test"
     test.scat_quantity = "x-ray"
@@ -251,7 +251,7 @@ def test_dump(tmp_path, mocker):
     with open(file, "r") as f:
         actual = f.read()
     expected = (
-        "[DiffractionObject]\nname = test\nwavelength = 1.54\nscat_quantity = x-ray\nthing1 = 1\n"
+        "[Diffraction_object]\nname = test\nwavelength = 1.54\nscat_quantity = x-ray\nthing1 = 1\n"
         "thing2 = thing2\npackage_info = {'package2': '3.4.5', 'diffpy.utils': '3.3.0'}\n"
         "creation_time = 2012-01-14 00:00:00\n\n"
         "#### start data\n0.000000000000000000e+00 0.000000000000000000e+00\n"

tests/test_loaddata.py

@@ -8,7 +8,7 @@
 import numpy
 import pytest
 
-from diffpy.utils.parsers.data_loader import load_data
+from diffpy.utils.parsers import loadData
 
 
 ##############################################################################
@@ -18,41 +18,41 @@ def prepare_fixture(self, datafile):
         self.datafile = datafile
 
     def test_loadData_default(self):
-        """check load_data() with default options"""
+        """check loadData() with default options"""
         loaddata01 = self.datafile("loaddata01.txt")
         d2c = numpy.array([[3, 31], [4, 32], [5, 33]])
-        self.assertRaises(IOError, load_data, "doesnotexist")
+        self.assertRaises(IOError, loadData, "doesnotexist")
         # the default minrows=10 makes it read from the third line
-        d = load_data(loaddata01)
+        d = loadData(loaddata01)
         self.assertTrue(numpy.array_equal(d2c, d))
         # the usecols=(0, 1) would make it read from the third line
-        d = load_data(loaddata01, minrows=1, usecols=(0, 1))
+        d = loadData(loaddata01, minrows=1, usecols=(0, 1))
         self.assertTrue(numpy.array_equal(d2c, d))
         # check the effect of usecols effect
-        d = load_data(loaddata01, usecols=(0,))
+        d = loadData(loaddata01, usecols=(0,))
         self.assertTrue(numpy.array_equal(d2c[:, 0], d))
-        d = load_data(loaddata01, usecols=(1,))
+        d = loadData(loaddata01, usecols=(1,))
         self.assertTrue(numpy.array_equal(d2c[:, 1], d))
         return
 
     def test_loadData_1column(self):
         """check loading of one-column data."""
         loaddata01 = self.datafile("loaddata01.txt")
         d1c = numpy.arange(1, 6)
-        d = load_data(loaddata01, usecols=[0], minrows=1)
+        d = loadData(loaddata01, usecols=[0], minrows=1)
         self.assertTrue(numpy.array_equal(d1c, d))
-        d = load_data(loaddata01, usecols=[0], minrows=2)
+        d = loadData(loaddata01, usecols=[0], minrows=2)
         self.assertTrue(numpy.array_equal(d1c, d))
-        d = load_data(loaddata01, usecols=[0], minrows=3)
+        d = loadData(loaddata01, usecols=[0], minrows=3)
         self.assertFalse(numpy.array_equal(d1c, d))
         return
 
     def test_loadData_headers(self):
-        """check load_data() with headers options enabled"""
+        """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 = load_data(loaddatawithheaders, headers=True, hdel=delimiter, hignore=hignore)
+        hdata = loadData(loaddatawithheaders, headers=True, hdel=delimiter, hignore=hignore)
         # only fourteen lines of data are formatted properly
         assert len(hdata) == 14
         # check the following are floats

tests/test_resample.py

@@ -1,7 +1,7 @@
 import numpy as np
 import pytest
 
-from diffpy.utils.resampler import wsinterp
+from diffpy.utils.parsers.resample import wsinterp
 
 
 def test_wsinterp():

tests/test_serialization.py

@@ -3,9 +3,8 @@
 import numpy
 import pytest
 
+from diffpy.utils.parsers import deserialize_data, loadData, serialize_data
 from diffpy.utils.parsers.custom_exceptions import ImproperSizeError, UnsupportedTypeError
-from diffpy.utils.parsers.data_loader import load_data
-from diffpy.utils.parsers.serializer import deserialize_data, serialize_data
 
 tests_dir = os.path.dirname(os.path.abspath(locals().get("__file__", "file.py")))
 
@@ -21,8 +20,8 @@ def test_load_multiple(tmp_path, datafile):
     for hfname in tlm_list:
         # gather data using loadData
         headerfile = os.path.normpath(os.path.join(tests_dir, "testdata", "dbload", hfname))
-        hdata = load_data(headerfile, headers=True)
-        data_table = load_data(headerfile)
+        hdata = loadData(headerfile, headers=True)
+        data_table = loadData(headerfile)
 
         # check path extraction
         generated_data = serialize_data(headerfile, hdata, data_table, dt_colnames=["r", "gr"], show_path=True)
@@ -51,8 +50,8 @@ def test_exceptions(datafile):
     loadfile = datafile("loadfile.txt")
     warningfile = datafile("generatewarnings.txt")
     nodt = datafile("loaddatawithheaders.txt")
-    hdata = load_data(loadfile, headers=True)
-    data_table = load_data(loadfile)
+    hdata = loadData(loadfile, headers=True)
+    data_table = loadData(loadfile)
 
     # improper file types
     with pytest.raises(UnsupportedTypeError):
@@ -88,15 +87,15 @@ def test_exceptions(datafile):
     assert numpy.allclose(r_extract[data_name]["r"], r_list)
     assert numpy.allclose(gr_extract[data_name]["gr"], gr_list)
     # no datatable
-    nodt_hdata = load_data(nodt, headers=True)
-    nodt_dt = load_data(nodt)
+    nodt_hdata = loadData(nodt, headers=True)
+    nodt_dt = loadData(nodt)
     no_dt = serialize_data(nodt, nodt_hdata, nodt_dt, show_path=False)
     nodt_data_name = list(no_dt.keys())[0]
     assert numpy.allclose(no_dt[nodt_data_name]["data table"], nodt_dt)
 
     # ensure user is warned when columns are overwritten
-    hdata = load_data(warningfile, headers=True)
-    data_table = load_data(warningfile)
+    hdata = loadData(warningfile, headers=True)
+    data_table = loadData(warningfile)
     with pytest.warns(RuntimeWarning) as record:
         serialize_data(
             warningfile,