Rename ``pylint.testutils.TestMessage`` to ``MessageTest`` (#5051)

6 files changed, 161 insertions, 161 deletions

diff --git a/tests/extensions/test_check_docs.py b/tests/extensions/test_check_docs.py
index 059003e6c..6676c13b4 100644
--- a/tests/extensions/test_check_docs.py
+++ b/tests/extensions/test_check_docs.py
@@ -30,7 +30,7 @@ import pytest
 from astroid import nodes
 
 from pylint.extensions.docparams import DocstringParameterChecker
-from pylint.testutils import CheckerTestCase, TestMessage, set_config
+from pylint.testutils import CheckerTestCase, MessageTest, set_config
 
 
 class TestParamDocChecker(CheckerTestCase):
@@ -60,8 +60,8 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("y",)),
-            TestMessage(msg_id="missing-type-doc", node=node, args=("x, y",)),
+            MessageTest(msg_id="missing-param-doc", node=node, args=("y",)),
+            MessageTest(msg_id="missing-type-doc", node=node, args=("x, y",)),
         ):
             self.checker.visit_functiondef(node)
 
@@ -84,8 +84,8 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("y",)),
-            TestMessage(msg_id="missing-type-doc", node=node, args=("x, y",)),
+            MessageTest(msg_id="missing-param-doc", node=node, args=("y",)),
+            MessageTest(msg_id="missing-type-doc", node=node, args=("x, y",)),
         ):
             self.checker.visit_functiondef(node)
 
@@ -173,7 +173,7 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-type-doc", node=node, args=("x",))
+            MessageTest(msg_id="missing-type-doc", node=node, args=("x",))
         ):
             self.checker.visit_functiondef(node)
 
@@ -255,10 +255,10 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("that",)),
-            TestMessage(msg_id="missing-type-doc", node=node, args=("that",)),
-            TestMessage(msg_id="differing-param-doc", node=node, args=("these",)),
-            TestMessage(msg_id="differing-type-doc", node=node, args=("these",)),
+            MessageTest(msg_id="missing-param-doc", node=node, args=("that",)),
+            MessageTest(msg_id="missing-type-doc", node=node, args=("that",)),
+            MessageTest(msg_id="differing-param-doc", node=node, args=("these",)),
+            MessageTest(msg_id="differing-type-doc", node=node, args=("these",)),
         ):
             self.checker.visit_functiondef(node)
 
@@ -284,8 +284,8 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("y",)),
-            TestMessage(msg_id="missing-type-doc", node=node, args=("x, y",)),
+            MessageTest(msg_id="missing-param-doc", node=node, args=("y",)),
+            MessageTest(msg_id="missing-type-doc", node=node, args=("x, y",)),
         ):
             self.checker.visit_functiondef(node)
 
@@ -322,8 +322,8 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("x, y",)),
-            TestMessage(msg_id="missing-type-doc", node=node, args=("x, y",)),
+            MessageTest(msg_id="missing-param-doc", node=node, args=("x, y",)),
+            MessageTest(msg_id="missing-type-doc", node=node, args=("x, y",)),
         ):
             self.checker.visit_functiondef(node)
 
@@ -373,8 +373,8 @@ class TestParamDocChecker(CheckerTestCase):
         )
         method_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=method_node, args=("y",)),
-            TestMessage(msg_id="missing-type-doc", node=method_node, args=("x, y",)),
+            MessageTest(msg_id="missing-param-doc", node=method_node, args=("y",)),
+            MessageTest(msg_id="missing-type-doc", node=method_node, args=("x, y",)),
         ):
             self._visit_methods_of_class(node)
 
@@ -398,8 +398,8 @@ class TestParamDocChecker(CheckerTestCase):
         )
         method_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=method_node, args=("y",)),
-            TestMessage(msg_id="missing-type-doc", node=method_node, args=("x, y",)),
+            MessageTest(msg_id="missing-param-doc", node=method_node, args=("y",)),
+            MessageTest(msg_id="missing-type-doc", node=method_node, args=("x, y",)),
         ):
             self._visit_methods_of_class(node)
 
@@ -425,8 +425,8 @@ class TestParamDocChecker(CheckerTestCase):
         )
         method_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=method_node, args=("y",)),
-            TestMessage(msg_id="missing-type-doc", node=method_node, args=("x, y",)),
+            MessageTest(msg_id="missing-param-doc", node=method_node, args=("y",)),
+            MessageTest(msg_id="missing-type-doc", node=method_node, args=("x, y",)),
         ):
             self._visit_methods_of_class(node)
 
