test_class_sh_basic.cpp: rename uconsumer -> consumer

Author: rhaschke

tests/test_class_sh_basic.cpp

@@ -17,7 +17,7 @@ struct atyp { // Short for "any type".
     atyp(atyp &&other) { mtxt = other.mtxt + "_MvCtor"; }
 };
 
-struct uconsumer { // unique_ptr consumer
+struct consumer { // unique_ptr consumer
     std::unique_ptr<atyp> held;
     bool valid() const { return static_cast<bool>(held); }
 
@@ -90,7 +90,7 @@ struct SharedPtrStash {
 } // namespace pybind11_tests
 
 PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_basic::atyp)
-PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_basic::uconsumer)
+PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_basic::consumer)
 PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_basic::SharedPtrStash)
 
 namespace pybind11_tests {
@@ -136,19 +136,19 @@ TEST_SUBMODULE(class_sh_basic, m) {
     m.def("pass_udmp", pass_udmp);
     m.def("pass_udcp", pass_udcp);
 
-    py::classh<uconsumer>(m, "uconsumer")
+    py::classh<consumer>(m, "consumer")
         .def(py::init<>())
-        .def("valid", &uconsumer::valid)
-        .def("pass_uq_valu", &uconsumer::pass_uq_valu)
-        .def("pass_uq_rref", &uconsumer::pass_uq_rref)
-        .def("pass_uq_cref", &uconsumer::pass_uq_cref)
-        .def("pass_cptr", &uconsumer::pass_cptr)
-        .def("pass_cref", &uconsumer::pass_cref)
-        .def("rtrn_uq_valu", &uconsumer::rtrn_uq_valu)
-        .def("rtrn_uq_lref", &uconsumer::rtrn_uq_lref)
-        .def("rtrn_uq_cref", &uconsumer::rtrn_uq_cref)
-        .def("rtrn_cptr", &uconsumer::rtrn_cptr, py::return_value_policy::reference_internal)
-        .def("rtrn_cref", &uconsumer::rtrn_cref, py::return_value_policy::reference_internal);
+        .def("valid", &consumer::valid)
+        .def("pass_uq_valu", &consumer::pass_uq_valu)
+        .def("pass_uq_rref", &consumer::pass_uq_rref)
+        .def("pass_uq_cref", &consumer::pass_uq_cref)
+        .def("pass_cptr", &consumer::pass_cptr)
+        .def("pass_cref", &consumer::pass_cref)
+        .def("rtrn_uq_valu", &consumer::rtrn_uq_valu)
+        .def("rtrn_uq_lref", &consumer::rtrn_uq_lref)
+        .def("rtrn_uq_cref", &consumer::rtrn_uq_cref)
+        .def("rtrn_cptr", &consumer::rtrn_cptr, py::return_value_policy::reference_internal)
+        .def("rtrn_cref", &consumer::rtrn_cref, py::return_value_policy::reference_internal);
 
         // Helpers for testing.
         // These require selected functions above to work first, as indicated:

tests/test_class_sh_basic.py

@@ -121,14 +121,14 @@ def test_unique_ptr_roundtrip(num_round_trips=1000):
 @pytest.mark.parametrize(
     "pass_f, rtrn_f, moved_out, moved_in",
     [
-        (m.uconsumer.pass_uq_valu, m.uconsumer.rtrn_uq_valu, True, True),
-        (m.uconsumer.pass_uq_rref, m.uconsumer.rtrn_uq_valu, True, True),
-        (m.uconsumer.pass_uq_valu, m.uconsumer.rtrn_uq_lref, True, False),
-        (m.uconsumer.pass_uq_valu, m.uconsumer.rtrn_uq_cref, True, False),
+        (m.consumer.pass_uq_valu, m.consumer.rtrn_uq_valu, True, True),
+        (m.consumer.pass_uq_rref, m.consumer.rtrn_uq_valu, True, True),
+        (m.consumer.pass_uq_valu, m.consumer.rtrn_uq_lref, True, False),
+        (m.consumer.pass_uq_valu, m.consumer.rtrn_uq_cref, True, False),
     ],
 )
 def test_unique_ptr_consumer_roundtrip(pass_f, rtrn_f, moved_out, moved_in):
-    c = m.uconsumer()
+    c = m.consumer()
     recycled = m.atyp("passenger")
     mtxt_orig = m.get_mtxt(recycled)
     ptr_orig = m.get_ptr(recycled)
@@ -148,7 +148,7 @@ def test_unique_ptr_consumer_roundtrip(pass_f, rtrn_f, moved_out, moved_in):
 
 @pytest.mark.parametrize(
     "rtrn_f",
-    [m.uconsumer.rtrn_uq_cref, m.uconsumer.rtrn_cref, m.uconsumer.rtrn_cptr],
+    [m.consumer.rtrn_uq_cref, m.consumer.rtrn_cref, m.consumer.rtrn_cptr],
 )
 @pytest.mark.parametrize(
     "pass_f",
@@ -160,13 +160,13 @@ def test_unique_ptr_consumer_roundtrip(pass_f, rtrn_f, moved_out, moved_in):
         # and is thus (correctly) suppressed.
         # To fix this, smart_holder would need to store the (original) unique_ptr reference,
         # e.g. using a union of unique_ptr + shared_ptr.
-        pytest.param(m.uconsumer.pass_uq_cref, marks=pytest.mark.xfail),
-        m.uconsumer.pass_cptr,
-        m.uconsumer.pass_cref,
+        pytest.param(m.consumer.pass_uq_cref, marks=pytest.mark.xfail),
+        m.consumer.pass_cptr,
+        m.consumer.pass_cref,
     ],
 )
 def test_unique_ptr_cref_consumer_roundtrip(rtrn_f, pass_f):
-    c = m.uconsumer()
+    c = m.consumer()
     passenger = m.atyp("passenger")
     mtxt_orig = m.get_mtxt(passenger)
     ptr_orig = m.get_ptr(passenger)