Update tests

Author: gb119

Stoner/formats/data/zip.py

@@ -57,6 +57,8 @@ def load_measure_linkfile(new_data: Data, *args: Args, **kwargs: Kwargs) -> Data
         The subfolders contain json for the node operations and optionally (if the key HasData is True) a csv file.
     """
     filename, args, kwargs = get_filename(args, kwargs)
+    if not test_is_zip(filename):
+        raise StonerLoadError("Must be a zip file to load as a measurement sequence.")
     with zf.ZipFile(filename, "r") as seq:
         if "FileInfo.json" not in seq.namelist():
             raise StonerLoadError("Missing the Measurelink Sequence FileInfo.json entry")

tests/Stoner/folders/test_Folders.py

@@ -135,7 +135,7 @@ def test_Operators():
     fldr2 = DataFolder(path.join(datadir, "NLIV"), pattern="*.txt")
     fldr2.group(lambda x: "zero" if x["iterator"] % 2 == 0 else "one")
     fldr3 = fldr + fldr2
-    assert fldr3.shape == (52, {"one": (9, {}), "zero": (7, {})}), "Adding two DataFolders with groups failed"
+    assert fldr3.shape == (54, {"one": (9, {}), "zero": (7, {})}), "Adding two DataFolders with groups failed"
     fldr4 = fldr3 - fldr2
     fldr4.prune()
     assert fldr4.shape == fldr.shape, "Failed to subtract one DataFolder from another :{}".format(fldr4.shape)
@@ -149,7 +149,7 @@ def test_Operators():
     fldr = DataFolder(datadir, debug=False, recursive=False)
     names = list(fldr.ls)[::2]
     fldr -= names
-    assert len(fldr) == 26, "Failed to delete from a sequence"
+    assert len(fldr) == 27, "Failed to delete from a sequence"
     with pytest.raises(TypeError):
         fldr - 0.34
     with pytest.raises(RuntimeError):
@@ -186,7 +186,7 @@ def test_Base_Operators():
     fldr2 = DataFolder(path.join(datadir, "NLIV"), pattern="*.txt")
     fldr2.group(lambda x: "zero" if x["iterator"] % 2 == 0 else "one")
     fldr3 = fldr + fldr2
-    assert fldr3.shape == (52, {"one": (9, {}), "zero": (7, {})}), "Adding two DataFolders with groups failed"
+    assert fldr3.shape == (54, {"one": (9, {}), "zero": (7, {})}), "Adding two DataFolders with groups failed"
     fldr4 = fldr3 - fldr2
     fldr4.prune()
     assert fldr4.shape == fldr.shape, "Failed to subtract one DataFolder from another :{}".format(fldr4.shape)
@@ -200,7 +200,7 @@ def test_Base_Operators():
     fldr = DataFolder(datadir, debug=False, recursive=False)
     names = list(fldr.ls)[::2]
     fldr -= names
-    assert len(fldr) == 26, "Failed to delete from a sequence"
+    assert len(fldr) == 27, "Failed to delete from a sequence"
     with pytest.raises(TypeError):
         fldr - 0.34
     with pytest.raises(RuntimeError):
@@ -217,7 +217,7 @@ def test_Properties():
     fldr /= "Loaded as"
     grps = list(fldr.lsgrp)
     skip = 0 if Hyperspy_ok else 1
-    assert len(grps) == 27 - skip, f"Length of lsgrp not as expected: {len(grps)} not {27-skip}"
+    assert len(grps) == 28 - skip, f"Length of lsgrp not as expected: {len(grps)} not {27-skip}"
     fldr.debug = True
     fldr = fldr
     assert fldr["XRDFile"][0].debug, "Setting debug on folder failed!"

tests/Stoner/tools/test_widgets.py

@@ -78,7 +78,7 @@ def test_loader():
     fldr = DataFolder(False)
     del fldr["bad_data"]
     assert fldr.shape == (
-        52,
+        54,
         {
             "attocube_scan": (15, {}),
             "maximus_scan": (2, {"MPI_210127021": (3, {})}),