commit 0f82ce40757a3a5dedf419baf7da2d76ccc67750
author Patrick Venture <venture@google.com> Tue May 28 14:06:04 2019 -0700
committer Patrick Venture <venture@google.com> Tue May 28 15:52:06 2019 -0700
tree d8348372036053ba3b3c00c874b950dbb86c9491
parent 072a7dd6b58bdb6c5ce11f3e941646f7c5467442

test: firmware verificationPending: minor fixes

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

test/firmware_state_verificationpending_unittest.cpp

diff --git a/test/firmware_state_verificationpending_unittest.cpp b/test/firmware_state_verificationpending_unittest.cpp
index c42d83e..61b25c2 100644
--- a/test/firmware_state_verificationpending_unittest.cpp
+++ b/test/firmware_state_verificationpending_unittest.cpp
@@ -67,14 +67,15 @@
 TEST_F(FirmwareHandlerVerificationPendingTest, VerifyBlobIdAvailableInState)
 {
     /* Only in the verificationPending state (and later), should the
-     * verifyBlobId be present. */
-
+     * verifyBlobId be present.
+     */
     EXPECT_FALSE(handler->canHandleBlob(verifyBlobId));
 
     getToVerificationPending(staticLayoutBlobId);
 
     EXPECT_TRUE(handler->canHandleBlob(verifyBlobId));
     EXPECT_TRUE(handler->canHandleBlob(activeImageBlobId));
+    EXPECT_FALSE(handler->canHandleBlob(updateBlobId));
 }
 
 /*
@@ -106,7 +107,7 @@
        StatOnVerificationBlobReturnsFailure)
 {
     getToVerificationPending(hashBlobId);
-    ASSERT_TRUE(handler->canHandleBlob(activeHashBlobId));
+    ASSERT_TRUE(handler->canHandleBlob(verifyBlobId));
 
     blobs::BlobMeta meta;
     EXPECT_FALSE(handler->stat(verifyBlobId, &meta));
@@ -142,13 +143,14 @@
     EXPECT_TRUE(handler->open(session, flags, verifyBlobId));
 }
 
-TEST_F(FirmwareHandlerVerificationPendingTest, OpenActiveImageBlobFails)
+TEST_F(FirmwareHandlerVerificationPendingTest, OpenActiveBlobsFail)
 {
     /* Try opening the active blob Id.  This test is equivalent to trying to
      * open the active hash blob id, in that neither are ever allowed.
      */
     getToVerificationPending(staticLayoutBlobId);
     EXPECT_FALSE(handler->open(session, flags, activeImageBlobId));
+    EXPECT_FALSE(handler->open(session, flags, activeHashBlobId));
 }
 
 TEST_F(FirmwareHandlerVerificationPendingTest,
@@ -271,7 +273,7 @@
     getToVerificationPending(staticLayoutBlobId);
 
     EXPECT_TRUE(handler->open(session, flags, verifyBlobId));
-    EXPECT_THAT(handler->read(session, 0, 32), IsEmpty());
+    EXPECT_THAT(handler->read(session, 0, 1), IsEmpty());
 }
 
 } // namespace