mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-02 15:05:16 +00:00
Code Issues Releases Wiki Activity

[#821,!501] Addressed review comments

Browse Source 
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
        Cleaned up failure text

    src/lib/testutils/gtest_utils.h
        Replaced array with vector
This commit is contained in:
Thomas Markwalder
2019-09-06 09:27:22 -04:00
parent 83d5b63334
commit 60baf65d0c
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
View File

@@ -730,8 +730,8 @@ TEST_F(Dhcpv4SrvTest, sanityCheckDiscover) {
" provided in message DHCPDISCOVER");
// Add a hardware address. This should not throw.
uint8_t data[] = { 0, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe};
HWAddrPtr hwaddr(new HWAddr(data, sizeof(data), HTYPE_ETHER));
std::vector<uint8_t> data = { 0, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe};
HWAddrPtr hwaddr(new HWAddr(data, HTYPE_ETHER));
pkt->setHWAddr(hwaddr);
ASSERT_NO_THROW(srv.processDiscover(pkt));
@@ -767,8 +767,8 @@ TEST_F(Dhcpv4SrvTest, sanityCheckRequest) {
" provided in message DHCPREQUEST");
// Add a hardware address. Should not throw.
uint8_t data[] = { 0, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe};
HWAddrPtr hwaddr(new HWAddr(data, sizeof(data), HTYPE_ETHER));
std::vector<uint8_t> data = { 0, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe};
HWAddrPtr hwaddr(new HWAddr(data, HTYPE_ETHER));
pkt->setHWAddr(hwaddr);
EXPECT_NO_THROW(srv.processRequest(pkt));
@@ -812,8 +812,8 @@ TEST_F(Dhcpv4SrvTest, sanityCheckDecline) {
" provided in message DHCPDECLINE");
// Add a hardware address. Should throw because of missing address.
uint8_t data[] = { 0, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe};
HWAddrPtr hwaddr(new HWAddr(data, sizeof(data), HTYPE_ETHER));
std::vector<uint8_t> data = { 0, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe};
HWAddrPtr hwaddr(new HWAddr(data, HTYPE_ETHER));
pkt->setHWAddr(hwaddr);
ASSERT_THROW_MSG(srv.processDecline(pkt), RFCViolation,
"Mandatory 'Requested IP address' option missing in DHCPDECLINE"
@@ -859,8 +859,8 @@ TEST_F(Dhcpv4SrvTest, sanityCheckRelease) {
" provided in message DHCPRELEASE");
// Add a hardware address. Should not throw.
uint8_t data[] = { 0, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe};
HWAddrPtr hwaddr(new HWAddr(data, sizeof(data), HTYPE_ETHER));
std::vector<uint8_t> data = { 0, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe};
HWAddrPtr hwaddr(new HWAddr(data, HTYPE_ETHER));
pkt->setHWAddr(hwaddr);
EXPECT_NO_THROW(srv.processRelease(pkt));
@@ -894,8 +894,8 @@ TEST_F(Dhcpv4SrvTest, sanityCheckInform) {
" provided in message DHCPINFORM");
// Add a hardware address. Should not throw.
uint8_t data[] = { 0, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe};
HWAddrPtr hwaddr(new HWAddr(data, sizeof(data), HTYPE_ETHER));
std::vector<uint8_t> data = { 0, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe};
HWAddrPtr hwaddr(new HWAddr(data, HTYPE_ETHER));
pkt->setHWAddr(hwaddr);
ASSERT_NO_THROW(srv.processInform(pkt));

8
src/lib/testutils/gtest_utils.h
View File

@@ -25,11 +25,11 @@ namespace test {
{ \
try { \
statement; \
ADD_FAILURE() << "no exception, expected:" << #etype; \
ADD_FAILURE() << "no exception, expected: " << #etype; \
} catch (const etype& ex) { \
EXPECT_EQ(std::string(ex.what()), emsg); \
} catch (...) { \
ADD_FAILURE() << "wrong exception type thrown, expected " << #etype; \
ADD_FAILURE() << "wrong exception type thrown, expected: " << #etype; \
} \
} \
@@ -46,11 +46,11 @@ namespace test {
{ \
try { \
statement; \
GTEST_FAIL() << "no exception, expected:" << #etype; \
GTEST_FAIL() << "no exception, expected: " << #etype; \
} catch (const etype& ex) { \
ASSERT_EQ(std::string(ex.what()), emsg); \
} catch (...) { \
GTEST_FAIL() << "wrong exception type thrown, expected " << #etype; \
GTEST_FAIL() << "wrong exception type thrown, expected: " << #etype; \
} \
} \