Remove redundant functions and optimize code

rahul4732saini · rahul4732saini · commit 8410add274ad · 2024-07-24T21:39:43.000+05:30
diff --git a/tests/test_query/test_delete_query.py b/tests/test_query/test_delete_query.py
@@ -15,6 +15,7 @@
 import pytest
 import pandas as pd
 
+import utils
 import reset_tests
 from fise.query import QueryHandler
 
@@ -25,22 +26,12 @@
 TEST_RECORDS_FILE = Path(__file__).parent / "test_delete_query.hdf"
 
 
-def read_hdf(file: Path, path: str) -> pd.Series:
-    """
-    Reads the test records stored at the specified
-    path from the specified HDF5 file.
-    """
-
-    with pd.HDFStore(str(file)) as store:
-        return store[path]
-
-
 # Pandas series comprising path of all the filses and directories
 # present within the `file_dir` directory within the test directory.
 FILE_DIR_TEST_DIRECTORY_LISTINGS = pd.concat(
     [
-        read_hdf(TEST_DIRECTORY_LISTINGS_FILE, "/file_dir/dirs"),
-        read_hdf(TEST_DIRECTORY_LISTINGS_FILE, "/file_dir/files"),
+        utils.read_hdf(TEST_DIRECTORY_LISTINGS_FILE, "/file_dir/dirs"),
+        utils.read_hdf(TEST_DIRECTORY_LISTINGS_FILE, "/file_dir/files"),
     ],
     ignore_index=True,
 )
@@ -55,7 +46,7 @@ def verify_delete_query(path: str) -> None:
 
     # File and directories to be exempted during verification as
     # they are meant to be removed during the delete operation.
-    records: pd.Series = read_hdf(TEST_RECORDS_FILE, path)
+    records: pd.Series = utils.read_hdf(TEST_RECORDS_FILE, path)
 
     for i in FILE_DIR_TEST_DIRECTORY_LISTINGS:
         if (FILE_DIR_TEST_DIRECTORY / i).exists() or i in records.values:
@@ -90,45 +81,75 @@ class TestFileDeleteQuery:
 
     basic_query_syntax_test_params = [
         (1, f"DELETE FROM '{FILE_DIR_TEST_DIRECTORY / 'project'}'"),
-        (2, f"DELETE[TYPE FILE] FROM '{FILE_DIR_TEST_DIRECTORY / 'media'}' WHERE type = '.mp3'"),
-        (3, rf"R DELETE FROM '{FILE_DIR_TEST_DIRECTORY / 'project'}' WHERE name LIKE '.*\.py'"),
+        (
+            2,
+            f"DELETE[TYPE FILE] FROM '{FILE_DIR_TEST_DIRECTORY / 'media'}' WHERE type = '.mp3'",
+        ),
+        (
+            3,
+            rf"R DELETE FROM '{FILE_DIR_TEST_DIRECTORY / 'project'}' WHERE name LIKE '.*\.py'",
+        ),
     ]
 
     recursive_command_test_params = [
-        (1, f"R DELETE FROM '{FILE_DIR_TEST_DIRECTORY / 'reports'}' WHERE name = 'Q4.txt'"),
+        (
+            1,
+            f"R DELETE FROM '{FILE_DIR_TEST_DIRECTORY / 'reports'}' WHERE name = 'Q4.txt'",
+        ),
         (2, f"RECURSIVE DELETE FROM '{FILE_DIR_TEST_DIRECTORY / 'docs'}'"),
     ]
 
     path_types_test_params = [
-        (1, f"R DELETE FROM ABSOLUTE '{FILE_DIR_TEST_DIRECTORY / 'reports'}' WHERE name = 'Q2.txt'"),
+        (
+            1,
+            f"R DELETE FROM ABSOLUTE '{FILE_DIR_TEST_DIRECTORY / 'reports'}' WHERE name = 'Q2.txt'",
+        ),
         (2, f"DELETE FROM ABSOLUTE '{FILE_DIR_TEST_DIRECTORY / 'project'}'"),
-        (3, f"DELETE FROM RELATIVE '{FILE_DIR_TEST_DIRECTORY / 'media'}' WHERE type = '.mp4'"),
+        (
+            3,
+            f"DELETE FROM RELATIVE '{FILE_DIR_TEST_DIRECTORY / 'media'}' WHERE type = '.mp4'",
+        ),
     ]
 
     mixed_case_query_test_params = [
         (1, f"DeLeTE FRoM '{FILE_DIR_TEST_DIRECTORY / 'project'}'"),
-        (2, f"DelETE[TYPE FiLE] FrOM '{FILE_DIR_TEST_DIRECTORY / 'media'}' Where TypE = '.mp3'"),
-        (3, rf"r dELETe FrOM '{FILE_DIR_TEST_DIRECTORY / 'project'}' wHERe NaMe liKe '.*\.py'"),
+        (
+            2,
+            f"DelETE[TYPE FiLE] FrOM '{FILE_DIR_TEST_DIRECTORY / 'media'}' Where TypE = '.mp3'",
+        ),
+        (
+            3,
+            rf"r dELETe FrOM '{FILE_DIR_TEST_DIRECTORY / 'project'}' wHERe NaMe liKe '.*\.py'",
+        ),
     ]
 
     query_conditions_test_params = [
         (1, f"R DELETE FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE name = 'Q1.txt'"),
-        (2, rf"R DELETE FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE type='.txt' AND name LIKE '^IN.*\.txt$'"),
-        (3, f"R DELETE FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE type IN ('.mp4', '.avi') OR type='.mp3'"),
+        (
+            2,
+            rf"R DELETE FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE type='.txt' AND name LIKE '^IN.*\.txt$'",
+        ),
+        (
+            3,
+            f"R DELETE FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE type IN ('.mp4', '.avi') OR type='.mp3'",
+        ),
     ]
 
     nested_conditions_test_params = [
         (
-            1, f"R DELETE FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE "
-            "size[b] = 0 AND (filetype = '.txt' OR type = '.mp3')"
+            1,
+            f"R DELETE FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE "
+            "size[b] = 0 AND (filetype = '.txt' OR type = '.mp3')",
         ),
         (
-            2, f"R DELETE FROM '{FILE_DIR_TEST_DIRECTORY / 'project'}' WHERE size[b]"
-            "= 0 AND (type = None OR (type IN ('.txt', '.py'))) AND name != 'LICENSE'"
+            2,
+            f"R DELETE FROM '{FILE_DIR_TEST_DIRECTORY / 'project'}' WHERE size[b]"
+            "= 0 AND (type = None OR (type IN ('.txt', '.py'))) AND name != 'LICENSE'",
         ),
         (
-            3, f"R DELETE FROM '{FILE_DIR_TEST_DIRECTORY / 'reports'}' WHERE"
-            " type = '.txt' AND  (((name = 'Q1.txt' OR name = 'Q3.txt')))"
+            3,
+            f"R DELETE FROM '{FILE_DIR_TEST_DIRECTORY / 'reports'}' WHERE"
+            " type = '.txt' AND  (((name = 'Q1.txt' OR name = 'Q3.txt')))",
         ),
     ]
 
