commit 438e67716c5fe95f045d67b772332d8ada3b68f8
author Nelly Vouzoukidou <nellyv@google.com> Fri Nov 30 10:23:14 2018 +0100
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Nov 30 12:21:35 2018 +0000
tree 9abd8203aeaa397bbc125fae31644623777a97e7
parent 2c00bf7ac2f8bb2b95f92a8cb92d754e9a76e862

[ledger] Don't EXPECT_X in function that returns an AssertionResult.

Test: Existing PageStorage tests still pass.
Change-Id: I27153cbed43af030105fc381764954cd14f500a4

bin/ledger/storage/impl/storage_test_utils.cc

diff --git a/bin/ledger/storage/impl/storage_test_utils.cc b/bin/ledger/storage/impl/storage_test_utils.cc
index e945054..fff8c8e 100644
--- a/bin/ledger/storage/impl/storage_test_utils.cc
+++ b/bin/ledger/storage/impl/storage_test_utils.cc
@@ -154,7 +154,10 @@
       callback::Capture(callback::SetWhenCalled(&called), &status,
                         &object_identifier));
   RunLoopFor(kSufficientDelay);
-  EXPECT_TRUE(called);
+  if (!called) {
+    return ::testing::AssertionFailure()
+           << "AddObjectFromLocal callback wasn't called.";
+  }
   if (status != Status::OK) {
     return ::testing::AssertionFailure()
            << "AddObjectFromLocal failed with status " << status
@@ -166,7 +169,9 @@
       object_identifier, PageStorage::Location::LOCAL,
       callback::Capture(callback::SetWhenCalled(&called), &status, &result));
   RunLoopFor(kSufficientDelay);
-  EXPECT_TRUE(called);
+  if (!called) {
+    return ::testing::AssertionFailure() << "GetObject callback wasn't called.";
+  }
   if (status != Status::OK) {
     return ::testing::AssertionFailure()
            << "GetObject failed with status " << status << ". value: " << value
@@ -231,7 +236,10 @@
       GetStorage(), callback::Capture(callback::SetWhenCalled(&called), &status,
                                       empty_node_identifier));
   RunLoopFor(kSufficientDelay);
-  EXPECT_TRUE(called);
+  if (!called) {
+    return ::testing::AssertionFailure()
+           << "TreeNode::Empty callback wasn't called.";
+  }
   if (status != Status::OK) {
     return ::testing::AssertionFailure()
            << "TreeNode::Empty failed with status " << status;
@@ -248,10 +256,13 @@
       GetStorage(), identifier,
       callback::Capture(callback::SetWhenCalled(&called), &status, &result));
   RunLoopFor(kSufficientDelay);
-  EXPECT_TRUE(called);
+  if (!called) {
+    return ::testing::AssertionFailure()
+           << "TreeNode::FromIdentifier callback wasn't called.";
+  }
   if (status != Status::OK) {
     return ::testing::AssertionFailure()
-           << "TreeNode::FromDigest failed with status " << status;
+           << "TreeNode::FromIdentifier failed with status " << status;
   }
   node->swap(result);
   return ::testing::AssertionSuccess();
@@ -270,7 +281,10 @@
                         &identifier));
 
   RunLoopFor(kSufficientDelay);
-  EXPECT_TRUE(called);
+  if (!called) {
+    return ::testing::AssertionFailure()
+           << "TreeNode::FromEntries callback wasn't called.";
+  }
   if (status != Status::OK) {
     return ::testing::AssertionFailure()
            << "TreeNode::FromEntries failed with status " << status;
@@ -293,7 +307,10 @@
                         new_root_identifier, &new_nodes),
       &kTestNodeLevelCalculator);
   RunLoopFor(kSufficientDelay);
-  EXPECT_TRUE(called);
+  if (!called) {
+    return ::testing::AssertionFailure()
+           << "btree::ApplyChanges callback wasn't called.";
+  }
   if (status != Status::OK) {
     return ::testing::AssertionFailure()
            << "btree::ApplyChanges failed with status " << status;