commit 9a69f73446c7ebf1d053639fa96b3561809e4bce
author Patrick Venture <venture@google.com> Mon Jun 17 14:05:13 2019 -0700
committer Patrick Venture <venture@google.com> Tue Jun 18 18:37:06 2019 +0000
tree f5f4fa37d19f0a1b619728a85478199f37085a71
parent 3955aed91549f5aeae773fe939ad186f13b0f39e

test: consolidate blob lists

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: Id0a8b64ccaacd787eef799d46d9523307fafb422

test/firmware_state_updatecompleted_unittest.cpp

diff --git a/test/firmware_state_updatecompleted_unittest.cpp b/test/firmware_state_updatecompleted_unittest.cpp
index 923b6d0..9e43edb 100644
--- a/test/firmware_state_updatecompleted_unittest.cpp
+++ b/test/firmware_state_updatecompleted_unittest.cpp
@@ -196,9 +196,10 @@
 {
     getToUpdateCompleted(ActionStatus::success);
 
-    std::vector<std::string> expected = {updateBlobId, hashBlobId,
-                                         activeImageBlobId, staticLayoutBlobId};
-    EXPECT_THAT(handler->getBlobIds(), UnorderedElementsAreArray(expected));
+    EXPECT_THAT(
+        handler->getBlobIds(),
+        UnorderedElementsAreArray(
+            {updateBlobId, hashBlobId, activeImageBlobId, staticLayoutBlobId}));
 }
 
 /*
@@ -215,8 +216,8 @@
     handler->close(session);
     expectedState(FirmwareBlobHandler::UpdateState::notYetStarted);
 
-    std::vector<std::string> expected = {hashBlobId, staticLayoutBlobId};
-    EXPECT_THAT(handler->getBlobIds(), UnorderedElementsAreArray(expected));
+    EXPECT_THAT(handler->getBlobIds(),
+                UnorderedElementsAreArray(startingBlobs));
 }
 
 TEST_F(FirmwareHandlerUpdateCompletedTest,
@@ -227,8 +228,8 @@
     handler->close(session);
     expectedState(FirmwareBlobHandler::UpdateState::notYetStarted);
 
-    std::vector<std::string> expected = {hashBlobId, staticLayoutBlobId};
-    EXPECT_THAT(handler->getBlobIds(), UnorderedElementsAreArray(expected));
+    EXPECT_THAT(handler->getBlobIds(),
+                UnorderedElementsAreArray(startingBlobs));
 }
 
 /*