Skip to content

Commit 23d8a5e

Browse files
committed
refactor(tests): simplify fetch method calls in SyncDriverAdapterBase tests
1 parent f168506 commit 23d8a5e

File tree

1 file changed

+28
-116
lines changed

1 file changed

+28
-116
lines changed

tests/unit/test_driver/test_fetch_aliases.py

Lines changed: 28 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -233,19 +233,12 @@ def test_sync_fetch_delegates_to_select() -> None:
233233

234234
# Call the real fetch method implementation
235235
result = SyncDriverAdapterBase.fetch(
236-
mock_driver,
237-
"SELECT * FROM users",
238-
{"id": 1},
239-
schema_type=None,
240-
statement_config=None,
236+
mock_driver, "SELECT * FROM users", {"id": 1}, schema_type=None, statement_config=None
241237
)
242238

243239
# Verify select was called with same arguments
244240
mock_driver.select.assert_called_once_with(
245-
"SELECT * FROM users",
246-
{"id": 1},
247-
schema_type=None,
248-
statement_config=None,
241+
"SELECT * FROM users", {"id": 1}, schema_type=None, statement_config=None
249242
)
250243
assert result == [{"id": 1}]
251244

@@ -256,18 +249,11 @@ def test_sync_fetch_one_delegates_to_select_one() -> None:
256249
mock_driver.select_one = Mock(return_value={"id": 1})
257250

258251
result = SyncDriverAdapterBase.fetch_one(
259-
mock_driver,
260-
"SELECT * FROM users WHERE id = ?",
261-
{"id": 1},
262-
schema_type=None,
263-
statement_config=None,
252+
mock_driver, "SELECT * FROM users WHERE id = ?", {"id": 1}, schema_type=None, statement_config=None
264253
)
265254

266255
mock_driver.select_one.assert_called_once_with(
267-
"SELECT * FROM users WHERE id = ?",
268-
{"id": 1},
269-
schema_type=None,
270-
statement_config=None,
256+
"SELECT * FROM users WHERE id = ?", {"id": 1}, schema_type=None, statement_config=None
271257
)
272258
assert result == {"id": 1}
273259

@@ -278,18 +264,11 @@ def test_sync_fetch_one_or_none_delegates_to_select_one_or_none() -> None:
278264
mock_driver.select_one_or_none = Mock(return_value=None)
279265

280266
result = SyncDriverAdapterBase.fetch_one_or_none(
281-
mock_driver,
282-
"SELECT * FROM users WHERE id = ?",
283-
{"id": 999},
284-
schema_type=None,
285-
statement_config=None,
267+
mock_driver, "SELECT * FROM users WHERE id = ?", {"id": 999}, schema_type=None, statement_config=None
286268
)
287269

288270
mock_driver.select_one_or_none.assert_called_once_with(
289-
"SELECT * FROM users WHERE id = ?",
290-
{"id": 999},
291-
schema_type=None,
292-
statement_config=None,
271+
"SELECT * FROM users WHERE id = ?", {"id": 999}, schema_type=None, statement_config=None
293272
)
294273
assert result is None
295274

@@ -299,16 +278,9 @@ def test_sync_fetch_value_delegates_to_select_value() -> None:
299278
mock_driver = Mock(spec=SyncDriverAdapterBase)
300279
mock_driver.select_value = Mock(return_value=42)
301280

302-
result = SyncDriverAdapterBase.fetch_value(
303-
mock_driver,
304-
"SELECT COUNT(*) FROM users",
305-
statement_config=None,
306-
)
281+
result = SyncDriverAdapterBase.fetch_value(mock_driver, "SELECT COUNT(*) FROM users", statement_config=None)
307282

308-
mock_driver.select_value.assert_called_once_with(
309-
"SELECT COUNT(*) FROM users",
310-
statement_config=None,
311-
)
283+
mock_driver.select_value.assert_called_once_with("SELECT COUNT(*) FROM users", statement_config=None)
312284
assert result == 42
313285

314286

@@ -318,15 +290,10 @@ def test_sync_fetch_value_or_none_delegates_to_select_value_or_none() -> None:
318290
mock_driver.select_value_or_none = Mock(return_value=None)
319291

