xai-review 0.37.0__py3-none-any.whl → 0.38.0__py3-none-any.whl

ai_review/tests/suites/services/vcs/{bitbucket → bitbucket_cloud}/test_adapter.py

@@ -1,22 +1,22 @@
-from ai_review.clients.bitbucket.pr.schema.comments import (
-    BitbucketPRCommentSchema,
-    BitbucketCommentContentSchema,
-    BitbucketCommentInlineSchema,
-    BitbucketCommentParentSchema,
+from ai_review.clients.bitbucket_cloud.pr.schema.comments import (
+    BitbucketCloudPRCommentSchema,
+    BitbucketCloudCommentContentSchema,
+    BitbucketCloudCommentInlineSchema,
+    BitbucketCloudCommentParentSchema,
 )
-from ai_review.clients.bitbucket.pr.schema.user import BitbucketUserSchema
-from ai_review.services.vcs.bitbucket.adapter import get_review_comment_from_bitbucket_pr_comment
+from ai_review.clients.bitbucket_cloud.pr.schema.user import BitbucketCloudUserSchema
+from ai_review.services.vcs.bitbucket_cloud.adapter import get_review_comment_from_bitbucket_pr_comment
 from ai_review.services.vcs.types import ReviewCommentSchema, UserSchema
 
 
 def test_maps_all_fields_correctly():
     """Should map Bitbucket PR comment with all fields correctly."""
-    comment = BitbucketPRCommentSchema(
+    comment = BitbucketCloudPRCommentSchema(
         id=101,
-        user=BitbucketUserSchema(uuid="u-123", display_name="Alice", nickname="alice"),
+        user=BitbucketCloudUserSchema(uuid="u-123", display_name="Alice", nickname="alice"),
         parent=None,
-        inline=BitbucketCommentInlineSchema(path="src/utils.py", to_line=10),
-        content=BitbucketCommentContentSchema(raw="Looks good"),
+        inline=BitbucketCloudCommentInlineSchema(path="src/utils.py", to_line=10),
+        content=BitbucketCloudCommentContentSchema(raw="Looks good"),
     )
 
     result = get_review_comment_from_bitbucket_pr_comment(comment)
@@ -37,12 +37,12 @@ def test_maps_all_fields_correctly():
 
 def test_maps_with_parent_comment():
     """Should set parent_id and use it as thread_id."""
-    comment = BitbucketPRCommentSchema(
+    comment = BitbucketCloudPRCommentSchema(
         id=202,
-        user=BitbucketUserSchema(uuid="u-456", display_name="Bob", nickname="bob"),
-        parent=BitbucketCommentParentSchema(id=101),
-        inline=BitbucketCommentInlineSchema(path="src/main.py", to_line=20),
-        content=BitbucketCommentContentSchema(raw="I agree"),
+        user=BitbucketCloudUserSchema(uuid="u-456", display_name="Bob", nickname="bob"),
+        parent=BitbucketCloudCommentParentSchema(id=101),
+        inline=BitbucketCloudCommentInlineSchema(path="src/main.py", to_line=20),
+        content=BitbucketCloudCommentContentSchema(raw="I agree"),
     )
 
     result = get_review_comment_from_bitbucket_pr_comment(comment)
@@ -56,12 +56,12 @@ def test_maps_with_parent_comment():
 
 def test_maps_without_user():
     """Should handle missing user gracefully."""
-    comment = BitbucketPRCommentSchema(
+    comment = BitbucketCloudPRCommentSchema(
         id=303,
         user=None,
         parent=None,
-        inline=BitbucketCommentInlineSchema(path="src/app.py", to_line=5),
-        content=BitbucketCommentContentSchema(raw="Anonymous feedback"),
+        inline=BitbucketCloudCommentInlineSchema(path="src/app.py", to_line=5),
+        content=BitbucketCloudCommentContentSchema(raw="Anonymous feedback"),
     )
 
     result = get_review_comment_from_bitbucket_pr_comment(comment)
@@ -74,12 +74,12 @@ def test_maps_without_user():
 
 def test_maps_without_inline():
     """Should handle missing inline gracefully (file and line None)."""
-    comment = BitbucketPRCommentSchema(
+    comment = BitbucketCloudPRCommentSchema(
         id=404,
-        user=BitbucketUserSchema(uuid="u-789", display_name="Charlie", nickname="charlie"),
+        user=BitbucketCloudUserSchema(uuid="u-789", display_name="Charlie", nickname="charlie"),
         parent=None,
         inline=None,
-        content=BitbucketCommentContentSchema(raw="General comment"),
+        content=BitbucketCloudCommentContentSchema(raw="General comment"),
     )
 
     result = get_review_comment_from_bitbucket_pr_comment(comment)
@@ -91,12 +91,12 @@ def test_maps_without_inline():
 
 def test_maps_with_empty_body_and_defaults():
     """Should default body to empty string if content.raw is empty or None."""
-    comment = BitbucketPRCommentSchema(
+    comment = BitbucketCloudPRCommentSchema(
         id=505,
         user=None,
         parent=None,
         inline=None,
-        content=BitbucketCommentContentSchema(raw="", html=None, markup=None),
+        content=BitbucketCloudCommentContentSchema(raw="", html=None, markup=None),
     )
 
     result = get_review_comment_from_bitbucket_pr_comment(comment)

ai_review/tests/suites/services/vcs/{bitbucket → bitbucket_cloud}/test_client.py

@@ -1,18 +1,18 @@
 import pytest
 
-from ai_review.services.vcs.bitbucket.client import BitbucketVCSClient
+from ai_review.services.vcs.bitbucket_cloud.client import BitbucketCloudVCSClient
 from ai_review.services.vcs.types import ReviewInfoSchema, ReviewCommentSchema, ReviewThreadSchema, ThreadKind
-from ai_review.tests.fixtures.clients.bitbucket import FakeBitbucketPullRequestsHTTPClient
+from ai_review.tests.fixtures.clients.bitbucket_cloud import FakeBitbucketCloudPullRequestsHTTPClient
 
 
 @pytest.mark.asyncio
-@pytest.mark.usefixtures("bitbucket_http_client_config")
+@pytest.mark.usefixtures("bitbucket_cloud_http_client_config")
 async def test_get_review_info_returns_valid_schema(
-        bitbucket_vcs_client: BitbucketVCSClient,
-        fake_bitbucket_pull_requests_http_client: FakeBitbucketPullRequestsHTTPClient,
+        bitbucket_cloud_vcs_client: BitbucketCloudVCSClient,
+        fake_bitbucket_cloud_pull_requests_http_client: FakeBitbucketCloudPullRequestsHTTPClient,
 ):
     """Should return detailed PR info with branches, author, reviewers, and files."""
-    info = await bitbucket_vcs_client.get_review_info()
+    info = await bitbucket_cloud_vcs_client.get_review_info()
 
     assert isinstance(info, ReviewInfoSchema)
     assert info.id == 1
@@ -20,7 +20,7 @@ async def test_get_review_info_returns_valid_schema(
     assert info.description == "This is a fake PR for testing"
 
     assert info.author.username == "tester"
-    assert {r.username for r in info.reviewers} == {"reviewer"}
+    assert {reviewer.username for reviewer in info.reviewers} == {"reviewer"}
 
     assert info.source_branch.ref == "feature/test"
     assert info.target_branch.ref == "main"
@@ -30,20 +30,20 @@ async def test_get_review_info_returns_valid_schema(
     assert "app/main.py" in info.changed_files
     assert len(info.changed_files) == 2
 
-    called_methods = [name for name, _ in fake_bitbucket_pull_requests_http_client.calls]
+    called_methods = [name for name, _ in fake_bitbucket_cloud_pull_requests_http_client.calls]
     assert called_methods == ["get_pull_request", "get_files"]
 
 
 @pytest.mark.asyncio
-@pytest.mark.usefixtures("bitbucket_http_client_config")
+@pytest.mark.usefixtures("bitbucket_cloud_http_client_config")
 async def test_get_general_comments_filters_inline(
-        bitbucket_vcs_client: BitbucketVCSClient,
-        fake_bitbucket_pull_requests_http_client: FakeBitbucketPullRequestsHTTPClient,
+        bitbucket_cloud_vcs_client: BitbucketCloudVCSClient,
+        fake_bitbucket_cloud_pull_requests_http_client: FakeBitbucketCloudPullRequestsHTTPClient,
 ):
     """Should return only general comments (without inline info)."""
-    comments = await bitbucket_vcs_client.get_general_comments()
+    comments = await bitbucket_cloud_vcs_client.get_general_comments()
 
-    assert all(isinstance(c, ReviewCommentSchema) for c in comments)
+    assert all(isinstance(comment, ReviewCommentSchema) for comment in comments)
     assert len(comments) == 1
 
     first = comments[0]
@@ -51,20 +51,20 @@ async def test_get_general_comments_filters_inline(
     assert first.file is None
     assert first.line is None
 
-    called_methods = [name for name, _ in fake_bitbucket_pull_requests_http_client.calls]
+    called_methods = [name for name, _ in fake_bitbucket_cloud_pull_requests_http_client.calls]
     assert called_methods == ["get_comments"]
 
 
 @pytest.mark.asyncio
-@pytest.mark.usefixtures("bitbucket_http_client_config")
+@pytest.mark.usefixtures("bitbucket_cloud_http_client_config")
 async def test_get_inline_comments_filters_general(
-        bitbucket_vcs_client: BitbucketVCSClient,
-        fake_bitbucket_pull_requests_http_client: FakeBitbucketPullRequestsHTTPClient,
+        bitbucket_cloud_vcs_client: BitbucketCloudVCSClient,
+        fake_bitbucket_cloud_pull_requests_http_client: FakeBitbucketCloudPullRequestsHTTPClient,
 ):
     """Should return only inline comments with file and line references."""
-    comments = await bitbucket_vcs_client.get_inline_comments()
+    comments = await bitbucket_cloud_vcs_client.get_inline_comments()
 
-    assert all(isinstance(c, ReviewCommentSchema) for c in comments)
+    assert all(isinstance(comment, ReviewCommentSchema) for comment in comments)
     assert len(comments) == 1
 
     first = comments[0]
@@ -72,22 +72,22 @@ async def test_get_inline_comments_filters_general(
     assert first.file == "file.py"
     assert first.line == 5
 
-    called_methods = [name for name, _ in fake_bitbucket_pull_requests_http_client.calls]
+    called_methods = [name for name, _ in fake_bitbucket_cloud_pull_requests_http_client.calls]
     assert called_methods == ["get_comments"]
 
 
 @pytest.mark.asyncio
-@pytest.mark.usefixtures("bitbucket_http_client_config")
+@pytest.mark.usefixtures("bitbucket_cloud_http_client_config")
 async def test_create_general_comment_posts_comment(
-        bitbucket_vcs_client: BitbucketVCSClient,
-        fake_bitbucket_pull_requests_http_client: FakeBitbucketPullRequestsHTTPClient,
+        bitbucket_cloud_vcs_client: BitbucketCloudVCSClient,
+        fake_bitbucket_cloud_pull_requests_http_client: FakeBitbucketCloudPullRequestsHTTPClient,
 ):
     """Should post a general (non-inline) comment."""
     message = "Hello from Bitbucket test!"
 
-    await bitbucket_vcs_client.create_general_comment(message)
+    await bitbucket_cloud_vcs_client.create_general_comment(message)
 
-    calls = [args for name, args in fake_bitbucket_pull_requests_http_client.calls if name == "create_comment"]
+    calls = [args for name, args in fake_bitbucket_cloud_pull_requests_http_client.calls if name == "create_comment"]
     assert len(calls) == 1
     call_args = calls[0]
     assert call_args["content"]["raw"] == message
@@ -96,19 +96,19 @@ async def test_create_general_comment_posts_comment(
 
 
 @pytest.mark.asyncio
-@pytest.mark.usefixtures("bitbucket_http_client_config")
+@pytest.mark.usefixtures("bitbucket_cloud_http_client_config")
 async def test_create_inline_comment_posts_comment(
-        bitbucket_vcs_client: BitbucketVCSClient,
-        fake_bitbucket_pull_requests_http_client: FakeBitbucketPullRequestsHTTPClient,
+        bitbucket_cloud_vcs_client: BitbucketCloudVCSClient,
+        fake_bitbucket_cloud_pull_requests_http_client: FakeBitbucketCloudPullRequestsHTTPClient,
 ):
     """Should post an inline comment with correct file and line."""
     file = "file.py"
     line = 10
     message = "Looks good"
 
-    await bitbucket_vcs_client.create_inline_comment(file, line, message)
+    await bitbucket_cloud_vcs_client.create_inline_comment(file, line, message)
 
-    calls = [args for name, args in fake_bitbucket_pull_requests_http_client.calls if name == "create_comment"]
+    calls = [args for name, args in fake_bitbucket_cloud_pull_requests_http_client.calls if name == "create_comment"]
     assert len(calls) == 1
 
     call_args = calls[0]
@@ -118,18 +118,18 @@ async def test_create_inline_comment_posts_comment(
 
 
 @pytest.mark.asyncio
-@pytest.mark.usefixtures("bitbucket_http_client_config")
+@pytest.mark.usefixtures("bitbucket_cloud_http_client_config")
 async def test_create_inline_reply_posts_comment(
-        bitbucket_vcs_client: BitbucketVCSClient,
-        fake_bitbucket_pull_requests_http_client: FakeBitbucketPullRequestsHTTPClient,
+        bitbucket_cloud_vcs_client: BitbucketCloudVCSClient,
+        fake_bitbucket_cloud_pull_requests_http_client: FakeBitbucketCloudPullRequestsHTTPClient,
 ):
     """Should post a reply to an existing inline thread."""
     thread_id = 42
     message = "I agree with this inline comment."
 
-    await bitbucket_vcs_client.create_inline_reply(thread_id, message)
+    await bitbucket_cloud_vcs_client.create_inline_reply(thread_id, message)
 
-    calls = [args for name, args in fake_bitbucket_pull_requests_http_client.calls if name == "create_comment"]
+    calls = [args for name, args in fake_bitbucket_cloud_pull_requests_http_client.calls if name == "create_comment"]
     assert len(calls) == 1
 
     call_args = calls[0]
@@ -140,18 +140,18 @@ async def test_create_inline_reply_posts_comment(
 
 
 @pytest.mark.asyncio
-@pytest.mark.usefixtures("bitbucket_http_client_config")
+@pytest.mark.usefixtures("bitbucket_cloud_http_client_config")
 async def test_create_summary_reply_posts_comment_with_parent(
-        bitbucket_vcs_client: BitbucketVCSClient,
-        fake_bitbucket_pull_requests_http_client: FakeBitbucketPullRequestsHTTPClient,
+        bitbucket_cloud_vcs_client: BitbucketCloudVCSClient,
+        fake_bitbucket_cloud_pull_requests_http_client: FakeBitbucketCloudPullRequestsHTTPClient,
 ):
     """Should post a reply to a general thread (same API with parent id)."""
     thread_id = 7
     message = "Thanks for the clarification."
 
-    await bitbucket_vcs_client.create_summary_reply(thread_id, message)
+    await bitbucket_cloud_vcs_client.create_summary_reply(thread_id, message)
 
-    calls = [args for name, args in fake_bitbucket_pull_requests_http_client.calls if name == "create_comment"]
+    calls = [args for name, args in fake_bitbucket_cloud_pull_requests_http_client.calls if name == "create_comment"]
     assert len(calls) == 1
 
     call_args = calls[0]
@@ -162,13 +162,13 @@ async def test_create_summary_reply_posts_comment_with_parent(
 
 
 @pytest.mark.asyncio
-@pytest.mark.usefixtures("bitbucket_http_client_config")
+@pytest.mark.usefixtures("bitbucket_cloud_http_client_config")
 async def test_get_inline_threads_groups_by_thread_id(
-        bitbucket_vcs_client: BitbucketVCSClient,
-        fake_bitbucket_pull_requests_http_client: FakeBitbucketPullRequestsHTTPClient,
+        bitbucket_cloud_vcs_client: BitbucketCloudVCSClient,
+        fake_bitbucket_cloud_pull_requests_http_client: FakeBitbucketCloudPullRequestsHTTPClient,
 ):
     """Should group inline comments into threads."""
-    threads = await bitbucket_vcs_client.get_inline_threads()
+    threads = await bitbucket_cloud_vcs_client.get_inline_threads()
 
     assert all(isinstance(thread, ReviewThreadSchema) for thread in threads)
     assert len(threads) == 1
@@ -180,25 +180,25 @@ async def test_get_inline_threads_groups_by_thread_id(
     assert len(thread.comments) == 1
     assert isinstance(thread.comments[0], ReviewCommentSchema)
 
-    called_methods = [name for name, _ in fake_bitbucket_pull_requests_http_client.calls]
+    called_methods = [name for name, _ in fake_bitbucket_cloud_pull_requests_http_client.calls]
     assert "get_comments" in called_methods
 
 
 @pytest.mark.asyncio
-@pytest.mark.usefixtures("bitbucket_http_client_config")
+@pytest.mark.usefixtures("bitbucket_cloud_http_client_config")
 async def test_get_general_threads_groups_by_thread_id(
-        bitbucket_vcs_client: BitbucketVCSClient,
-        fake_bitbucket_pull_requests_http_client: FakeBitbucketPullRequestsHTTPClient,
+        bitbucket_cloud_vcs_client: BitbucketCloudVCSClient,
+        fake_bitbucket_cloud_pull_requests_http_client: FakeBitbucketCloudPullRequestsHTTPClient,
 ):
     """Should group general (non-inline) comments into SUMMARY threads."""
-    threads = await bitbucket_vcs_client.get_general_threads()
+    threads = await bitbucket_cloud_vcs_client.get_general_threads()
 
-    assert all(isinstance(t, ReviewThreadSchema) for t in threads)
+    assert all(isinstance(thread, ReviewThreadSchema) for thread in threads)
     assert len(threads) == 1
     thread = threads[0]
     assert thread.kind == ThreadKind.SUMMARY
     assert len(thread.comments) == 1
     assert isinstance(thread.comments[0], ReviewCommentSchema)
 
-    called_methods = [name for name, _ in fake_bitbucket_pull_requests_http_client.calls]
+    called_methods = [name for name, _ in fake_bitbucket_cloud_pull_requests_http_client.calls]
     assert "get_comments" in called_methods

ai_review/tests/suites/services/vcs/bitbucket_server/test_adapter.py

@@ -0,0 +1,115 @@
+from ai_review.clients.bitbucket_server.pr.schema.comments import (
+    BitbucketServerCommentSchema,
+    BitbucketServerCommentAnchorSchema,
+)
+from ai_review.clients.bitbucket_server.pr.schema.user import BitbucketServerUserSchema
+from ai_review.services.vcs.bitbucket_server.adapter import get_review_comment_from_bitbucket_server_comment
+from ai_review.services.vcs.types import ReviewCommentSchema, UserSchema
+
+
+def test_maps_all_fields_correctly():
+    """Should map Bitbucket Server comment with all fields correctly."""
+    comment = BitbucketServerCommentSchema(
+        id=101,
+        text="Looks good",
+        author=BitbucketServerUserSchema(
+            id=1,
+            name="alice",
+            slug="alice",
+            display_name="Alice",
+        ),
+        anchor=BitbucketServerCommentAnchorSchema(path="src/utils.py", line=10, line_type="ADDED"),
+        comments=[],
+        created_date=1690000000,
+        updated_date=1690000001,
+    )
+
+    result = get_review_comment_from_bitbucket_server_comment(comment)
+
+    assert isinstance(result, ReviewCommentSchema)
+    assert result.id == 101
+    assert result.body == "Looks good"
+    assert result.file == "src/utils.py"
+    assert result.line == 10
+    assert result.parent_id is None
+    assert result.thread_id == 101
+
+    assert isinstance(result.author, UserSchema)
+    assert result.author.id == 1
+    assert result.author.name == "Alice"
+    assert result.author.username == "alice"
+
+
+def test_maps_author_with_missing_fields():
+    """Should handle partially filled author fields gracefully."""
+    comment = BitbucketServerCommentSchema(
+        id=202,
+        text="Anonymous-like comment",
+        author=BitbucketServerUserSchema(
+            id=None,
+            name="",
+            slug=None,
+            display_name="",
+        ),
+        anchor=BitbucketServerCommentAnchorSchema(path="src/app.py", line=15, line_type="ADDED"),
+        comments=[],
+        created_date=1690000004,
+        updated_date=1690000005,
+    )
+
+    result = get_review_comment_from_bitbucket_server_comment(comment)
+
+    assert isinstance(result, ReviewCommentSchema)
+    assert result.author.id is None
+    assert result.author.name == ""
+    assert result.author.username == ""
+
+
+def test_maps_without_anchor():
+    """Should handle missing anchor gracefully."""
+    comment = BitbucketServerCommentSchema(
+        id=303,
+        text="General feedback",
+        author=BitbucketServerUserSchema(
+            id=4,
+            name="dave",
+            slug="dave",
+            display_name="Dave",
+        ),
+        anchor=None,
+        comments=[],
+        created_date=1690000006,
+        updated_date=1690000007,
+    )
+
+    result = get_review_comment_from_bitbucket_server_comment(comment)
+
+    assert result.file is None
+    assert result.line is None
+    assert result.thread_id == 303
+
+
+def test_maps_empty_text_defaults_to_empty_body():
+    """Should default empty text to empty body."""
+    comment = BitbucketServerCommentSchema(
+        id=404,
+        text="",
+        author=BitbucketServerUserSchema(
+            id=7,
+            name="ghost",
+            slug="ghost",
+            display_name="Ghost",
+        ),
+        anchor=None,
+        comments=[],
+        created_date=1690000008,
+        updated_date=1690000009,
+    )
+
+    result = get_review_comment_from_bitbucket_server_comment(comment)
+
+    assert isinstance(result, ReviewCommentSchema)
+    assert result.body == ""
+    assert result.file is None
+    assert result.line is None
+    assert result.thread_id == 404

ai_review/tests/suites/services/vcs/bitbucket_server/test_client.py

@@ -0,0 +1,201 @@
+import pytest
+
+from ai_review.services.vcs.bitbucket_server.client import BitbucketServerVCSClient
+from ai_review.services.vcs.types import ReviewInfoSchema, ReviewCommentSchema, ReviewThreadSchema, ThreadKind
+from ai_review.tests.fixtures.clients.bitbucket_server import FakeBitbucketServerPullRequestsHTTPClient
+
+
+@pytest.mark.asyncio
+@pytest.mark.usefixtures("bitbucket_server_http_client_config")
+async def test_get_review_info_returns_valid_schema(
+        bitbucket_server_vcs_client: BitbucketServerVCSClient,
+        fake_bitbucket_server_pull_requests_http_client: FakeBitbucketServerPullRequestsHTTPClient,
+):
+    """Should return detailed PR info with branches, author, reviewers, and files."""
+    info = await bitbucket_server_vcs_client.get_review_info()
+
+    assert isinstance(info, ReviewInfoSchema)
+    assert info.id == 1
+    assert info.title == "Fake Bitbucket Server PR"
+    assert info.description == "PR for testing server client"
+
+    assert info.author.username == "author"
+    assert {reviewer.username for reviewer in info.reviewers} == {"reviewer"}
+
+    assert info.source_branch.ref == "feature/test"
+    assert info.target_branch.ref == "main"
+    assert info.base_sha == "abc123"
+    assert info.head_sha == "def456"
+
+    assert "src/main.py" in info.changed_files
+    assert len(info.changed_files) == 1
+
+    called_methods = [name for name, _ in fake_bitbucket_server_pull_requests_http_client.calls]
+    assert called_methods == ["get_pull_request", "get_changes"]
+
+
+@pytest.mark.asyncio
+@pytest.mark.usefixtures("bitbucket_server_http_client_config")
+async def test_get_general_comments_filters_inline(
+        bitbucket_server_vcs_client: BitbucketServerVCSClient,
+        fake_bitbucket_server_pull_requests_http_client: FakeBitbucketServerPullRequestsHTTPClient,
+):
+    """Should return only general comments (without anchor)."""
+    comments = await bitbucket_server_vcs_client.get_general_comments()
+
+    assert all(isinstance(comment, ReviewCommentSchema) for comment in comments)
+    assert len(comments) == 1
+
+    first = comments[0]
+    assert first.body == "General comment"
+    assert first.file is None
+    assert first.line is None
+
+    called_methods = [name for name, _ in fake_bitbucket_server_pull_requests_http_client.calls]
+    assert called_methods == ["get_comments"]
+
+
+@pytest.mark.asyncio
+@pytest.mark.usefixtures("bitbucket_server_http_client_config")
+async def test_get_inline_comments_filters_general(
+        bitbucket_server_vcs_client: BitbucketServerVCSClient,
+        fake_bitbucket_server_pull_requests_http_client: FakeBitbucketServerPullRequestsHTTPClient,
+):
+    """Should return only inline comments with file and line references."""
+    comments = await bitbucket_server_vcs_client.get_inline_comments()
+
+    assert all(isinstance(comment, ReviewCommentSchema) for comment in comments)
+    assert len(comments) == 1
+
+    first = comments[0]
+    assert first.body == "Inline comment"
+    assert first.file == "src/main.py"
+    assert first.line == 5
+
+    called_methods = [name for name, _ in fake_bitbucket_server_pull_requests_http_client.calls]
+    assert called_methods == ["get_comments"]
+
+
+@pytest.mark.asyncio
+@pytest.mark.usefixtures("bitbucket_server_http_client_config")
+async def test_create_general_comment_posts_comment(
+        bitbucket_server_vcs_client: BitbucketServerVCSClient,
+        fake_bitbucket_server_pull_requests_http_client: FakeBitbucketServerPullRequestsHTTPClient,
+):
+    """Should post a general (non-inline) comment."""
+    message = "Hello from Bitbucket Server test!"
+
+    await bitbucket_server_vcs_client.create_general_comment(message)
+
+    calls = [args for name, args in fake_bitbucket_server_pull_requests_http_client.calls if name == "create_comment"]
+    assert len(calls) == 1
+    call_args = calls[0]
+    assert call_args["text"] == message
+    assert call_args["project_key"] == "PRJ"
+    assert call_args["repo_slug"] == "repo"
+
+
+@pytest.mark.asyncio
+@pytest.mark.usefixtures("bitbucket_server_http_client_config")
+async def test_create_inline_comment_posts_comment(
+        bitbucket_server_vcs_client: BitbucketServerVCSClient,
+        fake_bitbucket_server_pull_requests_http_client: FakeBitbucketServerPullRequestsHTTPClient,
+):
+    """Should post an inline comment with correct file and line."""
+    file = "src/app.py"
+    line = 10
+    message = "Looks good"
+
+    await bitbucket_server_vcs_client.create_inline_comment(file, line, message)
+
+    calls = [args for name, args in fake_bitbucket_server_pull_requests_http_client.calls if name == "create_comment"]
+    assert len(calls) == 1
+
+    call_args = calls[0]
+    assert call_args["text"] == message
+    assert call_args["anchor"]["path"] == file
+    assert call_args["anchor"]["line"] == line
+    assert call_args["anchor"]["lineType"] == "ADDED"
+
+
+@pytest.mark.asyncio
+@pytest.mark.usefixtures("bitbucket_server_http_client_config")
+async def test_create_inline_reply_posts_comment(
+        bitbucket_server_vcs_client: BitbucketServerVCSClient,
+        fake_bitbucket_server_pull_requests_http_client: FakeBitbucketServerPullRequestsHTTPClient,
+):
+    """Should post a reply to an existing inline thread."""
+    thread_id = 42
+    message = "Reply inline comment"
+
+    await bitbucket_server_vcs_client.create_inline_reply(thread_id, message)
+
+    calls = [args for name, args in fake_bitbucket_server_pull_requests_http_client.calls if name == "create_comment"]
+    assert len(calls) == 1
+
+    call_args = calls[0]
+    assert call_args["parent"]["id"] == thread_id
+    assert call_args["text"] == message
+
+
+@pytest.mark.asyncio
+@pytest.mark.usefixtures("bitbucket_server_http_client_config")
+async def test_create_summary_reply_posts_comment(
+        bitbucket_server_vcs_client: BitbucketServerVCSClient,
+        fake_bitbucket_server_pull_requests_http_client: FakeBitbucketServerPullRequestsHTTPClient,
+):
+    """Should post a reply to a general thread (same API with parent id)."""
+    thread_id = 7
+    message = "Thanks for the clarification."
+
+    await bitbucket_server_vcs_client.create_summary_reply(thread_id, message)
+
+    calls = [args for name, args in fake_bitbucket_server_pull_requests_http_client.calls if name == "create_comment"]
+    assert len(calls) == 1
+
+    call_args = calls[0]
+    assert call_args["parent"]["id"] == thread_id
+    assert call_args["text"] == message
+
+
+@pytest.mark.asyncio
+@pytest.mark.usefixtures("bitbucket_server_http_client_config")
+async def test_get_inline_threads_groups_by_thread_id(
+        bitbucket_server_vcs_client: BitbucketServerVCSClient,
+        fake_bitbucket_server_pull_requests_http_client: FakeBitbucketServerPullRequestsHTTPClient,
+):
+    """Should group inline comments into threads."""
+    threads = await bitbucket_server_vcs_client.get_inline_threads()
+
+    assert all(isinstance(thread, ReviewThreadSchema) for thread in threads)
+    assert len(threads) == 1
+
+    thread = threads[0]
+    assert thread.kind == ThreadKind.INLINE
+    assert thread.file == "src/main.py"
+    assert thread.line == 5
+    assert len(thread.comments) == 1
+    assert isinstance(thread.comments[0], ReviewCommentSchema)
+
+    called_methods = [name for name, _ in fake_bitbucket_server_pull_requests_http_client.calls]
+    assert "get_comments" in called_methods
+
+
+@pytest.mark.asyncio
+@pytest.mark.usefixtures("bitbucket_server_http_client_config")
+async def test_get_general_threads_groups_by_thread_id(
+        bitbucket_server_vcs_client: BitbucketServerVCSClient,
+        fake_bitbucket_server_pull_requests_http_client: FakeBitbucketServerPullRequestsHTTPClient,
+):
+    """Should group general (non-inline) comments into SUMMARY threads."""
+    threads = await bitbucket_server_vcs_client.get_general_threads()
+
+    assert all(isinstance(thread, ReviewThreadSchema) for thread in threads)
+    assert len(threads) == 1
+    thread = threads[0]
+    assert thread.kind == ThreadKind.SUMMARY
+    assert len(thread.comments) == 1
+    assert isinstance(thread.comments[0], ReviewCommentSchema)
+
+    called_methods = [name for name, _ in fake_bitbucket_server_pull_requests_http_client.calls]
+    assert "get_comments" in called_methods