commit 6fdd02e7b80a7495321b79db982dfe8c05ff23c4
author Patrick Venture <venture@google.com> Tue May 28 13:02:04 2019 -0700
committer Patrick Venture <venture@google.com> Tue May 28 13:27:43 2019 -0700
tree 8e502cb997370b236f307114ae9f60797e9a0eab
parent 9b57a4cd3ecf3a65b92dc10c92fa0728f1f1d34f

test: add state check helper method

Reduce duplicate code by providing a simple helper that will perform the
expectation check of a given state.

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

test/firmware_state_verificationstarted_unittest.cpp

diff --git a/test/firmware_state_verificationstarted_unittest.cpp b/test/firmware_state_verificationstarted_unittest.cpp
index b09e9ce..e5f57e5 100644
--- a/test/firmware_state_verificationstarted_unittest.cpp
+++ b/test/firmware_state_verificationstarted_unittest.cpp
@@ -44,23 +44,20 @@
   protected:
     void getToVerificationStarted(const std::string& blobId)
     {
-        auto realHandler = dynamic_cast<FirmwareBlobHandler*>(handler.get());
         EXPECT_CALL(imageMock, open(blobId)).WillOnce(Return(true));
         EXPECT_TRUE(handler->open(session, flags, blobId));
-        EXPECT_EQ(FirmwareBlobHandler::UpdateState::uploadInProgress,
-                  realHandler->getCurrentState());
+        expectedState(FirmwareBlobHandler::UpdateState::uploadInProgress);
+
         EXPECT_CALL(imageMock, close()).WillRepeatedly(Return());
         handler->close(session);
-        EXPECT_EQ(FirmwareBlobHandler::UpdateState::verificationPending,
-                  realHandler->getCurrentState());
+        expectedState(FirmwareBlobHandler::UpdateState::verificationPending);
 
         EXPECT_TRUE(handler->open(session, flags, verifyBlobId));
         EXPECT_CALL(*verifyMockPtr, triggerVerification())
             .WillOnce(Return(true));
 
         EXPECT_TRUE(handler->commit(session, {}));
-        EXPECT_EQ(FirmwareBlobHandler::UpdateState::verificationStarted,
-                  realHandler->getCurrentState());
+        expectedState(FirmwareBlobHandler::UpdateState::verificationStarted);
     }
 
     std::uint16_t session = 1;
@@ -104,12 +101,9 @@
     expectedMeta.metadata.push_back(
         static_cast<std::uint8_t>(VerifyCheckResponses::failed));
 
-    auto realHandler = dynamic_cast<FirmwareBlobHandler*>(handler.get());
     EXPECT_TRUE(handler->stat(session, &meta));
     EXPECT_EQ(expectedMeta, meta);
-
-    EXPECT_EQ(FirmwareBlobHandler::UpdateState::verificationCompleted,
-              realHandler->getCurrentState());
+    expectedState(FirmwareBlobHandler::UpdateState::verificationCompleted);
 }
 
 TEST_F(FirmwareHandlerVerificationStartedTest,
@@ -128,12 +122,9 @@
     expectedMeta.metadata.push_back(
         static_cast<std::uint8_t>(VerifyCheckResponses::success));
 
-    auto realHandler = dynamic_cast<FirmwareBlobHandler*>(handler.get());
     EXPECT_TRUE(handler->stat(session, &meta));
     EXPECT_EQ(expectedMeta, meta);
-
-    EXPECT_EQ(FirmwareBlobHandler::UpdateState::verificationCompleted,
-              realHandler->getCurrentState());
+    expectedState(FirmwareBlobHandler::UpdateState::verificationCompleted);
 }
 
 /* TODO: Once verificationCompleted is the state, canHandleBlob should accept
@@ -253,9 +244,7 @@
 {
     getToVerificationStarted(staticLayoutBlobId);
     EXPECT_TRUE(handler->commit(session, {}));
-    auto realHandler = dynamic_cast<FirmwareBlobHandler*>(handler.get());
-    EXPECT_EQ(FirmwareBlobHandler::UpdateState::verificationStarted,
-              realHandler->getCurrentState());
+    expectedState(FirmwareBlobHandler::UpdateState::verificationStarted);
 }
 
 /*