@@ -537,12 +537,12 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("xarg, zarg",)),
-            TestMessage(msg_id="missing-type-doc", node=node, args=("yarg, zarg",)),
-            TestMessage(
+            MessageTest(msg_id="missing-param-doc", node=node, args=("xarg, zarg",)),
+            MessageTest(msg_id="missing-type-doc", node=node, args=("yarg, zarg",)),
+            MessageTest(
                 msg_id="differing-param-doc", node=node, args=("xarg1, zarg1",)
             ),
-            TestMessage(msg_id="differing-type-doc", node=node, args=("yarg1, zarg1",)),
+            MessageTest(msg_id="differing-type-doc", node=node, args=("yarg1, zarg1",)),
         ):
             self.checker.visit_functiondef(node)
 
@@ -560,8 +560,8 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="differing-param-doc", node=node, args=("yarg1",)),
-            TestMessage(msg_id="differing-type-doc", node=node, args=("yarg1",)),
+            MessageTest(msg_id="differing-param-doc", node=node, args=("yarg1",)),
+            MessageTest(msg_id="differing-type-doc", node=node, args=("yarg1",)),
         ):
             self.checker.visit_functiondef(node)
 
@@ -584,12 +584,12 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("xarg, zarg",)),
-            TestMessage(msg_id="missing-type-doc", node=node, args=("xarg, zarg",)),
-            TestMessage(
+            MessageTest(msg_id="missing-param-doc", node=node, args=("xarg, zarg",)),
+            MessageTest(msg_id="missing-type-doc", node=node, args=("xarg, zarg",)),
+            MessageTest(
                 msg_id="differing-param-doc", node=node, args=("xarg1, zarg1",)
             ),
-            TestMessage(msg_id="differing-type-doc", node=node, args=("xarg1, zarg1",)),
+            MessageTest(msg_id="differing-type-doc", node=node, args=("xarg1, zarg1",)),
         ):
             self.checker.visit_functiondef(node)
 
@@ -607,8 +607,8 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="differing-param-doc", node=node, args=("yarg1",)),
-            TestMessage(msg_id="differing-type-doc", node=node, args=("yarg1",)),
+            MessageTest(msg_id="differing-param-doc", node=node, args=("yarg1",)),
+            MessageTest(msg_id="differing-type-doc", node=node, args=("yarg1",)),
         ):
             self.checker.visit_functiondef(node)
 
@@ -635,12 +635,12 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("xarg, zarg",)),
-            TestMessage(msg_id="missing-type-doc", node=node, args=("xarg, zarg",)),
-            TestMessage(
+            MessageTest(msg_id="missing-param-doc", node=node, args=("xarg, zarg",)),
+            MessageTest(msg_id="missing-type-doc", node=node, args=("xarg, zarg",)),
+            MessageTest(
                 msg_id="differing-param-doc", node=node, args=("xarg1, zarg1",)
             ),
-            TestMessage(msg_id="differing-type-doc", node=node, args=("xarg1, zarg1",)),
+            MessageTest(msg_id="differing-type-doc", node=node, args=("xarg1, zarg1",)),
         ):
             self.checker.visit_functiondef(node)
 
@@ -660,8 +660,8 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="differing-param-doc", node=node, args=("yarg1",)),
-            TestMessage(msg_id="differing-type-doc", node=node, args=("yarg1",)),
+            MessageTest(msg_id="differing-param-doc", node=node, args=("yarg1",)),
+            MessageTest(msg_id="differing-type-doc", node=node, args=("yarg1",)),
         ):
             self.checker.visit_functiondef(node)
 
@@ -752,8 +752,8 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("x",)),
-            TestMessage(msg_id="missing-type-doc", node=node, args=("x, y",)),
+            MessageTest(msg_id="missing-param-doc", node=node, args=("x",)),
+            MessageTest(msg_id="missing-type-doc", node=node, args=("x, y",)),
         ):
             self._visit_methods_of_class(node)
 
@@ -780,8 +780,8 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("x",)),
-            TestMessage(msg_id="missing-type-doc", node=node, args=("x, y",)),
+            MessageTest(msg_id="missing-param-doc", node=node, args=("x",)),
+            MessageTest(msg_id="missing-type-doc", node=node, args=("x, y",)),
         ):
             self._visit_methods_of_class(node)
 
@@ -810,8 +810,8 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("x",)),
-            TestMessage(msg_id="missing-type-doc", node=node, args=("x, y",)),
+            MessageTest(msg_id="missing-param-doc", node=node, args=("x",)),
+            MessageTest(msg_id="missing-type-doc", node=node, args=("x, y",)),
         ):
             self._visit_methods_of_class(node)
 
@@ -863,8 +863,8 @@ class TestParamDocChecker(CheckerTestCase):
         )
         constructor_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=constructor_node, args=("x",)),
