PEL: Refactor the test data factory

This commit has no functional changes, it just does some things
to make the PEL data creator for testcases, pelDataFactory(), be
more manageable:

- Change to return a plain vector instead of a unique_ptr<vector>.
- Keeps the data for each section in separate vectors and then
  either returns those as-is or combines them into a PEL.
- Change the TestPelType enum to TestPELType to match the style guide.
- Have pelDataFactory provide the SRC section instead of srcDataFactory.

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

1 files changed, 14 insertions, 14 deletions

diff --git a/test/openpower-pels/user_header_test.cpp b/test/openpower-pels/user_header_test.cpp
index d3eedfc..88ac9a5 100644
--- a/test/openpower-pels/user_header_test.cpp
+++ b/test/openpower-pels/user_header_test.cpp
@@ -15,9 +15,9 @@ TEST(UserHeaderTest, SizeTest)
 
 TEST(UserHeaderTest, UnflattenFlattenTest)
 {
-    auto data = pelDataFactory(TestPelType::userHeaderSimple);
+    auto data = pelDataFactory(TestPELType::userHeaderSection);
 
-    Stream stream(*data);
+    Stream stream(data);
     UserHeader uh(stream);
     EXPECT_EQ(uh.valid(), true);
 
@@ -41,7 +41,7 @@ TEST(UserHeaderTest, UnflattenFlattenTest)
     Stream newStream(newData);
 
     uh.flatten(newStream);
-    EXPECT_EQ(*data, newData);
+    EXPECT_EQ(data, newData);
 
     // Change a field, then flatten and unflatten again
     uh.subsystem() = 0x44;
@@ -49,7 +49,7 @@ TEST(UserHeaderTest, UnflattenFlattenTest)
     newStream.offset(0);
     newData.clear();
     uh.flatten(newStream);
-    EXPECT_NE(*data, newData);
+    EXPECT_NE(data, newData);
 
     newStream.offset(0);
     UserHeader newUH(newStream);
@@ -60,10 +60,10 @@ TEST(UserHeaderTest, UnflattenFlattenTest)
 
 TEST(UserHeaderTest, ShortDataTest)
 {
-    auto data = pelDataFactory(TestPelType::userHeaderSimple);
-    data->resize(data->size() - 1);
+    auto data = pelDataFactory(TestPELType::userHeaderSection);
+    data.resize(data.size() - 1);
 
-    Stream stream(*data);
+    Stream stream(data);
     UserHeader uh(stream);
 
     EXPECT_EQ(uh.valid(), false);
@@ -71,12 +71,12 @@ TEST(UserHeaderTest, ShortDataTest)
 
 TEST(UserHeaderTest, CorruptDataTest1)
 {
-    auto data = pelDataFactory(TestPelType::userHeaderSimple);
-    data->resize(data->size() - 1);
+    auto data = pelDataFactory(TestPELType::userHeaderSection);
+    data.resize(data.size() - 1);
 
-    data->at(0) = 0; // corrupt the section ID
+    data.at(0) = 0; // corrupt the section ID
 
-    Stream stream(*data);
+    Stream stream(data);
     UserHeader uh(stream);
 
     EXPECT_EQ(uh.valid(), false);
@@ -84,11 +84,11 @@ TEST(UserHeaderTest, CorruptDataTest1)
 
 TEST(UserHeaderTest, CorruptDataTest2)
 {
-    auto data = pelDataFactory(TestPelType::userHeaderSimple);
+    auto data = pelDataFactory(TestPELType::userHeaderSection);
 
-    data->at(4) = 0x22; // corrupt the version
+    data.at(4) = 0x22; // corrupt the version
 
-    Stream stream(*data);
+    Stream stream(data);
     UserHeader uh(stream);
 
     EXPECT_EQ(uh.valid(), false);