Use actual data to test headers and test error IO msg

Author: bobleesj

tests/diffpy/utils/parsers/test_loaddata.py

@@ -14,8 +14,9 @@ def test_loadData_default(datafile):
     loaddata01 = datafile("loaddata01.txt")
     d2c = np.array([[3, 31], [4, 32], [5, 33]])
 
-    with pytest.raises(IOError):
+    with pytest.raises(IOError) as err:
         loadData("doesnotexist")
+    assert "No such file or directory" in str(err.value)
 
     # The default minrows=10 makes it read from the third line
     d = loadData(loaddata01)
@@ -51,22 +52,27 @@ def test_loadData_1column(datafile):
 
 def test_loadData_headers(datafile):
     """check loadData() with headers options enabled"""
+    expected = {
+        "wavelength": 0.1,
+        "dataformat": "Qnm",
+        "inputfile": "darkSub_rh20_C_01.chi",
+        "mode": "xray",
+        "bgscale": 1.2998929285,
+        "composition": "0.800.20",
+        "outputtype": "gr",
+        "qmaxinst": 25.0,
+        "qmin": 0.1,
+        "qmax": 25.0,
+        "rmax": "100.0r",
+        "rmin": "0.0r",
+        "rstep": "0.01r",
+        "rpoly": "0.9r",
+    }
+
     loaddatawithheaders = datafile("loaddatawithheaders.txt")
     hignore = ["# ", "// ", "["]  # ignore lines beginning with these strings
     delimiter = ": "  # what our data should be separated by
 
     # Load data with headers
     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
-    vfloats = ["wavelength", "qmaxinst", "qmin", "qmax", "bgscale"]
-    for name in vfloats:
-        assert isinstance(hdata.get(name), float)
-
-    # Check the following are NOT floats
-    vnfloats = ["composition", "rmax", "rmin", "rstep", "rpoly"]
-    for name in vnfloats:
-        assert not isinstance(hdata.get(name), float)
+    assert hdata == expected