Skip to content
This repository was archived by the owner on Oct 23, 2023. It is now read-only.

Commit 6059157

Browse files
edomora97edomora97
committed
Fixed warnings in UnionPromiseBuilder tests
1 parent 001e66d commit 6059157

2 files changed

Lines changed: 60 additions & 40 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
build
2-
_build
3-
_builds
1+
build*
2+
_build*
43

54
*.swp
65

@@ -18,4 +17,4 @@ cmake-build-debug/
1817

1918
tags
2019

21-
.vscode
20+
.vscode

‎cpp/util/union_promise_test.cpp‎

Lines changed: 57 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ kj::Exception getError(std::string what = "on no!") {
1313
kj::str(what));
1414
}
1515

16+
// NOLINTNEXTLINE
1617
TEST(UnionPromise, NoPromises) {
1718
kj::EventLoop loop;
1819
kj::WaitScope waitScope(loop);
@@ -24,13 +25,14 @@ TEST(UnionPromise, NoPromises) {
2425
.Finalize()
2526
.then([&]() { finalized = true; })
2627
.wait(waitScope);
27-
ASSERT_TRUE(finalized);
28+
EXPECT_TRUE(finalized);
2829
}
2930

3031
/*
3132
* Single Promise fulfilled
3233
*/
3334

35+
// NOLINTNEXTLINE
3436
TEST(UnionPromise, SinglePromiseFulfilledBeforeAdd) {
3537
kj::EventLoop loop;
3638
kj::WaitScope waitScope(loop);
@@ -45,9 +47,10 @@ TEST(UnionPromise, SinglePromiseFulfilledBeforeAdd) {
4547
.Finalize()
4648
.then([&]() { finalized = true; })
4749
.wait(waitScope);
48-
ASSERT_TRUE(finalized);
50+
EXPECT_TRUE(finalized);
4951
}
5052

53+
// NOLINTNEXTLINE
5154
TEST(UnionPromise, SinglePromiseFulfilledAfterAdd) {
5255
kj::EventLoop loop;
5356
kj::WaitScope waitScope(loop);
@@ -62,9 +65,10 @@ TEST(UnionPromise, SinglePromiseFulfilledAfterAdd) {
6265
.Finalize()
6366
.then([&]() { finalized = true; })
6467
.wait(waitScope);
65-
ASSERT_TRUE(finalized);
68+
EXPECT_TRUE(finalized);
6669
}
6770

71+
// NOLINTNEXTLINE
6872
TEST(UnionPromise, SinglePromiseFulfilledAfterFinalize) {
6973
kj::EventLoop loop;
7074
kj::WaitScope waitScope(loop);
@@ -76,13 +80,14 @@ TEST(UnionPromise, SinglePromiseFulfilledAfterFinalize) {
7680
std::move(builder).Finalize().then([&]() { finalized = true; });
7781
pair.fulfiller->fulfill();
7882
finalizer.wait(waitScope);
79-
ASSERT_TRUE(finalized);
83+
EXPECT_TRUE(finalized);
8084
}
8185

8286
/*
8387
* Single Promise rejected
8488
*/
8589

90+
// NOLINTNEXTLINE
8691
TEST(UnionPromise, SinglePromisesRejectedBefore) {
8792
kj::EventLoop loop;
8893
kj::WaitScope waitScope(loop);
@@ -99,10 +104,11 @@ TEST(UnionPromise, SinglePromisesRejectedBefore) {
99104
.Finalize()
100105
.then([&]() { finalized = true; }, [&](auto ex) { errored = true; })
101106
.wait(waitScope);
102-
ASSERT_FALSE(finalized);
103-
ASSERT_TRUE(errored);
107+
EXPECT_FALSE(finalized);
108+
EXPECT_TRUE(errored);
104109
}
105110

111+
// NOLINTNEXTLINE
106112
TEST(UnionPromise, SinglePromisesRejectedAfterAdd) {
107113
kj::EventLoop loop;
108114
kj::WaitScope waitScope(loop);
@@ -120,10 +126,11 @@ TEST(UnionPromise, SinglePromisesRejectedAfterAdd) {
120126
.Finalize()
121127
.then([&]() { finalized = true; }, [&](auto ex) { errored = true; })
122128
.wait(waitScope);
123-
ASSERT_FALSE(finalized);
124-
ASSERT_TRUE(errored);
129+
EXPECT_FALSE(finalized);
130+
EXPECT_TRUE(errored);
125131
}
126132

133+
// NOLINTNEXTLINE
127134
TEST(UnionPromise, SinglePromisesRejectedAfterFinalize) {
128135
kj::EventLoop loop;
129136
kj::WaitScope waitScope(loop);
@@ -140,14 +147,15 @@ TEST(UnionPromise, SinglePromisesRejectedAfterFinalize) {
140147

141148
pair.fulfiller->reject(getError());
142149
finalizer.wait(waitScope);
143-
ASSERT_FALSE(finalized);
144-
ASSERT_TRUE(errored);
150+
EXPECT_FALSE(finalized);
151+
EXPECT_TRUE(errored);
145152
}
146153

147154
/*
148155
* Multiple Promises fulfilled
149156
*/
150157

158+
// NOLINTNEXTLINE
151159
TEST(UnionPromise, MultiplePromisesFulfilledBeforeAdd) {
152160
kj::EventLoop loop;
153161
kj::WaitScope waitScope(loop);
@@ -166,9 +174,10 @@ TEST(UnionPromise, MultiplePromisesFulfilledBeforeAdd) {
166174
.Finalize()
167175
.then([&]() { finalized = true; })
168176
.wait(waitScope);
169-
ASSERT_TRUE(finalized);
177+
EXPECT_TRUE(finalized);
170178
}
171179

180+
// NOLINTNEXTLINE
172181
TEST(UnionPromise, MultiplePromisesFulfilledBeforeAndAfterAdd) {
173182
kj::EventLoop loop;
174183
kj::WaitScope waitScope(loop);
@@ -188,9 +197,10 @@ TEST(UnionPromise, MultiplePromisesFulfilledBeforeAndAfterAdd) {
188197
.Finalize()
189198
.then([&]() { finalized = true; })
190199
.wait(waitScope);
191-
ASSERT_TRUE(finalized);
200+
EXPECT_TRUE(finalized);
192201
}
193202

203+
// NOLINTNEXTLINE
194204
TEST(UnionPromise, MultiplePromisesFulfilledAfterAdd) {
195205
kj::EventLoop loop;
196206
kj::WaitScope waitScope(loop);
@@ -210,9 +220,10 @@ TEST(UnionPromise, MultiplePromisesFulfilledAfterAdd) {
210220
.Finalize()
211221
.then([&]() { finalized = true; })
212222
.wait(waitScope);
213-
ASSERT_TRUE(finalized);
223+
EXPECT_TRUE(finalized);
214224
}
215225

226+
// NOLINTNEXTLINE
216227
TEST(UnionPromise, MultiplePromisesFulfilledAfterFinalize) {
217228
kj::EventLoop loop;
218229
kj::WaitScope waitScope(loop);
@@ -231,13 +242,14 @@ TEST(UnionPromise, MultiplePromisesFulfilledAfterFinalize) {
231242

232243
pair2.fulfiller->fulfill();
233244
finalizer.wait(waitScope);
234-
ASSERT_TRUE(finalized);
245+
EXPECT_TRUE(finalized);
235246
}
236247

237248
/*
238249
* Multiple Promises rejected
239250
*/
240251

252+
// NOLINTNEXTLINE
241253
TEST(UnionPromise, MultiplePromisesOneRejectedBeforeAdd) {
242254
kj::EventLoop loop;
243255
kj::WaitScope waitScope(loop);
@@ -260,10 +272,11 @@ TEST(UnionPromise, MultiplePromisesOneRejectedBeforeAdd) {
260272
.Finalize()
261273
.then([&]() { finalized = true; }, [&](auto ex) { errored = true; })
262274
.wait(waitScope);
263-
ASSERT_FALSE(finalized);
264-
ASSERT_TRUE(errored);
275+
EXPECT_FALSE(finalized);
276+
EXPECT_TRUE(errored);
265277
}
266278

279+
// NOLINTNEXTLINE
267280
TEST(UnionPromise, MultiplePromisesOneRejectedAfterAdd) {
268281
kj::EventLoop loop;
269282
kj::WaitScope waitScope(loop);
@@ -287,10 +300,11 @@ TEST(UnionPromise, MultiplePromisesOneRejectedAfterAdd) {
287300
.Finalize()
288301
.then([&]() { finalized = true; }, [&](auto ex) { errored = true; })
289302
.wait(waitScope);
290-
ASSERT_FALSE(finalized);
291-
ASSERT_TRUE(errored);
303+
EXPECT_FALSE(finalized);
304+
EXPECT_TRUE(errored);
292305
}
293306

307+
// NOLINTNEXTLINE
294308
TEST(UnionPromise, MultiplePromisesOneRejectedAfterFinalize) {
295309
kj::EventLoop loop;
296310
kj::WaitScope waitScope(loop);
@@ -313,14 +327,15 @@ TEST(UnionPromise, MultiplePromisesOneRejectedAfterFinalize) {
313327
kj::heapString(__FILE__), __LINE__,
314328
kj::heapString("Oh no!")));
315329
finalizer.wait(waitScope);
316-
ASSERT_FALSE(finalized);
317-
ASSERT_TRUE(errored);
330+
EXPECT_FALSE(finalized);
331+
EXPECT_TRUE(errored);
318332
}
319333

320334
/*
321335
* Use cases
322336
*/
323337

338+
// NOLINTNEXTLINE
324339
TEST(UnionPromise, NonFatalFailures) {
325340
kj::EventLoop loop;
326341
kj::WaitScope waitScope(loop);
@@ -342,12 +357,13 @@ TEST(UnionPromise, NonFatalFailures) {
342357
.Finalize()
343358
.then([&]() { success = true; }, [&](auto ex) { errored = true; })
344359
.wait(waitScope);
345-
ASSERT_TRUE(success);
346-
ASSERT_FALSE(errored);
347-
ASSERT_TRUE(onReadyCalled);
348-
ASSERT_FALSE(onFailureCalled);
360+
EXPECT_TRUE(success);
361+
EXPECT_FALSE(errored);
362+
EXPECT_TRUE(onReadyCalled);
363+
EXPECT_FALSE(onFailureCalled);
349364
}
350365

366+
// NOLINTNEXTLINE
351367
TEST(UnionPromise, RandomResolveOrder) {
352368
kj::EventLoop loop;
353369
kj::WaitScope waitScope(loop);
@@ -363,7 +379,7 @@ TEST(UnionPromise, RandomResolveOrder) {
363379
fulfillers[i] = std::move(pair.fulfiller);
364380
}
365381

366-
std::mt19937 rnd(SEED);
382+
std::mt19937 rnd(SEED); // NOLINT
367383
std::shuffle(fulfillers.begin(), fulfillers.end(), rnd);
368384

369385
util::UnionPromiseBuilder builder;
@@ -379,9 +395,10 @@ TEST(UnionPromise, RandomResolveOrder) {
379395
.Finalize()
380396
.then([&]() { finalized = true; })
381397
.wait(waitScope);
382-
ASSERT_TRUE(finalized);
398+
EXPECT_TRUE(finalized);
383399
}
384400

401+
// NOLINTNEXTLINE
385402
TEST(UnionPromise, RandomResolveOrderOneFailed) {
386403
kj::EventLoop loop;
387404
kj::WaitScope waitScope(loop);
@@ -397,7 +414,7 @@ TEST(UnionPromise, RandomResolveOrderOneFailed) {
397414
fulfillers[i] = std::move(pair.fulfiller);
398415
}
399416

400-
std::mt19937 rnd(SEED);
417+
std::mt19937 rnd(SEED); // NOLINT
401418
std::shuffle(fulfillers.begin(), fulfillers.end(), rnd);
402419

403420
util::UnionPromiseBuilder builder;
@@ -406,10 +423,11 @@ TEST(UnionPromise, RandomResolveOrderOneFailed) {
406423
}
407424
size_t failIndex = rnd() % NUM_PROMISES;
408425
for (size_t i = 0; i < NUM_PROMISES; i++) {
409-
if (i == failIndex)
426+
if (i == failIndex) {
410427
fulfillers[i]->reject(getError());
411-
else
428+
} else {
412429
fulfillers[i]->fulfill();
430+
}
413431
}
414432

415433
bool finalized = false;
@@ -418,10 +436,11 @@ TEST(UnionPromise, RandomResolveOrderOneFailed) {
418436
.Finalize()
419437
.then([&]() { finalized = true; }, [&](auto ex) { errored = true; })
420438
.wait(waitScope);
421-
ASSERT_FALSE(finalized);
422-
ASSERT_TRUE(errored);
439+
EXPECT_FALSE(finalized);
440+
EXPECT_TRUE(errored);
423441
}
424442

443+
// NOLINTNEXTLINE
425444
TEST(UnionPromise, ChainedPromises) {
426445
kj::EventLoop loop;
427446
kj::WaitScope waitScope(loop);
@@ -454,13 +473,14 @@ TEST(UnionPromise, ChainedPromises) {
454473
std::move(builder).Finalize().then([&]() { finalized = true; });
455474
A.fulfiller->fulfill();
456475
finalizer.wait(waitScope);
457-
ASSERT_TRUE(finalized);
476+
EXPECT_TRUE(finalized);
458477
}
459478

460479
/*
461480
* Callback methods
462481
*/
463482

483+
// NOLINTNEXTLINE
464484
TEST(UnionPromise, OnReady) {
465485
kj::EventLoop loop;
466486
kj::WaitScope waitScope(loop);
@@ -476,10 +496,11 @@ TEST(UnionPromise, OnReady) {
476496
builder.OnFailure([&errored](auto ex) { errored = true; });
477497

478498
std::move(builder).Finalize().wait(waitScope);
479-
ASSERT_TRUE(done.all());
480-
ASSERT_FALSE(errored);
499+
EXPECT_TRUE(done.all());
500+
EXPECT_FALSE(errored);
481501
}
482502

503+
// NOLINTNEXTLINE
483504
TEST(UnionPromise, OnFailure) {
484505
kj::EventLoop loop;
485506
kj::WaitScope waitScope(loop);
@@ -500,8 +521,8 @@ TEST(UnionPromise, OnFailure) {
500521
pair.fulfiller->reject(getError());
501522

502523
std::move(builder).Finalize().then([]() {}, [](auto ex) {}).wait(waitScope);
503-
ASSERT_TRUE(failCallbacks.all());
504-
ASSERT_FALSE(succeded);
524+
EXPECT_TRUE(failCallbacks.all());
525+
EXPECT_FALSE(succeded);
505526
}
506527

507528
} // namespace

0 commit comments

Comments
 (0)