Skip to content

Commit b577fcc

Browse files
MorganCaronMorganCaron
committed
Container/MeshNetwork: Fix NodePtr naming
1 parent a58e26c commit b577fcc

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎modules/Container/MeshNetwork.mpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ export namespace CppUtils::Container
9898
class MeshNodePtr final
9999
{
100100
public:
101-
using NodePtr = NetworkPtr<MeshNode<Key, Value>>;
102-
using SharedPtr = NodePtr::SharedPtr;
101+
using NetworkPtr = NetworkPtr<MeshNode<Key, Value>>;
102+
using SharedPtr = NetworkPtr::SharedPtr;
103103

104104
class Branch final
105105
{
@@ -155,12 +155,12 @@ export namespace CppUtils::Container
155155

156156
[[nodiscard]] static auto makeRoot(auto&&... args) -> MeshNodePtr
157157
{
158-
return MeshNodePtr{NodePtr::makeRoot(std::forward<decltype(args)>(args)...)};
158+
return MeshNodePtr{NetworkPtr::makeRoot(std::forward<decltype(args)>(args)...)};
159159
}
160160

161161
[[nodiscard]] static auto make(auto&&... args) -> MeshNodePtr
162162
{
163-
return MeshNodePtr{NodePtr::make(std::forward<decltype(args)>(args)...)};
163+
return MeshNodePtr{NetworkPtr::make(std::forward<decltype(args)>(args)...)};
164164
}
165165

166166
MeshNodePtr(const SharedPtr& node): m_node(node) {}

‎tests/Container/MeshNetwork.mpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export namespace CppUtils::UnitTest::Container::MeshNetwork
88
inline auto _ = TestSuite{"Container/MeshNetwork", {"Container/NetworkPtr"}, [](auto& suite) {
99
using Logger = CppUtils::Logger<"CppUtils">;
1010
using StringMeshNode = CppUtils::Container::MeshNodePtr<std::string, std::string>;
11-
using Node = StringMeshNode::NodePtr::Value;
11+
using Node = StringMeshNode::NetworkPtr::Value;
1212

1313
suite.addTest("Initialization", [&] {
1414
auto _ = StringMeshNode::make("banana");
@@ -47,7 +47,7 @@ export namespace CppUtils::UnitTest::Container::MeshNetwork
4747
const auto& fruits = fruitBranches.at("Elements");
4848
suite.expectEqual(std::size(fruits), 1uz);
4949
{
50-
auto apple = StringMeshNode::NodePtr::SharedPtr{fruits[0]};
50+
auto apple = StringMeshNode::NetworkPtr::SharedPtr{fruits[0]};
5151
auto appleAccessor = apple->sharedAccess();
5252
const auto& value = appleAccessor->value.value;
5353
Logger::print("{}\n", value);
@@ -69,14 +69,14 @@ export namespace CppUtils::UnitTest::Container::MeshNetwork
6969
const auto& fruits = fruitBranches.at("Elements");
7070
suite.expectEqual(std::size(fruits), 2uz);
7171
{
72-
auto apple = StringMeshNode::NodePtr::SharedPtr{fruits[0]};
72+
auto apple = StringMeshNode::NetworkPtr::SharedPtr{fruits[0]};
7373
auto appleAccessor = apple->sharedAccess();
7474
const auto& value = appleAccessor->value.value;
7575
Logger::print("{}\n", value);
7676
suite.expectEqual(value, "apple");
7777
}
7878
{
79-
auto banana = StringMeshNode::NodePtr::SharedPtr{fruits[1]};
79+
auto banana = StringMeshNode::NetworkPtr::SharedPtr{fruits[1]};
8080
auto bananaAccessor = banana->sharedAccess();
8181
const auto& value = bananaAccessor->value.value;
8282
Logger::print("{}\n", value);
@@ -93,7 +93,7 @@ export namespace CppUtils::UnitTest::Container::MeshNetwork
9393
const auto& fruits = fruitBranches.at("Elements");
9494
suite.expectEqual(std::size(fruits), 1uz);
9595
{
96-
auto banana = StringMeshNode::NodePtr::SharedPtr{fruits[0]};
96+
auto banana = StringMeshNode::NetworkPtr::SharedPtr{fruits[0]};
9797
auto bananaAccessor = banana->sharedAccess();
9898
const auto& value = bananaAccessor->value.value;
9999
Logger::print("{}\n", value);
@@ -124,14 +124,14 @@ export namespace CppUtils::UnitTest::Container::MeshNetwork
124124
const auto& fruits = fruitBranches.at("Elements");
125125
suite.expectEqual(std::size(fruits), 2uz);
126126
{
127-
auto apple = StringMeshNode::NodePtr::SharedPtr{fruits[0]};
127+
auto apple = StringMeshNode::NetworkPtr::SharedPtr{fruits[0]};
128128
auto appleAccessor = apple->sharedAccess();
129129
const auto& value = appleAccessor->value.value;
130130
Logger::print("{}\n", value);
131131
suite.expectEqual(value, "apple");
132132
}
133133
{
134-
auto banana = StringMeshNode::NodePtr::SharedPtr{fruits[1]};
134+
auto banana = StringMeshNode::NetworkPtr::SharedPtr{fruits[1]};
135135
auto bananaAccessor = banana->sharedAccess();
136136
const auto& value = bananaAccessor->value.value;
137137
Logger::print("{}\n", value);
@@ -193,7 +193,7 @@ export namespace CppUtils::UnitTest::Container::MeshNetwork
193193
const auto& fruitBranches = fruitAccessor->value.branches;
194194
const auto& fruits = fruitBranches.at("Elements");
195195
suite.expectEqual(std::size(fruits), 1uz);
196-
auto firstFruit = StringMeshNode::NodePtr::SharedPtr{fruits[0]};
196+
auto firstFruit = StringMeshNode::NetworkPtr::SharedPtr{fruits[0]};
197197
auto appleAccessor = firstFruit->sharedAccess();
198198
const auto& appleName = appleAccessor->value.value;
199199
const auto& fruitName = fruitAccessor->value.value;
@@ -206,7 +206,7 @@ export namespace CppUtils::UnitTest::Container::MeshNetwork
206206
const auto& appleBranches = appleAccessor->value.branches;
207207
const auto& appleCategories = appleBranches.at("Categories");
208208
suite.expect(std::size(appleCategories) == 1);
209-
auto firstCategory = StringMeshNode::NodePtr::SharedPtr{appleCategories[0]};
209+
auto firstCategory = StringMeshNode::NetworkPtr::SharedPtr{appleCategories[0]};
210210
auto fruitAccessor = firstCategory->sharedAccess();
211211
const auto& appleName = appleAccessor->value.value;
212212
const auto& fruitName = fruitAccessor->value.value;
@@ -225,7 +225,7 @@ export namespace CppUtils::UnitTest::Container::MeshNetwork
225225
const auto& fruitBranches = fruitAccessor->value.branches;
226226
const auto& fruits = fruitBranches.at("Elements");
227227
suite.expectEqual(std::size(fruits), 1uz);
228-
auto firstFruit = StringMeshNode::NodePtr::SharedPtr{fruits[0]};
228+
auto firstFruit = StringMeshNode::NetworkPtr::SharedPtr{fruits[0]};
229229
auto appleAccessor = firstFruit->sharedAccess();
230230
const auto& appleName = appleAccessor->value.value;
231231
const auto& fruitName = fruitAccessor->value.value;
@@ -238,7 +238,7 @@ export namespace CppUtils::UnitTest::Container::MeshNetwork
238238
const auto& appleBranches = appleAccessor->value.branches;
239239
const auto& appleCategories = appleBranches.at("Categories");
240240
suite.expect(std::size(appleCategories) == 1);
241-
auto firstCategory = StringMeshNode::NodePtr::SharedPtr{appleCategories[0]};
241+
auto firstCategory = StringMeshNode::NetworkPtr::SharedPtr{appleCategories[0]};
242242
auto fruitAccessor = firstCategory->sharedAccess();
243243
const auto& appleName = appleAccessor->value.value;
244244
const auto& fruitName = fruitAccessor->value.value;
@@ -274,19 +274,19 @@ export namespace CppUtils::UnitTest::Container::MeshNetwork
274274
const auto& fruitBranches = fruitAccessor->value.branches;
275275
for (const auto& weakFruit : fruitBranches.at("Elements"))
276276
{
277-
auto fruit = StringMeshNode::NodePtr::SharedPtr{weakFruit};
277+
auto fruit = StringMeshNode::NetworkPtr::SharedPtr{weakFruit};
278278
auto fruitAccessor = fruit->sharedAccess();
279279
const auto& fruitBranches = fruitAccessor->value.branches;
280280

281281
const auto& fruitCategories = fruitBranches.at("Categories");
282282
suite.expect(std::size(fruitCategories) == 1);
283-
auto fruitCategory = StringMeshNode::NodePtr::SharedPtr{fruitCategories[0]};
283+
auto fruitCategory = StringMeshNode::NetworkPtr::SharedPtr{fruitCategories[0]};
284284
auto fruitCategoryAccessor = fruitCategory->sharedAccess();
285285
suite.expectEqual(fruitCategoryAccessor->value.value, "fruit");
286286

287287
const auto& colors = fruitBranches.at("Colors");
288288
suite.expect(std::size(colors) == 1);
289-
auto color = StringMeshNode::NodePtr::SharedPtr{colors[0]};
289+
auto color = StringMeshNode::NetworkPtr::SharedPtr{colors[0]};
290290
auto colorAccessor = color->sharedAccess();
291291

292292
Logger::print("{} is a {} {}\n", fruitAccessor->value.value, colorAccessor->value.value, fruitCategoryAccessor->value.value);

0 commit comments

Comments
 (0)