Commit 1ebc34fa authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[5393] Replace ASSERT_NE with EXPECT_NE and swapped values.

As a result of the review.
parent e3a6262f
...@@ -1702,7 +1702,7 @@ TEST_F(DORATest, changingCircuitId) { ...@@ -1702,7 +1702,7 @@ TEST_F(DORATest, changingCircuitId) {
ASSERT_EQ(DHCPOFFER, static_cast<int>(resp->getType())); ASSERT_EQ(DHCPOFFER, static_cast<int>(resp->getType()));
// Make sure that the client has been offerred a different address // Make sure that the client has been offerred a different address
// given that circuit-id is not used. // 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. // Specify circuit-id matching the one in the configuration.
client.setCircuitId("charter950"); client.setCircuitId("charter950");
...@@ -1716,7 +1716,7 @@ TEST_F(DORATest, changingCircuitId) { ...@@ -1716,7 +1716,7 @@ TEST_F(DORATest, changingCircuitId) {
ASSERT_EQ(DHCPOFFER, static_cast<int>(resp->getType())); ASSERT_EQ(DHCPOFFER, static_cast<int>(resp->getType()));
// Make sure that the client has been offerred reserved address given that // Make sure that the client has been offerred reserved address given that
// matching circuit-id has been specified. // 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. // Let's now change the circuit-id.
client.setCircuitId("gdansk"); client.setCircuitId("gdansk");
...@@ -1728,7 +1728,7 @@ TEST_F(DORATest, changingCircuitId) { ...@@ -1728,7 +1728,7 @@ TEST_F(DORATest, changingCircuitId) {
ASSERT_TRUE(client.getContext().response_); ASSERT_TRUE(client.getContext().response_);
resp = client.getContext().response_; resp = client.getContext().response_;
// The client should be refused this address. // The client should be refused this address.
ASSERT_EQ(DHCPNAK, static_cast<int>(resp->getType())); EXPECT_EQ(DHCPNAK, static_cast<int>(resp->getType()));
// In this case, the client falls back to the 4-way exchange and should be // In this case, the client falls back to the 4-way exchange and should be
// allocated an address from the dynamic pool. // allocated an address from the dynamic pool.
...@@ -1738,7 +1738,7 @@ TEST_F(DORATest, changingCircuitId) { ...@@ -1738,7 +1738,7 @@ TEST_F(DORATest, changingCircuitId) {
resp = client.getContext().response_; resp = client.getContext().response_;
// The client should be allocated some address. // The client should be allocated some address.
ASSERT_EQ(DHCPACK, static_cast<int>(resp->getType())); ASSERT_EQ(DHCPACK, static_cast<int>(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 // Starting tests which require MySQL backend availability. Those tests
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment