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

diff --git a/test/firmware_state_updatestarted_unittest.cpp b/test/firmware_state_updatestarted_unittest.cpp
index e2348e4..6b55b4e 100644
--- a/test/firmware_state_updatestarted_unittest.cpp
+++ b/test/firmware_state_updatestarted_unittest.cpp
@@ -158,17 +158,17 @@
  * stat(session) - this will trigger a check, and the state may change.
  */
 TEST_F(FirmwareHandlerUpdateStartedTest,
-       CallStatChecksUpdateStatusReturnsRunningDoesNotChangeState)
+       CallStatChecksActionStatusReturnsRunningDoesNotChangeState)
 {
     getToUpdateStarted();
     EXPECT_CALL(*updateMockPtr, status())
-        .WillOnce(Return(UpdateStatus::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>(UpdateStatus::running));
+        static_cast<std::uint8_t>(ActionStatus::running));
 
     EXPECT_TRUE(handler->stat(session, &meta));
     EXPECT_EQ(expectedMeta, meta);
@@ -176,17 +176,17 @@
 }
 
 TEST_F(FirmwareHandlerUpdateStartedTest,
-       CallStatChecksUpdateStatusReturnsFailedChangesStateToCompleted)
+       CallStatChecksActionStatusReturnsFailedChangesStateToCompleted)
 {
     getToUpdateStarted();
     EXPECT_CALL(*updateMockPtr, status())
-        .WillOnce(Return(UpdateStatus::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>(UpdateStatus::failed));
+        static_cast<std::uint8_t>(ActionStatus::failed));
 
     EXPECT_TRUE(handler->stat(session, &meta));
     EXPECT_EQ(expectedMeta, meta);
@@ -194,17 +194,17 @@
 }
 
 TEST_F(FirmwareHandlerUpdateStartedTest,
-       CallStatChecksUpdateStatusReturnsSuccessChangesStateToCompleted)
+       CallStatChecksActionStatusReturnsSuccessChangesStateToCompleted)
 {
     getToUpdateStarted();
     EXPECT_CALL(*updateMockPtr, status())
-        .WillOnce(Return(UpdateStatus::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>(UpdateStatus::success));
+        static_cast<std::uint8_t>(ActionStatus::success));
 
     EXPECT_TRUE(handler->stat(session, &meta));
     EXPECT_EQ(expectedMeta, meta);