commit 53407be367f112649cae10ebd6152f9bfd62b79b
author Matt Spinler <spinler@us.ibm.com> Mon Nov 18 09:16:31 2019 -0600
committer Matt Spinler <spinler@us.ibm.com> Tue Nov 19 19:34:51 2019 +0000
tree 7fb5574ebaef25f19e220516e5a19ff0d8c179cc
parent 6a53862ee333b825a886c5ff315f32b962b45fc7

PEL: Support UserData padding in the testcases

Some testcase updates were missed when the fix was made to pad the
UserData section to 4 byte boundaries as required by the spec.

Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I8129a70cfd740155ca05089563dfc5d7e63bdc81

test/openpower-pels/pel_test.cpp

diff --git a/test/openpower-pels/pel_test.cpp b/test/openpower-pels/pel_test.cpp
index 9976c5c..afab5ca 100644
--- a/test/openpower-pels/pel_test.cpp
+++ b/test/openpower-pels/pel_test.cpp
@@ -265,9 +265,16 @@
     const auto& d = ud->data();
 
     std::string jsonString{d.begin(), d.end()};
-    std::string expected =
+
+    std::string expectedJSON =
         R"({"KEY1":"VALUE1","KEY2":"VALUE2","KEY3":"VALUE3"})";
-    EXPECT_EQ(jsonString, expected);
+
+    // The actual data is null padded to a 4B boundary.
+    std::vector<uint8_t> expectedData;
+    expectedData.resize(52, '\0');
+    memcpy(expectedData.data(), expectedJSON.data(), expectedJSON.size());
+
+    EXPECT_EQ(d, expectedData);
 
     // Ensure we can read this as JSON
     auto newJSON = nlohmann::json::parse(jsonString);

test/openpower-pels/user_data_test.cpp

diff --git a/test/openpower-pels/user_data_test.cpp b/test/openpower-pels/user_data_test.cpp
index a350de9..a957a4d 100644
--- a/test/openpower-pels/user_data_test.cpp
+++ b/test/openpower-pels/user_data_test.cpp
@@ -89,13 +89,13 @@
 
 TEST(UserDataTest, ConstructorTest)
 {
-    std::vector<uint8_t> data{0x11, 0x22, 0x33, 0x44, 0x55, 0x66};
+    std::vector<uint8_t> data{0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88};
 
     UserData ud(0x1112, 0x42, 0x01, data);
     EXPECT_TRUE(ud.valid());
 
     EXPECT_EQ(ud.header().id, 0x5544);
-    EXPECT_EQ(ud.header().size, 14);
+    EXPECT_EQ(ud.header().size, 16);
     EXPECT_EQ(ud.header().version, 0x01);
     EXPECT_EQ(ud.header().subType, 0x42);
     EXPECT_EQ(ud.header().componentID, 0x1112);