Skip to content

Commit de0c415

Browse files
lesnik512claude
andcommitted
test(story-1.8): consolidate five in-tree transport stubs into RecordedTransport
Replaces the file-local _FakeTransport (test_client_construction.py), _OkTransport and _FailingTransport (test_middleware.py), two distinct _RecordingTransport variants (test_client_methods.py, test_client_response_model.py, test_client_middleware_wiring.py), and _TrackingTransport (test_client_lifecycle.py) with one shared RecordedTransport class. Each replacement is mechanical: - _FakeTransport() → RecordedTransport() - _OkTransport() → RecordedTransport(default=Response(...)) - _FailingTransport(exc) → RecordedTransport(default=exc) - _RecordingTransport (last_request flavor) → RecordedTransport(default=Response(...)) - _RecordingTransport (calls counter) → RecordedTransport(default=Response(...)) with .calls → len(transport.requests) - _TrackingTransport → RecordedTransport() (aclose_calls attribute preserved) Also fixes a pre-existing ruff format violation in recorded.py (ternary expression on three lines instead of one). No test behavior changes. Total test count unchanged from this commit's edits. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 4a0b126 commit de0c415

7 files changed

Lines changed: 91 additions & 188 deletions

‎src/httpware/transports/recorded.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ def __init__(
3535
default: Response | BaseException | None = None,
3636
) -> None:
3737
self._routes: dict[tuple[str, str], Response | BaseException] = (
38-
{(m.upper(), u): v for (m, u), v in routes.items()}
39-
if routes is not None
40-
else {}
38+
{(m.upper(), u): v for (m, u), v in routes.items()} if routes is not None else {}
4139
)
4240
self._default = default
4341
self.requests: list[Request] = []

‎tests/test_client_construction.py‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,14 @@
22

33
# ruff: noqa: SLF001
44

5-
from contextlib import AbstractAsyncContextManager
6-
7-
from httpware import AsyncClient, Limits, Timeout
5+
from httpware import AsyncClient, Limits, RecordedTransport, Timeout
86
from httpware.decoders.pydantic import PydanticDecoder
97
from httpware.middleware import Middleware
108
from httpware.request import Request
11-
from httpware.response import Response, StreamResponse
9+
from httpware.response import Response
1210
from httpware.transports.httpx2 import Httpx2Transport
1311

1412

15-
class _FakeTransport:
16-
"""Minimal Transport for construction tests; never actually called."""
17-
18-
async def __call__(self, request: Request) -> Response: # pragma: no cover - not used
19-
raise NotImplementedError
20-
21-
def stream( # pragma: no cover - not used
22-
self, request: Request
23-
) -> AbstractAsyncContextManager[StreamResponse]:
24-
raise NotImplementedError
25-
26-
async def aclose(self) -> None: # pragma: no cover - not used
27-
return None
28-
29-
3013
def test_init_defaults_provide_transport_and_decoder() -> None:
3114
client = AsyncClient()
3215
assert isinstance(client._transport, Httpx2Transport)
@@ -35,7 +18,7 @@ def test_init_defaults_provide_transport_and_decoder() -> None:
3518

3619

3720
def test_init_accepts_explicit_transport() -> None:
38-
transport = _FakeTransport()
21+
transport = RecordedTransport()
3922
client = AsyncClient(transport=transport)
4023
assert client._transport is transport
4124

‎tests/test_client_lifecycle.py‎

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,25 @@
11
"""Unit tests for AsyncClient lifecycle (__aenter__, __aexit__)."""
22

3-
from contextlib import AbstractAsyncContextManager
4-
5-
from httpware import AsyncClient
6-
from httpware.request import Request
7-
from httpware.response import Response, StreamResponse
8-
9-
10-
class _TrackingTransport:
11-
"""Counts aclose() invocations."""
12-
13-
def __init__(self) -> None:
14-
self.aclose_calls = 0
15-
16-
async def __call__(self, request: Request) -> Response: # pragma: no cover - not used
17-
raise NotImplementedError
18-
19-
def stream( # pragma: no cover - not used
20-
self, request: Request
21-
) -> AbstractAsyncContextManager[StreamResponse]:
22-
raise NotImplementedError
23-
24-
async def aclose(self) -> None:
25-
self.aclose_calls += 1
3+
from httpware import AsyncClient, RecordedTransport
264

