feat: major architectural refactor to 5.1b1 - Service Layer, gRPC & Agent evolution (fragmented secrets)

connpy/tests/test_sync.py

@@ -1,82 +1,91 @@
-"""Tests for connpy.core_plugins.sync"""
+"""Tests for connpy.services.sync_service"""
 import pytest
-from unittest.mock import MagicMock, patch, mock_open
-from connpy.core_plugins.sync import sync
+import os
+from unittest.mock import MagicMock, patch
+from connpy.services.sync_service import SyncService
 
 @pytest.fixture
-def mock_connapp():
-    app = MagicMock()
-    app.config.defaultdir = "/fake/dir"
-    app.config.file = "/fake/dir/config.yaml"
-    app.config.key = "/fake/dir/.osk"
-    app.config.config = {"sync": True}
-    return app
+def mock_config():
+    config = MagicMock()
+    config.defaultdir = "/fake/dir"
+    config.file = "/fake/dir/config.yaml"
+    config.key = "/fake/dir/.osk"
+    config.cachefile = "/fake/dir/.cache"
+    config.fzf_cachefile = "/fake/dir/.fzf_cache"
+    config.config = {"sync": True, "sync_remote": False}
+    return config
 
-class TestSyncPlugin:
-    def test_init(self, mock_connapp):
-        s = sync(mock_connapp)
-        assert s.sync is True
-        assert s.file == "/fake/dir/config.yaml"
-        assert s.token_file == "/fake/dir/gtoken.json"
+class TestSyncService:
+    def test_init(self, mock_config):
+        s = SyncService(mock_config)
+        assert s.sync_enabled is True
+        assert s.token_file == os.path.join("/fake/dir", "gtoken.json")
 
-    @patch("connpy.core_plugins.sync.os.path.exists")
-    @patch("connpy.core_plugins.sync.Credentials")
-    def test_get_credentials_success(self, MockCreds, mock_exists, mock_connapp):
+    @patch("connpy.services.sync_service.os.path.exists")
+    @patch("connpy.services.sync_service.Credentials")
+    def test_get_credentials_success(self, MockCreds, mock_exists, mock_config):
         mock_exists.return_value = True
         mock_cred_instance = MagicMock()
         mock_cred_instance.valid = True
         MockCreds.from_authorized_user_file.return_value = mock_cred_instance
         
-        s = sync(mock_connapp)
+        s = SyncService(mock_config)
         creds = s.get_credentials()
         assert creds == mock_cred_instance
 
-    @patch("connpy.core_plugins.sync.os.path.exists")
-    def test_get_credentials_not_found(self, mock_exists, mock_connapp):
+    @patch("connpy.services.sync_service.os.path.exists")
+    def test_get_credentials_not_found(self, mock_exists, mock_config):
         mock_exists.return_value = False
-        s = sync(mock_connapp)
-        assert s.get_credentials() == 0
+        s = SyncService(mock_config)
+        assert s.get_credentials() is None
 
-    @patch("connpy.core_plugins.sync.zipfile.ZipFile")
-    @patch("connpy.core_plugins.sync.os.path.basename")
-    def test_compress_specific_files(self, mock_basename, MockZipFile, mock_connapp):
+    @patch("connpy.services.sync_service.zipfile.ZipFile")
+    @patch("connpy.services.sync_service.os.path.exists")
+    @patch("connpy.services.sync_service.os.path.basename")
+    def test_compress_and_upload_local(self, mock_basename, mock_exists, MockZipFile, mock_config):
         mock_basename.return_value = "config.yaml"
-        s = sync(mock_connapp)
+        mock_exists.return_value = True
+        s = SyncService(mock_config)
+        
+        # Mocking list_backups and upload_file to avoid real API calls
+        s.list_backups = MagicMock(return_value=[])
+        s.upload_file = MagicMock(return_value=True)
+        
         zip_mock = MagicMock()
         MockZipFile.return_value.__enter__.return_value = zip_mock
         
-        s.compress_specific_files("/fake/zip.zip")
-        zip_mock.write.assert_any_call(s.file, "config.yaml")
-        zip_mock.write.assert_any_call(s.key, ".osk")
+        s.compress_and_upload()
+        # Verify zip was created with local config and key
+        zip_mock.write.assert_any_call(s.config.file, "config.yaml")
+        zip_mock.write.assert_any_call(s.config.key, ".osk")
 
