@ngocsangairvds/vsaf 3.1.27 → 3.2.1

package/tools/vds-scripts/jira_orchestrator/tests/test_adapter_watchers.py

@@ -0,0 +1,41 @@
+from __future__ import annotations
+
+from unittest.mock import MagicMock, patch
+
+from vds_jira_orchestrator.adapter import JiraAdapter
+
+
+@patch("vds_jira_orchestrator.adapter.Jira")
+def test_issue_get_watchers_calls_sdk(mock_jira: MagicMock) -> None:
+    client = MagicMock()
+    client.issue_get_watchers.return_value = {"watchCount": 1, "watchers": [{"accountId": "123"}]}
+    mock_jira.return_value = client
+
+    adapter = JiraAdapter(url="https://jira.example.com", username="user", password="pass")
+    payload = adapter.issue_get_watchers("NTTC-1")
+
+    client.issue_get_watchers.assert_called_once_with("NTTC-1")
+    assert payload["watchCount"] == 1
+
+
+@patch("vds_jira_orchestrator.adapter.Jira")
+def test_issue_add_watcher_calls_sdk(mock_jira: MagicMock) -> None:
+    client = MagicMock()
+    mock_jira.return_value = client
+
+    adapter = JiraAdapter(url="https://jira.example.com", username="user", password="pass")
+    adapter.issue_add_watcher("NTTC-2", "userAccount")
+
+    client.issue_add_watcher.assert_called_once_with("NTTC-2", "userAccount")
+
+
+@patch("vds_jira_orchestrator.adapter.Jira")
+def test_issue_delete_watcher_calls_sdk(mock_jira: MagicMock) -> None:
+    client = MagicMock()
+    mock_jira.return_value = client
+
+    adapter = JiraAdapter(url="https://jira.example.com", username="user", password="pass")
+    adapter.issue_delete_watcher("NTTC-3", "userAccount")
+
+    client.issue_delete_watcher.assert_called_once_with("NTTC-3", "userAccount")
+

package/tools/vds-scripts/jira_orchestrator/tests/test_advanced_search.py