-            TestMessage(
+            MessageTest(msg_id="missing-param-doc", node=constructor_node, args=("x",)),
+            MessageTest(
                 msg_id="missing-type-doc", node=constructor_node, args=("x, y",)
             ),
         ):
@@ -893,8 +893,8 @@ class TestParamDocChecker(CheckerTestCase):
         )
         constructor_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=constructor_node, args=("x",)),
-            TestMessage(
+            MessageTest(msg_id="missing-param-doc", node=constructor_node, args=("x",)),
+            MessageTest(
                 msg_id="missing-type-doc", node=constructor_node, args=("x, y",)
             ),
         ):
@@ -925,8 +925,8 @@ class TestParamDocChecker(CheckerTestCase):
         )
         constructor_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=constructor_node, args=("x",)),
-            TestMessage(
+            MessageTest(msg_id="missing-param-doc", node=constructor_node, args=("x",)),
+            MessageTest(
                 msg_id="missing-type-doc", node=constructor_node, args=("x, y",)
             ),
         ):
@@ -1000,13 +1000,13 @@ class TestParamDocChecker(CheckerTestCase):
         )
         constructor_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(
+            MessageTest(
                 msg_id="multiple-constructor-doc", node=node, args=(node.name,)
             ),
-            TestMessage(msg_id="missing-param-doc", node=node, args=("x",)),
-            TestMessage(msg_id="missing-type-doc", node=node, args=("x, y",)),
-            TestMessage(msg_id="missing-param-doc", node=constructor_node, args=("x",)),
-            TestMessage(
+            MessageTest(msg_id="missing-param-doc", node=node, args=("x",)),
+            MessageTest(msg_id="missing-type-doc", node=node, args=("x, y",)),
+            MessageTest(msg_id="missing-param-doc", node=constructor_node, args=("x",)),
+            MessageTest(
                 msg_id="missing-type-doc", node=constructor_node, args=("x, y",)
             ),
         ):
@@ -1044,13 +1044,13 @@ class TestParamDocChecker(CheckerTestCase):
         )
         constructor_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(
+            MessageTest(
                 msg_id="multiple-constructor-doc", node=node, args=(node.name,)
             ),
-            TestMessage(msg_id="missing-param-doc", node=node, args=("x",)),
-            TestMessage(msg_id="missing-type-doc", node=node, args=("x, y",)),
-            TestMessage(msg_id="missing-param-doc", node=constructor_node, args=("x",)),
-            TestMessage(
+            MessageTest(msg_id="missing-param-doc", node=node, args=("x",)),
+            MessageTest(msg_id="missing-type-doc", node=node, args=("x, y",)),
+            MessageTest(msg_id="missing-param-doc", node=constructor_node, args=("x",)),
+            MessageTest(
                 msg_id="missing-type-doc", node=constructor_node, args=("x, y",)
             ),
         ):
@@ -1092,13 +1092,13 @@ class TestParamDocChecker(CheckerTestCase):
         )
         constructor_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(
+            MessageTest(
                 msg_id="multiple-constructor-doc", node=node, args=(node.name,)
             ),
-            TestMessage(msg_id="missing-param-doc", node=node, args=("x",)),
-            TestMessage(msg_id="missing-type-doc", node=node, args=("x, y",)),
-            TestMessage(msg_id="missing-param-doc", node=constructor_node, args=("x",)),
-            TestMessage(
+            MessageTest(msg_id="missing-param-doc", node=node, args=("x",)),
+            MessageTest(msg_id="missing-type-doc", node=node, args=("x, y",)),
+            MessageTest(msg_id="missing-param-doc", node=constructor_node, args=("x",)),
+            MessageTest(
                 msg_id="missing-type-doc", node=constructor_node, args=("x, y",)
             ),
         ):
@@ -1116,10 +1116,10 @@ class TestParamDocChecker(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(
+            MessageTest(
                 msg_id="missing-param-doc", node=node, args=("missing_kwonly",)
             ),
-            TestMessage(msg_id="missing-type-doc", node=node, args=("missing_kwonly",)),
+            MessageTest(msg_id="missing-type-doc", node=node, args=("missing_kwonly",)),
         ):
             self.checker.visit_functiondef(node)
 
@@ -1139,7 +1139,7 @@ class TestParamDocChecker(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("args",))
+            MessageTest(msg_id="missing-param-doc", node=node, args=("args",))
         ):
             self.checker.visit_functiondef(node)
 
@@ -1159,7 +1159,7 @@ class TestParamDocChecker(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("kwargs",))
+            MessageTest(msg_id="missing-param-doc", node=node, args=("kwargs",))
         ):
             self.checker.visit_functiondef(node)
 