-    @patch("connpy.core_plugins.sync.zipfile.ZipFile")
-    @patch("connpy.core_plugins.sync.os.path.dirname")
-    def test_decompress_zip_yaml(self, mock_dirname, MockZipFile, mock_connapp):
+    @patch("connpy.services.sync_service.zipfile.ZipFile")
+    @patch("connpy.services.sync_service.os.path.exists")
+    @patch("connpy.services.sync_service.os.path.dirname")
+    @patch("connpy.services.sync_service.os.remove")
+    def test_perform_restore(self, mock_remove, mock_dirname, mock_exists, MockZipFile, mock_config):
         mock_dirname.return_value = "/fake/dir"
-        s = sync(mock_connapp)
+        # Mock exists to return True for key and zip, but False for caches during the cleanup phase
+        def exists_side_effect(path):
+            if ".cache" in path or ".fzf_cache" in path:
+                return False
+            return True
+        mock_exists.side_effect = exists_side_effect
+        
+        s = SyncService(mock_config)
         zip_mock = MagicMock()
         zip_mock.namelist.return_value = ["config.yaml", ".osk"]
         MockZipFile.return_value.__enter__.return_value = zip_mock
         
-        assert s.decompress_zip("/fake/zip.zip") == 0
-        zip_mock.extract.assert_any_call("config.yaml", "/fake/dir")
+        with patch("connpy.services.sync_service.yaml.safe_load") as mock_load:
+            mock_load.return_value = {"connections": {}, "profiles": {}, "config": {}}
+            assert s.perform_restore("/fake/zip.zip") is True
+            
         zip_mock.extract.assert_any_call(".osk", "/fake/dir")
 
-    @patch("connpy.core_plugins.sync.zipfile.ZipFile")
-    @patch("connpy.core_plugins.sync.os.path.dirname")
-    def test_decompress_zip_json_fallback(self, mock_dirname, MockZipFile, mock_connapp):
-        mock_dirname.return_value = "/fake/dir"
-        s = sync(mock_connapp)
-        zip_mock = MagicMock()
-        zip_mock.namelist.return_value = ["config.json", ".osk"]
-        MockZipFile.return_value.__enter__.return_value = zip_mock
-        
-        assert s.decompress_zip("/fake/old_zip.zip") == 0
-        zip_mock.extract.assert_any_call("config.json", "/fake/dir")
-
-    @patch.object(sync, "get_credentials")
-    @patch("connpy.core_plugins.sync.build")
-    def test_get_appdata_files(self, mock_build, mock_get_credentials, mock_connapp):
+    @patch.object(SyncService, "get_credentials")
+    @patch("connpy.services.sync_service.build")
+    def test_list_backups(self, mock_build, mock_get_credentials, mock_config):
         mock_get_credentials.return_value = MagicMock()
         mock_service = MagicMock()
         mock_build.return_value = mock_service
@@ -87,22 +96,8 @@ class TestSyncPlugin:
             ]
         }
         
-        s = sync(mock_connapp)
-        files = s.get_appdata_files()
+        s = SyncService(mock_config)
+        files = s.list_backups()
         assert len(files) == 1
         assert files[0]["id"] == "1"
         assert files[0]["timestamp"] == "1000"
-
-    @patch.object(sync, "get_credentials")
-    @patch("connpy.core_plugins.sync.build")
-    @patch("connpy.core_plugins.sync.MediaFileUpload")
-    @patch("connpy.core_plugins.sync.os.path.basename")
-    def test_backup_file_to_drive(self, mock_basename, mock_media, mock_build, mock_get_credentials, mock_connapp):
-        mock_get_credentials.return_value = MagicMock()
-        mock_basename.return_value = "backup.zip"
-        mock_service = MagicMock()
-        mock_build.return_value = mock_service
-        
-        s = sync(mock_connapp)
-        assert s.backup_file_to_drive("/fake/backup.zip", 1234567890000) == 0
-        mock_service.files().create.assert_called_once()