From b69f9fed33cd4eb32a1d8a80be8c4eda0ca8ec42 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Fri, 29 Jan 2021 15:13:04 -0800 Subject: [PATCH] Removing test_type_caster_bare_interface, which was moved to the separate PR #2834. --- tests/CMakeLists.txt | 1 - tests/test_type_caster_bare_interface.cpp | 215 ---------------------- tests/test_type_caster_bare_interface.py | 41 ----- 3 files changed, 257 deletions(-) delete mode 100644 tests/test_type_caster_bare_interface.cpp delete mode 100644 tests/test_type_caster_bare_interface.py diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 05985611a..9f1c1d5e3 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -132,7 +132,6 @@ set(PYBIND11_TEST_FILES test_stl.cpp test_stl_binders.cpp test_tagbased_polymorphic.cpp - test_type_caster_bare_interface.cpp test_union.cpp test_virtual_functions.cpp) diff --git a/tests/test_type_caster_bare_interface.cpp b/tests/test_type_caster_bare_interface.cpp deleted file mode 100644 index e334635a4..000000000 --- a/tests/test_type_caster_bare_interface.cpp +++ /dev/null @@ -1,215 +0,0 @@ -// Systematically exercises the detail::type_caster<> interface. This is going a step in the -// direction of an integration test, to ensure multiple components of pybind11 work together -// correctly. It is also useful to show the type_caster<> interface virtually clutter-free. - -#include "pybind11_tests.h" - -#include - -namespace pybind11_tests { -namespace type_caster_bare_interface { - -struct mpty {}; - -// clang-format off - -mpty rtrn_valu() { mpty obj; return obj; } -mpty&& rtrn_rref() { static mpty obj; return std::move(obj); } -mpty const& rtrn_cref() { static mpty obj; return obj; } -mpty& rtrn_mref() { static mpty obj; return obj; } -mpty const* rtrn_cptr() { return new mpty; } -mpty* rtrn_mptr() { return new mpty; } - -const char* pass_valu(mpty) { return "load_valu"; } -const char* pass_rref(mpty&&) { return "load_rref"; } -const char* pass_cref(mpty const&) { return "load_cref"; } -const char* pass_mref(mpty&) { return "load_mref"; } -const char* pass_cptr(mpty const*) { return "load_cptr"; } -const char* pass_mptr(mpty*) { return "load_mptr"; } - -std::shared_ptr rtrn_shmp() { return std::shared_ptr(new mpty); } -std::shared_ptr rtrn_shcp() { return std::shared_ptr(new mpty); } - -const char* pass_shmp(std::shared_ptr) { return "load_shmp"; } -const char* pass_shcp(std::shared_ptr) { return "load_shcp"; } - -std::unique_ptr rtrn_uqmp() { return std::unique_ptr(new mpty); } -std::unique_ptr rtrn_uqcp() { return std::unique_ptr(new mpty); } - -const char* pass_uqmp(std::unique_ptr) { return "load_uqmp"; } -const char* pass_uqcp(std::unique_ptr) { return "load_uqcp"; } - -// clang-format on - -} // namespace type_caster_bare_interface -} // namespace pybind11_tests - -namespace pybind11 { -namespace detail { - -using namespace pybind11_tests::type_caster_bare_interface; - -template <> -struct type_caster { - static constexpr auto name = _(); - - // static handle cast(mpty, ...) - // is redundant (leads to ambiguous overloads). - - static handle cast(mpty && /*src*/, return_value_policy /*policy*/, handle /*parent*/) { - return str("cast_rref").release(); - } - - static handle cast(mpty const & /*src*/, return_value_policy /*policy*/, handle /*parent*/) { - return str("cast_cref").release(); - } - - static handle cast(mpty & /*src*/, return_value_policy /*policy*/, handle /*parent*/) { - return str("cast_mref").release(); - } - - static handle cast(mpty const *src, return_value_policy /*policy*/, handle /*parent*/) { - delete src; - return str("cast_cptr").release(); - } - - static handle cast(mpty *src, return_value_policy /*policy*/, handle /*parent*/) { - delete src; - return str("cast_mptr").release(); - } - - template - using cast_op_type = conditional_t< - std::is_same, mpty const *>::value, - mpty const *, - conditional_t< - std::is_same, mpty *>::value, - mpty *, - conditional_t< - std::is_same::value, - mpty const &, - conditional_t::value, - mpty &, - conditional_t::value, mpty &&, mpty>>>>>; - - // clang-format off - - operator mpty() { return rtrn_valu(); } - operator mpty&&() && { return rtrn_rref(); } - operator mpty const&() { return rtrn_cref(); } - operator mpty&() { return rtrn_mref(); } - operator mpty const*() { static mpty obj; return &obj; } - operator mpty*() { static mpty obj; return &obj; } - - // clang-format on - - bool load(handle /*src*/, bool /*convert*/) { return true; } -}; - -template <> -struct type_caster> { - static constexpr auto name = _>(); - - static handle cast(const std::shared_ptr & /*src*/, - return_value_policy /*policy*/, - handle /*parent*/) { - return str("cast_shmp").release(); - } - - template - using cast_op_type = std::shared_ptr; - - operator std::shared_ptr() { return rtrn_shmp(); } - - bool load(handle /*src*/, bool /*convert*/) { return true; } -}; - -template <> -struct type_caster> { - static constexpr auto name = _>(); - - static handle cast(const std::shared_ptr & /*src*/, - return_value_policy /*policy*/, - handle /*parent*/) { - return str("cast_shcp").release(); - } - - template - using cast_op_type = std::shared_ptr; - - operator std::shared_ptr() { return rtrn_shcp(); } - - bool load(handle /*src*/, bool /*convert*/) { return true; } -}; - -template <> -struct type_caster> { - static constexpr auto name = _>(); - - static handle - cast(std::unique_ptr && /*src*/, return_value_policy /*policy*/, handle /*parent*/) { - return str("cast_uqmp").release(); - } - - template - using cast_op_type = std::unique_ptr; - - operator std::unique_ptr() { return rtrn_uqmp(); } - - bool load(handle /*src*/, bool /*convert*/) { return true; } -}; - -template <> -struct type_caster> { - static constexpr auto name = _>(); - - static handle cast(std::unique_ptr && /*src*/, - return_value_policy /*policy*/, - handle /*parent*/) { - return str("cast_uqcp").release(); - } - - template - using cast_op_type = std::unique_ptr; - - operator std::unique_ptr() { return rtrn_uqcp(); } - - bool load(handle /*src*/, bool /*convert*/) { return true; } -}; - -} // namespace detail -} // namespace pybind11 - -namespace pybind11_tests { -namespace type_caster_bare_interface { - -TEST_SUBMODULE(type_caster_bare_interface, m) { - m.def("rtrn_valu", rtrn_valu); - m.def("rtrn_rref", rtrn_rref); - m.def("rtrn_cref", rtrn_cref); - m.def("rtrn_mref", rtrn_mref); - m.def("rtrn_cptr", rtrn_cptr); - m.def("rtrn_mptr", rtrn_mptr); - - m.def("pass_valu", pass_valu); - m.def("pass_rref", pass_rref); - m.def("pass_cref", pass_cref); - m.def("pass_mref", pass_mref); - m.def("pass_cptr", pass_cptr); - m.def("pass_mptr", pass_mptr); - - m.def("rtrn_shmp", rtrn_shmp); - m.def("rtrn_shcp", rtrn_shcp); - - m.def("pass_shmp", pass_shmp); - m.def("pass_shcp", pass_shcp); - - m.def("rtrn_uqmp", rtrn_uqmp); - m.def("rtrn_uqcp", rtrn_uqcp); - - m.def("pass_uqmp", pass_uqmp); - m.def("pass_uqcp", pass_uqcp); -} - -} // namespace type_caster_bare_interface -} // namespace pybind11_tests diff --git a/tests/test_type_caster_bare_interface.py b/tests/test_type_caster_bare_interface.py deleted file mode 100644 index a427244db..000000000 --- a/tests/test_type_caster_bare_interface.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- - -from pybind11_tests import type_caster_bare_interface as m - - -def test_cast(): - assert m.rtrn_valu() == "cast_rref" - assert m.rtrn_rref() == "cast_rref" - assert m.rtrn_cref() == "cast_cref" - assert m.rtrn_mref() == "cast_mref" - assert m.rtrn_cptr() == "cast_cptr" - assert m.rtrn_mptr() == "cast_mptr" - - -def test_load(): - assert m.pass_valu(None) == "load_valu" - assert m.pass_rref(None) == "load_rref" - assert m.pass_cref(None) == "load_cref" - assert m.pass_mref(None) == "load_mref" - assert m.pass_cptr(None) == "load_cptr" - assert m.pass_mptr(None) == "load_mptr" - - -def test_cast_shared_ptr(): - assert m.rtrn_shmp() == "cast_shmp" - assert m.rtrn_shcp() == "cast_shcp" - - -def test_load_shared_ptr(): - assert m.pass_shmp(None) == "load_shmp" - assert m.pass_shcp(None) == "load_shcp" - - -def test_cast_unique_ptr(): - assert m.rtrn_uqmp() == "cast_uqmp" - assert m.rtrn_uqcp() == "cast_uqcp" - - -def test_load_unique_ptr(): - assert m.pass_uqmp(None) == "load_uqmp" - assert m.pass_uqcp(None) == "load_uqcp"