mirror of
https://github.com/rdkit/rdkit.git
synced 2026-06-04 21:54:27 +08:00
* Remove Dict::getData() for a strict abstraction boundary Replace direct access to Dict's internal std::vector<Pair> with encapsulated methods: size(), empty(), const iteration via begin()/end(), appendPair(), markNonPOD(), and getRawVal(). This enables future changes to Dict's internal representation without breaking callers. Ref: rdkit/rdkit#9112 * Harden Dict::appendPair to take a populated Pair by move appendPair(Pair&&) now auto-detects non-POD status via RDValue::needsCleanup(), eliminating markNonPOD() and the risk of dangling references or uninitialized entries. needsCleanup() is placed next to destroy() on RDValue to keep the POD/non-POD distinction in one place. * Remove vestigial dictHasNonPOD param from streamReadProp Both callers ignored the output. Non-POD detection is now handled by Dict::appendPair via RDValue::needsCleanup(). * unbork java build * Address PR review: bulk append, rename getRawVal, add custom data test - Add Dict::append(vector<Pair>&&) for bulk insertion with reserve - Use bulk append in streamReadProps to restore pre-allocation - Rename getRawVal -> getRDValue per reviewer preference - Add test verifying custom AnyTag data is destroyed through Dict lifecycle * heed self-review * don't manually implement vec.insert * Add test: ExplicitBitVect round-trip through Dict serialization Exercises the full streamWriteProps/streamReadProps path with an ExplicitBitVect in an RDProps Dict, confirming the custom handler is invoked and no memory is leaked (verified under valgrind). * in anyTag test, assert destructors ran a specific number of times. --------- Co-authored-by: bddap (Coding Agent) <andrew+bot@dirksen.com>
780 lines
19 KiB
C++
780 lines
19 KiB
C++
//
|
|
// Copyright 2001-2025 Randal M. Henne and other RDKit contributors
|
|
//
|
|
// @@ All Rights Reserved @@
|
|
// This file is part of the RDKit.
|
|
// The contents are covered by the terms of the BSD license
|
|
// which is included in the file license.txt, found at the root
|
|
// of the RDKit source tree.
|
|
//
|
|
//
|
|
|
|
#include <catch2/catch_all.hpp>
|
|
#include "types.h"
|
|
#include "StreamOps.h"
|
|
#include <RDGeneral/Invariant.h>
|
|
#include <RDGeneral/RDAny.h>
|
|
#include <RDGeneral/Dict.h>
|
|
#include <RDGeneral/RDLog.h>
|
|
#include <RDGeneral/utils.h>
|
|
#include <boost/shared_ptr.hpp>
|
|
#include <vector>
|
|
#include <ctime>
|
|
|
|
using namespace RDKit;
|
|
using namespace std;
|
|
|
|
struct Foo {
|
|
int bar{0};
|
|
float baz{0.f};
|
|
Foo() {}
|
|
Foo(int bar, float baz) : bar(bar), baz(baz) {}
|
|
~Foo() {}
|
|
};
|
|
|
|
TEST_CASE("testGithub940") {
|
|
// a couple small tests to check for memory leaks. Only useful with valgrind
|
|
{ // tests computed props
|
|
STR_VECT computed;
|
|
auto *d = new Dict();
|
|
d->setVal(RDKit::detail::computedPropName, computed);
|
|
computed.push_back("foo");
|
|
d->setVal(RDKit::detail::computedPropName, computed);
|
|
delete d;
|
|
}
|
|
{ // tests computed props
|
|
STR_VECT computed;
|
|
auto *d = new Dict();
|
|
d->setVal(RDKit::detail::computedPropName, computed);
|
|
computed.push_back("foo");
|
|
d->setVal(RDKit::detail::computedPropName, computed);
|
|
d->clearVal(RDKit::detail::computedPropName);
|
|
delete d;
|
|
}
|
|
}
|
|
|
|
TEST_CASE("testRDValue") {
|
|
{
|
|
RDAny v(-2147450880);
|
|
}
|
|
|
|
{
|
|
int vi = 0;
|
|
RDValue v(0);
|
|
for (int i = 0; i < 100; ++i) {
|
|
vi += i;
|
|
v = rdvalue_cast<int>(v) + i;
|
|
REQUIRE(vi == rdvalue_cast<int>(v));
|
|
}
|
|
}
|
|
{
|
|
RDAny a(1);
|
|
RDAny b = a;
|
|
REQUIRE(rdany_cast<int>(a) == 1);
|
|
REQUIRE(rdany_cast<int>(b) == 1);
|
|
}
|
|
|
|
{
|
|
RDAny a(1);
|
|
RDAny b = a;
|
|
REQUIRE(rdany_cast<int>(a) == 1);
|
|
REQUIRE(rdany_cast<int>(b) == rdany_cast<int>(a));
|
|
std::map<std::string, RDAny> foo;
|
|
foo["foo"] = a;
|
|
foo["bar"] = std::string("This is a test");
|
|
REQUIRE(rdany_cast<int>(foo["foo"]) == 1);
|
|
REQUIRE(rdany_cast<int>(foo["foo"]) == rdany_cast<int>(a));
|
|
REQUIRE(rdany_cast<std::string>(foo["bar"]) == "This is a test");
|
|
}
|
|
|
|
{
|
|
bool a = true;
|
|
RDValue v(a);
|
|
REQUIRE(rdvalue_cast<bool>(v) == true);
|
|
v = (int)10;
|
|
REQUIRE(rdvalue_cast<int>(v) == 10);
|
|
}
|
|
|
|
{
|
|
Dict d;
|
|
bool a = true;
|
|
d.setVal("foo", a);
|
|
d.getVal<bool>("foo");
|
|
}
|
|
|
|
{ // tests computed props
|
|
STR_VECT computed;
|
|
Dict d;
|
|
d.setVal(RDKit::detail::computedPropName, computed);
|
|
computed.push_back("foo");
|
|
d.setVal(RDKit::detail::computedPropName, computed);
|
|
STR_VECT computed2 = d.getVal<STR_VECT>(RDKit::detail::computedPropName);
|
|
REQUIRE(computed2[0] == "foo");
|
|
Dict d2(d);
|
|
computed2 = d2.getVal<STR_VECT>(RDKit::detail::computedPropName);
|
|
REQUIRE(computed2[0] == "foo");
|
|
}
|
|
|
|
{
|
|
std::vector<int> fooV;
|
|
fooV.resize(3);
|
|
fooV[0] = 1;
|
|
fooV[1] = 2;
|
|
fooV[2] = 3;
|
|
std::vector<int> fooV2;
|
|
RDAny a(fooV);
|
|
fooV2 = rdany_cast<std::vector<int>>(a);
|
|
REQUIRE(fooV == fooV2);
|
|
|
|
Dict d;
|
|
{
|
|
std::vector<int> fooV2;
|
|
d.setVal("bar", fooV);
|
|
d.getVal("bar", fooV2);
|
|
REQUIRE(fooV == fooV2);
|
|
}
|
|
}
|
|
|
|
{
|
|
std::vector<int> v;
|
|
for (int i = 0; i < 4; ++i) {
|
|
v.push_back(i);
|
|
}
|
|
|
|
RDAny foo(v);
|
|
RDAny bar = foo;
|
|
RDAny baz(foo);
|
|
|
|
for (int i = 0; i < 4; ++i) {
|
|
REQUIRE(rdany_cast<std::vector<int>>(foo)[i] == i);
|
|
REQUIRE(rdany_cast<std::vector<int>>(bar)[i] == i);
|
|
REQUIRE(rdany_cast<std::vector<int>>(baz)[i] == i);
|
|
}
|
|
}
|
|
|
|
{
|
|
std::vector<double> v;
|
|
for (double i = 0; i < 4; ++i) {
|
|
v.push_back(i);
|
|
}
|
|
|
|
RDAny foo(v);
|
|
|
|
for (int i = 0; i < 4; ++i) {
|
|
REQUIRE(rdany_cast<std::vector<double>>(foo)[i] == i);
|
|
}
|
|
|
|
RDAny b = foo;
|
|
|
|
for (int i = 0; i < 4; ++i) {
|
|
REQUIRE(rdany_cast<std::vector<double>>(b)[i] == i);
|
|
}
|
|
}
|
|
|
|
// growth in the loops below is loop * loops / 2, so going higher
|
|
// than this will cause an overflow of std::any_cast<int>(*v)
|
|
const int loops = sqrt(std::numeric_limits<int>::max());
|
|
{
|
|
std::clock_t clock1 = std::clock();
|
|
std::any v;
|
|
for (int i = 0; i < loops; ++i) {
|
|
v = i;
|
|
}
|
|
std::clock_t clock2 = std::clock();
|
|
|
|
std::cout << "static boost any:"
|
|
<< (double)(clock2 - clock1) / CLOCKS_PER_SEC << " s"
|
|
<< std::endl;
|
|
}
|
|
{
|
|
std::clock_t clock1 = std::clock();
|
|
std::any *v = nullptr, *vv;
|
|
for (int i = 0; i < loops; ++i) {
|
|
vv = new std::any(v ? std::any_cast<int>(*v) + i : i);
|
|
delete v;
|
|
v = vv;
|
|
}
|
|
delete vv;
|
|
std::clock_t clock2 = std::clock();
|
|
|
|
std::cout << "dynamic boost any:"
|
|
<< (double)(clock2 - clock1) / CLOCKS_PER_SEC << " s"
|
|
<< std::endl;
|
|
}
|
|
|
|
{
|
|
std::clock_t clock1 = std::clock();
|
|
RDAny v;
|
|
for (int i = 0; i < loops; ++i) {
|
|
v = i;
|
|
}
|
|
std::clock_t clock2 = std::clock();
|
|
|
|
std::cout << "static RDAny:" << (double)(clock2 - clock1) / CLOCKS_PER_SEC
|
|
<< " s" << std::endl;
|
|
}
|
|
|
|
{
|
|
std::clock_t clock1 = std::clock();
|
|
RDAny *v = nullptr, *vv;
|
|
for (int i = 0; i < loops; ++i) {
|
|
vv = new RDAny(v ? rdany_cast<int>(*v) + i : i);
|
|
delete v;
|
|
v = vv;
|
|
}
|
|
delete vv;
|
|
std::clock_t clock2 = std::clock();
|
|
|
|
std::cout << "dynamic RDAny:" << (double)(clock2 - clock1) / CLOCKS_PER_SEC
|
|
<< " s" << std::endl;
|
|
}
|
|
|
|
{
|
|
std::clock_t clock1 = std::clock();
|
|
RDValue v;
|
|
for (int i = 0; i < loops; ++i) {
|
|
v = i;
|
|
}
|
|
std::clock_t clock2 = std::clock();
|
|
|
|
std::cout << "static RDValue:" << (double)(clock2 - clock1) / CLOCKS_PER_SEC
|
|
<< " s" << std::endl;
|
|
}
|
|
|
|
{
|
|
std::clock_t clock1 = std::clock();
|
|
RDValue v(0);
|
|
for (int i = 0; i < loops; ++i) {
|
|
v = RDValue(rdvalue_cast<int>(v) + i);
|
|
}
|
|
|
|
std::clock_t clock2 = std::clock();
|
|
|
|
std::cout << "dynamic RDValue:"
|
|
<< (double)(clock2 - clock1) / CLOCKS_PER_SEC << " s"
|
|
<< std::endl;
|
|
}
|
|
|
|
{ // checks replacement with vector
|
|
RDAny vv(2.0);
|
|
REQUIRE(rdany_cast<double>(vv) == 2.0);
|
|
|
|
std::vector<int> vect;
|
|
vect.push_back(1);
|
|
vv = vect;
|
|
REQUIRE(rdany_cast<std::vector<int>>(vv)[0] == 1);
|
|
|
|
// tests copy
|
|
RDAny vvv(vv);
|
|
|
|
REQUIRE(rdany_cast<std::vector<int>>(vvv)[0] == 1);
|
|
}
|
|
|
|
{
|
|
// Checks fallback to Any
|
|
std::vector<std::pair<int, int>> pvect;
|
|
pvect.push_back(std::make_pair<int, int>(2, 2));
|
|
std::any any1(pvect);
|
|
auto a1 = std::any_cast<std::vector<std::pair<int, int>>>(any1);
|
|
CHECK(a1.size() == pvect.size());
|
|
auto a2 = std::any_cast<std::vector<std::pair<int, int>> &>(any1);
|
|
CHECK(a2.size() == pvect.size());
|
|
auto a3 = std::any_cast<const std::vector<std::pair<int, int>> &>(any1);
|
|
CHECK(a3.size() == pvect.size());
|
|
|
|
RDAny vv(pvect);
|
|
auto &any = rdany_cast<std::any &>(vv);
|
|
auto a4 = std::any_cast<std::vector<std::pair<int, int>>>(any);
|
|
CHECK(a4.size() == pvect.size());
|
|
auto a5 = std::any_cast<std::vector<std::pair<int, int>> &>(any);
|
|
REQUIRE(a5.size() == pvect.size());
|
|
auto a6 = std::any_cast<const std::vector<std::pair<int, int>> &>(any);
|
|
REQUIRE(a6.size() == pvect.size());
|
|
|
|
const std::vector<std::pair<int, int>> &pv =
|
|
rdany_cast<std::vector<std::pair<int, int>>>(vv);
|
|
REQUIRE(pv[0].first == 2);
|
|
RDAny vvv(vv);
|
|
REQUIRE((rdany_cast<std::vector<std::pair<int, int>>>(vvv)[0].first == 2));
|
|
}
|
|
|
|
{
|
|
// Check pointers -- RDAny doesn't delete these, must do them manually
|
|
auto *p = new std::vector<int>();
|
|
p->push_back(100);
|
|
RDAny v(p);
|
|
RDAny vv(v);
|
|
REQUIRE_THROWS_AS(rdany_cast<std::vector<int>>(v), std::bad_any_cast);
|
|
|
|
REQUIRE((*rdany_cast<std::vector<int> *>(vv))[0] == 100);
|
|
REQUIRE((*rdany_cast<std::vector<int> *>((const RDAny &)vv))[0] == 100);
|
|
delete p;
|
|
|
|
auto *m = new std::map<int, int>();
|
|
(*m)[0] = 1;
|
|
RDAny mv(m);
|
|
// leaks
|
|
auto *anym = rdany_cast<std::map<int, int> *>(mv);
|
|
REQUIRE(anym->find(0) != anym->end());
|
|
delete anym;
|
|
}
|
|
|
|
{
|
|
// check shared ptrs -- std::any deletes these :)
|
|
typedef boost::shared_ptr<std::vector<int>> vptr;
|
|
vptr p(new std::vector<int>());
|
|
p->push_back(100);
|
|
RDAny v(p);
|
|
RDAny vv(v);
|
|
REQUIRE((*rdany_cast<vptr>(v))[0] == 100);
|
|
REQUIRE((*rdany_cast<vptr>(vv))[0] == 100);
|
|
REQUIRE((*rdany_cast<vptr>((const RDAny &)vv))[0] == 100);
|
|
|
|
typedef boost::shared_ptr<std::map<int, int>> mptr;
|
|
mptr m(new std::map<int, int>());
|
|
(*m)[0] = 1;
|
|
RDAny mv(m);
|
|
// leaks
|
|
mptr anym = rdany_cast<mptr>(mv);
|
|
REQUIRE(anym->find(0) != anym->end());
|
|
|
|
RDAny any3(boost::shared_ptr<Foo>(new Foo(1, 2.f)));
|
|
REQUIRE(any3.m_value.getTag() == RDTypeTag::AnyTag);
|
|
}
|
|
}
|
|
|
|
class DictCon {
|
|
public:
|
|
DictCon() { d.reset(); };
|
|
DictCon(const DictCon &other) { d = other.d; };
|
|
DictCon &operator=(const DictCon &other) {
|
|
d = other.d;
|
|
return *this;
|
|
};
|
|
Dict *getDict() { return &d; };
|
|
|
|
private:
|
|
Dict d;
|
|
};
|
|
|
|
TEST_CASE("testStringPickleRoundtrips") {
|
|
{
|
|
Dict d;
|
|
std::string sv;
|
|
sv = "1";
|
|
d.setVal("foo", sv);
|
|
int iv;
|
|
d.getVal("foo", iv);
|
|
REQUIRE(iv == 1);
|
|
}
|
|
{
|
|
Dict d;
|
|
d.setVal("foo", "1");
|
|
int iv;
|
|
d.getVal("foo", iv);
|
|
REQUIRE(iv == 1);
|
|
}
|
|
{
|
|
Dict d;
|
|
std::string sv;
|
|
sv = "1.3";
|
|
d.setVal("foo", sv);
|
|
double dv;
|
|
d.getVal("foo", dv);
|
|
REQUIRE(feq(dv, 1.3));
|
|
}
|
|
|
|
{
|
|
Dict d;
|
|
int iv = 1;
|
|
d.setVal("foo", iv);
|
|
std::string sv;
|
|
d.getVal("foo", sv);
|
|
REQUIRE(sv == "1");
|
|
sv = d.getVal<std::string>("foo");
|
|
REQUIRE(sv == "1");
|
|
}
|
|
}
|
|
|
|
TEST_CASE("testVectToString") {
|
|
{
|
|
Dict d;
|
|
std::vector<int> v;
|
|
v.push_back(1);
|
|
v.push_back(0);
|
|
d.setVal("foo", v);
|
|
std::string sv;
|
|
d.getVal("foo", sv);
|
|
REQUIRE(sv == "[1,0]");
|
|
}
|
|
{
|
|
Dict d;
|
|
std::vector<unsigned int> v;
|
|
v.push_back(1);
|
|
v.push_back(0);
|
|
d.setVal("foo", v);
|
|
std::string sv;
|
|
d.getVal("foo", sv);
|
|
REQUIRE(sv == "[1,0]");
|
|
sv = d.getVal<std::string>("foo");
|
|
REQUIRE(sv == "[1,0]");
|
|
}
|
|
{
|
|
Dict d;
|
|
std::vector<double> v;
|
|
v.push_back(1.2);
|
|
v.push_back(0);
|
|
d.setVal("foo", v);
|
|
std::string sv;
|
|
d.getVal("foo", sv);
|
|
REQUIRE(sv == "[1.2,0]");
|
|
sv = d.getVal<std::string>("foo");
|
|
REQUIRE(sv == "[1.2,0]");
|
|
}
|
|
{
|
|
Dict d;
|
|
std::vector<float> v;
|
|
v.push_back(10001.f);
|
|
v.push_back(0);
|
|
d.setVal("foo", v);
|
|
std::string sv;
|
|
d.getVal("foo", sv);
|
|
REQUIRE(sv == "[10001,0]");
|
|
sv = d.getVal<std::string>("foo");
|
|
REQUIRE(sv == "[10001,0]");
|
|
}
|
|
}
|
|
|
|
TEST_CASE("testConstReturns") {
|
|
{
|
|
std::string v = "foo";
|
|
RDAny anyv(v);
|
|
|
|
std::string tgt = rdany_cast<std::string>(anyv);
|
|
const std::string &ctgt = rdany_cast<std::string>(anyv);
|
|
REQUIRE(ctgt != "");
|
|
}
|
|
|
|
{
|
|
Dict d;
|
|
std::string v = "foo";
|
|
d.setVal("foo", v);
|
|
|
|
// const std::string nv=d.getVal<const std::string &>("foo");
|
|
std::string nv = d.getVal<std::string>("foo");
|
|
REQUIRE(nv == "foo");
|
|
}
|
|
|
|
{
|
|
// int nreps=100000000;
|
|
int nreps = 100000;
|
|
Dict d;
|
|
std::string v = "foo";
|
|
RDAny anyv(v);
|
|
d.setVal("foo", v);
|
|
|
|
std::clock_t start, end;
|
|
|
|
double ls = 0;
|
|
start = std::clock();
|
|
for (int i = 0; i < nreps; ++i) {
|
|
const std::string &nv = rdany_cast<std::string>(anyv);
|
|
ls += nv.size();
|
|
}
|
|
end = std::clock();
|
|
BOOST_LOG(rdErrorLog) << "done: "
|
|
<< (end - start) / (double)(CLOCKS_PER_SEC) << " "
|
|
<< ls << std::endl;
|
|
|
|
ls = 0;
|
|
start = std::clock();
|
|
for (int i = 0; i < nreps; ++i) {
|
|
std::string nv = rdany_cast<std::string>(anyv);
|
|
ls += nv.size();
|
|
}
|
|
end = std::clock();
|
|
BOOST_LOG(rdErrorLog) << "done: "
|
|
<< (end - start) / (double)(CLOCKS_PER_SEC) << " "
|
|
<< ls << std::endl;
|
|
|
|
ls = 0;
|
|
start = std::clock();
|
|
for (int i = 0; i < nreps; ++i) {
|
|
const std::string &nv = rdany_cast<std::string>(anyv);
|
|
ls += nv.size();
|
|
}
|
|
end = std::clock();
|
|
BOOST_LOG(rdErrorLog) << "done: "
|
|
<< (end - start) / (double)(CLOCKS_PER_SEC) << " "
|
|
<< ls << std::endl;
|
|
|
|
ls = 0;
|
|
start = std::clock();
|
|
for (int i = 0; i < nreps; ++i) {
|
|
const std::string &nv = d.getVal<std::string>("foo");
|
|
ls += nv.size();
|
|
}
|
|
end = std::clock();
|
|
BOOST_LOG(rdErrorLog) << "done: "
|
|
<< (end - start) / (double)(CLOCKS_PER_SEC) << " "
|
|
<< ls << std::endl;
|
|
|
|
ls = 0;
|
|
start = std::clock();
|
|
std::string k = "foo";
|
|
for (int i = 0; i < nreps; ++i) {
|
|
if (d.hasVal(k)) {
|
|
const std::string &nv = rdany_cast<std::string>(anyv);
|
|
ls += nv.size();
|
|
}
|
|
}
|
|
end = std::clock();
|
|
BOOST_LOG(rdErrorLog) << "done: "
|
|
<< (end - start) / (double)(CLOCKS_PER_SEC) << " "
|
|
<< ls << std::endl;
|
|
|
|
// std::string nv=d.getVal<std::string>("foo");
|
|
}
|
|
}
|
|
|
|
TEST_CASE("testUpdate") {
|
|
{
|
|
Dict d;
|
|
std::string sv;
|
|
sv = "1.3";
|
|
d.setVal("foo", sv);
|
|
double dv = 3.0;
|
|
d.setVal("foo2", dv);
|
|
std::vector<int> f;
|
|
f.push_back(1);
|
|
f.push_back(2);
|
|
d.setVal("foo3", f);
|
|
|
|
Dict d2;
|
|
d2.update(d);
|
|
REQUIRE(d.getVal<std::string>("foo") == d2.getVal<std::string>("foo"));
|
|
REQUIRE(d.getVal<double>("foo2") == d2.getVal<double>("foo2"));
|
|
REQUIRE(d.getVal<std::vector<int>>("foo3") ==
|
|
d2.getVal<std::vector<int>>("foo3"));
|
|
}
|
|
|
|
{ // a few tests to make sure copying/updating with nonPOD data is ok
|
|
Dict d;
|
|
std::string sv;
|
|
sv = "1.3";
|
|
d.setVal("foo", sv);
|
|
double dv = 3.0;
|
|
d.setVal("foo2", dv);
|
|
std::vector<int> f;
|
|
f.push_back(1);
|
|
f.push_back(2);
|
|
d.setVal("foo3", f);
|
|
{
|
|
Dict d2;
|
|
d2.setVal("foo", 1);
|
|
d2.update(d, true);
|
|
REQUIRE(d2.getVal<std::string>("foo") == "1.3");
|
|
REQUIRE(d.getVal<double>("foo2") == d2.getVal<double>("foo2"));
|
|
REQUIRE(d.getVal<std::vector<int>>("foo3") ==
|
|
d2.getVal<std::vector<int>>("foo3"));
|
|
}
|
|
|
|
{
|
|
Dict d2 = d;
|
|
d2.setVal("foo", 1);
|
|
REQUIRE(1 == d2.getVal<int>("foo"));
|
|
REQUIRE(d.getVal<double>("foo2") == d2.getVal<double>("foo2"));
|
|
REQUIRE(d.getVal<std::vector<int>>("foo3") ==
|
|
d2.getVal<std::vector<int>>("foo3"));
|
|
}
|
|
|
|
{
|
|
Dict d2(d);
|
|
REQUIRE(d.getVal<double>("foo2") == d2.getVal<double>("foo2"));
|
|
REQUIRE(d.getVal<std::vector<int>>("foo3") ==
|
|
d2.getVal<std::vector<int>>("foo3"));
|
|
}
|
|
}
|
|
}
|
|
|
|
class FooHandler : public CustomPropHandler {
|
|
public:
|
|
const char *getPropName() const override { return "Foo"; }
|
|
bool canSerialize(const RDValue &value) const override {
|
|
return rdvalue_is<Foo>(value);
|
|
}
|
|
bool read(std::istream &ss, RDValue &value) const override {
|
|
int version = 0;
|
|
streamRead(ss, version);
|
|
Foo f;
|
|
streamRead(ss, f.bar);
|
|
streamRead(ss, f.baz);
|
|
value = f;
|
|
return true;
|
|
}
|
|
|
|
bool write(std::ostream &ss, const RDValue &value) const override {
|
|
try {
|
|
const Foo &f = rdvalue_cast<const Foo &>(value);
|
|
const int version = 0;
|
|
streamWrite(ss, version);
|
|
streamWrite(ss, f.bar);
|
|
streamWrite(ss, f.baz);
|
|
} catch (std::bad_any_cast &) {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
CustomPropHandler *clone() const override { return new FooHandler; }
|
|
};
|
|
|
|
TEST_CASE("testCustomProps") {
|
|
Foo f(1, 2.f);
|
|
Dict d;
|
|
d.setVal<Foo>("foo", f);
|
|
const RDValue &value = d.getRDValue("foo");
|
|
FooHandler foo_handler;
|
|
std::vector<CustomPropHandler *> handlers = {&foo_handler,
|
|
foo_handler.clone()};
|
|
for (auto handler : handlers) {
|
|
REQUIRE(handler->canSerialize(value));
|
|
RDValue bad_value = 1;
|
|
REQUIRE(!handler->canSerialize(bad_value));
|
|
std::stringstream ss;
|
|
REQUIRE(handler->write(ss, value));
|
|
RDValue newValue;
|
|
REQUIRE(handler->read(ss, newValue));
|
|
REQUIRE(from_rdvalue<const Foo &>(newValue).bar == f.bar);
|
|
REQUIRE(from_rdvalue<const Foo &>(newValue).baz == f.baz);
|
|
newValue.destroy();
|
|
}
|
|
delete handlers[1];
|
|
}
|
|
|
|
struct Bar {
|
|
int x{0};
|
|
int *dtor_count{nullptr};
|
|
Bar() = default;
|
|
Bar(int x, int *count) : x(x), dtor_count(count) {}
|
|
Bar(const Bar &o) = default;
|
|
Bar &operator=(const Bar &) = default;
|
|
~Bar() {
|
|
if (dtor_count) {
|
|
++(*dtor_count);
|
|
}
|
|
}
|
|
};
|
|
|
|
TEST_CASE("custom AnyTag data is destroyed through Dict lifecycle") {
|
|
int count = 0;
|
|
{
|
|
Dict d;
|
|
Bar b(42, &count);
|
|
d.setVal<Bar>("mybar", b);
|
|
REQUIRE(d.getVal<Bar>("mybar").x == 42);
|
|
}
|
|
REQUIRE(count == 3);
|
|
|
|
count = 0;
|
|
{
|
|
Dict d;
|
|
Bar b(7, &count);
|
|
d.setVal<Bar>("mybar", b);
|
|
Dict d2(d);
|
|
REQUIRE(d2.getVal<Bar>("mybar").x == 7);
|
|
}
|
|
REQUIRE(count == 4);
|
|
}
|
|
|
|
TEST_CASE("testGithub2910") {
|
|
Dict d;
|
|
d.setVal("foo", 1.0);
|
|
d.clearVal("foo");
|
|
d.clearVal("bar");
|
|
d.clearVal("foo");
|
|
}
|
|
|
|
TEST_CASE("basics") {
|
|
Dict d;
|
|
INT_VECT fooV;
|
|
fooV.resize(3);
|
|
REQUIRE(!d.hasVal("foo"));
|
|
int x = 1;
|
|
d.setVal("foo", x);
|
|
REQUIRE(d.hasVal("foo"));
|
|
REQUIRE(!d.hasVal("bar"));
|
|
int v, v2;
|
|
d.getVal("foo", v);
|
|
REQUIRE(v == 1);
|
|
v2 = d.getVal<int>("foo");
|
|
REQUIRE(v2 == v);
|
|
d.setVal("bar", fooV);
|
|
d.getVal("foo", v);
|
|
REQUIRE(v == 1);
|
|
v2 = d.getVal<int>("foo");
|
|
REQUIRE(v2 == v);
|
|
INT_VECT fooV2, fooV3;
|
|
d.getVal("bar", fooV2);
|
|
fooV3 = d.getVal<INT_VECT>("bar");
|
|
REQUIRE(fooV == fooV2);
|
|
REQUIRE(fooV2 == fooV3);
|
|
|
|
VECT_INT_VECT fooV4;
|
|
fooV4.resize(3);
|
|
REQUIRE(!d.hasVal("baz"));
|
|
d.setVal("baz", fooV4);
|
|
REQUIRE(d.hasVal("baz"));
|
|
|
|
DictCon dc1;
|
|
REQUIRE(!dc1.getDict()->hasVal("foo"));
|
|
int y = 1;
|
|
dc1.getDict()->setVal("foo", y);
|
|
REQUIRE(dc1.getDict()->hasVal("foo"));
|
|
REQUIRE(!dc1.getDict()->hasVal("bar"));
|
|
dc1.getDict()->setVal("bar", fooV);
|
|
dc1.getDict()->getVal("foo", v);
|
|
REQUIRE(v == 1);
|
|
dc1.getDict()->getVal("bar", fooV2);
|
|
REQUIRE(fooV == fooV2);
|
|
fooV4.resize(3);
|
|
REQUIRE(!dc1.getDict()->hasVal("baz"));
|
|
dc1.getDict()->setVal("baz", fooV4);
|
|
REQUIRE(dc1.getDict()->hasVal("baz"));
|
|
|
|
dc1.getDict()->reset();
|
|
|
|
DictCon dc2 = dc1;
|
|
REQUIRE(!dc2.getDict()->hasVal("foo"));
|
|
int z = 1;
|
|
dc2.getDict()->setVal("foo", z);
|
|
REQUIRE(dc2.getDict()->hasVal("foo"));
|
|
REQUIRE(!dc2.getDict()->hasVal("bar"));
|
|
dc2.getDict()->setVal("bar", fooV);
|
|
dc2.getDict()->getVal("foo", v);
|
|
REQUIRE(v == 1);
|
|
dc2.getDict()->getVal("bar", fooV2);
|
|
REQUIRE(fooV == fooV2);
|
|
fooV4.resize(3);
|
|
REQUIRE(!dc2.getDict()->hasVal("baz"));
|
|
dc2.getDict()->setVal("baz", fooV4);
|
|
REQUIRE(dc2.getDict()->hasVal("baz"));
|
|
|
|
DictCon dc3(dc2);
|
|
REQUIRE(dc3.getDict()->hasVal("foo"));
|
|
dc3.getDict()->getVal("foo", v);
|
|
REQUIRE(v == 1);
|
|
dc3.getDict()->getVal("bar", fooV2);
|
|
REQUIRE(fooV == fooV2);
|
|
fooV4.resize(3);
|
|
REQUIRE(dc3.getDict()->hasVal("baz"));
|
|
|
|
REQUIRE(dc3.getDict()->hasVal("foo"));
|
|
dc3.getDict()->getVal("foo", v);
|
|
REQUIRE(v == 1);
|
|
dc3.getDict()->getVal("bar", fooV2);
|
|
REQUIRE(fooV == fooV2);
|
|
fooV4.resize(3);
|
|
REQUIRE(dc3.getDict()->hasVal("baz"));
|
|
}
|