Skip to content

Commit 4891f55

Browse files
andrei-pavelandrei-pavel
committed
[#3163] EXPECT_EQ_MARGIN -> EXPECT_NEAR
1 parent f40fa49 commit 4891f55

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

‎src/bin/dhcp4/tests/dhcp4_srv_unittest.cc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1891,7 +1891,7 @@ TEST_F(Dhcpv4SrvTest, DiscoverCache) {
18911891
OptionUint32Ptr opt = boost::dynamic_pointer_cast<
18921892
OptionUint32>(offer->getOption(DHO_DHCP_LEASE_TIME));
18931893
ASSERT_TRUE(opt);
1894-
EXPECT_EQ_MARGIN(subnet_->getValid() - delta, opt->getValue(), 1);
1894+
EXPECT_NEAR(subnet_->getValid() - delta, opt->getValue(), 1);
18951895

18961896
// Check address
18971897
EXPECT_EQ(addr, offer->getYiaddr());
@@ -2072,7 +2072,7 @@ TEST_F(Dhcpv4SrvTest, RenewBasic) {
20722072
int32_t cltt = static_cast<int32_t>(l->cltt_);
20732073
int32_t expected = static_cast<int32_t>(time(NULL));
20742074
// Equality or difference by 1 between cltt and expected is ok.
2075-
EXPECT_EQ_MARGIN(cltt, expected, 1);
2075+
EXPECT_NEAR(cltt, expected, 1);
20762076

20772077
Lease4Ptr lease = LeaseMgrFactory::instance().getLease4(addr);
20782078
EXPECT_TRUE(LeaseMgrFactory::instance().deleteLease(lease));
@@ -2195,7 +2195,7 @@ TEST_F(Dhcpv4SrvTest, RenewDefaultLifetime) {
21952195
int32_t cltt = static_cast<int32_t>(c.l->cltt_);
21962196
int32_t expected = static_cast<int32_t>(time(NULL));
21972197
// Equality or difference by 1 between cltt and expected is ok.
2198-
EXPECT_EQ_MARGIN(cltt, expected, 1);
2198+
EXPECT_NEAR(cltt, expected, 1);
21992199

22002200
Lease4Ptr lease = LeaseMgrFactory::instance().getLease4(c.addr);
22012201
EXPECT_TRUE(LeaseMgrFactory::instance().deleteLease(lease));
@@ -2241,7 +2241,7 @@ TEST_F(Dhcpv4SrvTest, RenewHintLifetime) {
22412241
int32_t cltt = static_cast<int32_t>(c.l->cltt_);
22422242
int32_t expected = static_cast<int32_t>(time(NULL));
22432243
// Equality or difference by 1 between cltt and expected is ok.
2244-
EXPECT_EQ_MARGIN(cltt, expected, 1);
2244+
EXPECT_NEAR(cltt, expected, 1);
22452245

22462246
Lease4Ptr lease = LeaseMgrFactory::instance().getLease4(c.addr);
22472247
EXPECT_TRUE(LeaseMgrFactory::instance().deleteLease(lease));
@@ -2287,7 +2287,7 @@ TEST_F(Dhcpv4SrvTest, RenewMinLifetime) {
22872287
int32_t cltt = static_cast<int32_t>(c.l->cltt_);
22882288
int32_t expected = static_cast<int32_t>(time(NULL));
22892289
// Equality or difference by 1 between cltt and expected is ok.
2290-
EXPECT_EQ_MARGIN(cltt, expected, 1);
2290+
EXPECT_NEAR(cltt, expected, 1);
22912291

22922292
Lease4Ptr lease = LeaseMgrFactory::instance().getLease4(c.addr);
22932293
EXPECT_TRUE(LeaseMgrFactory::instance().deleteLease(lease));
@@ -2332,7 +2332,7 @@ TEST_F(Dhcpv4SrvTest, RenewMaxLifetime) {
23322332
int32_t cltt = static_cast<int32_t>(c.l->cltt_);
23332333
int32_t expected = static_cast<int32_t>(time(NULL));
23342334
// Equality or difference by 1 between cltt and expected is ok.
2335-
EXPECT_EQ_MARGIN(cltt, expected, 1);
2335+
EXPECT_NEAR(cltt, expected, 1);
23362336

23372337
Lease4Ptr lease = LeaseMgrFactory::instance().getLease4(c.addr);
23382338
EXPECT_TRUE(LeaseMgrFactory::instance().deleteLease(lease));
@@ -2400,7 +2400,7 @@ TEST_F(Dhcpv4SrvTest, RenewCache) {
24002400
OptionUint32Ptr opt = boost::dynamic_pointer_cast<
24012401
OptionUint32>(ack->getOption(DHO_DHCP_LEASE_TIME));
24022402
ASSERT_TRUE(opt);
2403-
EXPECT_EQ_MARGIN(subnet_->getValid() - delta, opt->getValue(), 1);
2403+
EXPECT_NEAR(subnet_->getValid() - delta, opt->getValue(), 1);
24042404

24052405
// Check address
24062406
EXPECT_EQ(addr, ack->getYiaddr());

‎src/bin/dhcp6/tests/dhcp6_srv_unittest.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,8 +1707,8 @@ TEST_F(Dhcpv6SrvTest, RequestCache) {
17071707

17081708
// Since the initial time values were set, one second could have ticked,
17091709
// so allow one second of margin error.
1710-
EXPECT_EQ_MARGIN(pref - delta, iaaddr->getPreferred(), 1);
1711-
EXPECT_EQ_MARGIN(valid - delta, iaaddr->getValid(), 1);
1710+
EXPECT_NEAR(pref - delta, iaaddr->getPreferred(), 1);
1711+
EXPECT_NEAR(valid - delta, iaaddr->getValid(), 1);
17121712

17131713
// check DUIDs
17141714
checkServerId(reply, srv.getServerID());
@@ -1782,8 +1782,8 @@ TEST_F(Dhcpv6SrvTest, pdRequestCache) {
17821782
// Check the prefix.
17831783
EXPECT_EQ(prefix, iapref->getAddress());
17841784
EXPECT_EQ(prefixlen, iapref->getLength());
1785-
EXPECT_EQ_MARGIN(pref - delta, iapref->getPreferred(), 1);
1786-
EXPECT_EQ_MARGIN(valid - delta, iapref->getValid(), 1);
1785+
EXPECT_NEAR(pref - delta, iapref->getPreferred(), 1);
1786+
EXPECT_NEAR(valid - delta, iapref->getValid(), 1);
17871787

17881788
// check DUIDs
17891789
checkServerId(reply, srv.getServerID());
@@ -1997,8 +1997,8 @@ TEST_F(Dhcpv6SrvTest, RenewCache) {
19971997

19981998
// Check the address.
19991999
EXPECT_EQ(addr, iaaddr->getAddress());
2000-
EXPECT_EQ_MARGIN(pref - delta, iaaddr->getPreferred(), 1);
2001-
EXPECT_EQ_MARGIN(valid - delta, iaaddr->getValid(), 1);
2000+
EXPECT_NEAR(pref - delta, iaaddr->getPreferred(), 1);
2001+
EXPECT_NEAR(valid - delta, iaaddr->getValid(), 1);
20022002

20032003
// check DUIDs
20042004
checkServerId(reply, srv.getServerID());
@@ -2072,8 +2072,8 @@ TEST_F(Dhcpv6SrvTest, pdRenewCache) {
20722072
// Check the prefix.
20732073
EXPECT_EQ(prefix, iapref->getAddress());
20742074
EXPECT_EQ(prefixlen, iapref->getLength());
2075-
EXPECT_EQ_MARGIN(pref - delta, iapref->getPreferred(), 1);
2076-
EXPECT_EQ_MARGIN(valid - delta, iapref->getValid(), 1);
2075+
EXPECT_NEAR(pref - delta, iapref->getPreferred(), 1);
2076+
EXPECT_NEAR(valid - delta, iapref->getValid(), 1);
20772077

20782078
// check DUIDs
20792079
checkServerId(reply, srv.getServerID());

‎src/lib/dhcpsrv/testutils/test_utils.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ detailCompareLease(const Lease4Ptr& first, const Lease4Ptr& second) {
5555

5656
// Since the initial time values were set, one second could have ticked,
5757
// so allow one second of margin error.
58-
EXPECT_EQ_MARGIN(first->valid_lft_, second->valid_lft_, 1);
59-
EXPECT_EQ_MARGIN(first->cltt_, second->cltt_, 1);
58+
EXPECT_NEAR(first->valid_lft_, second->valid_lft_, 1);
59+
EXPECT_NEAR(first->cltt_, second->cltt_, 1);
6060

6161
EXPECT_EQ(first->subnet_id_, second->subnet_id_);
6262
EXPECT_EQ(first->pool_id_, second->pool_id_);
@@ -92,9 +92,9 @@ detailCompareLease(const Lease6Ptr& first, const Lease6Ptr& second) {
9292

9393
// Since the initial time values were set, one second could have ticked,
9494
// so allow one second of margin error.
95-
EXPECT_EQ_MARGIN(first->preferred_lft_, second->preferred_lft_, 1);
96-
EXPECT_EQ_MARGIN(first->valid_lft_, second->valid_lft_, 1);
97-
EXPECT_EQ_MARGIN(first->cltt_, second->cltt_, 1);
95+
EXPECT_NEAR(first->preferred_lft_, second->preferred_lft_, 1);
96+
EXPECT_NEAR(first->valid_lft_, second->valid_lft_, 1);
97+
EXPECT_NEAR(first->cltt_, second->cltt_, 1);
9898

9999
EXPECT_EQ(first->subnet_id_, second->subnet_id_);
100100
EXPECT_EQ(first->pool_id_, second->pool_id_);

0 commit comments

Comments
 (0)