Unify test functions

matuzalemmuller · Jun 17, 2022 · 48a3839 · 48a3839
1 parent 7e7edd1
commit 48a3839
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 21 deletions.
diff --git a/tests/test_file_hash.py b/tests/test_file_hash.py
@@ -11,7 +11,10 @@
 
 
 class TestFileHash(unittest.TestCase):
-    def __match_file_hash_with_log(self):
+
+    def test_file_hash(self):
+        self.assertTrue(create_data_folder())
+        self.assertTrue(create_test_files(1))
         try:
             with open(
                 f"{TEST_DATA_DIR}/dummy-files-creator.csv", mode="r", encoding="utf-8"
@@ -23,15 +26,7 @@ def __match_file_hash_with_log(self):
                     with open(file_path, "rb") as fout:
                         f_bytes = fout.read()
                         hash_result = hashlib.md5(f_bytes).hexdigest()
-                        return file_hash == hash_result
-                else:
-                    return False
+                        self.assertEqual(file_hash, hash_result)
         except IOError as error:
             print(f"error: {error}")
-            return False
-
-    def test_file_hash(self):
-        self.assertTrue(create_data_folder())
-        self.assertTrue(create_test_files(1))
-        self.assertTrue(self.__match_file_hash_with_log())
         self.assertTrue(delete_data_folder())
diff --git a/tests/test_file_name.py b/tests/test_file_name.py
@@ -10,23 +10,17 @@
 
 
 class TestFileName(unittest.TestCase):
-    def __match_file_name_with_log(self):
+
+    def test_file_name(self):
+        self.assertTrue(create_data_folder())
+        self.assertTrue(create_test_files(1))
         try:
             with open(
                 f"{TEST_DATA_DIR}/dummy-files-creator.csv", mode="r", encoding="utf-8"
             ) as file:
                 log_entry = next(csv.reader(file))
                 file_path = log_entry[2]
-                if os.path.exists(file_path):
-                    return True
-                else:
-                    return False
+                self.assertTrue(os.path.exists(file_path))
         except IOError as error:
             print(f"error: {error}")
-            return False
-
-    def test_file_name(self):
-        self.assertTrue(create_data_folder())
-        self.assertTrue(create_test_files(1))
-        self.assertTrue(self.__match_file_name_with_log())
         self.assertTrue(delete_data_folder())