a typedef for returning "tree of data"
I'm working on adding support for RPCs, and that function requires
passing a tree of input data, and returning another tree of data. Given
that getItems()'s return value is quite similar (and something that's
widely supported through the code), let's requse this type for RPC I/O
as well.
I took care to only use this typedef at places where we have already
been dealing with tree data. This means that tests for, say,
leaf_editing were not changed because it's "something else than a
datastore". Coincidentally, the other use of the same structure is for
defining list keys, see I2c978762d3a78286b4f7fb97e16118772ddeb7bc.
Change-Id: I2a01cc6f8c6624e673eab43bc642c16d2bcfe2d7
diff --git a/tests/datastore_access.cpp b/tests/datastore_access.cpp
index 535abdc..ff29594 100644
--- a/tests/datastore_access.cpp
+++ b/tests/datastore_access.cpp
@@ -25,7 +25,7 @@
};
namespace std {
-std::ostream& operator<<(std::ostream& s, const std::map<std::string, leaf_data_> map)
+std::ostream& operator<<(std::ostream& s, const DatastoreAccess::Tree& map)
{
s << std::endl
<< "{";
@@ -183,7 +183,7 @@
datastore.commitChanges();
}
- std::map<std::string, leaf_data_> expected{{"/example-schema:down", bool{true}}};
+ DatastoreAccess::Tree expected{{"/example-schema:down", bool{true}}};
REQUIRE(datastore.getItems("/example-schema:down") == expected);
}
@@ -197,7 +197,7 @@
datastore.commitChanges();
}
- std::map<std::string, leaf_data_> expected{{"/example-schema:down", bool{false}},
+ DatastoreAccess::Tree expected{{"/example-schema:down", bool{false}},
// Sysrepo always returns containers when getting values, but
// libnetconf does not. This is fine by the YANG standard:
// https://tools.ietf.org/html/rfc7950#section-7.5.7 Furthermore,
@@ -220,7 +220,7 @@
datastore.setLeaf("/example-schema:leafEnum", enum_{"lol"});
datastore.commitChanges();
}
- std::map<std::string, leaf_data_> expected{{"/example-schema:leafEnum", enum_{"lol"}}};
+ DatastoreAccess::Tree expected{{"/example-schema:leafEnum", enum_{"lol"}}};
REQUIRE(datastore.getItems("/example-schema:leafEnum") == expected);
}
@@ -239,7 +239,7 @@
datastore.createListInstance("/example-schema:person[name='Petr']");
datastore.commitChanges();
}
- std::map<std::string, leaf_data_> expected{
+ DatastoreAccess::Tree expected{
{"/example-schema:person[name='Jan']", special_{SpecialValue::List}},
{"/example-schema:person[name='Jan']/name", std::string{"Jan"}},
{"/example-schema:person[name='Michal']", special_{SpecialValue::List}},