@@ -172,14 +193,26 @@ class TestDirDeleteQuery:
 
     basic_query_syntax_test_params = [
         (1, f"DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY / 'docs'}'"),
-        (2, f"DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY / 'reports'}' WHERE name LIKE '^report.*$'"),
-        (3, f"DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE name IN ('project', 'media')"),
+        (
+            2,
+            f"DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY / 'reports'}' WHERE name LIKE '^report.*$'",
+        ),
+        (
+            3,
+            f"DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE name IN ('project', 'media')",
+        ),
     ]
 
     recursive_command_test_params = [
         (1, f"R DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY / 'project'}'"),
-        (2, f"R DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY / 'reports'}' WHERE name='report-2023'"),
-        (3, f"R DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE name IN ('media', 'orders')"),
+        (
+            2,
+            f"R DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY / 'reports'}' WHERE name='report-2023'",
+        ),
+        (
+            3,
+            f"R DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE name IN ('media', 'orders')",
+        ),
     ]
 
     path_types_test_params = [
@@ -190,36 +223,45 @@ class TestDirDeleteQuery:
 
     mixed_case_query_test_params = [
         (1, f"DeLEtE[TYPe DIR] froM '{FILE_DIR_TEST_DIRECTORY / 'docs'}'"),
-        (2, f"DElEtE[tYPE DiR] From '{FILE_DIR_TEST_DIRECTORY / 'reports'}' Where NamE LikE '^report.*$'"),
-        (3, f"Delete[Type diR] FroM '{FILE_DIR_TEST_DIRECTORY}' WheRE NAMe In ('project', 'media')"),
+        (
+            2,
+            f"DElEtE[tYPE DiR] From '{FILE_DIR_TEST_DIRECTORY / 'reports'}' Where NamE LikE '^report.*$'",
+        ),
+        (
+            3,
+            f"Delete[Type diR] FroM '{FILE_DIR_TEST_DIRECTORY}' WheRE NAMe In ('project', 'media')",
+        ),
     ]
 
     query_conditions_test_params = [
+        (1, f"DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE name = 'media'"),
         (
-            1, f"DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE name = 'media'"
+            2,
+            f"DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE "
+            "name IN ('orders', 'media') AND parent LIKE '^.*file_dir[/]?$'",
         ),
         (
-            2, f"DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE "
-            "name IN ('orders', 'media') AND parent LIKE '^.*file_dir[/]?$'"
+            3,
+            f"DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY / 'reports'}' WHERE"
+            " name = 'report-2021' OR name = 'report-2022' OR name = 'report-2023'",
         ),
-        (
-            3, f"DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY / 'reports'}' WHERE"
-            " name = 'report-2021' OR name = 'report-2022' OR name = 'report-2023'"
-        )
     ]
 
     nested_conditions_test_params = [
         (
-            1, f"DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE parent"
-            " LIKE '^.*file_dir[/]?$' AND (name = 'orders' OR name = 'media')"
+            1,
+            f"DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE parent"
+            " LIKE '^.*file_dir[/]?$' AND (name = 'orders' OR name = 'media')",
         ),
         (
-            2, f"R DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE"
-            " ((name IN ('src'))) AND path LIKE '^.*file_dir/src[/]?$'"
+            2,
+            f"R DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY}' WHERE"
+            " ((name IN ('src'))) AND path LIKE '^.*file_dir/src[/]?$'",
         ),
         (
-            3, f"DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY / 'reports'}' WHERE path LIKE "
-            "'^.*report-20(23|24)[/]?$' AND ((name = 'report-2023') OR ((name = 'report-2024')))"
+            3,
+            f"DELETE[TYPE DIR] FROM '{FILE_DIR_TEST_DIRECTORY / 'reports'}' WHERE path LIKE "
+            "'^.*report-20(23|24)[/]?$' AND ((name = 'report-2023') OR ((name = 'report-2024')))",
         ),
     ]
 
@@ -242,7 +284,7 @@ def test_path_types(self, index: int, query: str) -> None:
     def test_query_conditions(self, index: int, query: str) -> None:
         """Tests directory delete query conditions."""
         examine_delete_query(query, f"/dir/conditions/test{index}")
-    
+
     @pytest.mark.parametrize(("index", "query"), nested_conditions_test_params)
     def test_nested_query_conditions(self, index: int, query: str) -> None:
         """Tests nested directory delete query conditions."""
diff --git a/tests/test_query/test_handlers/test_operators.py b/tests/test_query/test_handlers/test_operators.py
@@ -33,6 +33,7 @@
 import pytest
 import pandas as pd
 
+import utils
 import reset_tests
 from fise.common import constants
 from fise.shared import File, Directory, Field, DataLine
@@ -51,20 +52,12 @@
 TEST_DIRECTORY_LISTINGS_FILE = TEST_DIRECTORY.parent / "test_directory.hdf"
 TEST_RECORDS_FILE = Path(__file__).parent / "test_operators.hdf"
 
-
-def read_hdf(file: Path, path: str) -> pd.Series | pd.DataFrame:
-    """Reads records stored at the path mentioned from specified HDF5 file."""
-
-    with pd.HDFStore(str(file)) as store:
-        return store[path]
-
-
 # Pandas series comprising path of all the files and directories
 # present within the `file_dir` directory within test directory.
 FILE_DIR_TEST_DIRECTORY_LISTINGS = pd.concat(
     [
-        read_hdf(TEST_DIRECTORY_LISTINGS_FILE, "/file_dir/dirs"),
-        read_hdf(TEST_DIRECTORY_LISTINGS_FILE, "/file_dir/files"),
+        utils.read_hdf(TEST_DIRECTORY_LISTINGS_FILE, "/file_dir/dirs"),
+        utils.read_hdf(TEST_DIRECTORY_LISTINGS_FILE, "/file_dir/files"),
     ],
     ignore_index=True,
 )
@@ -79,7 +72,7 @@ def verify_search_operation(path: str, data: pd.DataFrame) -> None:
 
     assert isinstance(data, pd.DataFrame)
 
-    results: pd.DataFrame = read_hdf(TEST_RECORDS_FILE, path)
+    results: pd.DataFrame = utils.read_hdf(TEST_RECORDS_FILE, path)
 
     data_set: set[tuple[Any]] = set(tuple(row) for row in data.values)
     results_set: set[tuple[Any]] = set(tuple(row) for row in results.values)
@@ -96,7 +89,7 @@ def verify_delete_operation(path: str) -> None:
 
     # File and directories to be exempted during verification as
     # they are meant to be removed during the delete operation.
-    records: pd.Series = read_hdf(TEST_RECORDS_FILE, path)
+    records: pd.Series = utils.read_hdf(TEST_RECORDS_FILE, path)
 
     for i in FILE_DIR_TEST_DIRECTORY_LISTINGS:
         if (FILE_DIR_TEST_DIRECTORY / i).exists() or i in records.values:
diff --git a/tests/test_query/test_search_query.py b/tests/test_query/test_search_query.py
@@ -15,6 +15,8 @@
 import pytest
 import pandas as pd
 
+import utils
+
 from fise.common import constants
 from fise.query import QueryHandler
 
@@ -23,25 +25,14 @@
 TEST_RECORDS_FILE = Path(__file__).parent / "test_search_query.hdf"
 
 
-def read_hdf(path: str) -> pd.DataFrame:
-    """
-    Reads the test records stored at the specified
-    path from the `test_search_query.hdf` file.
-    """
-    global TEST_RECORDS_FILE
-
-    with pd.HDFStore(str(TEST_RECORDS_FILE)) as store:
-        return store[path]
-
-
 def verify_search_query(path: str, data: pd.DataFrame) -> None:
     """
     Verifies the pandas dataframe extracted from the search operation with the
     records stored at the specified path in the `test_operators.hdf` file.
     """
     global TEST_RECORDS_FILE
 
-    results: pd.DataFrame = read_hdf(path)
+    results: pd.DataFrame = utils.read_hdf(TEST_RECORDS_FILE, path)
 
     data_set: set[tuple[Any]] = set(tuple(row) for row in data.values)
     results_set: set[tuple[Any]] = set(tuple(row) for row in results.values)
