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_verificationstarted_unittest.cpp

diff --git a/test/firmware_state_verificationstarted_unittest.cpp b/test/firmware_state_verificationstarted_unittest.cpp
index 165ef0e..74e24b2 100644
--- a/test/firmware_state_verificationstarted_unittest.cpp
+++ b/test/firmware_state_verificationstarted_unittest.cpp
@@ -52,12 +52,12 @@
 {
     getToVerificationStarted(staticLayoutBlobId);
 
-    std::vector<std::string> expectedList = {
-        activeImageBlobId, staticLayoutBlobId, hashBlobId, verifyBlobId};
+    auto blobs = handler->getBlobIds();
+    EXPECT_THAT(
+        blobs, UnorderedElementsAreArray({activeImageBlobId, staticLayoutBlobId,
+                                          hashBlobId, verifyBlobId}));
 
-    EXPECT_THAT(handler->getBlobIds(), UnorderedElementsAreArray(expectedList));
-
-    for (const auto& blob : expectedList)
+    for (const auto& blob : blobs)
     {
         EXPECT_TRUE(handler->canHandleBlob(blob));
     }
@@ -283,10 +283,8 @@
 
     EXPECT_TRUE(handler->close(session));
 
-    std::vector<std::string> expectedBlobs = {staticLayoutBlobId, hashBlobId};
-
     EXPECT_THAT(handler->getBlobIds(),
-                UnorderedElementsAreArray(expectedBlobs));
+                UnorderedElementsAreArray(startingBlobs));
 
     expectedState(FirmwareBlobHandler::UpdateState::notYetStarted);
 }