updated tests

Author: samapriya

tests/conftest.py

@@ -40,6 +40,18 @@ def mock_ee_initialize():
         yield mock
 
 
+@pytest.fixture
+def mock_google_credentials():
+    """Mock Google credentials with proper methods."""
+    mock_creds = MagicMock()
+    mock_creds.before_request = MagicMock()
+    mock_creds.refresh = MagicMock()
+    mock_creds.expired = False
+    mock_creds.valid = True
+    mock_creds.service_account_email = "test@test-project.iam.gserviceaccount.com"
+    return mock_creds
+
+
 @pytest.fixture
 def mock_gdal():
     """Mock GDAL module for testing."""

tests/fake_ee.py

@@ -1,5 +1,7 @@
 """Enhanced fake ee module for comprehensive testing."""
 
+from unittest.mock import MagicMock
+
 import box
 
 
@@ -167,10 +169,10 @@ def geometry(self, *_, **__):
 
     def aggregate_array(self, *_, **__):
         return List(["aggregation-one", "aggregation-two"])
-    
+
     def size(self):
         return MockNumber(len(self.features))
-    
+
     def get(self, prop):
         return MockComputedObject(1000000)
 
@@ -220,7 +222,7 @@ class MockNumber:
     """Mock for ee.Number-like objects."""
     def __init__(self, value):
         self._value = value
-    
+
     def getInfo(self):
         return self._value
 
@@ -229,7 +231,7 @@ class MockComputedObject:
     """Mock for computed objects."""
     def __init__(self, value):
         self._value = value
-    
+
     def getInfo(self):
         return self._value
 
@@ -246,13 +248,13 @@ def fromImages(cls, images):
 
     def mosaic(self, *_, **__):
         return Image()
-    
+
     def aggregate_array(self, prop):
         """Mock aggregate_array to return asset sizes."""
         if prop == "system:asset_size":
             return List([1000000, 2000000, 500000])
         return List([])
-    
+
     def size(self):
         return MockNumber(len(self.images))
 
@@ -283,14 +285,18 @@ class EEException(Exception):
 
 class DataModule:
     """Mock ee.data module."""
-    
+
     @staticmethod
     def get_persistent_credentials():
-        """Mock credentials."""
-        class MockCredentials:
-            pass
-        return MockCredentials()
-    
+        """Mock credentials with proper Google auth structure."""
+        mock_creds = MagicMock()
+        mock_creds.before_request = MagicMock()
+        mock_creds.refresh = MagicMock()
+        mock_creds.expired = False
+        mock_creds.valid = True
+        mock_creds.service_account_email = "test@test-project.iam.gserviceaccount.com"
+        return mock_creds
+
     @staticmethod
     def getTaskList():
         """Mock task list."""
@@ -305,17 +311,17 @@ def getTaskList():
                 'update_timestamp_ms': 1609462800000,
             }
         ]
-    
+
     @staticmethod
     def getTaskStatus(task_ids):
         """Mock task status."""
         return [{'state': 'RUNNING', 'id': task_ids[0]}]
-    
+
     @staticmethod
     def cancelTask(task_id):
         """Mock cancel task."""
         pass
-    
+
     @staticmethod
     def getAsset(asset_path):
         """Mock get asset."""
@@ -328,7 +334,7 @@ def getAsset(asset_path):
         elif 'table' in asset_path.lower():
             return {'type': 'TABLE', 'sizeBytes': '1000000', 'featureCount': 100}
         return {'type': 'IMAGE'}
-    
+
     @staticmethod
     def getInfo(path):
         """Mock get info."""
@@ -340,15 +346,15 @@ def getInfo(path):
                 'maxAssets': '1000'
             }
         }
-    
+
     @staticmethod
     def getAssetRoots():
         """Mock get asset roots."""
         return [
             {'id': 'projects/test-project/assets'},
             {'id': 'users/testuser/assets'}
         ]
-    
+
     @staticmethod
     def getAssetRootQuota(root_path):
         """Mock get asset root quota."""

tests/test_geeup.py

@@ -226,47 +226,45 @@ def test_rename_batch_mode(self, mock_ee_initialize, temp_dir, mock_argv):
 class TestQuotaCommand:
     """Test quota command."""
 
-    def test_quota_no_project(self, mock_ee_initialize, mock_argv, mock_google_credentials):
+    def test_quota_no_project(self, mock_ee_initialize, mock_argv):
         """Test quota display without specific project."""
-        with patch('geeup.quota.ee.data.get_persistent_credentials', return_value=mock_google_credentials):
-            with patch('geeup.quota.fetch_quota_data') as mock_fetch:
-                mock_fetch.return_value = {
-                    'users/test': {
-                        'quota': {
-                            'sizeBytes': '1000000',
-                            'maxSizeBytes': '10000000',
-                            'assetCount': '10',
-                            'maxAssets': '100'
-                        }
+        with patch('geeup.quota.fetch_quota_data') as mock_fetch:
+            mock_fetch.return_value = {
+                'users/test': {
+                    'quota': {
+                        'sizeBytes': '1000000',
+                        'maxSizeBytes': '10000000',
+                        'assetCount': '10',
+                        'maxAssets': '100'
                     }
                 }
-                with patch('sys.argv', ['geeup', 'quota']):
-                    from geeup.geeup import main
-                    try:
-                        main()
-                    except SystemExit:
-                        pass
+            }
+            with patch('sys.argv', ['geeup', 'quota']):
+                from geeup.geeup import main
+                try:
+                    main()
+                except SystemExit:
+                    pass
 
-    def test_quota_specific_project(self, mock_ee_initialize, mock_argv, mock_google_credentials):
+    def test_quota_specific_project(self, mock_ee_initialize, mock_argv):
         """Test quota for specific project."""
-        with patch('geeup.quota.ee.data.get_persistent_credentials', return_value=mock_google_credentials):
-            with patch('geeup.quota.fetch_quota_data') as mock_fetch:
-                mock_fetch.return_value = {
-                    'projects/test': {
-                        'quota': {
-                            'sizeBytes': '5000000000',
-                            'maxSizeBytes': '10000000000',
-                            'assetCount': '50',
-                            'maxAssets': '1000'
-                        }
+        with patch('geeup.quota.fetch_quota_data') as mock_fetch:
+            mock_fetch.return_value = {
+                'projects/test': {
+                    'quota': {
+                        'sizeBytes': '5000000000',
+                        'maxSizeBytes': '10000000000',
+                        'assetCount': '50',
+                        'maxAssets': '1000'
                     }
                 }
-                with patch('sys.argv', ['geeup', 'quota', '--project', 'projects/test']):
-                    from geeup.geeup import main
-                    try:
-                        main()
-                    except SystemExit:
-                        pass
+            }
+            with patch('sys.argv', ['geeup', 'quota', '--project', 'projects/test']):
+                from geeup.geeup import main
+                try:
+                    main()
+                except SystemExit:
+                    pass
 
 
 class TestZipshapeCommand:
@@ -467,7 +465,7 @@ def test_delete_asset_failure(self, mock_ee_initialize, mock_argv):
 class TestUploadCommand:
     """Test upload commands."""
 
-    def test_upload_basic(self, mock_ee_initialize, temp_dir, mock_argv, mock_google_credentials):
+    def test_upload_basic(self, mock_ee_initialize, temp_dir, mock_argv):
         """Test basic image upload."""
         source_dir = temp_dir / "source"
         source_dir.mkdir()
@@ -479,24 +477,21 @@ def test_upload_basic(self, mock_ee_initialize, temp_dir, mock_argv, mock_google
         metadata_file = temp_dir / "metadata.csv"
         metadata_file.write_text("system:index\ntest_image")
 
-        with patch('geeup.batch_uploader.ee.data.get_persistent_credentials', return_value=mock_google_credentials):
-            with patch('geeup.batch_uploader.upload') as mock_upload:
-                with patch('sys.argv', [
-                    'geeup', 'upload',
-                    '--source', str(source_dir),
-                    '--dest', 'users/test/collection',
-                    '--metadata', str(metadata_file),
-                    '--user', 'test@example.com'
-                ]):
-                    from geeup.geeup import main
-                    try:
-                        main()
-                    except SystemExit:
-                        pass
-                    # Upload should be called if validation passes
-                    # With no actual GDAL, it may not be called
+        with patch('sys.argv', [
+            'geeup', 'upload',
+            '--source', str(source_dir),
+            '--dest', 'users/test/collection',
+            '--metadata', str(metadata_file),
+            '--user', 'test@example.com'
+        ]):
+            from geeup.geeup import main
+            try:
+                main()
+            except SystemExit:
+                pass
+                # Validation may fail, which is expected
 
-    def test_upload_with_options(self, mock_ee_initialize, temp_dir, mock_argv, mock_google_credentials):
+    def test_upload_with_options(self, mock_ee_initialize, temp_dir, mock_argv):
         """Test upload with additional options."""
         source_dir = temp_dir / "source"
         source_dir.mkdir()
@@ -508,30 +503,29 @@ def test_upload_with_options(self, mock_ee_initialize, temp_dir, mock_argv, mock
         metadata_file = temp_dir / "metadata.csv"
         metadata_file.write_text("system:index\ntest_image")
 
-        with patch('geeup.batch_uploader.ee.data.get_persistent_credentials', return_value=mock_google_credentials):
-            with patch('geeup.batch_uploader.upload') as mock_upload:
-                with patch('sys.argv', [
-                    'geeup', 'upload',
-                    '--source', str(source_dir),
-                    '--dest', 'users/test/collection',
-                    '--metadata', str(metadata_file),
-                    '--user', 'test@example.com',
-                    '--nodata', '0',
-                    '--pyramids', 'MEAN',
-                    '--workers', '2',
-                    '--dry-run'
-                ]):
-                    from geeup.geeup import main
-                    try:
-                        main()
-                    except SystemExit:
-                        pass
+        with patch('sys.argv', [
+            'geeup', 'upload',
+            '--source', str(source_dir),
+            '--dest', 'users/test/collection',
+            '--metadata', str(metadata_file),
+            '--user', 'test@example.com',
+            '--nodata', '0',
+            '--pyramids', 'MEAN',
+            '--workers', '2',
+            '--dry-run'
+        ]):
+            from geeup.geeup import main
+            try:
+                main()
+            except SystemExit:
+                pass
+                # Validation may fail, which is expected
 
 
 class TestTabupCommand:
     """Test table upload commands."""
 
-    def test_tabup_basic(self, mock_ee_initialize, temp_dir, mock_argv, mock_google_credentials):
+    def test_tabup_basic(self, mock_ee_initialize, temp_dir, mock_argv):
         """Test basic table upload."""
         source_dir = temp_dir / "source"
         source_dir.mkdir()
@@ -540,21 +534,20 @@ def test_tabup_basic(self, mock_ee_initialize, temp_dir, mock_argv, mock_google_
         test_csv = source_dir / "test_table.csv"
         test_csv.write_text("id,name\n1,test")
 
-        with patch('geeup.tuploader.ee.data.get_persistent_credentials', return_value=mock_google_credentials):
-            with patch('geeup.tuploader.tabup') as mock_tabup:
-                with patch('sys.argv', [
-                    'geeup', 'tabup',
-                    '--source', str(source_dir),
-                    '--dest', 'users/test/folder',
-                    '--user', 'test@example.com'
-                ]):
-                    from geeup.geeup import main
-                    try:
-                        main()
-                    except SystemExit:
-                        pass
+        with patch('sys.argv', [
+            'geeup', 'tabup',
+            '--source', str(source_dir),
+            '--dest', 'users/test/folder',
+            '--user', 'test@example.com'
+        ]):
+            from geeup.geeup import main
+            try:
+                main()
+            except SystemExit:
+                pass
+                # Validation may fail, which is expected
 
-    def test_tabup_with_coordinates(self, mock_ee_initialize, temp_dir, mock_argv, mock_google_credentials):
+    def test_tabup_with_coordinates(self, mock_ee_initialize, temp_dir, mock_argv):
         """Test table upload with coordinate columns."""
         source_dir = temp_dir / "source"
         source_dir.mkdir()
@@ -563,21 +556,20 @@ def test_tabup_with_coordinates(self, mock_ee_initialize, temp_dir, mock_argv, m
         test_csv = source_dir / "test_table.csv"
         test_csv.write_text("id,longitude,latitude\n1,0.0,0.0")
 
-        with patch('geeup.tuploader.ee.data.get_persistent_credentials', return_value=mock_google_credentials):
-            with patch('geeup.tuploader.tabup') as mock_tabup:
-                with patch('sys.argv', [
-                    'geeup', 'tabup',
-                    '--source', str(source_dir),
-                    '--dest', 'users/test/folder',
-                    '--user', 'test@example.com',
-                    '--x', 'longitude',
-                    '--y', 'latitude'
-                ]):
-                    from geeup.geeup import main
-                    try:
-                        main()
-                    except SystemExit:
-                        pass
+        with patch('sys.argv', [
+            'geeup', 'tabup',
+            '--source', str(source_dir),
+            '--dest', 'users/test/folder',
+            '--user', 'test@example.com',
+            '--x', 'longitude',
+            '--y', 'latitude'
+        ]):
+            from geeup.geeup import main
+            try:
+                main()
+            except SystemExit:
+                pass
+                # Validation may fail, which is expected
 
 
 class TestIntegration: