2016-04-13 00:37:36 +00:00
|
|
|
/*
|
2016-08-12 11:50:00 +00:00
|
|
|
tests/test_pickling.cpp -- pickle support
|
2016-04-13 00:37:36 +00:00
|
|
|
|
2016-04-17 18:21:41 +00:00
|
|
|
Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
|
2016-04-13 00:37:36 +00:00
|
|
|
|
|
|
|
All rights reserved. Use of this source code is governed by a
|
|
|
|
BSD-style license that can be found in the LICENSE file.
|
|
|
|
*/
|
|
|
|
|
2016-08-12 11:50:00 +00:00
|
|
|
#include "pybind11_tests.h"
|
2016-04-13 00:37:36 +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.
2017-07-25 20:47:36 +00:00
|
|
|
TEST_SUBMODULE(pickling, m) {
|
|
|
|
// test_roundtrip
|
|
|
|
class Pickleable {
|
|
|
|
public:
|
|
|
|
Pickleable(const std::string &value) : m_value(value) { }
|
|
|
|
const std::string &value() const { return m_value; }
|
2016-04-13 00:37:36 +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.
2017-07-25 20:47:36 +00:00
|
|
|
void setExtra1(int extra1) { m_extra1 = extra1; }
|
|
|
|
void setExtra2(int extra2) { m_extra2 = extra2; }
|
|
|
|
int extra1() const { return m_extra1; }
|
|
|
|
int extra2() const { return m_extra2; }
|
|
|
|
private:
|
|
|
|
std::string m_value;
|
|
|
|
int m_extra1 = 0;
|
|
|
|
int m_extra2 = 0;
|
|
|
|
};
|
2017-08-23 23:53:15 +00:00
|
|
|
|
|
|
|
class PickleableNew : public Pickleable {
|
|
|
|
public:
|
|
|
|
using Pickleable::Pickleable;
|
|
|
|
};
|
|
|
|
|
2016-04-13 00:37:36 +00:00
|
|
|
py::class_<Pickleable>(m, "Pickleable")
|
|
|
|
.def(py::init<std::string>())
|
|
|
|
.def("value", &Pickleable::value)
|
|
|
|
.def("extra1", &Pickleable::extra1)
|
|
|
|
.def("extra2", &Pickleable::extra2)
|
|
|
|
.def("setExtra1", &Pickleable::setExtra1)
|
|
|
|
.def("setExtra2", &Pickleable::setExtra2)
|
|
|
|
// For details on the methods below, refer to
|
|
|
|
// http://docs.python.org/3/library/pickle.html#pickling-class-instances
|
|
|
|
.def("__getstate__", [](const Pickleable &p) {
|
|
|
|
/* Return a tuple that fully encodes the state of the object */
|
|
|
|
return py::make_tuple(p.value(), p.extra1(), p.extra2());
|
|
|
|
})
|
|
|
|
.def("__setstate__", [](Pickleable &p, py::tuple t) {
|
|
|
|
if (t.size() != 3)
|
|
|
|
throw std::runtime_error("Invalid state!");
|
|
|
|
/* Invoke the constructor (need to use in-place version) */
|
|
|
|
new (&p) Pickleable(t[0].cast<std::string>());
|
|
|
|
|
|
|
|
/* Assign any additional state */
|
|
|
|
p.setExtra1(t[1].cast<int>());
|
|
|
|
p.setExtra2(t[2].cast<int>());
|
|
|
|
});
|
2016-10-10 23:12:48 +00:00
|
|
|
|
2017-08-23 23:53:15 +00:00
|
|
|
py::class_<PickleableNew, Pickleable>(m, "PickleableNew")
|
|
|
|
.def(py::init<std::string>())
|
|
|
|
.def(py::pickle(
|
|
|
|
[](const PickleableNew &p) {
|
|
|
|
return py::make_tuple(p.value(), p.extra1(), p.extra2());
|
|
|
|
},
|
|
|
|
[](py::tuple t) {
|
|
|
|
if (t.size() != 3)
|
|
|
|
throw std::runtime_error("Invalid state!");
|
|
|
|
auto p = PickleableNew(t[0].cast<std::string>());
|
|
|
|
|
|
|
|
p.setExtra1(t[1].cast<int>());
|
|
|
|
p.setExtra2(t[2].cast<int>());
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
));
|
|
|
|
|
2016-12-26 12:12:10 +00:00
|
|
|
#if !defined(PYPY_VERSION)
|
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.
2017-07-25 20:47:36 +00:00
|
|
|
// test_roundtrip_with_dict
|
|
|
|
class PickleableWithDict {
|
|
|
|
public:
|
|
|
|
PickleableWithDict(const std::string &value) : value(value) { }
|
|
|
|
|
|
|
|
std::string value;
|
|
|
|
int extra;
|
|
|
|
};
|
2017-08-23 23:53:15 +00:00
|
|
|
|
|
|
|
class PickleableWithDictNew : public PickleableWithDict {
|
|
|
|
public:
|
|
|
|
using PickleableWithDict::PickleableWithDict;
|
|
|
|
};
|
|
|
|
|
2016-10-10 23:12:48 +00:00
|
|
|
py::class_<PickleableWithDict>(m, "PickleableWithDict", py::dynamic_attr())
|
|
|
|
.def(py::init<std::string>())
|
|
|
|
.def_readwrite("value", &PickleableWithDict::value)
|
|
|
|
.def_readwrite("extra", &PickleableWithDict::extra)
|
|
|
|
.def("__getstate__", [](py::object self) {
|
|
|
|
/* Also include __dict__ in state */
|
|
|
|
return py::make_tuple(self.attr("value"), self.attr("extra"), self.attr("__dict__"));
|
|
|
|
})
|
|
|
|
.def("__setstate__", [](py::object self, py::tuple t) {
|
|
|
|
if (t.size() != 3)
|
|
|
|
throw std::runtime_error("Invalid state!");
|
|
|
|
/* Cast and construct */
|
|
|
|
auto& p = self.cast<PickleableWithDict&>();
|
2017-01-04 14:01:59 +00:00
|
|
|
new (&p) PickleableWithDict(t[0].cast<std::string>());
|
2016-10-10 23:12:48 +00:00
|
|
|
|
|
|
|
/* Assign C++ state */
|
|
|
|
p.extra = t[1].cast<int>();
|
|
|
|
|
|
|
|
/* Assign Python state */
|
|
|
|
self.attr("__dict__") = t[2];
|
|
|
|
});
|
2017-08-23 23:53:15 +00:00
|
|
|
|
|
|
|
py::class_<PickleableWithDictNew, PickleableWithDict>(m, "PickleableWithDictNew")
|
|
|
|
.def(py::init<std::string>())
|
|
|
|
.def(py::pickle(
|
|
|
|
[](py::object self) {
|
|
|
|
return py::make_tuple(self.attr("value"), self.attr("extra"), self.attr("__dict__"));
|
|
|
|
},
|
|
|
|
[](py::tuple t) {
|
|
|
|
if (t.size() != 3)
|
|
|
|
throw std::runtime_error("Invalid state!");
|
|
|
|
|
|
|
|
auto cpp_state = PickleableWithDictNew(t[0].cast<std::string>());
|
|
|
|
cpp_state.extra = t[1].cast<int>();
|
|
|
|
|
|
|
|
auto py_state = t[2].cast<py::dict>();
|
|
|
|
return std::make_pair(cpp_state, py_state);
|
|
|
|
}
|
|
|
|
));
|
2016-12-26 12:12:10 +00:00
|
|
|
#endif
|
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.
2017-07-25 20:47:36 +00:00
|
|
|
}
|