Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4393)

Unified Diff: chrome/installer/util/work_item_list_unittest.cc

Issue 1882923003: Add best-effort/allow rollback flags on WorkItem. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simple_list_tests
Patch Set: fix build error Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/installer/util/work_item_list_unittest.cc
diff --git a/chrome/installer/util/work_item_list_unittest.cc b/chrome/installer/util/work_item_list_unittest.cc
index 2d028eb5efce0fee0a2861791cea2afb63142cfc..d09071be2a4c04f1199c99fa13fe09c58649d3cd 100644
--- a/chrome/installer/util/work_item_list_unittest.cc
+++ b/chrome/installer/util/work_item_list_unittest.cc
@@ -28,12 +28,12 @@ TEST(WorkItemListTest, ExecutionSuccess) {
// Expect all three items to be done in order then undone.
InSequence s;
- EXPECT_CALL(*item1, Do()).WillOnce(Return(true));
- EXPECT_CALL(*item2, Do()).WillOnce(Return(true));
- EXPECT_CALL(*item3, Do()).WillOnce(Return(true));
- EXPECT_CALL(*item3, Rollback());
- EXPECT_CALL(*item2, Rollback());
- EXPECT_CALL(*item1, Rollback());
+ EXPECT_CALL(*item1, DoImpl()).WillOnce(Return(true));
+ EXPECT_CALL(*item2, DoImpl()).WillOnce(Return(true));
+ EXPECT_CALL(*item3, DoImpl()).WillOnce(Return(true));
+ EXPECT_CALL(*item3, RollbackImpl());
+ EXPECT_CALL(*item2, RollbackImpl());
+ EXPECT_CALL(*item1, RollbackImpl());
}
// Add the items to the list.
@@ -59,10 +59,10 @@ TEST(WorkItemListTest, ExecutionFailAndRollback) {
// Expect the two first work items to be done in order then undone.
InSequence s;
- EXPECT_CALL(*item1, Do()).WillOnce(Return(true));
- EXPECT_CALL(*item2, Do()).WillOnce(Return(false));
- EXPECT_CALL(*item2, Rollback());
- EXPECT_CALL(*item1, Rollback());
+ EXPECT_CALL(*item1, DoImpl()).WillOnce(Return(true));
+ EXPECT_CALL(*item2, DoImpl()).WillOnce(Return(false));
+ EXPECT_CALL(*item2, RollbackImpl());
+ EXPECT_CALL(*item1, RollbackImpl());
}
// Add the items to the list.

Powered by Google App Engine
This is Rietveld 408576698