From: Francis Dupont <fdupont@isc.org>
Date: Tue, 23 Oct 2018 20:05:14 +0000 (+0200)
Subject: [65-libyang-testutils] Cosmetics (trailing dots) and a '>>'
X-Git-Tag: 65-libyang-clean-keatext_base~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89dad52a118e17b601fe9ced49c56950fb69b3f9;p=thirdparty%2Fkea.git

[65-libyang-testutils] Cosmetics (trailing dots) and a '>>'
---

diff --git a/src/lib/yang/tests/adaptor_config_unittests.cc b/src/lib/yang/tests/adaptor_config_unittests.cc
index 6a86b0ad33..6f1eb9017e 100644
--- a/src/lib/yang/tests/adaptor_config_unittests.cc
+++ b/src/lib/yang/tests/adaptor_config_unittests.cc
@@ -82,7 +82,7 @@ TEST_F(AdaptorConfigTest, loadExamples4) {
                                "with-ddns.json" };
 
     ElementPtr x;
-    
+
     for (int i = 0; i<configs.size(); i++) {
         x.reset();
         testFile(string(CFG_EXAMPLES) + "/kea4/" + configs[i], false, x);
@@ -113,7 +113,7 @@ TEST_F(AdaptorConfigTest, loadExamples6) {
                                "stateless.json",
                                "with-ddns.json" };
     ElementPtr x;
-    
+
     for (int i = 0; i<configs.size(); i++) {
         x.reset();
         testFile(string(CFG_EXAMPLES) + "/kea6/" + configs[i], true, x);
diff --git a/src/lib/yang/tests/translator_utils_unittests.cc b/src/lib/yang/tests/translator_utils_unittests.cc
index 103f1f6b6d..cea5081d12 100644
--- a/src/lib/yang/tests/translator_utils_unittests.cc
+++ b/src/lib/yang/tests/translator_utils_unittests.cc
@@ -202,13 +202,12 @@ TEST(YangReprTest, setTest) {
     EXPECT_TRUE(repr.verify(testTree, sess, cerr));
 }
 
-
 /// @brief Tests specified configuration.
 ///
 /// Configuration is set and then verified using YangRepr object.
 ///
-/// @param model name of the model to be verified against
-/// @param tree tree to be verified
+/// @param model name of the model to be verified against.
+/// @param tree tree to be verified.
 void sanityCheckConfig(const std::string& model, const YRTree& tree) {
     // Get a translator object to play with.
     S_Connection conn(new Connection("utils unittests"));
@@ -225,8 +224,8 @@ void sanityCheckConfig(const std::string& model, const YRTree& tree) {
     EXPECT_TRUE(result);
 }
 
-// This is test environment sanity check. It verifies that every configuration
-// defined in yang_configs.h is sane.
+// This is test environment sanity check. It verifies that all configuration
+// defined in yang_configs.h are sane.
 TEST(YangReprTest, verifyConfigs) {
     for (auto x : test_configs) {
         cout << "Testing tree for model " << x.first << endl;
@@ -234,5 +233,4 @@ TEST(YangReprTest, verifyConfigs) {
     }
 }
 
-
 }; // end of anonymous namespace
diff --git a/src/lib/yang/tests/yang_configs.h b/src/lib/yang/tests/yang_configs.h
index 91cd3ae862..0720077b8b 100644
--- a/src/lib/yang/tests/yang_configs.h
+++ b/src/lib/yang/tests/yang_configs.h
@@ -442,20 +442,19 @@ const YRTree designExampleTree = {
       "disabled", SR_ENUM_T, true }
 };
 
-/// @brief Set of example configurations
-const std::vector<std::pair<std::string, YRTree>> test_configs =
+/// @brief Set of example configurations.
+const std::vector<std::pair<std::string, YRTree> > test_configs =
 {
-    { exampleModel, exampleTree },
-    { testModel, testTree },
-    { subnetTwoPoolsModelIetf6, subnetTwoPoolsTreeIetf6 },
-    { subnetTimersModel, subnetTimersIetf6 },
-    { validModelIetf6, validTreeIetf6 },
-    { subnetOptionsModelKeaDhcp4, subnetOptionsTreeKeaDhcp4 },
-    { subnetOptionsModelKeaDhcp6, subnetOptionsTreeKeaDhcp6 },
-    { designExampleModel, designExampleTree }
+    { exampleModel,                exampleTree },
+    { testModel,                   testTree },
+    { subnetTwoPoolsModelIetf6,    subnetTwoPoolsTreeIetf6 },
+    { subnetTimersModel,           subnetTimersIetf6 },
+    { validModelIetf6,             validTreeIetf6 },
+    { subnetOptionsModelKeaDhcp4,  subnetOptionsTreeKeaDhcp4 },
+    { subnetOptionsModelKeaDhcp6,  subnetOptionsTreeKeaDhcp6 },
+    { designExampleModel,          designExampleTree }
 };
 
-
 }; // end of namespace isc::yang::test
 }; // end of namespace isc::yang
 }; // end of namespace isc
diff --git a/src/lib/yang/testutils/translator_test.h b/src/lib/yang/testutils/translator_test.h
index 0cb5f8b1a9..11352865fe 100644
--- a/src/lib/yang/testutils/translator_test.h
+++ b/src/lib/yang/testutils/translator_test.h
@@ -41,11 +41,11 @@ public:
             : xpath_(xpath), value_(value), type_(type), settable_(settable) {
         }
 
-        /// @brief Retrieves configuration parameter from sysrepo
+        /// @brief Retrieves configuration parameter from sysrepo.
         ///
-        /// @param xpath The xpath of an element to be retrieved
+        /// @param xpath The xpath of an element to be retrieved.
         /// @param session Sysrepo session.
-        /// @return YangReprItem instance representing configuration parameter
+        /// @return YangReprItem instance representing configuration parameter.
         static YangReprItem get(const std::string& xpath, S_Session session);
 
         /// @brief The xpath.
@@ -62,8 +62,8 @@ public:
 
         /// @brief The equal operator ignoring settable.
         ///
-        /// @param other the other object to compare with
-        /// @return true if equal
+        /// @param other the other object to compare with.
+        /// @return true if equal.
         bool operator==(const YangReprItem& other) const {
             return ((xpath_ == other.xpath_) &&
                     (value_ == other.value_) &&
@@ -72,8 +72,8 @@ public:
 
         /// @brief The unequal operator ignoring settable.
         ///
-        /// @param other the other object to compare with
-        /// @return false if equal
+        /// @param other the other object to compare with.
+        /// @return false if equal.
         bool operator!=(const YangReprItem& other) const {
             return (!(*this == other));
         }
@@ -92,7 +92,7 @@ public:
     /// @param expected The expected value.
     /// @param session Sysrepo session.
     /// @param errs Error stream.
-    /// @return true if verification succeeds, false with errors displayed
+    /// @return true if verification succeeds, false with errors displayed.
     /// on errs if it fails.
     bool verify(const Tree& expected, S_Session session,
                 std::ostream& errs) const;