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
diff --git a/test/openpower-pels/repository_test.cpp b/test/openpower-pels/repository_test.cpp
index 57952e3..85ceab6 100644
--- a/test/openpower-pels/repository_test.cpp
+++ b/test/openpower-pels/repository_test.cpp
@@ -54,8 +54,8 @@
TEST_F(RepositoryTest, AddTest)
{
Repository repo{repoPath};
- auto data = pelDataFactory(TestPelType::pelSimple);
- auto pel = std::make_unique<PEL>(*data);
+ auto data = pelDataFactory(TestPELType::pelSimple);
+ auto pel = std::make_unique<PEL>(data);
repo.add(pel);
@@ -84,15 +84,15 @@
// Add some PELs to the repository
{
- auto data = pelDataFactory(TestPelType::pelSimple);
- auto pel = std::make_unique<PEL>(*data, 1);
+ auto data = pelDataFactory(TestPELType::pelSimple);
+ auto pel = std::make_unique<PEL>(data, 1);
pel->assignID();
repo.add(pel);
ids.emplace_back(pelID(pel->id()), obmcID(1));
}
{
- auto data = pelDataFactory(TestPelType::pelSimple);
- auto pel = std::make_unique<PEL>(*data, 2);
+ auto data = pelDataFactory(TestPELType::pelSimple);
+ auto pel = std::make_unique<PEL>(data, 2);
pel->assignID();
repo.add(pel);
ids.emplace_back(pelID(pel->id()), obmcID(2));
@@ -149,9 +149,9 @@
EXPECT_FALSE(noData);
// Add a PEL to the repo, and get the data back with getPELData.
- auto data = pelDataFactory(TestPelType::pelSimple);
- auto dataCopy = *data;
- auto pel = std::make_unique<PEL>(*data);
+ auto data = pelDataFactory(TestPELType::pelSimple);
+ auto dataCopy = data;
+ auto pel = std::make_unique<PEL>(data);
auto pelID = pel->id();
repo.add(pel);