SK-971: fix unit tests

Author: raushan-skyflow

skyflow/utils/_skyflow_messages.py

@@ -100,6 +100,8 @@ class Error(Enum):
         INVALID_TABLE_VALUE = f"{error_prefix} Validation error. Invalid type of table. Specify table as a string"
         EMPTY_RECORD_IDS_IN_DELETE = f"{error_prefix} Validation error. 'record ids' array can't be empty. Specify one or more record ids."
         BULK_DELETE_FAILURE = f"{error_prefix} Delete operation failed."
+        EMPTY_SKYFLOW_ID= f"{error_prefix} Validation error. Skyflow id can't be empty."
+        INVALID_FILE_COLUMN_NAME= f"{error_prefix} Validation error. 'column_name' can't be empty."
 
         INVALID_QUERY_TYPE = f"{error_prefix} Validation error. Query parameter is of type {{}}. Specify as a string."
         EMPTY_QUERY = f"{error_prefix} Validation error. Query parameter can't be empty. Specify as a string."

skyflow/utils/validations/_validations.py

@@ -714,10 +714,10 @@ def validate_file_upload_request(logger, request):
     # Column Name
     column_name = getattr(request, "column_name", None)
     if column_name is None:
-        raise SkyflowError(SkyflowMessages.Error.INVALID_COLUMN_NAME.value.format(type(column_name)), invalid_input_error_code)
+        raise SkyflowError(SkyflowMessages.Error.INVALID_FILE_COLUMN_NAME.value.format(type(column_name)), invalid_input_error_code)
     elif column_name.strip() == "":
         logger.error("Empty column name in FILE_UPLOAD")
-        raise SkyflowError(SkyflowMessages.Error.INVALID_COLUMN_NAME.value.format(type(column_name)), invalid_input_error_code)
+        raise SkyflowError(SkyflowMessages.Error.INVALID_FILE_COLUMN_NAME.value.format(type(column_name)), invalid_input_error_code)
 
     # File-related attributes
     file_path = getattr(request, "file_path", None)

tests/vault/controller/test__vault.py

@@ -726,18 +726,7 @@ class TestFileUploadValidation(unittest.TestCase):
     def setUp(self):
         self.logger = Mock()
 
-    def test_validate_missing_table(self):
-        """Test validation fails when table is missing"""
-        request = FileUploadRequest(
-            column_name="file_column",
-            skyflow_id="123",
-            file_path="/path/to/file.txt"
-        )
-        with self.assertRaises(SkyflowError) as error:
-            validate_file_upload_request(self.logger, request)
-        self.assertEqual(error.exception.message, SkyflowMessages.Error.INVALID_TABLE_VALUE.value)
-
-    def test_validate_empty_table(self):
+    def test_validate_invalid_table(self):
         """Test validation fails when table is empty"""
         request = FileUploadRequest(
             table="",
@@ -749,17 +738,6 @@ def test_validate_empty_table(self):
             validate_file_upload_request(self.logger, request)
         self.assertEqual(error.exception.message, SkyflowMessages.Error.EMPTY_TABLE_VALUE.value)
 
-    def test_validate_missing_skyflow_id(self):
-        """Test validation fails when skyflow_id is missing"""
-        request = FileUploadRequest(
-            table="test_table",
-            column_name="file_column",
-            file_path="/path/to/file.txt"
-        )
-        with self.assertRaises(SkyflowError) as error:
-            validate_file_upload_request(self.logger, request)
-        self.assertEqual(error.exception.message, SkyflowMessages.Error.IDS_KEY_ERROR.value)
-
     def test_validate_empty_skyflow_id(self):
         """Test validation fails when skyflow_id is empty"""
         request = FileUploadRequest(
@@ -773,30 +751,19 @@ def test_validate_empty_skyflow_id(self):
         self.assertEqual(error.exception.message, 
                         SkyflowMessages.Error.EMPTY_SKYFLOW_ID.value.format("FILE_UPLOAD"))
 
-    def test_validate_missing_column_name(self):
+    def test_validate_invalid_column_name(self):
         """Test validation fails when column_name is missing"""
         request = FileUploadRequest(
             table="test_table",
             skyflow_id="123",
+            column_name="",
             file_path="/path/to/file.txt"
         )
         with self.assertRaises(SkyflowError) as error:
             validate_file_upload_request(self.logger, request)
         self.assertEqual(error.exception.message, 
-                        SkyflowMessages.Error.INVALID_COLUMN_NAME.value.format(type(None)))
+                        SkyflowMessages.Error.INVALID_FILE_COLUMN_NAME.value.format("FILE_UPLOAD"))
 
-    def test_validate_empty_column_name(self):
-        """Test validation fails when column_name is empty"""
-        request = FileUploadRequest(
-            table="test_table",
-            column_name="",
-            skyflow_id="123",
-            file_path="/path/to/file.txt"
-        )
-        with self.assertRaises(SkyflowError) as error:
-            validate_file_upload_request(self.logger, request)
-        self.assertEqual(error.exception.message,
-                        SkyflowMessages.Error.INVALID_COLUMN_NAME.value.format(type("")))
 
     @patch('os.path.exists')
     @patch('os.path.isfile')