[#3578] addressed review comments

Author: Razvan Becheriu

src/bin/dhcp4/tests/config_parser_unittest.cc

@@ -6,24 +6,24 @@
 
 #include <config.h>
 
+#include <asiolink/addr_utilities.h>
 #include <cc/command_interpreter.h>
 #include <config/http_command_config.h>
+#include <dhcp/classify.h>
 #include <dhcp/docsis3_option_defs.h>
-#include <dhcp/libdhcp++.h>
 #include <dhcp/iface_mgr.h>
+#include <dhcp/libdhcp++.h>
+#include <dhcp/option4_addrlst.h>
 #include <dhcp/option_custom.h>
 #include <dhcp/option_int.h>
-#include <dhcp/option4_addrlst.h>
-#include <dhcp/classify.h>
 #include <dhcp/testutils/iface_mgr_test_config.h>
-#include <dhcp4/json_config_parser.h>
-#include <dhcp4/dhcp4_srv.h>
 #include <dhcp4/ctrl_dhcp4_srv.h>
-#include <asiolink/addr_utilities.h>
-#include <dhcpsrv/cfgmgr.h>
+#include <dhcp4/dhcp4_srv.h>
+#include <dhcp4/json_config_parser.h>
 #include <dhcpsrv/cfg_expiration.h>
 #include <dhcpsrv/cfg_hosts.h>
 #include <dhcpsrv/cfg_subnets4.h>
+#include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/parsers/simple_parser4.h>
 #include <dhcpsrv/subnet.h>
 #include <dhcpsrv/subnet_selector.h>
@@ -37,25 +37,23 @@
 #include <testutils/test_to_element.h>
 #include <util/chrono_time_utils.h>
 #include <util/doubles.h>
-#include "marker_file.h"
-#include "test_data_files_config.h"
-#include "test_libraries.h"
-#include "dhcp4_test_utils.h"
-#include "get_config_unittest.h"
-#include <gtest/gtest.h>
 
-#include <boost/foreach.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <fstream>
+
 #include <iostream>
 #include <sstream>
 #include <string>
 #include <vector>
 
 #include <arpa/inet.h>
-#include <limits.h>
+#include <gtest/gtest.h>
 #include <unistd.h>
 
+#include "dhcp4_test_utils.h"
+#include "get_config_unittest.h"
+#include "marker_file.h"
+#include "test_libraries.h"
+
 using namespace isc;
 using namespace isc::asiolink;
 using namespace isc::config;
@@ -374,7 +372,7 @@ class Dhcp4ParserTest : public LogContentTest {
     void configure(std::string config, int expected_code,
                    std::string exp_error = "") {
         ConstElementPtr json;
-        ASSERT_NO_THROW(json = parseDHCP4(config, true));
+        ASSERT_NO_THROW_LOG(json = parseDHCP4(config, true));
 
         ConstElementPtr status;
         EXPECT_NO_THROW(status = Dhcpv4SrvTest::configure(*srv_, json));
@@ -3843,15 +3841,15 @@ TEST_F(Dhcp4ParserTest, optionCodeNegative) {
 
 // Verify that out of bounds option code is rejected in the configuration.
 TEST_F(Dhcp4ParserTest, optionCodeNonUint8) {
-    // The valid option codes are uint16_t values so passing
-    // uint16_t maximum value incremented by 1 should result
+    // The valid option codes are uint8_t values so passing
+    // uint8_t maximum value incremented by 1 should result
     // in failure.
     testInvalidOptionParam("257", "code");
 }
 
 // Verify that out of bounds option code is rejected in the configuration.
 TEST_F(Dhcp4ParserTest, optionCodeHighNonUint8) {
-    // Another check for uint16_t overflow but this time
+    // Another check for uint8_t overflow but this time
     // let's pass even greater option code value.
     testInvalidOptionParam("500", "code");
 }

src/bin/dhcp4/tests/get_config_unittest.cc

@@ -9,25 +9,24 @@
 #include <cc/command_interpreter.h>
 #include <cc/data.h>
 #include <cc/simple_parser.h>
-#include <cc/cfg_to_element.h>
-#include <testutils/user_context_utils.h>
 #include <dhcp/testutils/iface_mgr_test_config.h>
-#include <dhcpsrv/cfgmgr.h>
-#include <dhcpsrv/parsers/simple_parser4.h>
-#include <dhcp4/dhcp4_srv.h>
 #include <dhcp4/ctrl_dhcp4_srv.h>
+#include <dhcp4/dhcp4_srv.h>
 #include <dhcp4/json_config_parser.h>
 #include <dhcp4/tests/dhcp4_test_utils.h>
 #include <dhcp4/tests/get_config_unittest.h>
+#include <dhcpsrv/cfgmgr.h>
 #include <testutils/gtest_utils.h>
-
-#include <boost/algorithm/string.hpp>
-#include <gtest/gtest.h>
+#include <testutils/user_context_utils.h>
 
 #include <iostream>
-#include <string>
-#include <sstream>
 #include <list>
+#include <sstream>
+#include <string>
+
+#include <boost/algorithm/string.hpp>
+
+#include <gtest/gtest.h>
 
 using namespace isc::config;
 using namespace isc::data;

src/bin/dhcp4/tests/get_config_unittest.cc.skel

@@ -9,25 +9,24 @@
 #include <cc/command_interpreter.h>
 #include <cc/data.h>
 #include <cc/simple_parser.h>
-#include <cc/cfg_to_element.h>
-#include <testutils/user_context_utils.h>
 #include <dhcp/testutils/iface_mgr_test_config.h>
-#include <dhcpsrv/cfgmgr.h>
-#include <dhcpsrv/parsers/simple_parser4.h>
-#include <dhcp4/dhcp4_srv.h>
 #include <dhcp4/ctrl_dhcp4_srv.h>
+#include <dhcp4/dhcp4_srv.h>
 #include <dhcp4/json_config_parser.h>
 #include <dhcp4/tests/dhcp4_test_utils.h>
 #include <dhcp4/tests/get_config_unittest.h>
+#include <dhcpsrv/cfgmgr.h>
 #include <testutils/gtest_utils.h>
-
-#include <boost/algorithm/string.hpp>
-#include <gtest/gtest.h>
+#include <testutils/user_context_utils.h>
 
 #include <iostream>
-#include <string>
-#include <sstream>
 #include <list>
+#include <sstream>
+#include <string>
+
+#include <boost/algorithm/string.hpp>
+
+#include <gtest/gtest.h>
 
 using namespace isc::config;
 using namespace isc::data;

src/bin/dhcp6/tests/config_parser_unittest.cc

@@ -6,25 +6,25 @@
 
 #include <config.h>
 
+#include <asiolink/addr_utilities.h>
 #include <cc/command_interpreter.h>
 #include <config/http_command_config.h>
+#include <dhcp/classify.h>
 #include <dhcp/docsis3_option_defs.h>
+#include <dhcp/iface_mgr.h>
 #include <dhcp/libdhcp++.h>
+#include <dhcp/option6_addrlst.h>
 #include <dhcp/option6_ia.h>
-#include <dhcp/iface_mgr.h>
 #include <dhcp/option_custom.h>
 #include <dhcp/option_int.h>
-#include <dhcp/option6_addrlst.h>
-#include <dhcp/classify.h>
 #include <dhcp/testutils/iface_mgr_test_config.h>
-#include <dhcp6/json_config_parser.h>
-#include <dhcp6/dhcp6_srv.h>
 #include <dhcp6/ctrl_dhcp6_srv.h>
-#include <asiolink/addr_utilities.h>
-#include <dhcpsrv/cfgmgr.h>
+#include <dhcp6/dhcp6_srv.h>
+#include <dhcp6/json_config_parser.h>
 #include <dhcpsrv/cfg_expiration.h>
 #include <dhcpsrv/cfg_hosts.h>
 #include <dhcpsrv/cfg_subnets6.h>
+#include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/parsers/simple_parser6.h>
 #include <dhcpsrv/subnet.h>
 #include <dhcpsrv/subnet_selector.h>
@@ -38,25 +38,23 @@
 #include <testutils/test_to_element.h>
 #include <util/chrono_time_utils.h>
 #include <util/doubles.h>
-#include "marker_file.h"
-#include "test_data_files_config.h"
-#include "test_libraries.h"
-#include "dhcp6_test_utils.h"
-#include "get_config_unittest.h"
-#include <gtest/gtest.h>
 
 #include <boost/foreach.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <fstream>
+
 #include <iostream>
 #include <sstream>
 #include <string>
 #include <vector>
 
 #include <arpa/inet.h>
-#include <limits.h>
+#include <gtest/gtest.h>
 #include <unistd.h>
 
+#include "dhcp6_test_utils.h"
+#include "get_config_unittest.h"
+#include "marker_file.h"
+#include "test_libraries.h"
+
 using namespace isc;
 using namespace isc::asiolink;
 using namespace isc::config;
@@ -462,7 +460,7 @@ class Dhcp6ParserTest : public LogContentTest {
     void configure(std::string config, int expected_code,
                    std::string exp_error = "") {
         ConstElementPtr json;
-        ASSERT_NO_THROW(json = parseDHCP6(config, true));
+        ASSERT_NO_THROW_LOG(json = parseDHCP6(config, true));
 
         ConstElementPtr status;
         EXPECT_NO_THROW(status = Dhcpv6SrvTest::configure(srv_, json));

src/bin/dhcp6/tests/get_config_unittest.cc

@@ -9,25 +9,24 @@
 #include <cc/command_interpreter.h>
 #include <cc/data.h>
 #include <cc/simple_parser.h>
-#include <cc/cfg_to_element.h>
-#include <testutils/user_context_utils.h>
 #include <dhcp/testutils/iface_mgr_test_config.h>
-#include <dhcpsrv/cfgmgr.h>
-#include <dhcpsrv/parsers/simple_parser6.h>
-#include <dhcp6/dhcp6_srv.h>
 #include <dhcp6/ctrl_dhcp6_srv.h>
+#include <dhcp6/dhcp6_srv.h>
 #include <dhcp6/json_config_parser.h>
 #include <dhcp6/tests/dhcp6_test_utils.h>
 #include <dhcp6/tests/get_config_unittest.h>
+#include <dhcpsrv/cfgmgr.h>
 #include <testutils/gtest_utils.h>
-
-#include <boost/algorithm/string.hpp>
-#include <gtest/gtest.h>
+#include <testutils/user_context_utils.h>
 
 #include <iostream>
-#include <string>
-#include <sstream>
 #include <list>
+#include <sstream>
+#include <string>
+
+#include <boost/algorithm/string.hpp>
+
+#include <gtest/gtest.h>
 
 using namespace isc::config;
 using namespace isc::data;

src/bin/dhcp6/tests/get_config_unittest.cc.skel

@@ -9,25 +9,24 @@
 #include <cc/command_interpreter.h>
 #include <cc/data.h>
 #include <cc/simple_parser.h>
-#include <cc/cfg_to_element.h>
-#include <testutils/user_context_utils.h>
 #include <dhcp/testutils/iface_mgr_test_config.h>
-#include <dhcpsrv/cfgmgr.h>
-#include <dhcpsrv/parsers/simple_parser6.h>
-#include <dhcp6/dhcp6_srv.h>
 #include <dhcp6/ctrl_dhcp6_srv.h>
+#include <dhcp6/dhcp6_srv.h>
 #include <dhcp6/json_config_parser.h>
 #include <dhcp6/tests/dhcp6_test_utils.h>
 #include <dhcp6/tests/get_config_unittest.h>
+#include <dhcpsrv/cfgmgr.h>
 #include <testutils/gtest_utils.h>
-
-#include <boost/algorithm/string.hpp>
-#include <gtest/gtest.h>
+#include <testutils/user_context_utils.h>
 
 #include <iostream>
-#include <string>
-#include <sstream>
 #include <list>
+#include <sstream>
+#include <string>
+
+#include <boost/algorithm/string.hpp>
+
+#include <gtest/gtest.h>
 
 using namespace isc::config;
 using namespace isc::data;