From 9c683be99471894a46dcf5290bf69b0638d1b78c Mon Sep 17 00:00:00 2001 From: juk0de Date: Wed, 7 Feb 2024 08:38:46 +0100 Subject: [PATCH] glossary test: fixed cleanup of temporary files --- tests/test_glossary.py | 83 ++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 44 deletions(-) diff --git a/tests/test_glossary.py b/tests/test_glossary.py index 3991774..1f6ca00 100644 --- a/tests/test_glossary.py +++ b/tests/test_glossary.py @@ -26,7 +26,7 @@ class TestGlossary(unittest.TestCase): " yes: sí\n" " I'm going home: me voy a casa\n") yaml_file_path = Path(yaml_file.name) - + # create and check valid glossary glossary = Glossary.from_file(yaml_file_path) self.assertEqual(glossary.name, "Sample") self.assertEqual(glossary.desc, "A brief description") @@ -55,7 +55,7 @@ class TestGlossary(unittest.TestCase): " 'yes': 'sí'\n" " \"I'm going home\": 'me voy a casa'\n") yaml_file_path = Path(yaml_file.name) - + # create and check valid glossary glossary = Glossary.from_file(yaml_file_path) self.assertEqual(glossary.name, "Sample") self.assertEqual(glossary.desc, "A brief description") @@ -77,75 +77,68 @@ class TestGlossary(unittest.TestCase): target_lang="fr", entries={"yes": "oui"}) - with tempfile.NamedTemporaryFile('w', delete=False, suffix=glossary_suffix) as tmp_file: + with tempfile.NamedTemporaryFile('w', suffix=glossary_suffix) as tmp_file: file_path = Path(tmp_file.name) glossary.to_file(file_path) - - with open(file_path, 'r') as file: - content = file.read() - - self.assertIn("Name: Test", content) - self.assertIn("Description: Test description", content) - self.assertIn("ID: '666'", content) - self.assertIn("SourceLang: en", content) - self.assertIn("TargetLang: fr", content) - self.assertIn("Entries", content) - # 'yes' is a YAML keyword and therefore quoted - self.assertIn("'yes': oui", content) - file_path.unlink() # Remove the temporary file + # read and check valid YAML + with open(file_path, 'r') as file: + content = file.read() + self.assertIn("Name: Test", content) + self.assertIn("Description: Test description", content) + self.assertIn("ID: '666'", content) + self.assertIn("SourceLang: en", content) + self.assertIn("TargetLang: fr", content) + self.assertIn("Entries", content) + # 'yes' is a YAML keyword and therefore quoted + self.assertIn("'yes': oui", content) def test_write_read_glossary(self) -> None: # Create glossary instance # -> use 'yes' in order to test if the YAML quoting is correctly removed when reading the file glossary_write = Glossary(name="Test", source_lang="en", target_lang="fr", entries={"yes": "oui"}) - with tempfile.NamedTemporaryFile('w', delete=False, suffix=glossary_suffix) as tmp_file: + with tempfile.NamedTemporaryFile('w', suffix=glossary_suffix) as tmp_file: file_path = Path(tmp_file.name) glossary_write.to_file(file_path) - - # create new instance from glossary file - glossary_read = Glossary.from_file(file_path) - self.assertEqual(glossary_write.name, glossary_read.name) - self.assertEqual(glossary_write.source_lang, glossary_read.source_lang) - self.assertEqual(glossary_write.target_lang, glossary_read.target_lang) - self.assertDictEqual(glossary_write.entries, glossary_read.entries) - - file_path.unlink() # Remove the temporary file + # create new instance from glossary file + glossary_read = Glossary.from_file(file_path) + self.assertEqual(glossary_write.name, glossary_read.name) + self.assertEqual(glossary_write.source_lang, glossary_read.source_lang) + self.assertEqual(glossary_write.target_lang, glossary_read.target_lang) + self.assertDictEqual(glossary_write.entries, glossary_read.entries) def test_import_export_csv(self) -> None: glossary = Glossary(name="Test", source_lang="en", target_lang="fr", entries={}) # First export to CSV - with tempfile.NamedTemporaryFile('w', delete=False, suffix=glossary_suffix) as csvfile: + with tempfile.NamedTemporaryFile('w', suffix=glossary_suffix) as csvfile: csv_file_path = Path(csvfile.name) - glossary.entries = {"hello": "salut", "goodbye": "au revoir"} - glossary.export_csv(glossary.entries, csv_file_path) + glossary.entries = {"hello": "salut", "goodbye": "au revoir"} + glossary.export_csv(glossary.entries, csv_file_path) - # Now import CSV - glossary.import_csv(csv_file_path) - self.assertEqual(glossary.entries, {"hello": "salut", "goodbye": "au revoir"}) - csv_file_path.unlink() # Remove the temporary file + # Now import CSV + glossary.import_csv(csv_file_path) + self.assertEqual(glossary.entries, {"hello": "salut", "goodbye": "au revoir"}) def test_import_export_tsv(self) -> None: glossary = Glossary(name="Test", source_lang="en", target_lang="fr", entries={}) # First export to TSV - with tempfile.NamedTemporaryFile('w', delete=False, suffix=glossary_suffix) as tsvfile: + with tempfile.NamedTemporaryFile('w', suffix=glossary_suffix) as tsvfile: tsv_file_path = Path(tsvfile.name) - glossary.entries = {"hello": "salut", "goodbye": "au revoir"} - glossary.export_tsv(glossary.entries, tsv_file_path) + glossary.entries = {"hello": "salut", "goodbye": "au revoir"} + glossary.export_tsv(glossary.entries, tsv_file_path) - # Now import TSV - glossary.import_tsv(tsv_file_path) - self.assertEqual(glossary.entries, {"hello": "salut", "goodbye": "au revoir"}) - tsv_file_path.unlink() # Remove the temporary file + # Now import TSV + glossary.import_tsv(tsv_file_path) + self.assertEqual(glossary.entries, {"hello": "salut", "goodbye": "au revoir"}) def test_to_file_wrong_suffix(self) -> None: """ Test for exception if suffix is wrong. """ glossary = Glossary(name="Test", source_lang="en", target_lang="fr", entries={"yes": "oui"}) - with tempfile.NamedTemporaryFile('w', delete=False, suffix='.wrong') as tmp_file: + with tempfile.NamedTemporaryFile('w', suffix='.wrong') as tmp_file: file_path = Path(tmp_file.name) with self.assertRaises(GlossaryError) as err: glossary.to_file(file_path) @@ -156,11 +149,13 @@ class TestGlossary(unittest.TestCase): Test if suffix is auto-generated if omitted. """ glossary = Glossary(name="Test", source_lang="en", target_lang="fr", entries={"yes": "oui"}) - with tempfile.NamedTemporaryFile('w', delete=False, suffix='') as tmp_file: + with tempfile.NamedTemporaryFile('w', suffix='') as tmp_file: file_path = Path(tmp_file.name) glossary.to_file(file_path) - assert glossary.file_path is not None - self.assertEqual(glossary.file_path.suffix, glossary_suffix) + assert glossary.file_path is not None + self.assertEqual(glossary.file_path.suffix, glossary_suffix) + # remove glossary file (differs from 'tmp_file' because of the added suffix + glossary.file_path.unlink() def test_to_str_with_id(self) -> None: # Create a Glossary instance with an ID