275

286
async def test_aenter_returns_self() -> None:
29-
transport = _TrackingTransport()
7+
transport = RecordedTransport()
308
client = AsyncClient(transport=transport)
319
async with client as entered:
3210
assert entered is client
3311

3412

3513
async def test_async_with_calls_aclose_on_exit() -> None:
36-
transport = _TrackingTransport()
14+
transport = RecordedTransport()
3715
client = AsyncClient(transport=transport)
3816
async with client:
3917
pass
4018
assert transport.aclose_calls == 1
4119

4220

4321
async def test_double_close_is_safe() -> None:
44-
transport = _TrackingTransport()
22+
transport = RecordedTransport()
4523
client = AsyncClient(transport=transport)
4624
async with client:
4725
pass
@@ -51,7 +29,7 @@ async def test_double_close_is_safe() -> None:
5129

5230

5331
async def test_view_async_with_does_not_close_transport() -> None:
54-
transport = _TrackingTransport()
32+
transport = RecordedTransport()
5533
client = AsyncClient(transport=transport)
5634
view = client.with_options(timeout=10)
5735
async with view:

‎tests/test_client_methods.py‎

Lines changed: 19 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,25 @@
11
"""Unit tests for AsyncClient HTTP method shortcuts."""
22

3-
from contextlib import AbstractAsyncContextManager
4-
53
import pytest
64

7-
from httpware import AsyncClient
8-
from httpware.request import Request
9-
from httpware.response import Response, StreamResponse
10-
5+
from httpware import AsyncClient, RecordedTransport
6+
from httpware.response import Response
117

12-
class _RecordingTransport:
13-
"""Captures the last-seen Request and returns a canned Response."""
148

