mirror of
https://github.com/rdkit/rdkit.git
synced 2026-06-07 22:44:25 +08:00
555ab6f1fe
* some initial work... Still some real questions here about what should be done with dp_mol data members * add some tests for move semantics of Dict and Props remove extraneous clear() * more in-depth testing of the molecule results * test refactoring * improve the molecule move test * fix some leaks found by valgrind the new tests are now all clean in valgrind * additional classes QueryAtom, QueryBond, RingInfo, Conformer * get swig working again. Not sure why this is necessary, but SWIG is a mysterious beast * fixes in response to review * updates in response to review
72 lines
2.0 KiB
C++
72 lines
2.0 KiB
C++
//
|
|
// Copyright (C) 2021 Greg Landrum
|
|
//
|
|
// @@ 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 <string>
|
|
#include "catch.hpp"
|
|
#include "Dict.h"
|
|
#include "RDProps.h"
|
|
using namespace std::string_literals;
|
|
|
|
TEST_CASE("Dict move semantics") {
|
|
RDKit::Dict d1;
|
|
d1.setVal("foo"s, 1);
|
|
d1.setVal("bar"s, "yep");
|
|
SECTION("move constructor") {
|
|
CHECK(d1.hasVal("foo"s));
|
|
CHECK(d1.hasVal("bar"s));
|
|
CHECK(d1.getVal<std::string>("bar"s) == "yep"s);
|
|
auto d2 = std::move(d1);
|
|
CHECK(d2.hasVal("foo"s));
|
|
CHECK(d2.hasVal("bar"s));
|
|
CHECK(d2.getVal<std::string>("bar"s) == "yep"s);
|
|
CHECK(!d1.hasVal("foo"s));
|
|
CHECK(!d1.hasVal("bar"s));
|
|
}
|
|
SECTION("move assignment") {
|
|
CHECK(d1.hasVal("foo"s));
|
|
CHECK(d1.hasVal("bar"s));
|
|
CHECK(d1.getVal<std::string>("bar"s) == "yep"s);
|
|
RDKit::Dict d2;
|
|
d2 = std::move(d1);
|
|
CHECK(d2.hasVal("foo"s));
|
|
CHECK(d2.hasVal("bar"s));
|
|
CHECK(d2.getVal<std::string>("bar"s) == "yep"s);
|
|
CHECK(!d1.hasVal("foo"s));
|
|
CHECK(!d1.hasVal("bar"s));
|
|
}
|
|
}
|
|
|
|
TEST_CASE("RDProps move semantics") {
|
|
RDKit::RDProps d1;
|
|
d1.setProp("foo"s, 1);
|
|
d1.setProp("bar"s, "yep");
|
|
SECTION("move constructor") {
|
|
CHECK(d1.hasProp("foo"s));
|
|
CHECK(d1.hasProp("bar"s));
|
|
CHECK(d1.getProp<std::string>("bar"s) == "yep"s);
|
|
auto d2 = std::move(d1);
|
|
CHECK(d2.hasProp("foo"s));
|
|
CHECK(d2.hasProp("bar"s));
|
|
CHECK(d2.getProp<std::string>("bar"s) == "yep"s);
|
|
CHECK(!d1.hasProp("foo"s));
|
|
CHECK(!d1.hasProp("bar"s));
|
|
}
|
|
SECTION("move assignment") {
|
|
CHECK(d1.hasProp("foo"s));
|
|
CHECK(d1.hasProp("bar"s));
|
|
CHECK(d1.getProp<std::string>("bar"s) == "yep"s);
|
|
RDKit::RDProps d2;
|
|
d2 = std::move(d1);
|
|
CHECK(d2.hasProp("foo"s));
|
|
CHECK(d2.hasProp("bar"s));
|
|
CHECK(d2.getProp<std::string>("bar"s) == "yep"s);
|
|
CHECK(!d1.hasProp("foo"s));
|
|
CHECK(!d1.hasProp("bar"s));
|
|
}
|
|
} |