mirror of
https://github.com/pybind/pybind11.git
synced 2026-03-14 20:27:47 +00:00
Update all remaining tests to new test styles
This udpates all the remaining tests to the new test suite code and comment styles started in #898. For the most part, the test coverage here is unchanged, with a few minor exceptions as noted below. - test_constants_and_functions: this adds more overload tests with overloads with different number of arguments for more comprehensive overload_cast testing. The test style conversion broke the overload tests under MSVC 2015, prompting the additional tests while looking for a workaround. - test_eigen: this dropped the unused functions `get_cm_corners` and `get_cm_corners_const`--these same tests were duplicates of the same things provided (and used) via ReturnTester methods. - test_opaque_types: this test had a hidden dependence on ExampleMandA which is now fixed by using the global UserType which suffices for the relevant test. - test_methods_and_attributes: this required some additions to UserType to make it usable as a replacement for the test's previous SimpleType: UserType gained a value mutator, and the `value` property is not mutable (it was previously readonly). Some overload tests were also added to better test overload_cast (as described above). - test_numpy_array: removed the untemplated mutate_data/mutate_data_t: the templated versions with an empty parameter pack expand to the same thing. - test_stl: this was already mostly in the new style; this just tweaks things a bit, localizing a class, and adding some missing `// test_whatever` comments. - test_virtual_functions: like `test_stl`, this was mostly in the new test style already, but needed some `// test_whatever` comments. This commit also moves the inherited virtual example code to the end of the file, after the main set of tests (since it is less important than the other tests, and rather length); it also got renamed to `test_inherited_virtuals` (from `test_inheriting_repeat`) because it tests both inherited virtual approaches, not just the repeat approach.
This commit is contained in:
@@ -10,84 +10,62 @@
|
||||
#include "pybind11_tests.h"
|
||||
#include <pybind11/stl.h>
|
||||
|
||||
std::string kw_func(int x, int y) { return "x=" + std::to_string(x) + ", y=" + std::to_string(y); }
|
||||
TEST_SUBMODULE(kwargs_and_defaults, m) {
|
||||
auto kw_func = [](int x, int y) { return "x=" + std::to_string(x) + ", y=" + std::to_string(y); };
|
||||
|
||||
std::string kw_func4(const std::vector<int> &entries) {
|
||||
std::string ret = "{";
|
||||
for (int i : entries)
|
||||
ret += std::to_string(i) + " ";
|
||||
ret.back() = '}';
|
||||
return ret;
|
||||
}
|
||||
|
||||
py::tuple args_function(py::args args) {
|
||||
return args;
|
||||
}
|
||||
|
||||
py::tuple args_kwargs_function(py::args args, py::kwargs kwargs) {
|
||||
return py::make_tuple(args, kwargs);
|
||||
}
|
||||
|
||||
py::tuple mixed_plus_args(int i, double j, py::args args) {
|
||||
return py::make_tuple(i, j, args);
|
||||
}
|
||||
|
||||
py::tuple mixed_plus_kwargs(int i, double j, py::kwargs kwargs) {
|
||||
return py::make_tuple(i, j, kwargs);
|
||||
}
|
||||
|
||||
py::tuple mixed_plus_args_kwargs(int i, double j, py::args args, py::kwargs kwargs) {
|
||||
return py::make_tuple(i, j, args, kwargs);
|
||||
}
|
||||
|
||||
// pybind11 won't allow these to be bound: args and kwargs, if present, must be at the end.
|
||||
void bad_args1(py::args, int) {}
|
||||
void bad_args2(py::kwargs, int) {}
|
||||
void bad_args3(py::kwargs, py::args) {}
|
||||
void bad_args4(py::args, int, py::kwargs) {}
|
||||
void bad_args5(py::args, py::kwargs, int) {}
|
||||
void bad_args6(py::args, py::args) {}
|
||||
void bad_args7(py::kwargs, py::kwargs) {}
|
||||
|
||||
struct KWClass {
|
||||
void foo(int, float) {}
|
||||
};
|
||||
|
||||
test_initializer arg_keywords_and_defaults([](py::module &m) {
|
||||
m.def("kw_func0", &kw_func);
|
||||
m.def("kw_func1", &kw_func, py::arg("x"), py::arg("y"));
|
||||
m.def("kw_func2", &kw_func, py::arg("x") = 100, py::arg("y") = 200);
|
||||
// test_named_arguments
|
||||
m.def("kw_func0", kw_func);
|
||||
m.def("kw_func1", kw_func, py::arg("x"), py::arg("y"));
|
||||
m.def("kw_func2", kw_func, py::arg("x") = 100, py::arg("y") = 200);
|
||||
m.def("kw_func3", [](const char *) { }, py::arg("data") = std::string("Hello world!"));
|
||||
|
||||
/* A fancier default argument */
|
||||
std::vector<int> list;
|
||||
list.push_back(13);
|
||||
list.push_back(17);
|
||||
m.def("kw_func4", &kw_func4, py::arg("myList") = list);
|
||||
std::vector<int> list{{13, 17}};
|
||||
m.def("kw_func4", [](const std::vector<int> &entries) {
|
||||
std::string ret = "{";
|
||||
for (int i : entries)
|
||||
ret += std::to_string(i) + " ";
|
||||
ret.back() = '}';
|
||||
return ret;
|
||||
}, py::arg("myList") = list);
|
||||
|
||||
m.def("args_function", &args_function);
|
||||
m.def("args_kwargs_function", &args_kwargs_function);
|
||||
m.def("kw_func_udl", kw_func, "x"_a, "y"_a=300);
|
||||
m.def("kw_func_udl_z", kw_func, "x"_a, "y"_a=0);
|
||||
|
||||
m.def("kw_func_udl", &kw_func, "x"_a, "y"_a=300);
|
||||
m.def("kw_func_udl_z", &kw_func, "x"_a, "y"_a=0);
|
||||
// test_args_and_kwargs
|
||||
m.def("args_function", [](py::args args) -> py::tuple { return args; });
|
||||
m.def("args_kwargs_function", [](py::args args, py::kwargs kwargs) {
|
||||
return py::make_tuple(args, kwargs);
|
||||
});
|
||||
|
||||
// test_mixed_args_and_kwargs
|
||||
m.def("mixed_plus_args", [](int i, double j, py::args args) {
|
||||
return py::make_tuple(i, j, args);
|
||||
});
|
||||
m.def("mixed_plus_kwargs", [](int i, double j, py::kwargs kwargs) {
|
||||
return py::make_tuple(i, j, kwargs);
|
||||
});
|
||||
auto mixed_plus_both = [](int i, double j, py::args args, py::kwargs kwargs) {
|
||||
return py::make_tuple(i, j, args, kwargs);
|
||||
};
|
||||
m.def("mixed_plus_args_kwargs", mixed_plus_both);
|
||||
|
||||
m.def("mixed_plus_args_kwargs_defaults", mixed_plus_both,
|
||||
py::arg("i") = 1, py::arg("j") = 3.14159);
|
||||
|
||||
// pybind11 won't allow these to be bound: args and kwargs, if present, must be at the end.
|
||||
// Uncomment these to test that the static_assert is indeed working:
|
||||
// m.def("bad_args1", [](py::args, int) {});
|
||||
// m.def("bad_args2", [](py::kwargs, int) {});
|
||||
// m.def("bad_args3", [](py::kwargs, py::args) {});
|
||||
// m.def("bad_args4", [](py::args, int, py::kwargs) {});
|
||||
// m.def("bad_args5", [](py::args, py::kwargs, int) {});
|
||||
// m.def("bad_args6", [](py::args, py::args) {});
|
||||
// m.def("bad_args7", [](py::kwargs, py::kwargs) {});
|
||||
|
||||
// test_function_signatures (along with most of the above)
|
||||
struct KWClass { void foo(int, float) {} };
|
||||
py::class_<KWClass>(m, "KWClass")
|
||||
.def("foo0", &KWClass::foo)
|
||||
.def("foo1", &KWClass::foo, "x"_a, "y"_a);
|
||||
|
||||
m.def("mixed_plus_args", &mixed_plus_args);
|
||||
m.def("mixed_plus_kwargs", &mixed_plus_kwargs);
|
||||
m.def("mixed_plus_args_kwargs", &mixed_plus_args_kwargs);
|
||||
|
||||
m.def("mixed_plus_args_kwargs_defaults", &mixed_plus_args_kwargs,
|
||||
py::arg("i") = 1, py::arg("j") = 3.14159);
|
||||
|
||||
// Uncomment these to test that the static_assert is indeed working:
|
||||
// m.def("bad_args1", &bad_args1);
|
||||
// m.def("bad_args2", &bad_args2);
|
||||
// m.def("bad_args3", &bad_args3);
|
||||
// m.def("bad_args4", &bad_args4);
|
||||
// m.def("bad_args5", &bad_args5);
|
||||
// m.def("bad_args6", &bad_args6);
|
||||
// m.def("bad_args7", &bad_args7);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user