320292
result = SyncDriverAdapterBase.fetch_value_or_none(
321-
mock_driver,
322-
"SELECT MAX(id) FROM empty_table",
323-
statement_config=None,
293+
mock_driver, "SELECT MAX(id) FROM empty_table", statement_config=None
324294
)
325295

326-
mock_driver.select_value_or_none.assert_called_once_with(
327-
"SELECT MAX(id) FROM empty_table",
328-
statement_config=None,
329-
)
296+
mock_driver.select_value_or_none.assert_called_once_with("SELECT MAX(id) FROM empty_table", statement_config=None)
330297
assert result is None
331298

332299

@@ -363,16 +330,11 @@ def test_sync_fetch_with_total_delegates_to_select_with_total() -> None:
363330
mock_driver.select_with_total = Mock(return_value=([{"id": 1}, {"id": 2}], 100))
364331

365332
result = SyncDriverAdapterBase.fetch_with_total(
366-
mock_driver,
367-
"SELECT * FROM users LIMIT 2",
368-
schema_type=None,
369-
statement_config=None,
333+
mock_driver, "SELECT * FROM users LIMIT 2", schema_type=None, statement_config=None
370334
)
371335

372336
mock_driver.select_with_total.assert_called_once_with(
373-
"SELECT * FROM users LIMIT 2",
374-
schema_type=None,
375-
statement_config=None,
337+
"SELECT * FROM users LIMIT 2", schema_type=None, statement_config=None
376338
)
377339
assert result == ([{"id": 1}, {"id": 2}], 100)
378340

@@ -384,18 +346,11 @@ async def test_async_fetch_delegates_to_select() -> None:
384346
mock_driver.select = AsyncMock(return_value=[{"id": 1}])
385347

386348
result = await AsyncDriverAdapterBase.fetch(
387-
mock_driver,
388-
"SELECT * FROM users",
389-
{"id": 1},
390-
schema_type=None,
391-
statement_config=None,
349+
mock_driver, "SELECT * FROM users", {"id": 1}, schema_type=None, statement_config=None
392350
)
393351

394352
mock_driver.select.assert_called_once_with(
395-
"SELECT * FROM users",
396-
{"id": 1},
397-
schema_type=None,
398-
statement_config=None,
353+
"SELECT * FROM users", {"id": 1}, schema_type=None, statement_config=None
399354
)
400355
assert result == [{"id": 1}]
401356

@@ -407,18 +362,11 @@ async def test_async_fetch_one_delegates_to_select_one() -> None:
407362
mock_driver.select_one = AsyncMock(return_value={"id": 1})
408363

409364
result = await AsyncDriverAdapterBase.fetch_one(
410-
mock_driver,
411-
"SELECT * FROM users WHERE id = ?",
412-
{"id": 1},
413-
schema_type=None,
414-
statement_config=None,
365+
mock_driver, "SELECT * FROM users WHERE id = ?", {"id": 1}, schema_type=None, statement_config=None
415366
)
416367

417368
mock_driver.select_one.assert_called_once_with(
418-
"SELECT * FROM users WHERE id = ?",
419-
{"id": 1},
420-
schema_type=None,
421-
statement_config=None,
369+
"SELECT * FROM users WHERE id = ?", {"id": 1}, schema_type=None, statement_config=None
422370
)
423371
assert result == {"id": 1}
424372

@@ -430,18 +378,11 @@ async def test_async_fetch_one_or_none_delegates_to_select_one_or_none() -> None
430378
mock_driver.select_one_or_none = AsyncMock(return_value=None)
431379

432380
result = await AsyncDriverAdapterBase.fetch_one_or_none(
433-
mock_driver,
434-
"SELECT * FROM users WHERE id = ?",
435-
{"id": 999},
436-
schema_type=None,
437-
statement_config=None,
381+
mock_driver, "SELECT * FROM users WHERE id = ?", {"id": 999}, schema_type=None, statement_config=None
438382
)
439383

440384
mock_driver.select_one_or_none.assert_called_once_with(
441-
"SELECT * FROM users WHERE id = ?",
442-
{"id": 999},
443-
schema_type=None,
444-
statement_config=None,
385+
"SELECT * FROM users WHERE id = ?", {"id": 999}, schema_type=None, statement_config=None
445386
)
446387
assert result is None
447388

