Merge pull request #117 from ArcanaFramework/error-message-fixup

Fixes issues with vendor formats used as classifiers

Author: tclose

extras/fileformats/extras/application/tests/test_application_serialization.py

@@ -1,7 +1,6 @@
-# import sys
-# import pytest
-from fileformats.application import Json, Yaml
+from pathlib import Path
 
+from fileformats.application import Json, Yaml
 
 SAMPLE_JSON = (
     """{"a": "string field", "alist": [0, 1, 2, 3, 4, 5], """
@@ -23,27 +22,19 @@
 """
 
 
-# @pytest.mark.xfail(
-#     sys.version_info.minor <= 9,
-#     reason="upstream Pydra issue with type-checking 'type' objects",
-# )
-def test_json_to_yaml(work_dir):
-    in_file = work_dir / "test.json"
+def test_json_to_yaml(tmp_path: Path):
+    in_file = tmp_path / "test.json"
     with open(in_file, "w") as f:
         f.write(SAMPLE_JSON)
     jsn = Json(in_file)
-    yml = Yaml.convert(jsn)
+    yml = Yaml.convert(jsn, out_dir=tmp_path)
     assert yml.raw_contents == SAMPLE_YAML
 
 
-# @pytest.mark.xfail(
-#     sys.version_info.minor <= 9,
-#     reason="upstream Pydra issue with type-checking 'type' objects",
-# )
-def test_yaml_to_json(work_dir):
-    in_file = work_dir / "test.yaml"
+def test_yaml_to_json(tmp_path: Path):
+    in_file = tmp_path / "test.yaml"
     with open(in_file, "w") as f:
-        f.write(SAMPLE_JSON)
+        f.write(SAMPLE_YAML)
     yml = Yaml(in_file)
-    jsn = Json.convert(yml)
+    jsn = Json.convert(yml, out_dir=tmp_path)
     assert jsn.raw_contents == SAMPLE_JSON

extras/fileformats/extras/generic/tests/test_converters.py

@@ -1,6 +1,8 @@
-import pytest
-from pathlib import Path
 import typing as ty
+from pathlib import Path
+
+import pytest
+
 from fileformats.generic import DirectoryOf, SetOf
 from fileformats.text import TextFile
 
@@ -24,15 +26,17 @@ def test_files(files_dir: Path, file_names: ty.List[str]) -> ty.List[Path]:
     return [files_dir / n for n in file_names]
 
 
-def test_list_dir_contents(files_dir: Path, test_files: ty.List[Path]) -> None:
+def test_list_dir_contents(
+    files_dir: Path, test_files: ty.List[Path], tmp_path: Path
+) -> None:
     text_set = SetOf[TextFile].convert(DirectoryOf[TextFile](files_dir))  # type: ignore[misc]
     assert sorted(t.name for t in text_set.contents) == sorted(
         f.name for f in test_files
     )
 
 
 def test_put_contents_in_dir(
-    file_names: ty.List[str], test_files: ty.List[Path]
+    file_names: ty.List[str], test_files: ty.List[Path], tmp_path: Path
 ) -> None:
     text_dir = DirectoryOf[TextFile].convert(SetOf[TextFile](test_files))  # type: ignore[misc]
     assert sorted(t.name for t in text_dir.contents) == file_names