test: improve coverage for new features

Author: Arakiss

tests/test_ai_service.py

@@ -85,9 +85,13 @@ def test_generate_commit_message_success(ai_service, mock_git_file):
         "usage": {"prompt_tokens": 100, "completion_tokens": 50, "total_tokens": 150},
     }
 
-    ai_service.session.post = MagicMock(return_value=MagicMock(status_code=200, json=lambda: mock_response))
+    ai_service.session.post = MagicMock(
+        return_value=MagicMock(status_code=200, json=lambda: mock_response)
+    )
 
-    suggestion, usage = ai_service.generate_commit_message("test diff", [mock_git_file("test.py")])
+    suggestion, usage = ai_service.generate_commit_message(
+        "test diff", [mock_git_file("test.py")]
+    )
 
     assert isinstance(suggestion, CommitSuggestion)
     assert suggestion.title == "✨ feat: add new feature"
@@ -97,7 +101,9 @@ def test_generate_commit_message_success(ai_service, mock_git_file):
 def test_generate_commit_message_api_error(ai_service, mock_git_file):
     """Test handling of API errors."""
     ai_service.session.post = MagicMock(
-        return_value=MagicMock(status_code=400, json=lambda: {"error": {"message": "API Error"}})
+        return_value=MagicMock(
+            status_code=400, json=lambda: {"error": {"message": "API Error"}}
+        )
     )
 
     with pytest.raises(ValueError) as exc_info:
@@ -113,7 +119,9 @@ def test_generate_commit_message_invalid_json(ai_service, mock_git_file):
         "usage": {"prompt_tokens": 100, "completion_tokens": 50, "total_tokens": 150},
     }
 
-    ai_service.session.post = MagicMock(return_value=MagicMock(status_code=200, json=lambda: mock_response))
+    ai_service.session.post = MagicMock(
+        return_value=MagicMock(status_code=200, json=lambda: mock_response)
+    )
 
     with pytest.raises(ValueError) as exc_info:
         ai_service.generate_commit_message("test diff", [mock_git_file("test.py")])
@@ -123,7 +131,9 @@ def test_generate_commit_message_invalid_json(ai_service, mock_git_file):
 
 def test_generate_commit_message_network_error(ai_service, mock_git_file):
     """Test handling of network errors."""
-    ai_service.session.post = MagicMock(side_effect=requests.exceptions.RequestException("Network Error"))
+    ai_service.session.post = MagicMock(
+        side_effect=requests.exceptions.RequestException("Network Error")
+    )
 
     with pytest.raises(ValueError) as exc_info:
         ai_service.generate_commit_message("test diff", [mock_git_file("test.py")])
@@ -141,7 +151,12 @@ def test_generate_commit_message_retries(mock_sleep, ai_service, mock_git_file):
                     "content": json.dumps(
                         {
                             "title": "✨ feat: retry success",
-                            "body": {"Features": {"emoji": "✨", "changes": ["Added new functionality"]}},
+                            "body": {
+                                "Features": {
+                                    "emoji": "✨",
+                                    "changes": ["Added new functionality"],
+                                }
+                            },
                             "summary": "Added new feature",
                         }
                     )
@@ -156,7 +171,9 @@ def test_generate_commit_message_retries(mock_sleep, ai_service, mock_git_file):
             MagicMock(status_code=200, json=lambda: mock_response),
         ]
     )
-    suggestion, _ = ai_service.generate_commit_message("diff", [mock_git_file("test.py")])
+    suggestion, _ = ai_service.generate_commit_message(
+        "diff", [mock_git_file("test.py")]
+    )
     assert suggestion.title == "✨ feat: retry success"
     assert ai_service.session.post.call_count == 2
 
@@ -182,3 +199,17 @@ def test_ai_service_missing_api_key():
         AIService(api_key=None)
 
     assert "API key is required" in str(exc_info.value)
+
+
+@patch("time.sleep", return_value=None)
+def test_generate_commit_message_retries_exhausted(
+    mock_sleep, ai_service, mock_git_file
+):
+    """Should raise error after exhausting all retries."""
+    ai_service.session.post = MagicMock(
+        side_effect=requests.exceptions.RequestException("temp")
+    )
+    with pytest.raises(ValueError) as exc_info:
+        ai_service.generate_commit_message("diff", [mock_git_file("test.py")])
+    assert "API Request failed" in str(exc_info.value)
+    assert ai_service.session.post.call_count == 3

tests/test_analyzer.py

@@ -1,6 +1,5 @@
 """Tests for commit analyzer module."""
 
-
 import pytest
 
 from commitloom.config.settings import config
@@ -52,7 +51,9 @@ def test_analyze_diff_complexity_token_limit_exceeded(analyzer, mock_git_file):
 def test_analyze_diff_complexity_many_files(analyzer, mock_git_file):
     """Test analysis when many files are changed."""
     diff = "Multiple file changes"
-    files = [mock_git_file(f"file{i}.py") for i in range(config.max_files_threshold + 1)]
+    files = [
+        mock_git_file(f"file{i}.py") for i in range(config.max_files_threshold + 1)
+    ]
 
     analysis = analyzer.analyze_diff_complexity(diff, files)
 
@@ -63,7 +64,9 @@ def test_analyze_diff_complexity_many_files(analyzer, mock_git_file):
 def test_analyze_diff_complexity_expensive_change(analyzer, mock_git_file):
     """Test analysis of an expensive change."""
     # Create a diff that will be expensive (>0.10€)
