commit 1d66fe6ee6805d682e0b6be4b177b58b8acbade2
author Patrick Venture <venture@google.com> Mon Jun 03 14:57:27 2019 -0700
committer Patrick Venture <venture@google.com> Tue Jun 04 18:15:15 2019 +0000
tree 04659eb1428f883a8278271d6b06fb04cebfdf7a
parent fdeb864820b17a7b6d4e26c64f9fcad74fa2415f

merge Verification and Update Interfaces

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

test/firmware_handler_unittest.cpp

diff --git a/test/firmware_handler_unittest.cpp b/test/firmware_handler_unittest.cpp
index e2ef7f4..a5d60f5 100644
--- a/test/firmware_handler_unittest.cpp
+++ b/test/firmware_handler_unittest.cpp
@@ -1,8 +1,7 @@
-#include "bmc_update_mock.hpp"
 #include "firmware_handler.hpp"
 #include "image_mock.hpp"
+#include "triggerable_mock.hpp"
 #include "util.hpp"
-#include "verification_mock.hpp"
 
 #include <algorithm>
 #include <vector>
@@ -23,7 +22,7 @@
     };
 
     auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(
-        {}, data, CreateVerifyMock(), CreateUpdateMock());
+        {}, data, CreateTriggerMock(), CreateTriggerMock());
     EXPECT_EQ(handler, nullptr);
 }
 TEST(FirmwareHandlerTest, CreateEmptyDataHandlerListFails)
@@ -36,7 +35,7 @@
     };
 
     auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(
-        blobs, {}, CreateVerifyMock(), CreateUpdateMock());
+        blobs, {}, CreateTriggerMock(), CreateTriggerMock());
     EXPECT_EQ(handler, nullptr);
 }
 TEST(FirmwareHandlerTest, VerifyHashRequiredForHappiness)
@@ -52,13 +51,13 @@
     };
 
     auto handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(
-        blobs, data, CreateVerifyMock(), CreateUpdateMock());
+        blobs, data, CreateTriggerMock(), CreateTriggerMock());
     EXPECT_EQ(handler, nullptr);
 
     blobs.push_back({hashBlobId, &imageMock});
 
     handler = FirmwareBlobHandler::CreateFirmwareBlobHandler(
-        blobs, data, CreateVerifyMock(), CreateUpdateMock());
+        blobs, data, CreateTriggerMock(), CreateTriggerMock());
     auto result = handler->getBlobIds();
     std::vector<std::string> expectedBlobs = {"asdf", hashBlobId};
     EXPECT_THAT(result, UnorderedElementsAreArray(expectedBlobs));