@@ -1180,7 +1180,7 @@ class TestParamDocChecker(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("args",))
+            MessageTest(msg_id="missing-param-doc", node=node, args=("args",))
         ):
             self.checker.visit_functiondef(node)
 
@@ -1201,7 +1201,7 @@ class TestParamDocChecker(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("kwargs",))
+            MessageTest(msg_id="missing-param-doc", node=node, args=("kwargs",))
         ):
             self.checker.visit_functiondef(node)
 
@@ -1226,7 +1226,7 @@ class TestParamDocChecker(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("args",))
+            MessageTest(msg_id="missing-param-doc", node=node, args=("args",))
         ):
             self.checker.visit_functiondef(node)
 
@@ -1251,7 +1251,7 @@ class TestParamDocChecker(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-param-doc", node=node, args=("kwargs",))
+            MessageTest(msg_id="missing-param-doc", node=node, args=("kwargs",))
         ):
             self.checker.visit_functiondef(node)
 
@@ -1608,7 +1608,7 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(
+            MessageTest(
                 msg_id="missing-raises-doc",
                 node=property_node,
                 args=("AttributeError",),
@@ -1642,7 +1642,7 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(
+            MessageTest(
                 msg_id="missing-raises-doc",
                 node=property_node,
                 args=("AttributeError",),
@@ -1678,7 +1678,7 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(
+            MessageTest(
                 msg_id="missing-raises-doc",
                 node=property_node,
                 args=("AttributeError",),
@@ -1713,7 +1713,7 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(
+            MessageTest(
                 msg_id="missing-raises-doc", node=setter_node, args=("AttributeError",)
             )
         ):
@@ -1749,7 +1749,7 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(
+            MessageTest(
                 msg_id="missing-raises-doc", node=setter_node, args=("AttributeError",)
             )
         ):
@@ -1789,7 +1789,7 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(
+            MessageTest(
                 msg_id="missing-raises-doc", node=setter_node, args=("AttributeError",)
             )
         ):
@@ -1896,7 +1896,7 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-type-doc", node=property_node)
+            MessageTest(msg_id="missing-return-type-doc", node=property_node)
         ):
             self.checker.visit_return(node)
 
@@ -1940,7 +1940,7 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-type-doc", node=property_node)
+            MessageTest(msg_id="missing-return-type-doc", node=property_node)
         ):
             self.checker.visit_return(node)
 
@@ -1965,7 +1965,7 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-type-doc", node=property_node)
+            MessageTest(msg_id="missing-return-type-doc", node=property_node)
         ):
             self.checker.visit_return(node)
 
@@ -1985,8 +1985,8 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-doc", node=func_node),
-            TestMessage(msg_id="missing-return-type-doc", node=func_node),
+            MessageTest(msg_id="missing-return-doc", node=func_node),
+            MessageTest(msg_id="missing-return-type-doc", node=func_node),
         ):
             self.checker.visit_return(node)
 
@@ -2008,8 +2008,8 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-doc", node=func_node),
-            TestMessage(msg_id="missing-return-type-doc", node=func_node),
+            MessageTest(msg_id="missing-return-doc", node=func_node),
+            MessageTest(msg_id="missing-return-type-doc", node=func_node),
         ):
             self.checker.visit_return(node)
 
@@ -2033,8 +2033,8 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-doc", node=func_node),
-            TestMessage(msg_id="missing-return-type-doc", node=func_node),
+            MessageTest(msg_id="missing-return-doc", node=func_node),
+            MessageTest(msg_id="missing-return-type-doc", node=func_node),
         ):
             self.checker.visit_return(node)
 
@@ -2058,7 +2058,7 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-doc", node=func_node)
+            MessageTest(msg_id="missing-return-doc", node=func_node)
         ):
             self.checker.visit_return(node)
 
@@ -2265,8 +2265,8 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="useless-type-doc", node=node, args=("_",)),
-            TestMessage(msg_id="useless-param-doc", node=node, args=("_, _ignored",)),
+            MessageTest(msg_id="useless-type-doc", node=node, args=("_",)),
+            MessageTest(msg_id="useless-param-doc", node=node, args=("_, _ignored",)),
         ):
             self.checker.visit_functiondef(node)
 
@@ -2289,8 +2289,8 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="useless-type-doc", node=node, args=("_",)),
-            TestMessage(msg_id="useless-param-doc", node=node, args=("_, _ignored",)),
+            MessageTest(msg_id="useless-type-doc", node=node, args=("_",)),
+            MessageTest(msg_id="useless-param-doc", node=node, args=("_, _ignored",)),
         ):
             self.checker.visit_functiondef(node)
 
