simplify logic and tests

ncompare/getters.py

@@ -85,20 +85,16 @@ def get_subgroups(node: Union[netCDF4.Dataset, netCDF4.Group, h5py.Group], file_
         return []
     elif file_type == "hdf5":
         return [key for key in node.keys() if isinstance(node[key], h5py.Group)]
-    elif file_type == "netcdf":  # should be "netcdf"
+    else:  # should be "netcdf"
         return list(node.groups)
-    else:
-        return []
 
 
 def get_variables(node: Union[netCDF4.Dataset, netCDF4.Group, h5py.Group], file_type: str) -> list:
     """Get a sorted list of variables from a netCDF or HDF5 group."""
     if file_type == "hdf5":
         return [key for key in node.keys() if isinstance(node[key], h5py.Dataset)]
-    elif file_type == "netcdf":
+    else:  # should be "netcdf"
         return sorted(node.variables)
-    else:
-        raise RuntimeError(f"Unsupported file type: {file_type}")
 
 
 def get_root_dims(file: FileToCompare) -> list:

ncompare/utility_types.py

@@ -16,13 +16,10 @@ class FileToCompare:
     def __post_init__(self):
         # We'll validate the inputs here.
         if not isinstance(self.path, (str, Path)):
-            raise ValueError(f"'path' must be a str or Path, was {type(self.path)}")
+            raise TypeError(f"'path' must be a str or Path, was {type(self.path)}")
         if self.type not in ("netcdf", "hdf5"):
             raise ValueError("'type' must be either 'netcdf' or 'hdf5'")
 
-    def __str__(self):
-        return f"path: {self.path} is considered a {self.type} file"
-
 
 class SummaryDifferencesDict(TypedDict):
     """Represents the number and type of differences between two files."""

tests/test_path_and_string_operations.py

@@ -27,7 +27,11 @@
 
 import pytest
 
-from ncompare.path_and_string_operations import coerce_to_str, ensure_valid_path_exists
+from ncompare.path_and_string_operations import (
+    coerce_to_str,
+    ensure_valid_path_exists,
+    validate_file_type,
+)
 
 
 def test_make_valid_path_with_simple_invalid_str_path():
@@ -50,6 +54,11 @@ def test_make_valid_path_from_Path_in_repo():
     assert isinstance(returnval, Path)
 
 
+def test_validate_file_type():
+    with pytest.raises(TypeError):
+        validate_file_type(Path(__file__))
+
+
 def test_error_from_wrong_path_type():
     with pytest.raises(TypeError):
         ensure_valid_path_exists((0, 1))

tests/test_utility_types.py

@@ -0,0 +1,13 @@
+from pathlib import Path
+
+import pytest
+
+from ncompare.utility_types import FileToCompare
+
+
+def test_FileToCompare():
+    with pytest.raises(TypeError):
+        assert FileToCompare(path=123, type="netcdf")
+
+    with pytest.raises(ValueError):
+        assert FileToCompare(path=Path(__file__), type="beebop_type")