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

diff --git a/test/firmware_state_notyetstarted_unittest.cpp b/test/firmware_state_notyetstarted_unittest.cpp
index 4d850aa..f662820 100644
--- a/test/firmware_state_notyetstarted_unittest.cpp
+++ b/test/firmware_state_notyetstarted_unittest.cpp
@@ -90,26 +90,22 @@
  */
 TEST_F(FirmwareHandlerNotYetStartedTest, OpenStaticImageFileVerifyStateChange)
 {
-    auto realHandler = dynamic_cast<FirmwareBlobHandler*>(handler.get());
-
     EXPECT_CALL(imageMock, open(staticLayoutBlobId)).WillOnce(Return(true));
 
     EXPECT_TRUE(handler->open(session, flags, staticLayoutBlobId));
-    EXPECT_EQ(FirmwareBlobHandler::UpdateState::uploadInProgress,
-              realHandler->getCurrentState());
+
+    expectedState(FirmwareBlobHandler::UpdateState::uploadInProgress);
 
     EXPECT_TRUE(handler->canHandleBlob(activeImageBlobId));
 }
 
 TEST_F(FirmwareHandlerNotYetStartedTest, OpenHashFileVerifyStateChange)
 {
-    auto realHandler = dynamic_cast<FirmwareBlobHandler*>(handler.get());
-
     EXPECT_CALL(imageMock, open(hashBlobId)).WillOnce(Return(true));
 
     EXPECT_TRUE(handler->open(session, flags, hashBlobId));
-    EXPECT_EQ(FirmwareBlobHandler::UpdateState::uploadInProgress,
-              realHandler->getCurrentState());
+
+    expectedState(FirmwareBlobHandler::UpdateState::uploadInProgress);
 
     EXPECT_TRUE(handler->canHandleBlob(activeHashBlobId));
 }