@@ -2319,8 +2319,8 @@ class TestParamDocChecker(CheckerTestCase):
         """
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="useless-type-doc", node=node, args=("_",)),
-            TestMessage(msg_id="useless-param-doc", node=node, args=("_, _ignored",)),
+            MessageTest(msg_id="useless-type-doc", node=node, args=("_",)),
+            MessageTest(msg_id="useless-param-doc", node=node, args=("_, _ignored",)),
         ):
             self.checker.visit_functiondef(node)
 
diff --git a/tests/extensions/test_check_raise_docs.py b/tests/extensions/test_check_raise_docs.py
index 15f09a6de..f191bc14e 100644
--- a/tests/extensions/test_check_raise_docs.py
+++ b/tests/extensions/test_check_raise_docs.py
@@ -23,7 +23,7 @@
 import astroid
 
 from pylint.extensions.docparams import DocstringParameterChecker
-from pylint.testutils import CheckerTestCase, TestMessage, set_config
+from pylint.testutils import CheckerTestCase, MessageTest, set_config
 
 
 class TestDocstringCheckerRaise(CheckerTestCase):
@@ -64,7 +64,7 @@ class TestDocstringCheckerRaise(CheckerTestCase):
         )
         raise_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
+            MessageTest(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
         ):
             self.checker.visit_raise(raise_node)
 
@@ -82,7 +82,7 @@ class TestDocstringCheckerRaise(CheckerTestCase):
         )
         raise_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
+            MessageTest(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
         ):
             self.checker.visit_raise(raise_node)
 
@@ -101,7 +101,7 @@ class TestDocstringCheckerRaise(CheckerTestCase):
         )
         raise_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
+            MessageTest(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
         ):
             self.checker.visit_raise(raise_node)
 
@@ -152,7 +152,7 @@ class TestDocstringCheckerRaise(CheckerTestCase):
         )
         raise_node = node.body[1]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-raises-doc", node=node, args=("error",))
+            MessageTest(msg_id="missing-raises-doc", node=node, args=("error",))
         ):
             self.checker.visit_raise(raise_node)
 
@@ -226,7 +226,7 @@ class TestDocstringCheckerRaise(CheckerTestCase):
         )
         raise_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
+            MessageTest(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
         ):
             self.checker.visit_raise(raise_node)
 
@@ -359,7 +359,7 @@ class TestDocstringCheckerRaise(CheckerTestCase):
         )
         node = raise_node.frame()
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
+            MessageTest(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
         ):
             self.checker.visit_raise(raise_node)
 
@@ -382,7 +382,7 @@ class TestDocstringCheckerRaise(CheckerTestCase):
         )
         node = raise_node.frame()
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
+            MessageTest(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
         ):
             self.checker.visit_raise(raise_node)
 
@@ -407,7 +407,7 @@ class TestDocstringCheckerRaise(CheckerTestCase):
         )
         node = raise_node.frame()
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
+            MessageTest(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
         ):
             self.checker.visit_raise(raise_node)
 
@@ -429,7 +429,7 @@ class TestDocstringCheckerRaise(CheckerTestCase):
         )
         node = raise_node.frame()
         with self.assertAddsMessages(
-            TestMessage(
+            MessageTest(
                 msg_id="missing-raises-doc",
                 node=node,
                 args=("RuntimeError, ValueError",),
@@ -456,7 +456,7 @@ class TestDocstringCheckerRaise(CheckerTestCase):
         )
         node = raise_node.frame()
         with self.assertAddsMessages(
-            TestMessage(
+            MessageTest(
                 msg_id="missing-raises-doc",
                 node=node,
                 args=("RuntimeError, ValueError",),
@@ -485,7 +485,7 @@ class TestDocstringCheckerRaise(CheckerTestCase):
         )
         node = raise_node.frame()
         with self.assertAddsMessages(
-            TestMessage(
+            MessageTest(
                 msg_id="missing-raises-doc",
                 node=node,
                 args=("RuntimeError, ValueError",),
@@ -607,7 +607,7 @@ class TestDocstringCheckerRaise(CheckerTestCase):
         )
         raise_node = node.body[1]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-raises-doc", node=node, args=("error",))
+            MessageTest(msg_id="missing-raises-doc", node=node, args=("error",))
         ):
             self.checker.visit_raise(raise_node)
 
@@ -665,7 +665,7 @@ class TestDocstringCheckerRaise(CheckerTestCase):
         )
         node = raise_node.frame()
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
+            MessageTest(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
         ):
             self.checker.visit_raise(raise_node)
 
@@ -685,7 +685,7 @@ class TestDocstringCheckerRaise(CheckerTestCase):
         )
         node = raise_node.frame()
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
+            MessageTest(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
         ):
             self.checker.visit_raise(raise_node)
 
@@ -733,7 +733,7 @@ class TestDocstringCheckerRaise(CheckerTestCase):
         )
         raise_node = node.body[1]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-raises-doc", node=node, args=("error",))
+            MessageTest(msg_id="missing-raises-doc", node=node, args=("error",))
         ):
             self.checker.visit_raise(raise_node)
 
@@ -808,7 +808,7 @@ class TestDocstringCheckerRaise(CheckerTestCase):
         )
         node = raise_node.frame()
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
+            MessageTest(msg_id="missing-raises-doc", node=node, args=("RuntimeError",))
         ):
             # we do NOT expect a warning about the OSError in inner_func!
             self.checker.visit_raise(raise_node)
diff --git a/tests/extensions/test_check_return_docs.py b/tests/extensions/test_check_return_docs.py
index 4b187c65f..6c73a188f 100644
--- a/tests/extensions/test_check_return_docs.py
+++ b/tests/extensions/test_check_return_docs.py
@@ -24,7 +24,7 @@
 import astroid
 
 from pylint.extensions.docparams import DocstringParameterChecker
-from pylint.testutils import CheckerTestCase, TestMessage, set_config
+from pylint.testutils import CheckerTestCase, MessageTest, set_config
 
 
 class TestDocstringCheckerReturn(CheckerTestCase):
@@ -52,8 +52,8 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         )
         return_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-doc", node=node),
-            TestMessage(msg_id="missing-return-type-doc", node=node),
+            MessageTest(msg_id="missing-return-doc", node=node),
+            MessageTest(msg_id="missing-return-type-doc", node=node),
         ):
             self.checker.visit_return(return_node)
 
@@ -81,7 +81,7 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         )
         return_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-type-doc", node=node)
+            MessageTest(msg_id="missing-return-type-doc", node=node)
         ):
             self.checker.visit_return(return_node)
 
@@ -113,7 +113,7 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         )
         return_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-doc", node=node)
+            MessageTest(msg_id="missing-return-doc", node=node)
         ):
             self.checker.visit_return(return_node)
 
@@ -131,8 +131,8 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         )
         return_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-doc", node=node),
-            TestMessage(msg_id="missing-return-type-doc", node=node),
+            MessageTest(msg_id="missing-return-doc", node=node),
+            MessageTest(msg_id="missing-return-type-doc", node=node),
         ):
             self.checker.visit_return(return_node)
 
@@ -150,7 +150,7 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         )
         return_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-type-doc", node=node)
+            MessageTest(msg_id="missing-return-type-doc", node=node)
         ):
             self.checker.visit_return(return_node)
 
@@ -168,7 +168,7 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         )
         return_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-doc", node=node)
+            MessageTest(msg_id="missing-return-doc", node=node)
         ):
             self.checker.visit_return(return_node)
 
@@ -186,8 +186,8 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         )
         return_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-doc", node=node),
-            TestMessage(msg_id="missing-return-type-doc", node=node),
+            MessageTest(msg_id="missing-return-doc", node=node),
+            MessageTest(msg_id="missing-return-type-doc", node=node),
         ):
             self.checker.visit_return(return_node)
 
@@ -211,7 +211,7 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         )
         return_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-doc", node=node)
+            MessageTest(msg_id="missing-return-doc", node=node)
         ):
             self.checker.visit_return(return_node)
 
@@ -231,8 +231,8 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         )
         return_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-doc", node=node),
-            TestMessage(msg_id="missing-return-type-doc", node=node),
+            MessageTest(msg_id="missing-return-doc", node=node),
+            MessageTest(msg_id="missing-return-type-doc", node=node),
         ):
             self.checker.visit_return(return_node)
 
@@ -454,7 +454,7 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         )
         return_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-doc", node=node)
+            MessageTest(msg_id="missing-return-doc", node=node)
         ):
             self.checker.visit_return(return_node)
 
@@ -472,7 +472,7 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         )
         return_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-doc", node=node)
+            MessageTest(msg_id="missing-return-doc", node=node)
         ):
             self.checker.visit_return(return_node)
 
@@ -491,7 +491,7 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         )
         return_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-return-doc", node=node)
+            MessageTest(msg_id="missing-return-doc", node=node)
         ):
             self.checker.visit_return(return_node)
 
@@ -507,7 +507,7 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="redundant-returns-doc", node=node)
+            MessageTest(msg_id="redundant-returns-doc", node=node)
         ):
             self.checker.visit_functiondef(node)
 
@@ -523,7 +523,7 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="redundant-returns-doc", node=node)
+            MessageTest(msg_id="redundant-returns-doc", node=node)
         ):
             self.checker.visit_functiondef(node)
 
@@ -540,7 +540,7 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="redundant-returns-doc", node=node)
+            MessageTest(msg_id="redundant-returns-doc", node=node)
         ):
             self.checker.visit_functiondef(node)
 
@@ -557,7 +557,7 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="redundant-returns-doc", node=node)
+            MessageTest(msg_id="redundant-returns-doc", node=node)
         ):
             self.checker.visit_functiondef(node)
 
@@ -576,7 +576,7 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="redundant-returns-doc", node=node)
+            MessageTest(msg_id="redundant-returns-doc", node=node)
         ):
             self.checker.visit_functiondef(node)
 
@@ -594,7 +594,7 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="redundant-returns-doc", node=node)
+            MessageTest(msg_id="redundant-returns-doc", node=node)
         ):
             self.checker.visit_functiondef(node)
 
@@ -685,7 +685,7 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="redundant-returns-doc", node=node)
+            MessageTest(msg_id="redundant-returns-doc", node=node)
         ):
             self.checker.visit_functiondef(node)
 
@@ -704,6 +704,6 @@ class TestDocstringCheckerReturn(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="redundant-returns-doc", node=node)
+            MessageTest(msg_id="redundant-returns-doc", node=node)
         ):
             self.checker.visit_functiondef(node)
diff --git a/tests/extensions/test_check_yields_docs.py b/tests/extensions/test_check_yields_docs.py
index 8d502deb5..e714b3c61 100644
--- a/tests/extensions/test_check_yields_docs.py
+++ b/tests/extensions/test_check_yields_docs.py
@@ -20,7 +20,7 @@
 import astroid
 
 from pylint.extensions.docparams import DocstringParameterChecker
-from pylint.testutils import CheckerTestCase, TestMessage, set_config
+from pylint.testutils import CheckerTestCase, MessageTest, set_config
 
 
 class TestDocstringCheckerYield(CheckerTestCase):
@@ -48,8 +48,8 @@ class TestDocstringCheckerYield(CheckerTestCase):
         )
         yield_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-yield-doc", node=node),
-            TestMessage(msg_id="missing-yield-type-doc", node=node),
+            MessageTest(msg_id="missing-yield-doc", node=node),
+            MessageTest(msg_id="missing-yield-type-doc", node=node),
         ):
             self.checker.visit_yield(yield_node)
 
@@ -77,7 +77,7 @@ class TestDocstringCheckerYield(CheckerTestCase):
         )
         yield_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-yield-type-doc", node=node)
+            MessageTest(msg_id="missing-yield-type-doc", node=node)
         ):
             self.checker.visit_yield(yield_node)
 
@@ -94,7 +94,7 @@ class TestDocstringCheckerYield(CheckerTestCase):
         )
         yield_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-yield-doc", node=node)
+            MessageTest(msg_id="missing-yield-doc", node=node)
         ):
             self.checker.visit_yield(yield_node)
 
@@ -112,8 +112,8 @@ class TestDocstringCheckerYield(CheckerTestCase):
         )
         yield_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-yield-doc", node=node),
-            TestMessage(msg_id="missing-yield-type-doc", node=node),
+            MessageTest(msg_id="missing-yield-doc", node=node),
+            MessageTest(msg_id="missing-yield-type-doc", node=node),
         ):
             self.checker.visit_yield(yield_node)
 
@@ -131,7 +131,7 @@ class TestDocstringCheckerYield(CheckerTestCase):
         )
         yield_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-yield-type-doc", node=node)
+            MessageTest(msg_id="missing-yield-type-doc", node=node)
         ):
             self.checker.visit_yield(yield_node)
 
@@ -149,7 +149,7 @@ class TestDocstringCheckerYield(CheckerTestCase):
         )
         yield_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-yield-doc", node=node)
+            MessageTest(msg_id="missing-yield-doc", node=node)
         ):
             self.checker.visit_yield(yield_node)
 
@@ -167,8 +167,8 @@ class TestDocstringCheckerYield(CheckerTestCase):
         )
         yield_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-yield-doc", node=node),
-            TestMessage(msg_id="missing-yield-type-doc", node=node),
+            MessageTest(msg_id="missing-yield-doc", node=node),
+            MessageTest(msg_id="missing-yield-type-doc", node=node),
         ):
             self.checker.visit_yield(yield_node)
 
@@ -188,8 +188,8 @@ class TestDocstringCheckerYield(CheckerTestCase):
         )
         yield_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-yield-doc", node=node),
-            TestMessage(msg_id="missing-yield-type-doc", node=node),
+            MessageTest(msg_id="missing-yield-doc", node=node),
+            MessageTest(msg_id="missing-yield-type-doc", node=node),
         ):
             self.checker.visit_yield(yield_node)
 
@@ -347,7 +347,7 @@ class TestDocstringCheckerYield(CheckerTestCase):
         )
         yield_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-yield-doc", node=node)
+            MessageTest(msg_id="missing-yield-doc", node=node)
         ):
             self.checker.visit_yield(yield_node)
 
@@ -365,7 +365,7 @@ class TestDocstringCheckerYield(CheckerTestCase):
         )
         yield_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-yield-doc", node=node)
+            MessageTest(msg_id="missing-yield-doc", node=node)
         ):
             self.checker.visit_yield(yield_node)
 
@@ -384,7 +384,7 @@ class TestDocstringCheckerYield(CheckerTestCase):
         )
         yield_node = node.body[0]
         with self.assertAddsMessages(
-            TestMessage(msg_id="missing-yield-doc", node=node)
+            MessageTest(msg_id="missing-yield-doc", node=node)
         ):
             self.checker.visit_yield(yield_node)
 
@@ -445,7 +445,7 @@ class TestDocstringCheckerYield(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="redundant-yields-doc", node=node)
+            MessageTest(msg_id="redundant-yields-doc", node=node)
         ):
             self.checker.visit_functiondef(node)
 
@@ -464,7 +464,7 @@ class TestDocstringCheckerYield(CheckerTestCase):
         '''
         )
         with self.assertAddsMessages(
-            TestMessage(msg_id="redundant-yields-doc", node=node)
+            MessageTest(msg_id="redundant-yields-doc", node=node)
         ):
             self.checker.visit_functiondef(node)
 
diff --git a/tests/extensions/test_confusing_elif.py b/tests/extensions/test_confusing_elif.py
index 74d6b4a01..236b0c6e6 100644
--- a/tests/extensions/test_confusing_elif.py
+++ b/tests/extensions/test_confusing_elif.py
@@ -12,7 +12,7 @@
 import astroid
 
 from pylint.extensions.confusing_elif import ConfusingConsecutiveElifChecker
-from pylint.testutils import CheckerTestCase, TestMessage
+from pylint.testutils import CheckerTestCase, MessageTest
 
 MSG_ID_CONFUSING_CONSECUTIVE_ELIF = "confusing-consecutive-elif"
 
@@ -40,7 +40,7 @@ class TestConfusingConsecutiveElifChecker(CheckerTestCase):
         """
         if_node_to_test, elif_node = astroid.extract_node(example_code)
         with self.assertAddsMessages(
-            TestMessage(msg_id=MSG_ID_CONFUSING_CONSECUTIVE_ELIF, node=elif_node)
+            MessageTest(msg_id=MSG_ID_CONFUSING_CONSECUTIVE_ELIF, node=elif_node)
         ):
             self.checker.visit_if(if_node_to_test)
 
