From e22247ec3383f463e4baaaa1b9c6783b7adf334c Mon Sep 17 00:00:00 2001
From: cfredric <cfredric@chromium.org>
Date: Thu, 22 Jul 2021 21:08:57 +0000
Subject: [PATCH] Simplify BarrierClosure tests and add a few expectations.
This avoids using standalone helper functions in favor of using inline
lambdas, which keeps each test case more self-contained. It also adds
some expectations about when the barrier_callback is null.
Change-Id: Ibfe20cf49a7615e5ce72e44e0bd5b5076368a471
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3043926
Auto-Submit: Chris Fredrickson <cfredric@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#904477}
---
base/barrier_closure_unittest.cc | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/base/barrier_closure_unittest.cc b/base/barrier_closure_unittest.cc
index 05104c1a99a42..7bb728550a3ba 100644
--- a/base/barrier_closure_unittest.cc
+++ b/base/barrier_closure_unittest.cc
@@ -5,27 +5,23 @@
#include "base/barrier_closure.h"
#include "base/bind.h"
+#include "base/test/bind.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
-void Increment(int* count) { (*count)++; }
-
TEST(BarrierClosureTest, RunImmediatelyForZeroClosures) {
int count = 0;
- auto done_closure = base::BindOnce(&Increment, base::Unretained(&count));
-
- base::RepeatingClosure barrier_closure =
- base::BarrierClosure(0, std::move(done_closure));
+ base::RepeatingClosure barrier_closure = base::BarrierClosure(
+ 0, base::BindLambdaForTesting([&count]() { ++count; }));
EXPECT_EQ(1, count);
+ EXPECT_FALSE(barrier_closure.is_null());
}
TEST(BarrierClosureTest, RunAfterNumClosures) {
int count = 0;
- auto done_closure = base::BindOnce(&Increment, base::Unretained(&count));
-
- base::RepeatingClosure barrier_closure =
- base::BarrierClosure(2, std::move(done_closure));
+ base::RepeatingClosure barrier_closure = base::BarrierClosure(
+ 2, base::BindLambdaForTesting([&count]() { ++count; }));
EXPECT_EQ(0, count);
barrier_closure.Run();
@@ -61,10 +57,6 @@ TEST(BarrierClosureTest, ReleasesDoneClosureWhenDone) {
EXPECT_TRUE(done_destructed);
}
-void ResetBarrierClosure(base::RepeatingClosure* closure) {
- *closure = base::RepeatingClosure();
-}
-
// Tests a case when |done_closure| resets a |barrier_closure|.
// |barrier_closure| is a RepeatingClosure holding the |done_closure|.
// |done_closure| holds a pointer back to the |barrier_closure|. When
@@ -74,9 +66,12 @@ void ResetBarrierClosure(base::RepeatingClosure* closure) {
// ResetBarrierClosure() or this test would crash inside Run().
TEST(BarrierClosureTest, KeepingClosureAliveUntilDone) {
base::RepeatingClosure barrier_closure;
- auto done_closure = base::BindOnce(ResetBarrierClosure, &barrier_closure);
- barrier_closure = base::BarrierClosure(1, std::move(done_closure));
+ barrier_closure =
+ base::BarrierClosure(1, base::BindLambdaForTesting([&barrier_closure]() {
+ barrier_closure = base::RepeatingClosure();
+ }));
barrier_closure.Run();
+ EXPECT_TRUE(barrier_closure.is_null());
}
} // namespace