commit da66fd84209f93d9f9c11ea45d45819b92a4a98f
author Patrick Venture <venture@google.com> Mon Jun 03 11:11:24 2019 -0700
committer Patrick Venture <venture@google.com> Mon Jun 03 11:24:59 2019 -0700
tree d076a0c3958f3466ddf67501cd78529c4584b24f
parent a2d8239473ea9c441e157481c83195c5dcffe5bc

merge Verification and Update statuses

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

test/firmware_state_verificationstarted_unittest.cpp

diff --git a/test/firmware_state_verificationstarted_unittest.cpp b/test/firmware_state_verificationstarted_unittest.cpp
index e031fe3..03ceb99 100644
--- a/test/firmware_state_verificationstarted_unittest.cpp
+++ b/test/firmware_state_verificationstarted_unittest.cpp
@@ -71,13 +71,13 @@
 {
     getToVerificationStarted(staticLayoutBlobId);
     EXPECT_CALL(*verifyMockPtr, status())
-        .WillOnce(Return(VerifyCheckResponses::running));
+        .WillOnce(Return(ActionStatus::running));
 
     blobs::BlobMeta meta, expectedMeta = {};
     expectedMeta.size = 0;
     expectedMeta.blobState = flags | blobs::StateFlags::committing;
     expectedMeta.metadata.push_back(
-        static_cast<std::uint8_t>(VerifyCheckResponses::running));
+        static_cast<std::uint8_t>(ActionStatus::running));
 
     EXPECT_TRUE(handler->stat(session, &meta));
     EXPECT_EQ(expectedMeta, meta);
@@ -88,13 +88,13 @@
 {
     getToVerificationStarted(staticLayoutBlobId);
     EXPECT_CALL(*verifyMockPtr, status())
-        .WillOnce(Return(VerifyCheckResponses::other));
+        .WillOnce(Return(ActionStatus::unknown));
 
     blobs::BlobMeta meta, expectedMeta = {};
     expectedMeta.size = 0;
     expectedMeta.blobState = flags | blobs::StateFlags::committing;
     expectedMeta.metadata.push_back(
-        static_cast<std::uint8_t>(VerifyCheckResponses::other));
+        static_cast<std::uint8_t>(ActionStatus::unknown));
 
     EXPECT_TRUE(handler->stat(session, &meta));
     EXPECT_EQ(expectedMeta, meta);
@@ -108,13 +108,13 @@
      */
     getToVerificationStarted(staticLayoutBlobId);
     EXPECT_CALL(*verifyMockPtr, status())
-        .WillOnce(Return(VerifyCheckResponses::failed));
+        .WillOnce(Return(ActionStatus::failed));
 
     blobs::BlobMeta meta, expectedMeta = {};
     expectedMeta.size = 0;
     expectedMeta.blobState = flags | blobs::StateFlags::commit_error;
     expectedMeta.metadata.push_back(
-        static_cast<std::uint8_t>(VerifyCheckResponses::failed));
+        static_cast<std::uint8_t>(ActionStatus::failed));
 
     EXPECT_TRUE(handler->stat(session, &meta));
     EXPECT_EQ(expectedMeta, meta);
@@ -129,13 +129,13 @@
      */
     getToVerificationStarted(staticLayoutBlobId);
     EXPECT_CALL(*verifyMockPtr, status())
-        .WillOnce(Return(VerifyCheckResponses::success));
+        .WillOnce(Return(ActionStatus::success));
 
     blobs::BlobMeta meta, expectedMeta = {};
     expectedMeta.size = 0;
     expectedMeta.blobState = flags | blobs::StateFlags::committed;
     expectedMeta.metadata.push_back(
-        static_cast<std::uint8_t>(VerifyCheckResponses::success));
+        static_cast<std::uint8_t>(ActionStatus::success));
 
     EXPECT_TRUE(handler->stat(session, &meta));
     EXPECT_EQ(expectedMeta, meta);