[#1423] Addressed comments

diff --git a/src/bin/d2/tests/parser_unittest.cc b/src/bin/d2/tests/parser_unittest.cc
index d6b8c58ab4c36bf031ddb9084a5cd29b3556ca91..d44fe8057d8968bfcfd5081c089686afb1ea9427 100644 (file)
--- a/src/bin/d2/tests/parser_unittest.cc
+++ b/src/bin/d2/tests/parser_unittest.cc
@@ -12,6 +12,7 @@
 #include <testutils/user_context_utils.h>
 #include <gtest/gtest.h>
 #include <fstream>
+#include <set>
 
 #include "test_data_files_config.h"
 

diff --git a/src/bin/d2/tests/parser_unittest.h b/src/bin/d2/tests/parser_unittest.h
index 7b22c9d0703210ad7c3684dff0a251060eacaba2..bcefcb788f9291c3a54a1330ff2dc64e624d0f1d 100644 (file)
--- a/src/bin/d2/tests/parser_unittest.h
+++ b/src/bin/d2/tests/parser_unittest.h
@@ -10,7 +10,6 @@
 #include <gtest/gtest.h>
 #include <cc/data.h>
 #include <d2/parser_context.h>
-#include <set>
 
 using namespace isc::data;
 using namespace std;

diff --git a/src/bin/dhcp4/tests/parser_unittest.cc b/src/bin/dhcp4/tests/parser_unittest.cc
index e620fbbc7ff4898e4c44a4e0fdfde0cda4703c83..159a21606667abf080e4faa20f07f0a67603d916 100644 (file)
--- a/src/bin/dhcp4/tests/parser_unittest.cc
+++ b/src/bin/dhcp4/tests/parser_unittest.cc
@@ -695,7 +695,7 @@ void loadFile(const string& fname, ElementPtr list) {
     list->add(json);
 }
 
-// This test checks that all map entries are in the all-keys file.
+// This test checks that all map entries are in the example files.
 TEST(ParserTest, mapEntries) {
     // Type of keyword set.
     typedef set<string> KeywordSet;
@@ -731,7 +731,7 @@ TEST(ParserTest, mapEntries) {
     }
     syntax_file.close();
 
-    // Get keywords from the all-keys and reservations file
+    // Get keywords from the example files.
     string sample_dir(CFG_EXAMPLES);
     sample_dir += "/";
     ElementPtr sample_json = Element::createList();

diff --git a/src/bin/dhcp6/tests/parser_unittest.cc b/src/bin/dhcp6/tests/parser_unittest.cc
index 79b6f2766e09901b630333fd926b794464767f8e..e9b9a0787ae54a919706b5db1f006f883b922782 100644 (file)
--- a/src/bin/dhcp6/tests/parser_unittest.cc
+++ b/src/bin/dhcp6/tests/parser_unittest.cc
@@ -684,7 +684,7 @@ void loadFile(const string& fname, ElementPtr list) {
     list->add(json);
 }
 
-// This test checks that all map entries are in the all-keys file.
+// This test checks that all map entries are in the example files.
 TEST(ParserTest, mapEntries) {
     // Type of keyword set.
     typedef set<string> KeywordSet;
@@ -729,7 +729,7 @@ TEST(ParserTest, mapEntries) {
     loadFile(sample_dir + "duid.json", sample_json);
     loadFile(sample_dir + "reservations.json", sample_json);
     KeywordSet sample_keys = {
-        "hosts-database",
+        "hosts-database"
     };
     // Recursively extract keywords.
     static void (*extract)(ConstElementPtr, KeywordSet&) =