From: Francis Dupont Date: Wed, 4 Nov 2015 02:24:03 +0000 (+0100) Subject: [3927] Addressed minor comments X-Git-Tag: trac4115_base~5^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=812b9eb21b4c06c49abaadbc8d3cf1f3ea53d7a8;p=thirdparty%2Fkea.git [3927] Addressed minor comments --- diff --git a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc index 141e32c4f4..59419df691 100644 --- a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc +++ b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc @@ -481,7 +481,7 @@ TEST_F(ParseConfigTest, basicOptionDefTest) { // Verify that the configuration string parses. int rcode = parseConfiguration(config); - ASSERT_TRUE(rcode == 0); + ASSERT_EQ(0, rcode); // Verify that the option definition can be retrieved. @@ -514,7 +514,7 @@ TEST_F(ParseConfigTest, minimalOptionDefTest) { // Verify that the configuration string parses. int rcode = parseConfiguration(config); - ASSERT_TRUE(rcode == 0); + ASSERT_EQ(0, rcode); // Verify that the option definition can be retrieved. @@ -547,7 +547,7 @@ TEST_F(ParseConfigTest, defaultSpaceOptionDefTest) { // Verify that the configuration string parses. int rcode = parseConfiguration(config); - ASSERT_TRUE(rcode == 0); + ASSERT_TRUE(0, rcode); // Verify that the option definition can be retrieved. @@ -590,13 +590,13 @@ TEST_F(ParseConfigTest, basicOptionDataTest) { // Verify that the configuration string parses. int rcode = parseConfiguration(config); - ASSERT_TRUE(rcode == 0); + ASSERT_TRUE(0, rcode); // Verify that the option can be retrieved. OptionPtr opt_ptr = getOptionPtr("isc", 100); ASSERT_TRUE(opt_ptr); - // Verify that the option definition is correct. + // Verify that the option data is correct. std::string val = "type=00100, len=00004: 192.0.2.0 (ipv4-address)"; EXPECT_EQ(val, opt_ptr->toText()); @@ -624,13 +624,13 @@ TEST_F(ParseConfigTest, minimalOptionDataTest) { // Verify that the configuration string parses. int rcode = parseConfiguration(config); - ASSERT_TRUE(rcode == 0); + ASSERT_TRUE(0, rcode); // Verify that the option can be retrieved. OptionPtr opt_ptr = getOptionPtr("isc", 100); ASSERT_TRUE(opt_ptr); - // Verify that the option definition is correct. + // Verify that the option data is correct. std::string val = "type=00100, len=00004: 192.0.2.0 (ipv4-address)"; EXPECT_EQ(val, opt_ptr->toText());