15-
def __init__(self) -> None:
16-
self.last_request: Request | None = None
17-
self.canned = Response(
9+
def _make_transport() -> RecordedTransport:
10+
return RecordedTransport(
11+
default=Response(
1812
status=200,
1913
headers={"x-from": "transport"},
2014
content=b"body",
2115
url="https://example.test/",
2216
elapsed=0.0,
2317
)
24-
25-
async def __call__(self, request: Request) -> Response:
26-
self.last_request = request
27-
return self.canned
28-
29-
def stream( # pragma: no cover - not exercised
30-
self, request: Request
31-
) -> AbstractAsyncContextManager[StreamResponse]:
32-
raise NotImplementedError
33-
34-
async def aclose(self) -> None: # pragma: no cover - not exercised
35-
return None
18+
)
3619

3720

3821
async def test_get_builds_request_with_method_and_url() -> None:
39-
transport = _RecordingTransport()
22+
transport = _make_transport()
4023
client = AsyncClient(transport=transport)
4124

4225
await client.get("https://api.example.com/users")
@@ -48,31 +31,31 @@ async def test_get_builds_request_with_method_and_url() -> None:
4831

4932

5033
async def test_relative_path_joins_with_base_url() -> None:
51-
transport = _RecordingTransport()
34+
transport = _make_transport()
5235
client = AsyncClient(base_url="https://api.example.com/v1", transport=transport)
5336
await client.get("/users")
5437
assert transport.last_request is not None
5538
assert transport.last_request.url == "https://api.example.com/v1/users"
5639

5740

5841
async def test_relative_path_without_leading_slash_joins_same_way() -> None:
59-
transport = _RecordingTransport()
42+
transport = _make_transport()
6043
client = AsyncClient(base_url="https://api.example.com/v1", transport=transport)
6144
await client.get("users")
6245
assert transport.last_request is not None
6346
assert transport.last_request.url == "https://api.example.com/v1/users"
6447

6548

6649
async def test_absolute_url_bypasses_base_url() -> None:
67-
transport = _RecordingTransport()
50+
transport = _make_transport()
6851
client = AsyncClient(base_url="https://api.example.com/v1", transport=transport)
6952
await client.get("https://other.com/foo")
7053
assert transport.last_request is not None
7154
assert transport.last_request.url == "https://other.com/foo"
7255

7356

7457
async def test_default_headers_merged_with_per_call_headers() -> None:
75-
transport = _RecordingTransport()
58+
transport = _make_transport()
7659
client = AsyncClient(
7760
default_headers={"x-keep": "1", "x-override": "default"},
7861
transport=transport,
@@ -87,15 +70,15 @@ async def test_default_headers_merged_with_per_call_headers() -> None:
8770

8871

8972
async def test_default_query_merged_with_per_call_params() -> None:
90-
transport = _RecordingTransport()
73+
transport = _make_transport()
9174
client = AsyncClient(default_query={"k": "default"}, transport=transport)
9275
await client.get("/", params={"k": "per-call", "extra": "1"})
9376
assert transport.last_request is not None
9477
assert transport.last_request.params == {"k": "per-call", "extra": "1"}
9578

9679

9780
async def test_post_with_json_serializes_and_sets_content_type() -> None:
98-
transport = _RecordingTransport()
81+
transport = _make_transport()
9982
client = AsyncClient(transport=transport)
10083
await client.post("/users", json={"name": "alice"})
10184
assert transport.last_request is not None
@@ -105,7 +88,7 @@ async def test_post_with_json_serializes_and_sets_content_type() -> None:
10588

10689

10790
async def test_post_with_content_preserves_bytes_unchanged() -> None:
108-
transport = _RecordingTransport()
91+
transport = _make_transport()
10992
client = AsyncClient(transport=transport)
11093
await client.post("/users", content=b"raw bytes")
11194
assert transport.last_request is not None
@@ -114,14 +97,14 @@ async def test_post_with_content_preserves_bytes_unchanged() -> None:
11497

11598

11699
async def test_post_json_and_content_raises_typeerror() -> None:
117-
transport = _RecordingTransport()
100+
transport = _make_transport()
118101
client = AsyncClient(transport=transport)
119102
with pytest.raises(TypeError, match="`json` or `content`"):
120103
await client.post("/users", json={"a": 1}, content=b"raw")
121104

122105

123106
async def test_post_per_call_content_type_skips_auto_injection() -> None:
124-
transport = _RecordingTransport()
107+
transport = _make_transport()
125108
client = AsyncClient(transport=transport)
126109
await client.post(
127110
"/users",
@@ -147,7 +130,7 @@ async def test_post_per_call_content_type_skips_auto_injection() -> None:
147130
],
148131
)
149132
async def test_each_method_emits_correct_wire_method(client_method_name: str, expected_wire_method: str) -> None:
150-
transport = _RecordingTransport()
133+
transport = _make_transport()
151134
client = AsyncClient(transport=transport)
152135
method = getattr(client, client_method_name)
153136
await method("/foo")
@@ -156,15 +139,15 @@ async def test_each_method_emits_correct_wire_method(client_method_name: str, ex
156139

157140

158141
async def test_request_method_uses_first_positional_method_arg() -> None:
159-
transport = _RecordingTransport()
142+
transport = _make_transport()
160143
client = AsyncClient(transport=transport)
161144
await client.request("CUSTOM", "/foo")
162145
assert transport.last_request is not None
163146
assert transport.last_request.method == "CUSTOM"
164147

165148

166149
async def test_per_call_timeout_propagates_to_request_extensions() -> None:
167-
transport = _RecordingTransport()
150+
transport = _make_transport()
168151
client = AsyncClient(transport=transport)
169152
await client.get("/foo", timeout=2.5)
170153
assert transport.last_request is not None

‎tests/test_client_middleware_wiring.py‎

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,21 @@
11
"""Unit tests for AsyncClient middleware wiring through compose() and with_options."""
22

3-
from contextlib import AbstractAsyncContextManager
4-
5-
from httpware import AsyncClient
3+
from httpware import AsyncClient, RecordedTransport
64
from httpware.middleware import Middleware, Next
75
from httpware.request import Request
8-
from httpware.response import Response, StreamResponse
9-
6+
from httpware.response import Response
107

11-
class _RecordingTransport:
12-
def __init__(self) -> None:
13-
self.calls = 0
148

15-
async def __call__(self, request: Request) -> Response:
16-
self.calls += 1
17-
return Response(
9+
def _make_transport() -> RecordedTransport:
10+
return RecordedTransport(
11+
default=Response(
1812
status=200,
1913
headers={},
2014
content=b"",
21-
url=request.url,
15+
url="/",
2216
elapsed=0.0,
2317
)
24-
25-
def stream( # pragma: no cover
26-
self, request: Request
27-
) -> AbstractAsyncContextManager[StreamResponse]:
28-
raise NotImplementedError
29-
30-
async def aclose(self) -> None: # pragma: no cover
31-
return None
18+
)
3219

3320

3421
def _make_recording_middleware(label: str, log: list[str]) -> Middleware:
@@ -41,19 +28,19 @@ async def __call__(self, request: Request, next: Next) -> Response: # noqa: A00
4128

4229

4330
async def test_middleware_runs_per_request() -> None:
44-
transport = _RecordingTransport()
31+
transport = _make_transport()
4532
log: list[str] = []
4633
client = AsyncClient(
4734
transport=transport,
4835
middleware=[_make_recording_middleware("A", log)],
4936
)
5037
await client.get("/foo")
5138
assert log == ["A"]
52-
assert transport.calls == 1
39+
assert len(transport.requests) == 1
5340

5441

5542
async def test_with_options_recomposes_middleware() -> None:
56-
transport = _RecordingTransport()
43+
transport = _make_transport()
5744
parent_log: list[str] = []
5845
view_log: list[str] = []
5946
client = AsyncClient(
@@ -69,7 +56,7 @@ async def test_with_options_recomposes_middleware() -> None:
6956

7057

7158
async def test_with_options_inherits_middleware_when_unset() -> None:
72-
transport = _RecordingTransport()
59+
transport = _make_transport()
7360
log: list[str] = []
7461
client = AsyncClient(
7562
transport=transport,
@@ -81,7 +68,7 @@ async def test_with_options_inherits_middleware_when_unset() -> None:
8168

8269

8370
async def test_view_shares_transport_with_parent() -> None:
84-
transport = _RecordingTransport()
71+
transport = _make_transport()
8572
client = AsyncClient(transport=transport)
8673
view = client.with_options(timeout=10)
8774
assert view._transport is client._transport # noqa: SLF001
@@ -94,28 +81,28 @@ async def test_view_does_not_own_transport() -> None:
9481

9582

9683
async def test_with_options_overrides_base_url() -> None:
97-
transport = _RecordingTransport()
84+
transport = _make_transport()
9885
client = AsyncClient(transport=transport, base_url="https://api.test/v1")
9986
view = client.with_options(base_url="https://other.test/v2")
10087
assert view._config.base_url == "https://other.test/v2" # noqa: SLF001
10188

10289

10390
async def test_with_options_overrides_default_headers() -> None:
104-
transport = _RecordingTransport()
91+
transport = _make_transport()
10592
client = AsyncClient(transport=transport, default_headers={"x-old": "1"})
10693
view = client.with_options(default_headers={"x-new": "2"})
10794
assert view._config.default_headers == {"x-new": "2"} # noqa: SLF001
10895

10996

11097
async def test_with_options_overrides_default_query() -> None:
111-
transport = _RecordingTransport()
98+
transport = _make_transport()
11299
client = AsyncClient(transport=transport, default_query={"old": "1"})
113100
view = client.with_options(default_query={"new": "2"})
114101
assert view._config.default_query == {"new": "2"} # noqa: SLF001
115102

116103

117104
async def test_with_options_overrides_decoder() -> None:
118-
transport = _RecordingTransport()
105+
transport = _make_transport()
119106

120107
class _NoopDecoder:
121108
def decode(self, content: bytes, model: type) -> object: # pragma: no cover # noqa: ARG002

0 commit comments

Comments
 (0)