Refactor tests for warnings

Author: jiwaszki

tests/test_warnings.cpp

@@ -13,67 +13,34 @@
 
 #include <utility>
 
-namespace warning_helpers {
-void warn_function(py::module &m, const char *name, py::handle category, const char *message) {
-    m.def(name, [category, message]() { py::warnings::warn(message, category); });
-}
-} // namespace warning_helpers
-
-class CustomWarning {};
-
 TEST_SUBMODULE(warnings_, m) {
 
     // Test warning mechanism base
-    m.def("raise_and_return", []() {
-        std::string message = "Warning was raised!";
+    m.def("warn_and_return_value", []() {
+        std::string message = "This is simple warning";
         py::warnings::warn(message.c_str(), PyExc_Warning);
         return 21;
     });
 
-    m.def("raise_default", []() { py::warnings::warn("RuntimeWarning is raised!"); });
+    m.def("warn_with_default_category", []() { py::warnings::warn("This is RuntimeWarning"); });
 
-    m.def("raise_from_cpython",
-          []() { py::warnings::warn("UnicodeWarning is raised!", PyExc_UnicodeWarning); });
+    m.def("warn_with_different_category",
+          []() { py::warnings::warn("This is FutureWarning", PyExc_FutureWarning); });
 
-    m.def("raise_and_fail",
-          []() { py::warnings::warn("RuntimeError should be raised!", PyExc_Exception); });
+    m.def("warn_with_invalid_category",
+          []() { py::warnings::warn("Invalid category", PyExc_Exception); });
 
     // Test custom warnings
     PYBIND11_CONSTINIT static py::gil_safe_call_once_and_store<py::object> ex_storage;
     ex_storage.call_once_and_store_result([&]() {
         return py::warnings::new_warning_type(m, "CustomWarning", PyExc_DeprecationWarning);
     });
 
-    m.def("raise_custom", []() {
-        py::warnings::warn("CustomWarning was raised!", ex_storage.get_stored());
+    m.def("warn_with_custom_type", []() {
+        py::warnings::warn("This is CustomWarning", ex_storage.get_stored());
         return 37;
     });
 
     m.def("register_duplicate_warning",
           [m]() { py::warnings::new_warning_type(m, "CustomWarning", PyExc_RuntimeWarning); });
-
-    // Bind warning categories
-    warning_helpers::warn_function(m, "raise_base_warning", PyExc_Warning, "This is Warning!");
-    warning_helpers::warn_function(
-        m, "raise_bytes_warning", PyExc_BytesWarning, "This is BytesWarning!");
-    warning_helpers::warn_function(
-        m, "raise_deprecation_warning", PyExc_DeprecationWarning, "This is DeprecationWarning!");
-    warning_helpers::warn_function(
-        m, "raise_future_warning", PyExc_FutureWarning, "This is FutureWarning!");
-    warning_helpers::warn_function(
-        m, "raise_import_warning", PyExc_ImportWarning, "This is ImportWarning!");
-    warning_helpers::warn_function(m,
-                                   "raise_pending_deprecation_warning",
-                                   PyExc_PendingDeprecationWarning,
-                                   "This is PendingDeprecationWarning!");
-    warning_helpers::warn_function(
-        m, "raise_resource_warning", PyExc_ResourceWarning, "This is ResourceWarning!");
-    warning_helpers::warn_function(
-        m, "raise_runtime_warning", PyExc_RuntimeWarning, "This is RuntimeWarning!");
-    warning_helpers::warn_function(
-        m, "raise_syntax_warning", PyExc_SyntaxWarning, "This is SyntaxWarning!");
-    warning_helpers::warn_function(
-        m, "raise_unicode_warning", PyExc_UnicodeWarning, "This is UnicodeWarning!");
-    warning_helpers::warn_function(
-        m, "raise_user_warning", PyExc_UserWarning, "This is UserWarning!");
 }

tests/test_warnings.py

@@ -11,9 +11,9 @@
 @pytest.mark.parametrize(
     ("expected_category", "expected_message", "expected_value", "module_function"),
     [
-        (Warning, "Warning was raised!", 21, m.raise_and_return),
-        (RuntimeWarning, "RuntimeWarning is raised!", None, m.raise_default),
-        (UnicodeWarning, "UnicodeWarning is raised!", None, m.raise_from_cpython),
+        (Warning, "This is simple warning", 21, m.warn_and_return_value),
+        (RuntimeWarning, "This is RuntimeWarning", None, m.warn_with_default_category),
+        (FutureWarning, "This is FutureWarning", None, m.warn_with_different_category),
     ],
 )
 def test_warning_simple(
@@ -29,7 +29,7 @@ def test_warning_simple(
 
 def test_warning_wrong_subclass_fail():
     with pytest.raises(Exception) as excinfo:
-        m.raise_and_fail()
+        m.warn_with_invalid_category()
 
     assert issubclass(excinfo.type, RuntimeError)
     assert (
@@ -73,9 +73,9 @@ def test_warning_register():
         (
             m.CustomWarning,
             DeprecationWarning,
-            "CustomWarning was raised!",
+            "This is CustomWarning",
             37,
-            m.raise_custom,
+            m.warn_with_custom_type,
         ),
     ],
 )
@@ -89,27 +89,3 @@ def test_warning_custom(
     assert issubclass(excinfo[0].category, expected_category)
     assert str(excinfo[0].message) == expected_message
     assert value == expected_value
-
-
-@pytest.mark.parametrize(
-    ("expected_category", "module_function"),
-    [
-        (Warning, m.raise_base_warning),
-        (BytesWarning, m.raise_bytes_warning),
-        (DeprecationWarning, m.raise_deprecation_warning),
-        (FutureWarning, m.raise_future_warning),
-        (ImportWarning, m.raise_import_warning),
-        (PendingDeprecationWarning, m.raise_pending_deprecation_warning),
-        (ResourceWarning, m.raise_resource_warning),
-        (RuntimeWarning, m.raise_runtime_warning),
-        (SyntaxWarning, m.raise_syntax_warning),
-        (UnicodeWarning, m.raise_unicode_warning),
-        (UserWarning, m.raise_user_warning),
-    ],
-)
-def test_warning_categories(expected_category, module_function):
-    with pytest.warns(Warning) as excinfo:
-        module_function()
-
-    assert issubclass(excinfo[0].category, expected_category)
-    assert str(excinfo[0].message) == f"This is {expected_category.__name__}!"