@@ -452,16 +393,9 @@ async def test_async_fetch_value_delegates_to_select_value() -> None:
452393
mock_driver = AsyncMock(spec=AsyncDriverAdapterBase)
453394
mock_driver.select_value = AsyncMock(return_value=42)
454395

455-
result = await AsyncDriverAdapterBase.fetch_value(
456-
mock_driver,
457-
"SELECT COUNT(*) FROM users",
458-
statement_config=None,
459-
)
396+
result = await AsyncDriverAdapterBase.fetch_value(mock_driver, "SELECT COUNT(*) FROM users", statement_config=None)
460397

461-
mock_driver.select_value.assert_called_once_with(
462-
"SELECT COUNT(*) FROM users",
463-
statement_config=None,
464-
)
398+
mock_driver.select_value.assert_called_once_with("SELECT COUNT(*) FROM users", statement_config=None)
465399
assert result == 42
466400

467401

@@ -472,15 +406,10 @@ async def test_async_fetch_value_or_none_delegates_to_select_value_or_none() ->
472406
mock_driver.select_value_or_none = AsyncMock(return_value=None)
473407

474408
result = await AsyncDriverAdapterBase.fetch_value_or_none(
475-
mock_driver,
476-
"SELECT MAX(id) FROM empty_table",
477-
statement_config=None,
409+
mock_driver, "SELECT MAX(id) FROM empty_table", statement_config=None
478410
)
479411

480-
mock_driver.select_value_or_none.assert_called_once_with(
481-
"SELECT MAX(id) FROM empty_table",
482-
statement_config=None,
483-
)
412+
mock_driver.select_value_or_none.assert_called_once_with("SELECT MAX(id) FROM empty_table", statement_config=None)
484413
assert result is None
485414

486415

@@ -519,16 +448,11 @@ async def test_async_fetch_with_total_delegates_to_select_with_total() -> None:
519448
mock_driver.select_with_total = AsyncMock(return_value=([{"id": 1}, {"id": 2}], 100))
520449

521450
result = await AsyncDriverAdapterBase.fetch_with_total(
522-
mock_driver,
523-
"SELECT * FROM users LIMIT 2",
524-
schema_type=None,
525-
statement_config=None,
451+
mock_driver, "SELECT * FROM users LIMIT 2", schema_type=None, statement_config=None
526452
)
527453

528454
mock_driver.select_with_total.assert_called_once_with(
529-
"SELECT * FROM users LIMIT 2",
530-
schema_type=None,
531-
statement_config=None,
455+
"SELECT * FROM users LIMIT 2", schema_type=None, statement_config=None
532456
)
533457
assert result == ([{"id": 1}, {"id": 2}], 100)
534458

@@ -551,17 +475,10 @@ def __init__(self, **kwargs: Any) -> None:
551475
mock_driver.select = Mock(return_value=expected_result)
552476

553477
result = SyncDriverAdapterBase.fetch(
554-
mock_driver,
555-
"SELECT * FROM users",
556-
schema_type=UserSchema,
557-
statement_config=None,
478+
mock_driver, "SELECT * FROM users", schema_type=UserSchema, statement_config=None
558479
)
559480

560-
mock_driver.select.assert_called_once_with(
561-
"SELECT * FROM users",
562-
schema_type=UserSchema,
563-
statement_config=None,
564-
)
481+
mock_driver.select.assert_called_once_with("SELECT * FROM users", schema_type=UserSchema, statement_config=None)
565482
assert result == expected_result
566483

567484

@@ -581,15 +498,10 @@ def __init__(self, **kwargs: Any) -> None:
581498
mock_driver.select_one = AsyncMock(return_value=expected_result)
582499

583500
result = await AsyncDriverAdapterBase.fetch_one(
584-
mock_driver,
585-
"SELECT * FROM users WHERE id = 1",
586-
schema_type=UserSchema,
587-
statement_config=None,
501+
mock_driver, "SELECT * FROM users WHERE id = 1", schema_type=UserSchema, statement_config=None
588502
)
589503

590504
mock_driver.select_one.assert_called_once_with(
591-
"SELECT * FROM users WHERE id = 1",
592-
schema_type=UserSchema,
593-
statement_config=None,
505+
"SELECT * FROM users WHERE id = 1", schema_type=UserSchema, statement_config=None
594506
)
595507
assert result == expected_result

0 commit comments

Comments
 (0)