@@ -0,0 +1,164 @@
+"""Tests for JIRA advanced search methods."""
+
+from __future__ import annotations
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+from typer.testing import CliRunner
+from vds_jira_orchestrator.adapter import JiraAdapter, JiraAdapterError, JiraAuthError
+from vds_jira_orchestrator.cli import app
+
+runner = CliRunner()
+
+
+# ---------------------------------------------------------------------------
+# Adapter method tests
+# ---------------------------------------------------------------------------
+
+
+@patch("vds_jira_orchestrator.adapter.Jira")
+def test_search_issues_advanced_calls_client(mock_jira: MagicMock) -> None:
+    """Test that search_issues_advanced calls the SDK client with pagination."""
+    client = MagicMock()
+    client.jql.return_value = {"issues": [{"key": "TEST-1"}, {"key": "TEST-2"}], "total": 2}
+    mock_jira.return_value = client
+
+    adapter = JiraAdapter(url="https://jira.example.com", username="user", password="pass")
+    result = adapter.search_issues_advanced("project = TEST", start=10, limit=25, fields=["summary", "status"])
+
+    client.jql.assert_called_once_with("project = TEST", fields="summary,status", start=10, limit=25)
+    assert result["total"] == 2
+
+
+@patch("vds_jira_orchestrator.adapter.Jira")
+def test_search_issues_advanced_defaults(mock_jira: MagicMock) -> None:
+    """Test that search_issues_advanced uses default parameters."""
+    client = MagicMock()
+    client.jql.return_value = {"issues": [], "total": 0}
+    mock_jira.return_value = client
+
+    adapter = JiraAdapter(url="https://jira.example.com", username="user", password="pass")
+    adapter.search_issues_advanced("project = TEST")
+
+    client.jql.assert_called_once_with("project = TEST", fields="*all", start=0, limit=50)
+
+
+@patch("vds_jira_orchestrator.adapter.Jira")
+def test_search_issues_by_filter_calls_get_filter(mock_jira: MagicMock) -> None:
+    """Test that search_issues_by_filter gets filter and uses its JQL."""
+    client = MagicMock()
+    client.get_filter.return_value = {"id": 10000, "name": "My Filter", "jql": "project = TEST AND status = Open"}
+    client.jql.return_value = {"issues": [{"key": "TEST-1"}], "total": 1}
+    mock_jira.return_value = client
+
+    adapter = JiraAdapter(url="https://jira.example.com", username="user", password="pass")
+    result = adapter.search_issues_by_filter(10000, start=0, limit=50)
+
+    client.get_filter.assert_called_once_with(10000)
+    client.jql.assert_called_once_with("project = TEST AND status = Open", fields="*all", start=0, limit=50)
+    assert result["total"] == 1
+
+
+@patch("vds_jira_orchestrator.adapter.Jira")
+def test_search_issues_by_filter_no_jql(mock_jira: MagicMock) -> None:
+    """Test that search_issues_by_filter raises error when filter has no JQL."""
+    client = MagicMock()
+    client.get_filter.return_value = {"id": 10000, "name": "My Filter", "jql": ""}
+    mock_jira.return_value = client
+
+    adapter = JiraAdapter(url="https://jira.example.com", username="user", password="pass")
+
+    with pytest.raises(JiraAdapterError, match="does not have a JQL query"):
+        adapter.search_issues_by_filter(10000)
+
+
+@patch("vds_jira_orchestrator.adapter.Jira")
+def test_search_issues_advanced_handles_error(mock_jira: MagicMock) -> None:
+    """Test that search_issues_advanced handles errors."""
+    client = MagicMock()
+    client.jql.side_effect = Exception("401 unauthorized")
+    mock_jira.return_value = client
+
+    adapter = JiraAdapter(url="https://jira.example.com", username="user", password="pass")
+
+    with pytest.raises(JiraAuthError):
+        adapter.search_issues_advanced("project = TEST")
+
+
+# ---------------------------------------------------------------------------
+# CLI command tests
+# ---------------------------------------------------------------------------
+
+
+@patch("vds_jira_orchestrator.cli.JiraAdapter")
+@patch("vds_jira_orchestrator.cli.JiraSettings")
+def test_cli_search_advanced_flag(mock_settings: MagicMock, mock_adapter_class: MagicMock) -> None:
+    """Test search command with --advanced flag."""
+    mock_adapter = MagicMock()
+    mock_adapter.search_issues_advanced.return_value = {"issues": [{"key": "TEST-1"}], "total": 1}
+    mock_adapter_class.return_value = mock_adapter
+
+    result = runner.invoke(app, ["search", "project = TEST", "--advanced", "--start", "10", "--limit", "25"])
+
+    assert result.exit_code == 0
+    mock_adapter.search_issues_advanced.assert_called_once()
+
+
+@patch("vds_jira_orchestrator.cli.JiraAdapter")
+@patch("vds_jira_orchestrator.cli.JiraSettings")
+def test_cli_search_with_start_uses_advanced(mock_settings: MagicMock, mock_adapter_class: MagicMock) -> None:
+    """Test search command with --start automatically uses advanced search."""
+    mock_adapter = MagicMock()
+    mock_adapter.search_issues_advanced.return_value = {"issues": [], "total": 0}
+    mock_adapter_class.return_value = mock_adapter
+
+    result = runner.invoke(app, ["search", "project = TEST", "--start", "5"])
+
+    assert result.exit_code == 0
+    mock_adapter.search_issues_advanced.assert_called_once()
+    mock_adapter.jql.assert_not_called()
+
+
+@patch("vds_jira_orchestrator.cli.JiraAdapter")
+@patch("vds_jira_orchestrator.cli.JiraSettings")
+def test_cli_search_by_filter_success(mock_settings: MagicMock, mock_adapter_class: MagicMock) -> None:
+    """Test search-by-filter command success."""
+    mock_adapter = MagicMock()
+    mock_adapter.search_issues_by_filter.return_value = {"issues": [{"key": "TEST-1"}], "total": 1}
+    mock_adapter_class.return_value = mock_adapter
+
+    result = runner.invoke(app, ["search-by-filter", "10000", "--limit", "50"])
+
+    assert result.exit_code == 0
+    assert "TEST-1" in result.stdout
+    mock_adapter.search_issues_by_filter.assert_called_once()
+
+
+@patch("vds_jira_orchestrator.cli.JiraAdapter")
+@patch("vds_jira_orchestrator.cli.JiraSettings")
+def test_cli_search_by_filter_with_pagination(mock_settings: MagicMock, mock_adapter_class: MagicMock) -> None:
+    """Test search-by-filter command with pagination."""
+    mock_adapter = MagicMock()
+    mock_adapter.search_issues_by_filter.return_value = {"issues": [], "total": 0}
+    mock_adapter_class.return_value = mock_adapter
+
+    result = runner.invoke(app, ["search-by-filter", "10000", "--start", "20", "--limit", "25"])
+
+    assert result.exit_code == 0
+    mock_adapter.search_issues_by_filter.assert_called_once_with(10000, start=20, limit=25, fields=None)
+
+
+@patch("vds_jira_orchestrator.cli.JiraAdapter")
+@patch("vds_jira_orchestrator.cli.JiraSettings")
+def test_cli_search_by_filter_handles_error(mock_settings: MagicMock, mock_adapter_class: MagicMock) -> None:
+    """Test search-by-filter command error handling."""
+    mock_adapter = MagicMock()
+    mock_adapter.search_issues_by_filter.side_effect = JiraAdapterError("Filter not found")
+    mock_adapter_class.return_value = mock_adapter
+
+    result = runner.invoke(app, ["search-by-filter", "99999"])
+
+    assert result.exit_code != 0
+    assert "Error" in result.stdout or "Error" in result.stderr
+

