Use names directly on other tests

EliahKagan · EliahKagan · commit 246cc1703f69 · 2024-03-28T23:00:15.000-04:00
The tests are written broadly (per the style elsewhere in this test
suite), but narrowing the message-checking tests in this specific
way has the further advantage that the logic of the code under test
will be less reflected in the logic of the tests, so that bugs are
less likely to be missed by being duplicated across code and tests.
diff --git a/test/deprecation/test_toplevel.py b/test/deprecation/test_toplevel.py
@@ -141,8 +141,8 @@ def test_private_module_alias_access() -> None:
 
 assert len(messages) == len(_PRIVATE_MODULE_ALIAS_TARGETS)
 
- for target, message in zip(_PRIVATE_MODULE_ALIAS_TARGETS, messages):
- assert message.endswith(f"Use{target.__name__} instead.")
+ for fullname, message in zip(_PRIVATE_MODULE_ALIAS_TARGET_NAMES, messages):
+ assert message.endswith(f"Use{fullname} instead.")
 
 
 def test_private_module_alias_import() -> None:
@@ -177,8 +177,8 @@ def test_private_module_alias_import() -> None:
 
 assert len(messages) == len(_PRIVATE_MODULE_ALIAS_TARGETS)
 
- for target, message in zip(_PRIVATE_MODULE_ALIAS_TARGETS, messages):
- assert message.endswith(f"Use{target.__name__} instead.")
+ for fullname, message in zip(_PRIVATE_MODULE_ALIAS_TARGET_NAMES, messages):
+ assert message.endswith(f"Use{fullname} instead.")
 
 
 def test_dir_contains_public_attributes() -> None:

-Original file line number
+Diff line change
 assertlen(messages) ==len(_PRIVATE_MODULE_ALIAS_TARGETS)
 -fortarget, messageinzip(_PRIVATE_MODULE_ALIAS_TARGETS, messages):
 -assertmessage.endswith(f"Use {target.__name__} instead.")
 +forfullname, messageinzip(_PRIVATE_MODULE_ALIAS_TARGET_NAMES, messages):
 +assertmessage.endswith(f"Use {fullname} instead.")
 deftest_private_module_alias_import() ->None:
 assertlen(messages) ==len(_PRIVATE_MODULE_ALIAS_TARGETS)
 -fortarget, messageinzip(_PRIVATE_MODULE_ALIAS_TARGETS, messages):
 -assertmessage.endswith(f"Use {target.__name__} instead.")
 +forfullname, messageinzip(_PRIVATE_MODULE_ALIAS_TARGET_NAMES, messages):
 +assertmessage.endswith(f"Use {fullname} instead.")
 deftest_dir_contains_public_attributes() ->None: