done

Author: root

source/parser/config_reader/config_node_.cpp

@@ -33,7 +33,7 @@ std::runtime_error ConfigNode::create_parsing_error(
     return std::runtime_error(ss.str());
 }
 
-const std::optional<std::string>& ConfigNode::get_path_node() {
+const std::optional<std::string>& ConfigNode::get_path_node() const{
     return m_path_node;
 }
 
@@ -129,7 +129,10 @@ ConfigNode::Iterator ConfigNode::end() const { return Iterator(m_node.end(), thi
 
 ConfigNodeExpected ConfigNode::operator[](std::string_view key) const {
     const YAML::Node child_node = m_node[key];
-    const std::string current_path = m_path_node.value() + "\\" + std::string(key);
+    std::string current_path = std::string(key);
+    if (m_path_node.has_value()){
+        current_path = m_path_node.value() + "\\" + std::string(key);
+    }
     if (!child_node) {
         std::stringstream ss;
         ss << "Key error: node " << *this << "which is located by path:" << current_path << ":\n";
@@ -146,7 +149,7 @@ ConfigNodeExpected ConfigNode::operator[](std::string_view key) const {
 };
 
 ConfigNode load_file(std::filesystem::path path) {
-    return ConfigNode(YAML::LoadFile(path.string()), path.string());
+    return ConfigNode(YAML::LoadFile(path.string()), std::nullopt, path.string());
 }
 
 }  // namespace sim

source/parser/config_reader/config_node_.hpp

@@ -30,7 +30,7 @@ class ConfigNode {
     [[nodiscard]] std::runtime_error create_parsing_error(
         std::string_view error) const;
 
-    const std::optional<std::string>& get_path_node();
+    const std::optional<std::string>& get_path_node() const;
 
     friend std::ostream& operator<<(std::ostream& out, const ConfigNode& node);
 
@@ -98,7 +98,7 @@ class ConfigNode {
 
     const std::optional<std::string> m_name;
 
-    std::optional<std::string> m_path_node;
+    mutable std::optional<std::string> m_path_node;
 };
 
 ConfigNode load_file(std::filesystem::path path);

source/parser/config_reader/config_node_with_preset_.cpp

@@ -84,6 +84,10 @@ std::ostream& operator<<(std::ostream& out, const ConfigNodeWithPreset& node) {
     return out << node.get_node();
 }
 
+const std::optional<std::string>& ConfigNodeWithPreset::get_path_node() const{
+    return m_node.get_path_node();
+}
+
 const std::string& ConfigNodeWithPreset::get_name_or_throw() const {
     return m_node.get_name_or_throw();
 }

source/parser/config_reader/config_node_with_preset_.hpp

@@ -36,6 +36,8 @@ class ConfigNodeWithPreset {
         return as<T>().value_or_throw();
     }
 
+    const std::optional<std::string>& get_path_node() const;
+
     [[nodiscard]] const std::string& get_name_or_throw() const;
 
     const std::optional<ConfigNode> get_presets_node() const noexcept;

test/parser/topology/check_paths.cpp

@@ -1,5 +1,3 @@
-#pragma once
-
 #include <gtest/gtest.h>
 
 #include "parser/config_reader/config_node_with_preset.hpp"
@@ -16,9 +14,9 @@ TEST(PathConfigNode, InsertedPath){
 )");
     ConfigNode node(root, std::nullopt, "root");
     auto a = node["a"].value();
-    auto b = node["b"].value();
-    auto c = node["c"].value();
-    ASSERT_EQ(a.get_path_node(), "root\\a");
+    auto b = a["b"].value();
+    auto c = b["c"].value();
+
     ASSERT_EQ(b.get_path_node(), "root\\a\\b");
     ASSERT_EQ(c.get_path_node(), "root\\a\\b\\c");
 }
@@ -27,9 +25,36 @@ TEST(PathConfigNode, MissingKey){
     std::filesystem::path bus_topology_path =
         std::filesystem::path(__FILE__).parent_path() /
         "bus_network.yml";
-    ConfigNode node = load_file(path);
-    auto result = node["connection-1->1"].value();
-    ASSERT_EQ(result.get_path_node(), bus_topology_path.string() + "connections\\connection-1->1");
+    ConfigNode node = load_file(bus_topology_path);
+    auto result = node["connections"]["connection-1->1"].value();
+
+    ASSERT_EQ(result.get_path_node(), bus_topology_path.string() + "\\connections\\connection-1->1");
+}
+
+TEST(PathConfigNodeWithPreset, InsertedPath){
+    YAML::Node root = YAML::Load(R"(
+a:
+  b:
+    c: 1
+)");
+    ConfigNode tmp(root, std::nullopt, "root");
+    ConfigNodeWithPreset node(tmp);
+    auto a = node["a"].value();
+    auto b = a["b"].value();
+    auto c = b["c"].value();
+
+    ASSERT_EQ(b.get_path_node(), "root\\a\\b");
+    ASSERT_EQ(c.get_path_node(), "root\\a\\b\\c");
+}
+
+TEST(PathConfigNodeWithPreset, MissingKey){
+    std::filesystem::path bus_topology_path =
+        std::filesystem::path(__FILE__).parent_path() /
+        "bus_network.yml";
+    ConfigNodeWithPreset node = load_file_with_presets(bus_topology_path);
+    auto result = node["connections"]["connection-1->1"].value();
+
+    ASSERT_EQ(result.get_path_node(), bus_topology_path.string() + "\\connections\\connection-1->1");
 }
 
 }