summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/core/ManagedContainersTest.cpp80
-rw-r--r--test/core/NodeTest.cpp2
-rw-r--r--test/core/common/VariantTest.cpp4
-rw-r--r--test/core/managed/ManagedContainerTest.cpp275
-rw-r--r--test/core/managed/ManagedTest.cpp123
-rw-r--r--test/core/managed/ManagerTest.cpp (renamed from test/core/ManagedTest.cpp)178
-rw-r--r--test/core/managed/TestManaged.hpp (renamed from test/core/TestManaged.hpp)2
7 files changed, 530 insertions, 134 deletions
diff --git a/test/core/ManagedContainersTest.cpp b/test/core/ManagedContainersTest.cpp
deleted file mode 100644
index 3abbd4d..0000000
--- a/test/core/ManagedContainersTest.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- Ousía
- Copyright (C) 2014, 2015 Benjamin Paaßen, Andreas Stöckel
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <array>
-
-#include <gtest/gtest.h>
-
-#include <core/Managed.hpp>
-#include <core/ManagedContainers.hpp>
-
-#include "TestManaged.hpp"
-
-namespace ousia {
-
-TEST(ManagedVector, managedVector)
-{
- // TODO: This test is highly incomplete
-
- constexpr int nElem = 16;
- std::array<bool, nElem> a;
-
- Manager mgr(1);
- {
- Rooted<Managed> root{new Managed{mgr}};
-
- std::vector<TestManaged*> elems;
- for (int i = 0; i < nElem; i++) {
- elems.push_back(new TestManaged{mgr, a[i]});
- }
-
- for (bool v : a) {
- ASSERT_TRUE(v);
- }
-
- ManagedVector<TestManaged> v(root, elems);
-
- // Remove the last element from the list. It should be garbage collected.
- v.pop_back();
- ASSERT_FALSE(a[nElem - 1]);
-
- // Insert a new element into the list.
- v.push_back(new TestManaged{mgr, a[nElem - 1]});
- ASSERT_TRUE(a[nElem - 1]);
-
- // Erase element 10
- {
- auto it = v.find(elems[10]);
- ASSERT_TRUE(it != v.end());
- v.erase(it);
- ASSERT_FALSE(a[10]);
- }
-
- // Erase element 3 - 5
- v.erase(v.find(elems[3]), v.find(elems[5]));
- ASSERT_FALSE(a[3] || a[4]);
- ASSERT_TRUE(a[5]);
- }
-
- for (bool v : a) {
- ASSERT_FALSE(v);
- }
-}
-
-}
-
diff --git a/test/core/NodeTest.cpp b/test/core/NodeTest.cpp
index 182dfdd..334fcc8 100644
--- a/test/core/NodeTest.cpp
+++ b/test/core/NodeTest.cpp
@@ -18,7 +18,7 @@
#include <gtest/gtest.h>
-#include <core/Managed.hpp>
+#include <core/managed/Managed.hpp>
#include <core/Node.hpp>
diff --git a/test/core/common/VariantTest.cpp b/test/core/common/VariantTest.cpp
index 580846e..673a89a 100644
--- a/test/core/common/VariantTest.cpp
+++ b/test/core/common/VariantTest.cpp
@@ -102,7 +102,7 @@ TEST(Variant, stringValue)
TEST(Variant, arrayValue)
{
const Variant v{{"test1", 42}};
- ASSERT_EQ(2, v.asArray().size());
+ ASSERT_EQ(2U, v.asArray().size());
ASSERT_EQ("test1", v.asArray()[0].asString());
ASSERT_EQ(42, v.asArray()[1].asInt());
}
@@ -112,7 +112,7 @@ TEST(Variant, mapValue)
const Variant v{{{"key1", "entry1"}, {"key2", "entry2"}}};
auto map = v.asMap();
- ASSERT_EQ(2, map.size());
+ ASSERT_EQ(2U, map.size());
ASSERT_EQ("entry1", map.find("key1")->second.asString());
ASSERT_EQ("entry2", map.find("key2")->second.asString());
diff --git a/test/core/managed/ManagedContainerTest.cpp b/test/core/managed/ManagedContainerTest.cpp
new file mode 100644
index 0000000..a2f7aa6
--- /dev/null
+++ b/test/core/managed/ManagedContainerTest.cpp
@@ -0,0 +1,275 @@
+/*
+ Ousía
+ Copyright (C) 2014, 2015 Benjamin Paaßen, Andreas Stöckel
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <array>
+
+#include <gtest/gtest.h>
+
+#include <core/managed/Managed.hpp>
+#include <core/managed/ManagedContainer.hpp>
+
+#include "TestManaged.hpp"
+
+namespace ousia {
+
+TEST(ManagedVector, managedVector)
+{
+ // TODO: This test is highly incomplete
+
+ constexpr int nElem = 16;
+ std::array<bool, nElem> a;
+
+ Manager mgr(1);
+ {
+ Rooted<Managed> root{new Managed{mgr}};
+
+ std::vector<TestManaged*> elems;
+ for (int i = 0; i < nElem; i++) {
+ elems.push_back(new TestManaged{mgr, a[i]});
+ }
+
+ for (bool v : a) {
+ ASSERT_TRUE(v);
+ }
+
+ ManagedVector<TestManaged> v(root, elems.begin(), elems.end());
+
+ // Remove the last element from the list. It should be garbage collected.
+ v.pop_back();
+ ASSERT_FALSE(a[nElem - 1]);
+
+ // Insert a new element into the list.
+ v.push_back(new TestManaged{mgr, a[nElem - 1]});
+ ASSERT_TRUE(a[nElem - 1]);
+
+ // Erase element 10
+ {
+ auto it = v.find(elems[10]);
+ ASSERT_TRUE(it != v.end());
+ v.erase(it);
+ ASSERT_FALSE(a[10]);
+ }
+
+ // Erase element 3 - 5
+ v.erase(v.find(elems[3]), v.find(elems[5]));
+ ASSERT_FALSE(a[3] || a[4]);
+ ASSERT_TRUE(a[5]);
+
+ {
+ // Copy the managed vector to another managed vector
+ ManagedVector<TestManaged> v2(v);
+ v2.push_back(new TestManaged{mgr, a[3]});
+ ASSERT_TRUE(a[3]);
+ }
+ ASSERT_FALSE(a[3]);
+ ASSERT_TRUE(a[5]);
+ }
+
+ for (bool v : a) {
+ ASSERT_FALSE(v);
+ }
+}
+
+
+TEST(ManagedVector, moveAssignment)
+{
+ constexpr int nElem = 16;
+ std::array<bool, nElem> a;
+
+ Manager mgr(1);
+ {
+ Rooted<Managed> root{new Managed{mgr}};
+ ManagedVector<TestManaged> v1(root);
+ {
+ ManagedVector<TestManaged> v2(root);
+
+ for (int i = 0; i < nElem; i++) {
+ v2.push_back(new TestManaged{mgr, a[i]});
+ }
+ for (bool v : a) {
+ ASSERT_TRUE(v);
+ }
+
+ v1 = std::move(v2);
+ ASSERT_EQ(nullptr, v2.getOwner());
+ }
+ for (bool v : a) {
+ ASSERT_TRUE(v);
+ }
+ }
+
+ for (bool v : a) {
+ ASSERT_FALSE(v);
+ }
+}
+
+TEST(ManagedVector, copyAssignment)
+{
+ constexpr int nElem = 16;
+ std::array<bool, nElem> a;
+
+ Manager mgr(1);
+ {
+ Rooted<Managed> root{new Managed{mgr}};
+ ManagedVector<TestManaged> v1(root);
+ {
+ ManagedVector<TestManaged> v2(root);
+
+ for (int i = 0; i < nElem; i++) {
+ v2.push_back(new TestManaged{mgr, a[i]});
+ }
+ for (bool v : a) {
+ ASSERT_TRUE(v);
+ }
+
+ v1 = v2;
+ ASSERT_TRUE(v1 == v2);
+ }
+ for (bool v : a) {
+ ASSERT_TRUE(v);
+ }
+ }
+
+ for (bool v : a) {
+ ASSERT_FALSE(v);
+ }
+}
+
+TEST(ManagedVector, copyWithNewOwner)
+{
+ constexpr int nElem = 16;
+ std::array<bool, nElem> a;
+
+ Manager mgr(1);
+ {
+ Rooted<Managed> root{new Managed{mgr}};
+ ManagedVector<TestManaged> v1(root);
+ {
+ Rooted<Managed> root2{new Managed{mgr}};
+ ManagedVector<TestManaged> v2(root2);
+
+ for (int i = 0; i < nElem; i++) {
+ v2.push_back(new TestManaged{mgr, a[i]});
+ }
+ for (bool v : a) {
+ ASSERT_TRUE(v);
+ }
+
+ ManagedVector<TestManaged> v3{root, v2};
+ v1 = std::move(v3);
+ ASSERT_EQ(nullptr, v3.getOwner());
+ ASSERT_TRUE(v1 != v2);
+ }
+ for (bool v : a) {
+ ASSERT_TRUE(v);
+ }
+ }
+
+ for (bool v : a) {
+ ASSERT_FALSE(v);
+ }
+}
+
+TEST(ManagedVector, moveWithNewOwner)
+{
+ constexpr int nElem = 16;
+ std::array<bool, nElem> a;
+
+ Manager mgr(1);
+ {
+ Rooted<Managed> root{new Managed{mgr}};
+ ManagedVector<TestManaged> v1(root);
+ {
+ Rooted<Managed> root2{new Managed{mgr}};
+ ManagedVector<TestManaged> v2(root2);
+
+ for (int i = 0; i < nElem; i++) {
+ v2.push_back(new TestManaged{mgr, a[i]});
+ }
+ for (bool v : a) {
+ ASSERT_TRUE(v);
+ }
+
+ ManagedVector<TestManaged> v3{root, std::move(v2)};
+ v1 = std::move(v3);
+ ASSERT_EQ(nullptr, v2.getOwner());
+ ASSERT_EQ(nullptr, v3.getOwner());
+ }
+ for (bool v : a) {
+ ASSERT_TRUE(v);
+ }
+ }
+
+ for (bool v : a) {
+ ASSERT_FALSE(v);
+ }
+}
+
+TEST(ManagedMap, managedMap)
+{
+ // TODO: This test is highly incomplete
+
+ constexpr int nElem = 16;
+ std::array<bool, nElem> a;
+
+ Manager mgr(1);
+ {
+ Rooted<Managed> root{new Managed{mgr}};
+
+ std::map<int, TestManaged*> elems;
+ for (int i = 0; i < nElem; i++) {
+ elems.insert(std::make_pair(i, new TestManaged{mgr, a[i]}));
+ }
+
+ for (bool v : a) {
+ ASSERT_TRUE(v);
+ }
+
+ ManagedMap<int, TestManaged> m(root, elems.begin(), elems.end());
+
+ // Remove the entry with the number 4
+ m.erase(m.find(10));
+ ASSERT_FALSE(a[10]);
+
+ // Insert a new element
+ m.insert(std::make_pair(nElem + 1, new TestManaged{mgr, a[10]}));
+ ASSERT_TRUE(a[10]);
+
+ // Erase element 3 - 5
+ m.erase(m.find(3), m.find(5));
+ ASSERT_FALSE(a[3] || a[4]);
+ ASSERT_TRUE(a[5]);
+
+ {
+ // Copy the managed map to another managed map vector
+ ManagedMap<int, TestManaged> m2(m);
+ m2.insert(std::make_pair(3, new TestManaged{mgr, a[3]}));
+ ASSERT_TRUE(a[3]);
+ }
+ ASSERT_FALSE(a[3]);
+ ASSERT_TRUE(a[5]);
+ }
+
+ for (bool v : a) {
+ ASSERT_FALSE(v);
+ }
+}
+
+
+}
+
diff --git a/test/core/managed/ManagedTest.cpp b/test/core/managed/ManagedTest.cpp
new file mode 100644
index 0000000..f196770
--- /dev/null
+++ b/test/core/managed/ManagedTest.cpp
@@ -0,0 +1,123 @@
+/*
+ Ousía
+ Copyright (C) 2014, 2015 Benjamin Paaßen, Andreas Stöckel
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <gtest/gtest.h>
+
+#include <core/managed/Managed.hpp>
+
+#include "TestManaged.hpp"
+
+namespace ousia {
+
+TEST(Managed, data)
+{
+ Manager mgr{1};
+
+ Rooted<Managed> n{new Managed{mgr}};
+
+ Rooted<Managed> m1{new Managed{mgr}};
+ n->storeData("info", m1);
+ ASSERT_TRUE(n->hasDataKey("info"));
+ ASSERT_FALSE(n->hasDataKey("test"));
+
+ Rooted<Managed> m2{new Managed{mgr}};
+ n->storeData("test", m2);
+ ASSERT_TRUE(n->hasDataKey("info"));
+ ASSERT_TRUE(n->hasDataKey("test"));
+
+ ASSERT_TRUE(n->deleteData("info"));
+ ASSERT_FALSE(n->deleteData("info"));
+ ASSERT_FALSE(n->hasDataKey("info"));
+ ASSERT_TRUE(n->hasDataKey("test"));
+
+ n->storeData("info2", m1);
+
+ std::map<std::string, Rooted<Managed>> m = n->readData();
+ ASSERT_TRUE(m.find("info2") != m.end());
+ ASSERT_TRUE(m.find("test") != m.end());
+
+ ASSERT_EQ(m1, m.find("info2")->second);
+ ASSERT_EQ(m2, m.find("test")->second);
+}
+
+class TypeTestManaged1 : public Managed {
+ using Managed::Managed;
+};
+
+class TypeTestManaged2 : public Managed {
+ using Managed::Managed;
+};
+
+class TypeTestManaged3 : public Managed {
+ using Managed::Managed;
+};
+
+class TypeTestManaged4 : public Managed {
+ using Managed::Managed;
+};
+
+class TypeTestManaged5 : public Managed {
+ using Managed::Managed;
+};
+
+ManagedType Type1("Type1", typeid(TypeTestManaged1));
+ManagedType Type2("Type2", typeid(TypeTestManaged2));
+ManagedType Type3("Type3", typeid(TypeTestManaged3), {&Type1});
+ManagedType Type4("Type2", typeid(TypeTestManaged4), {&Type3, &Type2});
+
+TEST(ManagedType, isa)
+{
+ ASSERT_TRUE(Type1.isa(Type1));
+ ASSERT_FALSE(Type1.isa(Type2));
+ ASSERT_FALSE(Type1.isa(Type3));
+ ASSERT_FALSE(Type1.isa(Type4));
+
+ ASSERT_FALSE(Type2.isa(Type1));
+ ASSERT_TRUE(Type2.isa(Type2));
+ ASSERT_FALSE(Type2.isa(Type3));
+ ASSERT_FALSE(Type2.isa(Type4));
+
+ ASSERT_TRUE(Type3.isa(Type1));
+ ASSERT_FALSE(Type3.isa(Type2));
+ ASSERT_TRUE(Type3.isa(Type3));
+ ASSERT_FALSE(Type3.isa(Type4));
+
+ ASSERT_TRUE(Type4.isa(Type1));
+ ASSERT_TRUE(Type4.isa(Type2));
+ ASSERT_TRUE(Type4.isa(Type3));
+ ASSERT_TRUE(Type4.isa(Type4));
+}
+
+TEST(Managed, type)
+{
+ Manager mgr(1);
+
+ Rooted<TypeTestManaged1> m1{new TypeTestManaged1(mgr)};
+ Rooted<TypeTestManaged2> m2{new TypeTestManaged2(mgr)};
+ Rooted<TypeTestManaged3> m3{new TypeTestManaged3(mgr)};
+ Rooted<TypeTestManaged4> m4{new TypeTestManaged4(mgr)};
+ Rooted<TypeTestManaged5> m5{new TypeTestManaged5(mgr)};
+
+ ASSERT_EQ(&Type1, &m1->type());
+ ASSERT_EQ(&Type2, &m2->type());
+ ASSERT_EQ(&Type3, &m3->type());
+ ASSERT_EQ(&Type4, &m4->type());
+ ASSERT_EQ(&ManagedType::None, &m5->type());
+}
+}
+
diff --git a/test/core/ManagedTest.cpp b/test/core/managed/ManagerTest.cpp
index ab60f04..f597af7 100644
--- a/test/core/ManagedTest.cpp
+++ b/test/core/managed/ManagerTest.cpp
@@ -22,7 +22,7 @@
#include <gtest/gtest.h>
-#include <core/Managed.hpp>
+#include <core/managed/Managed.hpp>
#include "TestManaged.hpp"
@@ -30,128 +30,171 @@ namespace ousia {
/* Class ObjectDescriptor */
+class TestObjectDescriptor : public Manager::ObjectDescriptor {
+public:
+ int refInCount() const
+ {
+ int res = 0;
+ for (const auto &e : refIn) {
+ res += e.second;
+ }
+ return res + rootRefCount;
+ }
+
+ int refOutCount() const
+ {
+ int res = 0;
+ for (const auto &e : refOut) {
+ res += e.second;
+ }
+ return res;
+ }
+
+ int refInCount(Managed *o) const
+ {
+ if (o == nullptr) {
+ return rootRefCount;
+ }
+
+ const auto it = refIn.find(o);
+ if (it != refIn.cend()) {
+ return it->second;
+ }
+ return 0;
+ }
+
+ int refOutCount(Managed *o) const
+ {
+ const auto it = refOut.find(o);
+ if (it != refOut.cend()) {
+ return it->second;
+ }
+ return 0;
+ }
+};
+
TEST(ObjectDescriptor, degree)
{
// Do not use actual Managed in this test -- we don't want to test their
// behaviour
- ObjectDescriptor nd;
+ TestObjectDescriptor nd;
Managed *n1 = reinterpret_cast<Managed *>(intptr_t{0x10});
Managed *n2 = reinterpret_cast<Managed *>(intptr_t{0x20});
// Input degree
- ASSERT_EQ(0, nd.refIn.size());
+ ASSERT_EQ(0U, nd.refIn.size());
ASSERT_EQ(0, nd.refInCount(n1));
- nd.incrDegree(RefDir::IN, n1);
+ nd.incrDegree(Manager::RefDir::IN, n1);
ASSERT_EQ(1, nd.refInCount());
ASSERT_EQ(1, nd.refInCount(n1));
ASSERT_EQ(0, nd.refInCount(n2));
- ASSERT_EQ(1, nd.refIn.size());
+ ASSERT_EQ(1U, nd.refIn.size());
- nd.incrDegree(RefDir::IN, n1);
+ nd.incrDegree(Manager::RefDir::IN, n1);
ASSERT_EQ(2, nd.refInCount());
ASSERT_EQ(2, nd.refInCount(n1));
ASSERT_EQ(0, nd.refInCount(n2));
- ASSERT_EQ(1, nd.refIn.size());
+ ASSERT_EQ(1U, nd.refIn.size());
- nd.incrDegree(RefDir::IN, n2);
+ nd.incrDegree(Manager::RefDir::IN, n2);
ASSERT_EQ(3, nd.refInCount());
ASSERT_EQ(2, nd.refInCount(n1));
ASSERT_EQ(1, nd.refInCount(n2));
- ASSERT_EQ(2, nd.refIn.size());
+ ASSERT_EQ(2U, nd.refIn.size());
- nd.incrDegree(RefDir::IN, nullptr);
+ nd.incrDegree(Manager::RefDir::IN, nullptr);
ASSERT_EQ(4, nd.refInCount());
ASSERT_EQ(2, nd.refInCount(n1));
ASSERT_EQ(1, nd.refInCount(n2));
- ASSERT_EQ(2, nd.refIn.size());
+ ASSERT_EQ(2U, nd.refIn.size());
- ASSERT_TRUE(nd.decrDegree(RefDir::IN, n1));
+ ASSERT_TRUE(nd.decrDegree(Manager::RefDir::IN, n1));
ASSERT_EQ(3, nd.refInCount());
ASSERT_EQ(1, nd.refInCount(n1));
ASSERT_EQ(1, nd.refInCount(n2));
- ASSERT_EQ(2, nd.refIn.size());
+ ASSERT_EQ(2U, nd.refIn.size());
- ASSERT_TRUE(nd.decrDegree(RefDir::IN, n1));
+ ASSERT_TRUE(nd.decrDegree(Manager::RefDir::IN, n1));
ASSERT_EQ(2, nd.refInCount());
ASSERT_EQ(0, nd.refInCount(n1));
ASSERT_EQ(1, nd.refInCount(n2));
- ASSERT_EQ(1, nd.refIn.size());
+ ASSERT_EQ(1U, nd.refIn.size());
- ASSERT_TRUE(nd.decrDegree(RefDir::IN, n2));
+ ASSERT_TRUE(nd.decrDegree(Manager::RefDir::IN, n2));
ASSERT_EQ(1, nd.refInCount());
ASSERT_EQ(0, nd.refInCount(n1));
ASSERT_EQ(0, nd.refInCount(n2));
- ASSERT_EQ(0, nd.refIn.size());
+ ASSERT_EQ(0U, nd.refIn.size());
- ASSERT_TRUE(nd.decrDegree(RefDir::IN, nullptr));
+ ASSERT_TRUE(nd.decrDegree(Manager::RefDir::IN, nullptr));
ASSERT_EQ(0, nd.refInCount());
ASSERT_EQ(0, nd.refInCount(n1));
ASSERT_EQ(0, nd.refInCount(n2));
- ASSERT_EQ(0, nd.refIn.size());
+ ASSERT_EQ(0U, nd.refIn.size());
// Output degree
- ASSERT_EQ(0, nd.refOut.size());
+ ASSERT_EQ(0U, nd.refOut.size());
ASSERT_EQ(0, nd.refOutCount(n1));
- nd.incrDegree(RefDir::OUT, n1);
+ nd.incrDegree(Manager::RefDir::OUT, n1);
ASSERT_EQ(1, nd.refOutCount());
ASSERT_EQ(1, nd.refOutCount(n1));
ASSERT_EQ(0, nd.refOutCount(n2));
- ASSERT_EQ(1, nd.refOut.size());
+ ASSERT_EQ(1U, nd.refOut.size());
- nd.incrDegree(RefDir::OUT, n1);
+ nd.incrDegree(Manager::RefDir::OUT, n1);
ASSERT_EQ(2, nd.refOutCount());
ASSERT_EQ(2, nd.refOutCount(n1));
ASSERT_EQ(0, nd.refOutCount(n2));
- ASSERT_EQ(1, nd.refOut.size());
+ ASSERT_EQ(1U, nd.refOut.size());
- nd.incrDegree(RefDir::OUT, n2);
+ nd.incrDegree(Manager::RefDir::OUT, n2);
ASSERT_EQ(3, nd.refOutCount());
ASSERT_EQ(2, nd.refOutCount(n1));
ASSERT_EQ(1, nd.refOutCount(n2));
- ASSERT_EQ(2, nd.refOut.size());
+ ASSERT_EQ(2U, nd.refOut.size());
- nd.incrDegree(RefDir::OUT, nullptr);
+ nd.incrDegree(Manager::RefDir::OUT, nullptr);
ASSERT_EQ(3, nd.refOutCount());
ASSERT_EQ(2, nd.refOutCount(n1));
ASSERT_EQ(1, nd.refOutCount(n2));
- ASSERT_EQ(2, nd.refOut.size());
+ ASSERT_EQ(2U, nd.refOut.size());
- ASSERT_TRUE(nd.decrDegree(RefDir::OUT, n1));
+ ASSERT_TRUE(nd.decrDegree(Manager::RefDir::OUT, n1));
ASSERT_EQ(2, nd.refOutCount());
ASSERT_EQ(1, nd.refOutCount(n1));
ASSERT_EQ(1, nd.refOutCount(n2));
- ASSERT_EQ(2, nd.refOut.size());
+ ASSERT_EQ(2U, nd.refOut.size());
- ASSERT_TRUE(nd.decrDegree(RefDir::OUT, n1));
+ ASSERT_TRUE(nd.decrDegree(Manager::RefDir::OUT, n1));
ASSERT_EQ(1, nd.refOutCount());
ASSERT_EQ(0, nd.refOutCount(n1));
ASSERT_EQ(1, nd.refOutCount(n2));
- ASSERT_EQ(1, nd.refOut.size());
+ ASSERT_EQ(1U, nd.refOut.size());
- ASSERT_TRUE(nd.decrDegree(RefDir::OUT, n2));
+ ASSERT_TRUE(nd.decrDegree(Manager::RefDir::OUT, n2));
ASSERT_EQ(0, nd.refOutCount());
ASSERT_EQ(0, nd.refOutCount(n1));
ASSERT_EQ(0, nd.refOutCount(n2));
- ASSERT_EQ(0, nd.refOut.size());
+ ASSERT_EQ(0U, nd.refOut.size());
- ASSERT_TRUE(nd.decrDegree(RefDir::OUT, nullptr));
+ ASSERT_TRUE(nd.decrDegree(Manager::RefDir::OUT, nullptr));
ASSERT_EQ(0, nd.refOutCount());
ASSERT_EQ(0, nd.refOutCount(n1));
ASSERT_EQ(0, nd.refOutCount(n2));
- ASSERT_EQ(0, nd.refOut.size());
+ ASSERT_EQ(0U, nd.refOut.size());
}
TEST(ObjectDescriptor, rootRefCount)
{
- ObjectDescriptor nd;
+ TestObjectDescriptor nd;
ASSERT_EQ(0, nd.rootRefCount);
- nd.incrDegree(RefDir::IN, nullptr);
+ nd.incrDegree(Manager::RefDir::IN, nullptr);
ASSERT_EQ(1, nd.rootRefCount);
- nd.incrDegree(RefDir::OUT, nullptr);
+ nd.incrDegree(Manager::RefDir::OUT, nullptr);
ASSERT_EQ(2, nd.rootRefCount);
ASSERT_EQ(2, nd.refInCount(nullptr));
@@ -159,13 +202,13 @@ TEST(ObjectDescriptor, rootRefCount)
ASSERT_EQ(0, nd.refOutCount(nullptr));
ASSERT_EQ(0, nd.refOutCount());
- ASSERT_TRUE(nd.decrDegree(RefDir::OUT, nullptr));
+ ASSERT_TRUE(nd.decrDegree(Manager::RefDir::OUT, nullptr));
ASSERT_EQ(1, nd.rootRefCount);
- ASSERT_TRUE(nd.decrDegree(RefDir::IN, nullptr));
+ ASSERT_TRUE(nd.decrDegree(Manager::RefDir::IN, nullptr));
ASSERT_EQ(0, nd.rootRefCount);
- ASSERT_FALSE(nd.decrDegree(RefDir::IN, nullptr));
+ ASSERT_FALSE(nd.decrDegree(Manager::RefDir::IN, nullptr));
ASSERT_EQ(0, nd.rootRefCount);
}
@@ -436,7 +479,7 @@ TEST(Manager, disconnectDoubleRootedSubgraph)
}
Rooted<TestManaged> createFullyConnectedGraph(Manager &mgr, int nElem,
- bool alive[])
+ bool alive[])
{
std::vector<Rooted<TestManaged>> nodes;
@@ -474,18 +517,13 @@ TEST(Manager, fullyConnectedGraph)
}
class HidingTestManaged : public TestManaged {
-
private:
Rooted<Managed> hidden;
public:
+ HidingTestManaged(Manager &mgr, bool &alive) : TestManaged(mgr, alive){};
- HidingTestManaged(Manager &mgr, bool &alive) : TestManaged(mgr, alive) {};
-
- void setHiddenRef(Handle<Managed> t) {
- hidden = t;
- }
-
+ void setHiddenRef(Handle<Managed> t) { hidden = t; }
};
TEST(Manager, hiddenRootedGraph)
@@ -511,5 +549,45 @@ TEST(Manager, hiddenRootedGraph)
}
}
+TEST(Manager, storeData)
+{
+ Manager mgr(1);
+
+ std::array<bool, 5> a;
+
+ {
+ Rooted<TestManaged> n{new TestManaged{mgr, a[0]}};
+
+ mgr.storeData(n.get(), "key1", new TestManaged{mgr, a[1]});
+
+ Managed *m2 = new TestManaged{mgr, a[2]};
+ mgr.storeData(n.get(), "key2", m2);
+
+ ASSERT_TRUE(a[0] && a[1] && a[2]);
+
+ ASSERT_TRUE(mgr.deleteData(n.get(), "key1"));
+ ASSERT_FALSE(a[1]);
+ ASSERT_FALSE(mgr.deleteData(n.get(), "key1"));
+
+ mgr.storeData(n.get(), "key1", new TestManaged{mgr, a[3]});
+ ASSERT_TRUE(a[3]);
+
+ Managed *m = new TestManaged{mgr, a[4]};
+ mgr.storeData(n.get(), "key1", m);
+ ASSERT_FALSE(a[3]);
+ ASSERT_TRUE(a[4]);
+
+ ASSERT_EQ(m, mgr.readData(n.get(), "key1"));
+ ASSERT_EQ(m2, mgr.readData(n.get(), "key2"));
+
+ auto map = mgr.readData(n.get());
+ ASSERT_EQ(2U, map.size());
+ ASSERT_TRUE(map.find("key1") != map.end());
+ ASSERT_TRUE(map.find("key2") != map.end());
+ }
+
+ ASSERT_FALSE(a[0] || a[1] || a[2] || a[3] || a[4]);
+}
+
}
diff --git a/test/core/TestManaged.hpp b/test/core/managed/TestManaged.hpp
index 3b93e51..ed51c3b 100644
--- a/test/core/TestManaged.hpp
+++ b/test/core/managed/TestManaged.hpp
@@ -19,7 +19,7 @@
#ifndef _TEST_MANAGED_H_
#define _TEST_MANAGED_H_
-#include <core/Managed.hpp>
+#include <core/managed/Managed.hpp>
namespace ousia {
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-01 09:13:14 +0000