-    tokens_for_10_cents = int((0.10 * 1_000_000) / config.model_costs[config.default_model].input)
+    tokens_for_10_cents = int(
+        (0.10 * 1_000_000) / config.model_costs[config.default_model].input
+    )
     diff = "diff --git a/expensive.py b/expensive.py\n" + (
         "+" + "x" * tokens_for_10_cents * config.token_estimation_ratio + "\n"
     )
@@ -115,7 +118,9 @@ def test_analyze_diff_complexity_multiple_conditions(analyzer, mock_git_file):
     # 1. Many files
     # 2. Moderate cost
     # 3. One large file
-    files = [mock_git_file(f"file{i}.py") for i in range(config.max_files_threshold + 1)]
+    files = [
+        mock_git_file(f"file{i}.py") for i in range(config.max_files_threshold + 1)
+    ]
     tokens = config.token_limit * 0.8
     diff = "x" * int(tokens * config.token_estimation_ratio)
 
@@ -189,3 +194,26 @@ def test_get_cost_context():
     assert "moderate" in CommitAnalyzer.get_cost_context(0.05)
     assert "expensive" in CommitAnalyzer.get_cost_context(0.1)
     assert "very expensive" in CommitAnalyzer.get_cost_context(1.0)
+
+
+def test_estimate_tokens_and_cost_unknown_model(capsys):
+    """Fallback to zero cost for unknown model."""
+    tokens, cost = CommitAnalyzer.estimate_tokens_and_cost("test", model="unknown")
+    captured = capsys.readouterr()
+    assert "Cost estimation is not available" in captured.out
+    assert tokens >= 0
+    assert cost == 0
+
+
+def test_analyze_diff_complexity_moderate_cost(analyzer, mock_git_file):
+    """Should warn about moderate cost without marking complex."""
+    tokens_for_six_cents = int(
+        (0.06 * 1_000_000) / config.model_costs[config.default_model].input
+    )
+    diff = "diff --git a/mod.py b/mod.py\n" + (
+        "+" + "x" * tokens_for_six_cents * config.token_estimation_ratio + "\n"
+    )
+    files = [mock_git_file("mod.py")]
+    analysis = analyzer.analyze_diff_complexity(diff, files)
+    assert any("moderate" in str(w) for w in analysis.warnings)
+    assert analysis.is_complex

tests/test_cli_handler.py

@@ -83,7 +83,10 @@ def test_handle_commit_success(cli):
 
 def test_handle_commit_complex_changes(cli):
     """Test handling complex changes."""
-    mock_files = [GitFile(f"test{i}.py", "A", old_path=None, size=100, hash="abc123") for i in range(4)]
+    mock_files = [
+        GitFile(f"test{i}.py", "A", old_path=None, size=100, hash="abc123")
+        for i in range(4)
+    ]
     cli.git.get_staged_files = MagicMock(return_value=mock_files)
     cli.git.create_commit = MagicMock(return_value=True)
 
@@ -121,7 +124,9 @@ def test_handle_commit_api_error(cli):
     """Test handling API error."""
     mock_file = GitFile("test.py", "A", old_path=None, size=100, hash="abc123")
     cli.git.get_staged_files = MagicMock(return_value=[mock_file])
-    cli.ai_service.generate_commit_message = MagicMock(side_effect=Exception("API error"))
+    cli.ai_service.generate_commit_message = MagicMock(
+        side_effect=Exception("API error")
+    )
 
     with pytest.raises(SystemExit) as exc:
         cli.run(auto_commit=True)
@@ -145,7 +150,9 @@ def test_create_batches_with_ignored_files(cli):
 
 def test_create_batches_git_error(cli):
     """Test batch creation with git error."""
-    cli.git.get_staged_files = MagicMock(side_effect=subprocess.CalledProcessError(1, "git"))
+    cli.git.get_staged_files = MagicMock(
+        side_effect=subprocess.CalledProcessError(1, "git")
+    )
 
     batches = cli._create_batches([])
 
@@ -222,7 +229,10 @@ def test_debug_mode(cli):
 
 def test_process_files_in_batches_error(cli):
     """Test error handling in batch processing."""
-    mock_files = [GitFile(f"test{i}.py", "A", old_path=None, size=100, hash="abc123") for i in range(4)]
+    mock_files = [
+        GitFile(f"test{i}.py", "A", old_path=None, size=100, hash="abc123")
+        for i in range(4)
+    ]
     cli.git.get_diff = MagicMock(side_effect=GitError("Git error"))
 
     with pytest.raises(SystemExit) as exc:
@@ -281,3 +291,16 @@ def test_maybe_create_branch_not_complex(cli):
         mock_console.confirm_branch_creation.return_value = True
         cli._maybe_create_branch(analysis)
         cli.git.create_and_checkout_branch.assert_not_called()
+
+
+def test_process_single_commit_maybe_create_branch_once(cli, mock_git_file):
+    """_maybe_create_branch should be invoked only once."""
+    cli.auto_commit = True
+    cli._maybe_create_branch = MagicMock()
+    cli.git.create_commit = MagicMock(return_value=True)
+    file = mock_git_file("test.py")
+    with patch(
+        "commitloom.cli.cli_handler.metrics_manager.start_commit_tracking"
+    ), patch("commitloom.cli.cli_handler.metrics_manager.finish_commit_tracking"):
+        cli._process_single_commit([file])
+    cli._maybe_create_branch.assert_called_once()