From 1ebc34fa8d7244f5872a5de22f43f64935aa8833 Mon Sep 17 00:00:00 2001 From: Marcin Siodelski Date: Fri, 20 Oct 2017 17:51:04 +0200 Subject: [PATCH] [5393] Replace ASSERT_NE with EXPECT_NE and swapped values. As a result of the review. --- src/bin/dhcp4/tests/dora_unittest.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/dhcp4/tests/dora_unittest.cc b/src/bin/dhcp4/tests/dora_unittest.cc index 8bf9a1de29..b0d6b16d8d 100644 --- a/src/bin/dhcp4/tests/dora_unittest.cc +++ b/src/bin/dhcp4/tests/dora_unittest.cc @@ -1702,7 +1702,7 @@ TEST_F(DORATest, changingCircuitId) { ASSERT_EQ(DHCPOFFER, static_cast(resp->getType())); // Make sure that the client has been offerred a different address // given that circuit-id is not used. - ASSERT_NE(resp->getYiaddr().toText(), "10.0.0.9"); + EXPECT_NE("10.0.0.9", resp->getYiaddr().toText()); // Specify circuit-id matching the one in the configuration. client.setCircuitId("charter950"); @@ -1716,7 +1716,7 @@ TEST_F(DORATest, changingCircuitId) { ASSERT_EQ(DHCPOFFER, static_cast(resp->getType())); // Make sure that the client has been offerred reserved address given that // matching circuit-id has been specified. - ASSERT_EQ("10.0.0.9", resp->getYiaddr().toText()); + EXPECT_EQ("10.0.0.9", resp->getYiaddr().toText()); // Let's now change the circuit-id. client.setCircuitId("gdansk"); @@ -1728,7 +1728,7 @@ TEST_F(DORATest, changingCircuitId) { ASSERT_TRUE(client.getContext().response_); resp = client.getContext().response_; // The client should be refused this address. - ASSERT_EQ(DHCPNAK, static_cast(resp->getType())); + EXPECT_EQ(DHCPNAK, static_cast(resp->getType())); // In this case, the client falls back to the 4-way exchange and should be // allocated an address from the dynamic pool. @@ -1738,7 +1738,7 @@ TEST_F(DORATest, changingCircuitId) { resp = client.getContext().response_; // The client should be allocated some address. ASSERT_EQ(DHCPACK, static_cast(resp->getType())); - ASSERT_NE(client.config_.lease_.addr_.toText(), "10.0.0.9"); + EXPECT_NE("10.0.0.9", client.config_.lease_.addr_.toText()); } // Starting tests which require MySQL backend availability. Those tests -- 2.47.2