From: Francis Dupont <fdupont@isc.org>
Date: Mon, 25 Apr 2016 14:43:28 +0000 (+0200)
Subject: [4268a] Updated tests for 4 byte padding
X-Git-Tag: trac4106_update_base~41^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8ab56f272726e5130b3a74d76ec8c044631a90a;p=thirdparty%2Fkea.git

[4268a] Updated tests for 4 byte padding
---

diff --git a/src/lib/eval/tests/token_unittest.cc b/src/lib/eval/tests/token_unittest.cc
index 85a3811ba2..c26d2e7025 100644
--- a/src/lib/eval/tests/token_unittest.cc
+++ b/src/lib/eval/tests/token_unittest.cc
@@ -629,16 +629,18 @@ TEST_F(TokenTest, pkt4Fields) {
     ASSERT_NO_THROW(t_.reset(new TokenPkt4(TokenPkt4::HLEN)));
     EXPECT_NO_THROW(t_->evaluate(*pkt4_, values_));
     ASSERT_EQ(1, values_.size());
-    ASSERT_EQ(1, values_.top().size());
-    EXPECT_EQ(7, static_cast<uint8_t>(values_.top()[0]));
+    ASSERT_EQ(4, values_.top().size());
+    uint32_t expected_hlen = htonl(7);
+    EXPECT_EQ(0, memcmp(&expected, &values_.top()[0], 4));
 
     // Check htype value.
     clearStack();
     ASSERT_NO_THROW(t_.reset(new TokenPkt4(TokenPkt4::HTYPE)));
     EXPECT_NO_THROW(t_->evaluate(*pkt4_, values_));
     ASSERT_EQ(1, values_.size());
-    ASSERT_EQ(1, values_.top().size());
-    EXPECT_EQ(123, static_cast<uint8_t>(values_.top()[0]));
+    ASSERT_EQ(4, values_.top().size());
+    uint32_t expected_htype = htonl(123);
+    EXPECT_EQ(0, memcmp(&expected, &values_.top()[0], 4));
 
     // Check giaddr value.
     clearStack();