package/tools/vds-scripts/jira_orchestrator/tests/test_agile.py

@@ -0,0 +1,256 @@
+"""Tests for JIRA Agile/Scrum operations."""
+
+from __future__ import annotations
+
+from unittest.mock import Mock, patch
+
+import pytest
+from typer.testing import CliRunner
+from vds_jira_orchestrator.cli import app
+from vds_jira_orchestrator.errors import JiraAdapterError
+
+
+@pytest.fixture
+def runner() -> CliRunner:
+    """Create a CLI runner for testing."""
+    return CliRunner()
+
+
+@pytest.fixture
+def sample_board() -> dict:
+    """Sample agile board response."""
+    return {
+        "id": 1,
+        "name": "Test Board",
+        "type": "scrum",
+        "location": {"projectId": 10000, "displayName": "Test Project"},
+    }
+
+
+@pytest.fixture
+def sample_epic() -> dict:
+    """Sample epic response."""
+    return {
+        "id": 1,
+        "key": "TEST-100",
+        "name": "Test Epic",
+        "summary": "Test Epic Summary",
+        "done": False,
+    }
+
+
+class TestAgileBoardOperations:
+    """Test suite for Agile board operations."""
+
+    @patch("vds_jira_orchestrator.cli.JiraAdapter")
+    @patch("vds_jira_orchestrator.cli.JiraSettings")
+    def test_board_list(self, mock_settings: Mock, mock_adapter_class: Mock, runner: CliRunner, sample_board: dict) -> None:
+        """Test board list command."""
+        mock_adapter = Mock()
+        mock_adapter.get_all_agile_boards.return_value = [sample_board]
+        mock_adapter_class.return_value = mock_adapter
+
+        result = runner.invoke(app, ["board", "list", "--limit", "10"])
+        assert result.exit_code == 0
+        mock_adapter.get_all_agile_boards.assert_called_once_with(
+            project_key=None, board_type=None, start=0, limit=10
+        )
+
+    @patch("vds_jira_orchestrator.cli.JiraAdapter")
+    @patch("vds_jira_orchestrator.cli.JiraSettings")
+    def test_board_get_by_id(self, mock_settings: Mock, mock_adapter_class: Mock, runner: CliRunner, sample_board: dict) -> None:
+        """Test board get by ID command."""
+        mock_adapter = Mock()
+        mock_adapter.get_agile_board.return_value = sample_board
+        mock_adapter_class.return_value = mock_adapter
+
+        result = runner.invoke(app, ["board", "get", "--board-id", "1"])
+        assert result.exit_code == 0
+        mock_adapter.get_agile_board.assert_called_once_with(1)
+
+    @patch("vds_jira_orchestrator.cli.JiraAdapter")
+    @patch("vds_jira_orchestrator.cli.JiraSettings")
+    def test_board_get_by_filter(self, mock_settings: Mock, mock_adapter_class: Mock, runner: CliRunner, sample_board: dict) -> None:
+        """Test board get by filter ID command."""
+        mock_adapter = Mock()
+        mock_adapter.get_agile_board_by_filter_id.return_value = sample_board
+        mock_adapter_class.return_value = mock_adapter
+
+        result = runner.invoke(app, ["board", "get", "--filter-id", "100"])
+        assert result.exit_code == 0
+        mock_adapter.get_agile_board_by_filter_id.assert_called_once_with(100)
+
+    @patch("vds_jira_orchestrator.cli.JiraAdapter")
+    @patch("vds_jira_orchestrator.cli.JiraSettings")
+    def test_board_create(self, mock_settings: Mock, mock_adapter_class: Mock, runner: CliRunner, sample_board: dict) -> None:
+        """Test board create command."""
+        mock_adapter = Mock()
+        mock_adapter.create_agile_board.return_value = sample_board
+        mock_adapter_class.return_value = mock_adapter
+
+        result = runner.invoke(
+            app,
+            [
+                "board",
+                "create",
+                "--name",
+                "Test Board",
+                "--type",
+                "scrum",
+                "--filter-id",
+                "100",
+                "--yes",
+            ],
+        )
+        assert result.exit_code == 0
+        mock_adapter.create_agile_board.assert_called_once_with("Test Board", "scrum", 100)
+
+    @patch("vds_jira_orchestrator.cli.JiraAdapter")
+    @patch("vds_jira_orchestrator.cli.JiraSettings")
+    def test_board_create_requires_yes(self, mock_settings: Mock, mock_adapter_class: Mock, runner: CliRunner) -> None:
+        """Test board create requires --yes flag."""
+        result = runner.invoke(
+            app,
+            [
+                "board",
+                "create",
+                "--name",
+                "Test Board",
+                "--type",
+                "scrum",
+                "--filter-id",
+                "100",
+            ],
+        )
+        assert result.exit_code != 0
+        assert "Refusing to create without --yes" in result.stderr
+
+    @patch("vds_jira_orchestrator.cli.JiraAdapter")
+    @patch("vds_jira_orchestrator.cli.JiraSettings")
+    def test_board_delete(self, mock_settings: Mock, mock_adapter_class: Mock, runner: CliRunner) -> None:
+        """Test board delete command."""
+        mock_adapter = Mock()
+        mock_adapter_class.return_value = mock_adapter
+
+        result = runner.invoke(app, ["board", "delete", "--board-id", "1", "--yes"])
+        assert result.exit_code == 0
+        mock_adapter.delete_agile_board.assert_called_once_with(1)
+
+    @patch("vds_jira_orchestrator.cli.JiraAdapter")
+    @patch("vds_jira_orchestrator.cli.JiraSettings")
+    def test_board_config(self, mock_settings: Mock, mock_adapter_class: Mock, runner: CliRunner) -> None:
+        """Test board config command."""
+        mock_adapter = Mock()
+        mock_adapter.get_agile_board_configuration.return_value = {"config": "test"}
+        mock_adapter_class.return_value = mock_adapter
+
+        result = runner.invoke(app, ["board", "config", "--board-id", "1"])
+        assert result.exit_code == 0
+        mock_adapter.get_agile_board_configuration.assert_called_once_with(1)
+
+    @patch("vds_jira_orchestrator.cli.JiraAdapter")
+    @patch("vds_jira_orchestrator.cli.JiraSettings")
+    def test_board_issues(self, mock_settings: Mock, mock_adapter_class: Mock, runner: CliRunner) -> None:
+        """Test board issues command."""
+        mock_adapter = Mock()
+        mock_adapter.get_issues_for_board.return_value = []
+        mock_adapter_class.return_value = mock_adapter
+
+        result = runner.invoke(app, ["board", "issues", "--board-id", "1"])
+        assert result.exit_code == 0
+        mock_adapter.get_issues_for_board.assert_called_once_with(1)
+
+    @patch("vds_jira_orchestrator.cli.JiraAdapter")
+    @patch("vds_jira_orchestrator.cli.JiraSettings")
+    def test_board_properties(self, mock_settings: Mock, mock_adapter_class: Mock, runner: CliRunner) -> None:
+        """Test board properties command."""
+        mock_adapter = Mock()
+        mock_adapter.get_agile_board_properties.return_value = [{"key": "prop1", "value": "val1"}]
+        mock_adapter_class.return_value = mock_adapter
+
+        result = runner.invoke(app, ["board", "properties", "--board-id", "1"])
+        assert result.exit_code == 0
+        mock_adapter.get_agile_board_properties.assert_called_once_with(1)
+
+    @patch("vds_jira_orchestrator.cli.JiraAdapter")
+    @patch("vds_jira_orchestrator.cli.JiraSettings")
+    def test_board_velocity(self, mock_settings: Mock, mock_adapter_class: Mock, runner: CliRunner) -> None:
+        """Test board velocity command."""
+        mock_adapter = Mock()
+        mock_adapter.get_agile_board_refined_velocity.return_value = {"velocity": 10}
+        mock_adapter_class.return_value = mock_adapter
+
+        result = runner.invoke(app, ["board", "velocity", "--board-id", "1"])
+        assert result.exit_code == 0
+        mock_adapter.get_agile_board_refined_velocity.assert_called_once_with(1)
+
+    @patch("vds_jira_orchestrator.cli.JiraAdapter")
+    @patch("vds_jira_orchestrator.cli.JiraSettings")
+    def test_board_error_handling(self, mock_settings: Mock, mock_adapter_class: Mock, runner: CliRunner) -> None:
+        """Test board command error handling."""
+        mock_adapter = Mock()
+        mock_adapter.get_agile_board.side_effect = JiraAdapterError("Test error")
+        mock_adapter_class.return_value = mock_adapter
+
+        result = runner.invoke(app, ["board", "get", "--board-id", "1"])
+        assert result.exit_code != 0
+
+
+class TestEpicOperations:
+    """Test suite for Epic operations."""
+
+    @patch("vds_jira_orchestrator.cli.JiraAdapter")
+    @patch("vds_jira_orchestrator.cli.JiraSettings")
+    def test_epic_issues(self, mock_settings: Mock, mock_adapter_class: Mock, runner: CliRunner) -> None:
+        """Test epic issues command."""
+        mock_adapter = Mock()
+        mock_adapter.epic_issues.return_value = []
+        mock_adapter_class.return_value = mock_adapter
+
+        result = runner.invoke(app, ["epic", "issues", "--epic-key", "TEST-100"])
+        assert result.exit_code == 0
+        mock_adapter.epic_issues.assert_called_once_with("TEST-100")
+
+    @patch("vds_jira_orchestrator.cli.JiraAdapter")
+    @patch("vds_jira_orchestrator.cli.JiraSettings")
+    def test_epic_list(self, mock_settings: Mock, mock_adapter_class: Mock, runner: CliRunner, sample_epic: dict) -> None:
+        """Test epic list command."""
+        mock_adapter = Mock()
+        mock_adapter.get_epics.return_value = [sample_epic]
+        mock_adapter_class.return_value = mock_adapter
+
+        result = runner.invoke(app, ["epic", "list", "--board-id", "1", "--limit", "10"])
+        assert result.exit_code == 0
+        mock_adapter.get_epics.assert_called_once_with(1, done=False, start=0, limit=10)
+
+    @patch("vds_jira_orchestrator.cli.JiraAdapter")
+    @patch("vds_jira_orchestrator.cli.JiraSettings")
+    def test_epic_issues_for_epic(self, mock_settings: Mock, mock_adapter_class: Mock, runner: CliRunner) -> None:
+        """Test epic issues-for-epic command."""
+        mock_adapter = Mock()
+        mock_adapter.get_issues_for_epic.return_value = []
+        mock_adapter_class.return_value = mock_adapter
+
+        result = runner.invoke(app, ["epic", "issues-for-epic", "--board-id", "1", "--epic-id", "100", "--limit", "10"])
+        assert result.exit_code == 0
+        mock_adapter.get_issues_for_epic.assert_called_once_with(1, 100, jql="", validate_query="", fields="*all", expand="", start=0, limit=10)
+
+    @patch("vds_jira_orchestrator.cli.JiraAdapter")
+    @patch("vds_jira_orchestrator.cli.JiraSettings")
+    def test_epic_requires_epic_key(self, mock_settings: Mock, mock_adapter_class: Mock, runner: CliRunner) -> None:
+        """Test epic issues requires epic-key."""
+        result = runner.invoke(app, ["epic", "issues"])
+        assert result.exit_code != 0
+        assert "--epic-key required" in result.stderr
+
+    @patch("vds_jira_orchestrator.cli.JiraAdapter")
+    @patch("vds_jira_orchestrator.cli.JiraSettings")
+    def test_epic_error_handling(self, mock_settings: Mock, mock_adapter_class: Mock, runner: CliRunner) -> None:
+        """Test epic command error handling."""
+        mock_adapter = Mock()
+        mock_adapter.epic_issues.side_effect = JiraAdapterError("Test error")
+        mock_adapter_class.return_value = mock_adapter
+
+        result = runner.invoke(app, ["epic", "issues", "--epic-key", "TEST-100"])
+        assert result.exit_code != 0
+

package/tools/vds-scripts/jira_orchestrator/tests/test_application_properties.py

@@ -0,0 +1,193 @@
+from __future__ import annotations
+
+from unittest.mock import MagicMock, Mock, patch
+
+import pytest
+from typer.testing import CliRunner
+from vds_jira_orchestrator.adapter import JiraAdapter, JiraAdapterError
+from vds_jira_orchestrator.cli import app
+
+
+@pytest.fixture
+def mock_adapter() -> JiraAdapter:
+    """Fixture for a JiraAdapter."""
+    with patch("vds_jira_orchestrator.adapter.Jira") as mock_jira_class:
+        mock_client = MagicMock()
+        mock_jira_class.return_value = mock_client
+        adapter = JiraAdapter(url="https://jira.example.com", username="user", password="pass")
+        adapter._client = mock_client
+        return adapter
+
+
+@pytest.fixture
+def runner() -> CliRunner:
+    return CliRunner()
+
+
+@pytest.fixture
+def mock_settings_class() -> MagicMock:
+    """Mock JiraSettings for CLI tests."""
+    mock_settings = Mock()
+    mock_settings.base_url = "https://jira.example.com"
+    mock_settings.username = "testuser"
+    mock_settings.password = "testpass"
+    mock_settings.token = None
+    mock_settings.require_basic_or_token = Mock()
+    with patch("vds_jira_orchestrator.cli.JiraSettings") as mock_class:
+        mock_class.return_value = mock_settings
+        yield mock_class
+
+
+@pytest.fixture
+def mock_adapter_class() -> MagicMock:
+    """Mock JiraAdapter for CLI tests."""
+    with patch("vds_jira_orchestrator.cli.JiraAdapter") as mock_class:
+        yield mock_class
+
+
+# ---------------------------------------------------------------------------
+# Adapter method tests
+# ---------------------------------------------------------------------------
+
+
+def test_get_property_calls_client(mock_adapter: JiraAdapter) -> None:
+    """Test that get_property calls the SDK client with correct parameters."""
+    mock_adapter._client.get_property.return_value = {"key": "test.key", "value": "test_value"}
+    result = mock_adapter.get_property(key="test.key")
+    mock_adapter._client.get_property.assert_called_once_with(key="test.key", permission_level=None, key_filter=None)
+    assert result["key"] == "test.key"
+
+
+def test_get_property_with_filters(mock_adapter: JiraAdapter) -> None:
+    """Test get_property with permission level and key filter."""
+    mock_adapter._client.get_property.return_value = {"key": "test.key", "value": "test_value"}
+    result = mock_adapter.get_property(key="test.key", permission_level="SYSTEM", key_filter="test.*")
+    mock_adapter._client.get_property.assert_called_once_with(key="test.key", permission_level="SYSTEM", key_filter="test.*")
+    assert result["key"] == "test.key"
+
+
+def test_get_property_handles_error(mock_adapter: JiraAdapter) -> None:
+    """Test that get_property handles errors from the SDK client."""
+    mock_adapter._client.get_property.side_effect = Exception("API Error")
+    with pytest.raises(JiraAdapterError, match="API Error"):
+        mock_adapter.get_property(key="test.key")
+
+
+def test_set_property_calls_client(mock_adapter: JiraAdapter) -> None:
+    """Test that set_property calls the SDK client."""
+    mock_adapter._client.set_property.return_value = None
+    mock_adapter.set_property("prop.id", "new_value")
+    mock_adapter._client.set_property.assert_called_once_with("prop.id", "new_value")
+
+
+def test_set_property_handles_error(mock_adapter: JiraAdapter) -> None:
+    """Test that set_property handles errors from the SDK client."""
+    mock_adapter._client.set_property.side_effect = Exception("API Error")
+    with pytest.raises(JiraAdapterError, match="API Error"):
+        mock_adapter.set_property("prop.id", "value")
+
+
+def test_get_advanced_settings_calls_client(mock_adapter: JiraAdapter) -> None:
+    """Test that get_advanced_settings calls the SDK client."""
+    mock_adapter._client.get_advanced_settings.return_value = {"setting1": "value1", "setting2": "value2"}
+    result = mock_adapter.get_advanced_settings()
+    mock_adapter._client.get_advanced_settings.assert_called_once()
+    assert "setting1" in result
+
+
+def test_get_advanced_settings_handles_error(mock_adapter: JiraAdapter) -> None:
+    """Test that get_advanced_settings handles errors from the SDK client."""
+    mock_adapter._client.get_advanced_settings.side_effect = Exception("API Error")
+    with pytest.raises(JiraAdapterError, match="API Error"):
+        mock_adapter.get_advanced_settings()
+
+
+# ---------------------------------------------------------------------------
+# CLI command tests
+# ---------------------------------------------------------------------------
+
+
+def test_property_get_success(runner: CliRunner, mock_settings_class: MagicMock, mock_adapter_class: MagicMock) -> None:
+    """Test successful property get."""
+    mock_adapter = MagicMock()
+    mock_adapter_class.return_value = mock_adapter
+    mock_adapter.get_property.return_value = {"key": "test.key", "value": "test_value"}
+
+    result = runner.invoke(app, ["property", "get", "--key", "test.key"])
+    assert result.exit_code == 0
+    assert "test.key" in result.stdout
+    mock_adapter.get_property.assert_called_once_with(key="test.key", permission_level=None, key_filter=None)
+
+
+def test_property_get_with_filters(runner: CliRunner, mock_settings_class: MagicMock, mock_adapter_class: MagicMock) -> None:
+    """Test property get with filters."""
+    mock_adapter = MagicMock()
+    mock_adapter_class.return_value = mock_adapter
+    mock_adapter.get_property.return_value = {"key": "test.key", "value": "test_value"}
+
+    result = runner.invoke(app, ["property", "get", "--key", "test.key", "--permission-level", "SYSTEM", "--key-filter", "test.*"])
+    assert result.exit_code == 0
+    mock_adapter.get_property.assert_called_once_with(key="test.key", permission_level="SYSTEM", key_filter="test.*")
+
+
+def test_property_set_success(runner: CliRunner, mock_settings_class: MagicMock, mock_adapter_class: MagicMock) -> None:
+    """Test successful property set."""
+    mock_adapter = MagicMock()
+    mock_adapter_class.return_value = mock_adapter
+    mock_adapter.set_property.return_value = None
+
+    result = runner.invoke(app, ["property", "set", "--property-id", "prop.id", "--value", "new_value", "--yes"])
+    assert result.exit_code == 0
+    assert "set" in result.stdout
+    mock_adapter.set_property.assert_called_once_with("prop.id", "new_value")
+
+
+def test_property_set_requires_yes(runner: CliRunner, mock_settings_class: MagicMock, mock_adapter_class: MagicMock) -> None:
+    """Test property set requires --yes flag."""
+    result = runner.invoke(app, ["property", "set", "--property-id", "prop.id", "--value", "new_value"])
+    assert result.exit_code != 0
+    assert "Refusing to set property without --yes" in result.stderr
+    mock_adapter_class.return_value.set_property.assert_not_called()
+
+
+def test_property_set_requires_property_id(runner: CliRunner, mock_settings_class: MagicMock, mock_adapter_class: MagicMock) -> None:
+    """Test property set requires --property-id."""
+    result = runner.invoke(app, ["property", "set", "--value", "new_value", "--yes"])
+    assert result.exit_code != 0
+    assert "--property-id required for set" in result.stderr
+    mock_adapter_class.return_value.set_property.assert_not_called()
+
+
+def test_property_set_requires_value(runner: CliRunner, mock_settings_class: MagicMock, mock_adapter_class: MagicMock) -> None:
+    """Test property set requires --value."""
+    result = runner.invoke(app, ["property", "set", "--property-id", "prop.id", "--yes"])
+    assert result.exit_code != 0
+    assert "--value required for set" in result.stderr
+    mock_adapter_class.return_value.set_property.assert_not_called()
+
+
+def test_settings_advanced_success(runner: CliRunner, mock_settings_class: MagicMock, mock_adapter_class: MagicMock) -> None:
+    """Test successful advanced settings get."""
+    mock_adapter = MagicMock()
+    mock_adapter_class.return_value = mock_adapter
+    mock_adapter.get_advanced_settings.return_value = {"setting1": "value1", "setting2": "value2"}
+
+    result = runner.invoke(app, ["settings", "advanced"])
+    assert result.exit_code == 0
+    assert "setting1" in result.stdout
+    mock_adapter.get_advanced_settings.assert_called_once()
+
+
+def test_property_invalid_action(runner: CliRunner, mock_settings_class: MagicMock, mock_adapter_class: MagicMock) -> None:
+    """Test property command with invalid action."""
+    result = runner.invoke(app, ["property", "invalid"])
+    assert result.exit_code != 0
+    assert "Unknown action: invalid" in result.stderr
+
+
+def test_settings_invalid_action(runner: CliRunner, mock_settings_class: MagicMock, mock_adapter_class: MagicMock) -> None:
+    """Test settings command with invalid action."""
+    result = runner.invoke(app, ["settings", "invalid"])
+    assert result.exit_code != 0
+    assert "Unknown action: invalid" in result.stderr
+