Rename examples files, as per #288
This renames example files from `exampleN` to `example-description`.
Specifically, the following renaming is applied:
example1 -> example-methods-and-attributes
example2 -> example-python-types
example3 -> example-operator-overloading
example4 -> example-constants-and-functions
example5 -> example-callbacks (*)
example6 -> example-sequence-and-iterators
example7 -> example-buffers
example8 -> example-custom-ref-counting
example9 -> example-modules
example10 -> example-numpy-vectorize
example11 -> example-arg-keywords-and-defaults
example12 -> example-virtual-functions
example13 -> example-keep-alive
example14 -> example-opaque-types
example15 -> example-pickling
example16 -> example-inheritance
example17 -> example-stl-binders
example18 -> example-eval
example19 -> example-custom-exceptions
* the inheritance parts of example5 are moved into example-inheritance
(previously example16), and the remainder is left as example-callbacks.
This commit also renames the internal variables ("Example1",
"Example2", "Example4", etc.) into non-numeric names ("ExampleMandA",
"ExamplePythonTypes", "ExampleWithEnum", etc.) to correspond to the
file renaming.
The order of tests is preserved, but this can easily be changed if
there is some more natural ordering by updating the list in
examples/CMakeLists.txt.
2016-07-18 20:43:18 +00:00
|
|
|
/*
|
2016-08-12 11:50:00 +00:00
|
|
|
tests/test_methods_and_attributes.cpp -- constructors, deconstructors, attribute access,
|
Rename examples files, as per #288
This renames example files from `exampleN` to `example-description`.
Specifically, the following renaming is applied:
example1 -> example-methods-and-attributes
example2 -> example-python-types
example3 -> example-operator-overloading
example4 -> example-constants-and-functions
example5 -> example-callbacks (*)
example6 -> example-sequence-and-iterators
example7 -> example-buffers
example8 -> example-custom-ref-counting
example9 -> example-modules
example10 -> example-numpy-vectorize
example11 -> example-arg-keywords-and-defaults
example12 -> example-virtual-functions
example13 -> example-keep-alive
example14 -> example-opaque-types
example15 -> example-pickling
example16 -> example-inheritance
example17 -> example-stl-binders
example18 -> example-eval
example19 -> example-custom-exceptions
* the inheritance parts of example5 are moved into example-inheritance
(previously example16), and the remainder is left as example-callbacks.
This commit also renames the internal variables ("Example1",
"Example2", "Example4", etc.) into non-numeric names ("ExampleMandA",
"ExamplePythonTypes", "ExampleWithEnum", etc.) to correspond to the
file renaming.
The order of tests is preserved, but this can easily be changed if
there is some more natural ordering by updating the list in
examples/CMakeLists.txt.
2016-07-18 20:43:18 +00:00
|
|
|
__str__, argument and return value conventions
|
|
|
|
|
|
|
|
Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
|
|
|
|
|
|
|
|
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"
|
|
|
|
#include "constructor_stats.h"
|
Rename examples files, as per #288
This renames example files from `exampleN` to `example-description`.
Specifically, the following renaming is applied:
example1 -> example-methods-and-attributes
example2 -> example-python-types
example3 -> example-operator-overloading
example4 -> example-constants-and-functions
example5 -> example-callbacks (*)
example6 -> example-sequence-and-iterators
example7 -> example-buffers
example8 -> example-custom-ref-counting
example9 -> example-modules
example10 -> example-numpy-vectorize
example11 -> example-arg-keywords-and-defaults
example12 -> example-virtual-functions
example13 -> example-keep-alive
example14 -> example-opaque-types
example15 -> example-pickling
example16 -> example-inheritance
example17 -> example-stl-binders
example18 -> example-eval
example19 -> example-custom-exceptions
* the inheritance parts of example5 are moved into example-inheritance
(previously example16), and the remainder is left as example-callbacks.
This commit also renames the internal variables ("Example1",
"Example2", "Example4", etc.) into non-numeric names ("ExampleMandA",
"ExamplePythonTypes", "ExampleWithEnum", etc.) to correspond to the
file renaming.
The order of tests is preserved, but this can easily be changed if
there is some more natural ordering by updating the list in
examples/CMakeLists.txt.
2016-07-18 20:43:18 +00:00
|
|
|
|
|
|
|
class ExampleMandA {
|
|
|
|
public:
|
Improve constructor/destructor tracking
This commit rewrites the examples that look for constructor/destructor
calls to do so via static variable tracking rather than output parsing.
The added ConstructorStats class provides methods to keep track of
constructors and destructors, number of default/copy/move constructors,
and number of copy/move assignments. It also provides a mechanism for
storing values (e.g. for value construction), and then allows all of
this to be checked at the end of a test by getting the statistics for a
C++ (or python mapping) class.
By not relying on the precise pattern of constructions/destructions,
but rather simply ensuring that every construction is matched with a
destruction on the same object, we ensure that everything that gets
created also gets destroyed as expected.
This replaces all of the various "std::cout << whatever" code in
constructors/destructors with
`print_created(this)`/`print_destroyed(this)`/etc. functions which
provide similar output, but now has a unified format across the
different examples, including a new ### prefix that makes mixed example
output and lifecycle events easier to distinguish.
With this change, relaxed mode is no longer needed, which enables
testing for proper destruction under MSVC, and under any other compiler
that generates code calling extra constructors, or optimizes away any
constructors. GCC/clang are used as the baseline for move
constructors; the tests are adapted to allow more move constructors to
be evoked (but other types are constructors much have matching counts).
This commit also disables output buffering of tests, as the buffering
sometimes results in C++ output ending up in the middle of python
output (or vice versa), depending on the OS/python version.
2016-08-07 17:05:26 +00:00
|
|
|
ExampleMandA() { print_default_created(this); }
|
|
|
|
ExampleMandA(int value) : value(value) { print_created(this, value); }
|
|
|
|
ExampleMandA(const ExampleMandA &e) : value(e.value) { print_copy_created(this); }
|
|
|
|
ExampleMandA(ExampleMandA &&e) : value(e.value) { print_move_created(this); }
|
|
|
|
~ExampleMandA() { print_destroyed(this); }
|
|
|
|
|
Rename examples files, as per #288
This renames example files from `exampleN` to `example-description`.
Specifically, the following renaming is applied:
example1 -> example-methods-and-attributes
example2 -> example-python-types
example3 -> example-operator-overloading
example4 -> example-constants-and-functions
example5 -> example-callbacks (*)
example6 -> example-sequence-and-iterators
example7 -> example-buffers
example8 -> example-custom-ref-counting
example9 -> example-modules
example10 -> example-numpy-vectorize
example11 -> example-arg-keywords-and-defaults
example12 -> example-virtual-functions
example13 -> example-keep-alive
example14 -> example-opaque-types
example15 -> example-pickling
example16 -> example-inheritance
example17 -> example-stl-binders
example18 -> example-eval
example19 -> example-custom-exceptions
* the inheritance parts of example5 are moved into example-inheritance
(previously example16), and the remainder is left as example-callbacks.
This commit also renames the internal variables ("Example1",
"Example2", "Example4", etc.) into non-numeric names ("ExampleMandA",
"ExamplePythonTypes", "ExampleWithEnum", etc.) to correspond to the
file renaming.
The order of tests is preserved, but this can easily be changed if
there is some more natural ordering by updating the list in
examples/CMakeLists.txt.
2016-07-18 20:43:18 +00:00
|
|
|
std::string toString() {
|
|
|
|
return "ExampleMandA[value=" + std::to_string(value) + "]";
|
|
|
|
}
|
|
|
|
|
Improve constructor/destructor tracking
This commit rewrites the examples that look for constructor/destructor
calls to do so via static variable tracking rather than output parsing.
The added ConstructorStats class provides methods to keep track of
constructors and destructors, number of default/copy/move constructors,
and number of copy/move assignments. It also provides a mechanism for
storing values (e.g. for value construction), and then allows all of
this to be checked at the end of a test by getting the statistics for a
C++ (or python mapping) class.
By not relying on the precise pattern of constructions/destructions,
but rather simply ensuring that every construction is matched with a
destruction on the same object, we ensure that everything that gets
created also gets destroyed as expected.
This replaces all of the various "std::cout << whatever" code in
constructors/destructors with
`print_created(this)`/`print_destroyed(this)`/etc. functions which
provide similar output, but now has a unified format across the
different examples, including a new ### prefix that makes mixed example
output and lifecycle events easier to distinguish.
With this change, relaxed mode is no longer needed, which enables
testing for proper destruction under MSVC, and under any other compiler
that generates code calling extra constructors, or optimizes away any
constructors. GCC/clang are used as the baseline for move
constructors; the tests are adapted to allow more move constructors to
be evoked (but other types are constructors much have matching counts).
This commit also disables output buffering of tests, as the buffering
sometimes results in C++ output ending up in the middle of python
output (or vice versa), depending on the OS/python version.
2016-08-07 17:05:26 +00:00
|
|
|
void operator=(const ExampleMandA &e) { print_copy_assigned(this); value = e.value; }
|
|
|
|
void operator=(ExampleMandA &&e) { print_move_assigned(this); value = e.value; }
|
Rename examples files, as per #288
This renames example files from `exampleN` to `example-description`.
Specifically, the following renaming is applied:
example1 -> example-methods-and-attributes
example2 -> example-python-types
example3 -> example-operator-overloading
example4 -> example-constants-and-functions
example5 -> example-callbacks (*)
example6 -> example-sequence-and-iterators
example7 -> example-buffers
example8 -> example-custom-ref-counting
example9 -> example-modules
example10 -> example-numpy-vectorize
example11 -> example-arg-keywords-and-defaults
example12 -> example-virtual-functions
example13 -> example-keep-alive
example14 -> example-opaque-types
example15 -> example-pickling
example16 -> example-inheritance
example17 -> example-stl-binders
example18 -> example-eval
example19 -> example-custom-exceptions
* the inheritance parts of example5 are moved into example-inheritance
(previously example16), and the remainder is left as example-callbacks.
This commit also renames the internal variables ("Example1",
"Example2", "Example4", etc.) into non-numeric names ("ExampleMandA",
"ExamplePythonTypes", "ExampleWithEnum", etc.) to correspond to the
file renaming.
The order of tests is preserved, but this can easily be changed if
there is some more natural ordering by updating the list in
examples/CMakeLists.txt.
2016-07-18 20:43:18 +00:00
|
|
|
|
|
|
|
void add1(ExampleMandA other) { value += other.value; } // passing by value
|
|
|
|
void add2(ExampleMandA &other) { value += other.value; } // passing by reference
|
|
|
|
void add3(const ExampleMandA &other) { value += other.value; } // passing by const reference
|
|
|
|
void add4(ExampleMandA *other) { value += other->value; } // passing by pointer
|
|
|
|
void add5(const ExampleMandA *other) { value += other->value; } // passing by const pointer
|
|
|
|
|
|
|
|
void add6(int other) { value += other; } // passing by value
|
|
|
|
void add7(int &other) { value += other; } // passing by reference
|
|
|
|
void add8(const int &other) { value += other; } // passing by const reference
|
|
|
|
void add9(int *other) { value += *other; } // passing by pointer
|
|
|
|
void add10(const int *other) { value += *other; } // passing by const pointer
|
|
|
|
|
|
|
|
ExampleMandA self1() { return *this; } // return by value
|
|
|
|
ExampleMandA &self2() { return *this; } // return by reference
|
|
|
|
const ExampleMandA &self3() { return *this; } // return by const reference
|
|
|
|
ExampleMandA *self4() { return this; } // return by pointer
|
|
|
|
const ExampleMandA *self5() { return this; } // return by const pointer
|
|
|
|
|
|
|
|
int internal1() { return value; } // return by value
|
|
|
|
int &internal2() { return value; } // return by reference
|
|
|
|
const int &internal3() { return value; } // return by const reference
|
|
|
|
int *internal4() { return &value; } // return by pointer
|
|
|
|
const int *internal5() { return &value; } // return by const pointer
|
|
|
|
|
|
|
|
int value = 0;
|
|
|
|
};
|
|
|
|
|
2016-10-21 16:51:14 +00:00
|
|
|
struct TestProperties {
|
|
|
|
int value = 1;
|
|
|
|
static int static_value;
|
|
|
|
|
|
|
|
int get() const { return value; }
|
|
|
|
void set(int v) { value = v; }
|
|
|
|
|
|
|
|
static int static_get() { return static_value; }
|
|
|
|
static void static_set(int v) { static_value = v; }
|
|
|
|
};
|
|
|
|
|
|
|
|
int TestProperties::static_value = 1;
|
|
|
|
|
2016-11-01 10:44:57 +00:00
|
|
|
struct SimpleValue { int value = 1; };
|
|
|
|
|
|
|
|
struct TestPropRVP {
|
|
|
|
SimpleValue v1;
|
|
|
|
SimpleValue v2;
|
|
|
|
static SimpleValue sv1;
|
|
|
|
static SimpleValue sv2;
|
|
|
|
|
|
|
|
const SimpleValue &get1() const { return v1; }
|
|
|
|
const SimpleValue &get2() const { return v2; }
|
|
|
|
SimpleValue get_rvalue() const { return v2; }
|
|
|
|
void set1(int v) { v1.value = v; }
|
|
|
|
void set2(int v) { v2.value = v; }
|
|
|
|
};
|
|
|
|
|
|
|
|
SimpleValue TestPropRVP::sv1{};
|
|
|
|
SimpleValue TestPropRVP::sv2{};
|
|
|
|
|
2016-10-10 23:12:48 +00:00
|
|
|
class DynamicClass {
|
|
|
|
public:
|
|
|
|
DynamicClass() { print_default_created(this); }
|
|
|
|
~DynamicClass() { print_destroyed(this); }
|
|
|
|
};
|
|
|
|
|
2016-10-14 16:01:17 +00:00
|
|
|
class CppDerivedDynamicClass : public DynamicClass { };
|
|
|
|
|
2016-09-03 18:54:22 +00:00
|
|
|
test_initializer methods_and_attributes([](py::module &m) {
|
Rename examples files, as per #288
This renames example files from `exampleN` to `example-description`.
Specifically, the following renaming is applied:
example1 -> example-methods-and-attributes
example2 -> example-python-types
example3 -> example-operator-overloading
example4 -> example-constants-and-functions
example5 -> example-callbacks (*)
example6 -> example-sequence-and-iterators
example7 -> example-buffers
example8 -> example-custom-ref-counting
example9 -> example-modules
example10 -> example-numpy-vectorize
example11 -> example-arg-keywords-and-defaults
example12 -> example-virtual-functions
example13 -> example-keep-alive
example14 -> example-opaque-types
example15 -> example-pickling
example16 -> example-inheritance
example17 -> example-stl-binders
example18 -> example-eval
example19 -> example-custom-exceptions
* the inheritance parts of example5 are moved into example-inheritance
(previously example16), and the remainder is left as example-callbacks.
This commit also renames the internal variables ("Example1",
"Example2", "Example4", etc.) into non-numeric names ("ExampleMandA",
"ExamplePythonTypes", "ExampleWithEnum", etc.) to correspond to the
file renaming.
The order of tests is preserved, but this can easily be changed if
there is some more natural ordering by updating the list in
examples/CMakeLists.txt.
2016-07-18 20:43:18 +00:00
|
|
|
py::class_<ExampleMandA>(m, "ExampleMandA")
|
|
|
|
.def(py::init<>())
|
|
|
|
.def(py::init<int>())
|
|
|
|
.def(py::init<const ExampleMandA&>())
|
|
|
|
.def("add1", &ExampleMandA::add1)
|
|
|
|
.def("add2", &ExampleMandA::add2)
|
|
|
|
.def("add3", &ExampleMandA::add3)
|
|
|
|
.def("add4", &ExampleMandA::add4)
|
|
|
|
.def("add5", &ExampleMandA::add5)
|
|
|
|
.def("add6", &ExampleMandA::add6)
|
|
|
|
.def("add7", &ExampleMandA::add7)
|
|
|
|
.def("add8", &ExampleMandA::add8)
|
|
|
|
.def("add9", &ExampleMandA::add9)
|
|
|
|
.def("add10", &ExampleMandA::add10)
|
|
|
|
.def("self1", &ExampleMandA::self1)
|
|
|
|
.def("self2", &ExampleMandA::self2)
|
|
|
|
.def("self3", &ExampleMandA::self3)
|
|
|
|
.def("self4", &ExampleMandA::self4)
|
|
|
|
.def("self5", &ExampleMandA::self5)
|
|
|
|
.def("internal1", &ExampleMandA::internal1)
|
|
|
|
.def("internal2", &ExampleMandA::internal2)
|
|
|
|
.def("internal3", &ExampleMandA::internal3)
|
|
|
|
.def("internal4", &ExampleMandA::internal4)
|
|
|
|
.def("internal5", &ExampleMandA::internal5)
|
|
|
|
.def("__str__", &ExampleMandA::toString)
|
Improve constructor/destructor tracking
This commit rewrites the examples that look for constructor/destructor
calls to do so via static variable tracking rather than output parsing.
The added ConstructorStats class provides methods to keep track of
constructors and destructors, number of default/copy/move constructors,
and number of copy/move assignments. It also provides a mechanism for
storing values (e.g. for value construction), and then allows all of
this to be checked at the end of a test by getting the statistics for a
C++ (or python mapping) class.
By not relying on the precise pattern of constructions/destructions,
but rather simply ensuring that every construction is matched with a
destruction on the same object, we ensure that everything that gets
created also gets destroyed as expected.
This replaces all of the various "std::cout << whatever" code in
constructors/destructors with
`print_created(this)`/`print_destroyed(this)`/etc. functions which
provide similar output, but now has a unified format across the
different examples, including a new ### prefix that makes mixed example
output and lifecycle events easier to distinguish.
With this change, relaxed mode is no longer needed, which enables
testing for proper destruction under MSVC, and under any other compiler
that generates code calling extra constructors, or optimizes away any
constructors. GCC/clang are used as the baseline for move
constructors; the tests are adapted to allow more move constructors to
be evoked (but other types are constructors much have matching counts).
This commit also disables output buffering of tests, as the buffering
sometimes results in C++ output ending up in the middle of python
output (or vice versa), depending on the OS/python version.
2016-08-07 17:05:26 +00:00
|
|
|
.def_readwrite("value", &ExampleMandA::value)
|
|
|
|
;
|
2016-10-10 23:12:48 +00:00
|
|
|
|
2016-10-21 16:51:14 +00:00
|
|
|
py::class_<TestProperties>(m, "TestProperties")
|
|
|
|
.def(py::init<>())
|
|
|
|
.def_readonly("def_readonly", &TestProperties::value)
|
|
|
|
.def_readwrite("def_readwrite", &TestProperties::value)
|
|
|
|
.def_property_readonly("def_property_readonly", &TestProperties::get)
|
|
|
|
.def_property("def_property", &TestProperties::get, &TestProperties::set)
|
|
|
|
.def_readonly_static("def_readonly_static", &TestProperties::static_value)
|
|
|
|
.def_readwrite_static("def_readwrite_static", &TestProperties::static_value)
|
|
|
|
.def_property_readonly_static("def_property_readonly_static",
|
|
|
|
[](py::object) { return TestProperties::static_get(); })
|
|
|
|
.def_property_static("def_property_static",
|
|
|
|
[](py::object) { return TestProperties::static_get(); },
|
|
|
|
[](py::object, int v) { return TestProperties::static_set(v); });
|
|
|
|
|
2016-11-01 10:44:57 +00:00
|
|
|
py::class_<SimpleValue>(m, "SimpleValue")
|
|
|
|
.def_readwrite("value", &SimpleValue::value);
|
|
|
|
|
|
|
|
auto static_get1 = [](py::object) -> const SimpleValue & { return TestPropRVP::sv1; };
|
|
|
|
auto static_get2 = [](py::object) -> const SimpleValue & { return TestPropRVP::sv2; };
|
|
|
|
auto static_set1 = [](py::object, int v) { TestPropRVP::sv1.value = v; };
|
|
|
|
auto static_set2 = [](py::object, int v) { TestPropRVP::sv2.value = v; };
|
|
|
|
auto rvp_copy = py::return_value_policy::copy;
|
|
|
|
|
|
|
|
py::class_<TestPropRVP>(m, "TestPropRVP")
|
|
|
|
.def(py::init<>())
|
|
|
|
.def_property_readonly("ro_ref", &TestPropRVP::get1)
|
|
|
|
.def_property_readonly("ro_copy", &TestPropRVP::get2, rvp_copy)
|
|
|
|
.def_property_readonly("ro_func", py::cpp_function(&TestPropRVP::get2, rvp_copy))
|
|
|
|
.def_property("rw_ref", &TestPropRVP::get1, &TestPropRVP::set1)
|
|
|
|
.def_property("rw_copy", &TestPropRVP::get2, &TestPropRVP::set2, rvp_copy)
|
|
|
|
.def_property("rw_func", py::cpp_function(&TestPropRVP::get2, rvp_copy), &TestPropRVP::set2)
|
|
|
|
.def_property_readonly_static("static_ro_ref", static_get1)
|
|
|
|
.def_property_readonly_static("static_ro_copy", static_get2, rvp_copy)
|
|
|
|
.def_property_readonly_static("static_ro_func", py::cpp_function(static_get2, rvp_copy))
|
|
|
|
.def_property_static("static_rw_ref", static_get1, static_set1)
|
|
|
|
.def_property_static("static_rw_copy", static_get2, static_set2, rvp_copy)
|
|
|
|
.def_property_static("static_rw_func", py::cpp_function(static_get2, rvp_copy), static_set2)
|
|
|
|
.def_property_readonly("rvalue", &TestPropRVP::get_rvalue)
|
|
|
|
.def_property_readonly_static("static_rvalue", [](py::object) { return SimpleValue(); });
|
|
|
|
|
2016-10-10 23:12:48 +00:00
|
|
|
py::class_<DynamicClass>(m, "DynamicClass", py::dynamic_attr())
|
|
|
|
.def(py::init());
|
2016-10-14 16:01:17 +00:00
|
|
|
|
|
|
|
py::class_<CppDerivedDynamicClass, DynamicClass>(m, "CppDerivedDynamicClass")
|
|
|
|
.def(py::init());
|
2016-09-03 18:54:22 +00:00
|
|
|
});
|