fixup! Improve accuaracy of unit tests: Count num of copies/moves

Author: rhaschke

tests/test_class_sh_basic.py

@@ -17,15 +17,15 @@ def test_atyp_constructors():
 
 
 def check_regex(expected, actual):
-    result = re.fullmatch(expected, actual)
+    result = re.match(expected + "$", actual)
     if result is None:
         pytest.fail("expected: '{}' != actual: '{}'".format(expected, actual))
 
 
 @pytest.mark.parametrize(
     "rtrn_f, expected",
     [
-        (m.rtrn_valu, "rtrn_valu(_MvCtor){1}"),
+        (m.rtrn_valu, "rtrn_valu(_MvCtor){1,3}"),
         (m.rtrn_rref, "rtrn_rref(_MvCtor){1}"),
         (m.rtrn_cref, "rtrn_cref_CpCtor"),
         (m.rtrn_mref, "rtrn_mref"),
@@ -46,15 +46,15 @@ def test_cast(rtrn_f, expected):
 @pytest.mark.parametrize(
     "pass_f, mtxt, expected",
     [
-        (m.pass_valu, "Valu", "pass_valu:Valu(_MvCtor){1}_CpCtor"),
-        (m.pass_cref, "Cref", "pass_cref:Cref(_MvCtor){1}"),
-        (m.pass_mref, "Mref", "pass_mref:Mref(_MvCtor){1}"),
-        (m.pass_cptr, "Cptr", "pass_cptr:Cptr(_MvCtor){1}"),
-        (m.pass_mptr, "Mptr", "pass_mptr:Mptr(_MvCtor){1}"),
-        (m.pass_shmp, "Shmp", "pass_shmp:Shmp(_MvCtor){1}"),
-        (m.pass_shcp, "Shcp", "pass_shcp:Shcp(_MvCtor){1}"),
-        (m.pass_uqmp, "Uqmp", "pass_uqmp:Uqmp(_MvCtor){1}"),
-        (m.pass_uqcp, "Uqcp", "pass_uqcp:Uqcp(_MvCtor){1}"),
+        (m.pass_valu, "Valu", "pass_valu:Valu(_MvCtor){1,2}_CpCtor"),
+        (m.pass_cref, "Cref", "pass_cref:Cref(_MvCtor){1,2}"),
+        (m.pass_mref, "Mref", "pass_mref:Mref(_MvCtor){1,2}"),
+        (m.pass_cptr, "Cptr", "pass_cptr:Cptr(_MvCtor){1,2}"),
+        (m.pass_mptr, "Mptr", "pass_mptr:Mptr(_MvCtor){1,2}"),
+        (m.pass_shmp, "Shmp", "pass_shmp:Shmp(_MvCtor){1,2}"),
+        (m.pass_shcp, "Shcp", "pass_shcp:Shcp(_MvCtor){1,2}"),
+        (m.pass_uqmp, "Uqmp", "pass_uqmp:Uqmp(_MvCtor){1,2}"),
+        (m.pass_uqcp, "Uqcp", "pass_uqcp:Uqcp(_MvCtor){1,2}"),
     ],
 )
 def test_load_with_mtxt(pass_f, mtxt, expected):
@@ -117,7 +117,7 @@ def test_unique_ptr_roundtrip(num_round_trips=1000):
     for _ in range(num_round_trips):
         id_orig = id(recycled)
         recycled = m.unique_ptr_roundtrip(recycled)
-        check_regex("passenger(_MvCtor){1}", m.get_mtxt(recycled))
+        check_regex("passenger(_MvCtor){1,2}", m.get_mtxt(recycled))
         id_rtrn = id(recycled)
         # Ensure the returned object is a different Python instance.
         assert id_rtrn != id_orig
@@ -138,7 +138,7 @@ def test_unique_ptr_consumer_roundtrip(pass_f, rtrn_f, moved_out, moved_in):
     recycled = m.atyp("passenger")
     mtxt_orig = m.get_mtxt(recycled)
     ptr_orig = m.get_ptr(recycled)
-    check_regex("passenger_(MvCtor){1}", mtxt_orig)
+    check_regex("passenger(_MvCtor){1,2}", mtxt_orig)
 
     pass_f(c, recycled)  # pass object to C++ consumer c
     if moved_out:  # if moved (always), ensure it is flagged as disowned