@@ -64,7 +64,7 @@ class TestConfusingConsecutiveElifChecker(CheckerTestCase):
         """
         if_node_to_test, elif_node = astroid.extract_node(example_code)
         with self.assertAddsMessages(
-            TestMessage(msg_id=MSG_ID_CONFUSING_CONSECUTIVE_ELIF, node=elif_node)
+            MessageTest(msg_id=MSG_ID_CONFUSING_CONSECUTIVE_ELIF, node=elif_node)
         ):
             self.checker.visit_if(if_node_to_test)
 
@@ -84,7 +84,7 @@ class TestConfusingConsecutiveElifChecker(CheckerTestCase):
         """
         if_node_to_test, elif_node = astroid.extract_node(example_code)
         with self.assertAddsMessages(
-            TestMessage(msg_id=MSG_ID_CONFUSING_CONSECUTIVE_ELIF, node=elif_node)
+            MessageTest(msg_id=MSG_ID_CONFUSING_CONSECUTIVE_ELIF, node=elif_node)
         ):
             self.checker.visit_if(if_node_to_test)
 
diff --git a/tests/extensions/test_while_used.py b/tests/extensions/test_while_used.py
index 755e77dfb..9eab48520 100644
--- a/tests/extensions/test_while_used.py
+++ b/tests/extensions/test_while_used.py
@@ -4,7 +4,7 @@
 import astroid
 
 from pylint.extensions.while_used import WhileChecker
-from pylint.testutils import CheckerTestCase, TestMessage
+from pylint.testutils import CheckerTestCase, MessageTest
 
 
 class TestWhileUsed(CheckerTestCase):
@@ -21,5 +21,5 @@ class TestWhileUsed(CheckerTestCase):
         """
         ).body[1]
 
-        with self.assertAddsMessages(TestMessage("while-used", node=node)):
+        with self.assertAddsMessages(MessageTest("while-used", node=node)):
             self.checker.visit_while(node)