Skip to content

Commit 9133227

Browse files
author
MarcoFalke
committed
Merge #14935: tests: Test for expected return values when calling functions returning a success code
c84c2b8 tests: Test for expected return values when calling functions returning a success code (practicalswift) Pull request description: Test for expected return values when calling functions returning a success code (instead of discarding the return values). **Note to reviewers:** The following commands can be used to verify that the only text fragments added in this PR are `BOOST_CHECK(`, `!` and `)` : ``` $ git diff HEAD~1 | grep -E '^[\-][^\-]' | cut -b2- > before.txt $ git diff HEAD~1 | grep -E '^[\+][^\+]' | cut -b2- > after.txt $ cat after.txt | sed 's/BOOST_CHECK(//g' | sed 's/));/);/g' | tr -d '!' > after-sed.txt $ diff -u before.txt after-sed.txt $ ``` Tree-SHA512: ff0863ef2046a2eda3c44e9c6b9aedfe167881f2fa58db29fef859416831233ef6502a3a11fd2322bc1a924db83df8d4a5c5879298007f2a7b085e2a7286af70
2 parents 6723d8e + c84c2b8 commit 9133227

16 files changed

+161
-161
lines changed

‎src/test/addrman_tests.cpp

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,11 @@ BOOST_AUTO_TEST_CASE(addrman_ports)
148148

149149
// Test 7; Addr with same IP but diff port does not replace existing addr.
150150
CService addr1 = ResolveService("250.1.1.1", 8333);
151-
addrman.Add(CAddress(addr1, NODE_NONE), source);
151+
BOOST_CHECK(addrman.Add(CAddress(addr1, NODE_NONE), source));
152152
BOOST_CHECK_EQUAL(addrman.size(), 1U);
153153

154154
CService addr1_port = ResolveService("250.1.1.1", 8334);
155-
addrman.Add(CAddress(addr1_port, NODE_NONE), source);
155+
BOOST_CHECK(!addrman.Add(CAddress(addr1_port, NODE_NONE), source));
156156
BOOST_CHECK_EQUAL(addrman.size(), 1U);
157157
CAddrInfo addr_ret2 = addrman.Select();
158158
BOOST_CHECK_EQUAL(addr_ret2.ToString(), "250.1.1.1:8333");
@@ -175,7 +175,7 @@ BOOST_AUTO_TEST_CASE(addrman_select)
175175

176176
// Test: Select from new with 1 addr in new.
177177
CService addr1 = ResolveService("250.1.1.1", 8333);
178-
addrman.Add(CAddress(addr1, NODE_NONE), source);
178+
BOOST_CHECK(addrman.Add(CAddress(addr1, NODE_NONE), source));
179179
BOOST_CHECK_EQUAL(addrman.size(), 1U);
180180

181181
bool newOnly = true;
@@ -199,20 +199,20 @@ BOOST_AUTO_TEST_CASE(addrman_select)
199199
CService addr3 = ResolveService("250.3.2.2", 9999);
200200
CService addr4 = ResolveService("250.3.3.3", 9999);
201201

202-
addrman.Add(CAddress(addr2, NODE_NONE), ResolveService("250.3.1.1", 8333));
203-
addrman.Add(CAddress(addr3, NODE_NONE), ResolveService("250.3.1.1", 8333));
204-
addrman.Add(CAddress(addr4, NODE_NONE), ResolveService("250.4.1.1", 8333));
202+
BOOST_CHECK(addrman.Add(CAddress(addr2, NODE_NONE), ResolveService("250.3.1.1", 8333)));
203+
BOOST_CHECK(addrman.Add(CAddress(addr3, NODE_NONE), ResolveService("250.3.1.1", 8333)));
204+
BOOST_CHECK(addrman.Add(CAddress(addr4, NODE_NONE), ResolveService("250.4.1.1", 8333)));
205205

206206
// Add three addresses to tried table.
207207
CService addr5 = ResolveService("250.4.4.4", 8333);
208208
CService addr6 = ResolveService("250.4.5.5", 7777);
209209
CService addr7 = ResolveService("250.4.6.6", 8333);
210210

211-
addrman.Add(CAddress(addr5, NODE_NONE), ResolveService("250.3.1.1", 8333));
211+
BOOST_CHECK(addrman.Add(CAddress(addr5, NODE_NONE), ResolveService("250.3.1.1", 8333)));
212212
addrman.Good(CAddress(addr5, NODE_NONE));
213-
addrman.Add(CAddress(addr6, NODE_NONE), ResolveService("250.3.1.1", 8333));
213+
BOOST_CHECK(addrman.Add(CAddress(addr6, NODE_NONE), ResolveService("250.3.1.1", 8333)));
214214
addrman.Good(CAddress(addr6, NODE_NONE));
215-
addrman.Add(CAddress(addr7, NODE_NONE), ResolveService("250.1.1.3", 8333));
215+
BOOST_CHECK(addrman.Add(CAddress(addr7, NODE_NONE), ResolveService("250.1.1.3", 8333)));
216216
addrman.Good(CAddress(addr7, NODE_NONE));
217217

218218
// Test: 6 addrs + 1 addr from last test = 7.
@@ -236,19 +236,19 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions)
236236

237237
for (unsigned int i = 1; i < 18; i++) {
238238
CService addr = ResolveService("250.1.1." + std::to_string(i));
239-
addrman.Add(CAddress(addr, NODE_NONE), source);
239+
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
240240

241241
//Test: No collision in new table yet.
242242
BOOST_CHECK_EQUAL(addrman.size(), i);
243243
}
244244

245245
//Test: new table collision!
246246
CService addr1 = ResolveService("250.1.1.18");
247-
addrman.Add(CAddress(addr1, NODE_NONE), source);
247+
BOOST_CHECK(addrman.Add(CAddress(addr1, NODE_NONE), source));
248248
BOOST_CHECK_EQUAL(addrman.size(), 17U);
249249

250250
CService addr2 = ResolveService("250.1.1.19");
251-
addrman.Add(CAddress(addr2, NODE_NONE), source);
251+
BOOST_CHECK(addrman.Add(CAddress(addr2, NODE_NONE), source));
252252
BOOST_CHECK_EQUAL(addrman.size(), 18U);
253253
}
254254

@@ -262,7 +262,7 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
262262

263263
for (unsigned int i = 1; i < 80; i++) {
264264
CService addr = ResolveService("250.1.1." + std::to_string(i));
265-
addrman.Add(CAddress(addr, NODE_NONE), source);
265+
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
266266
addrman.Good(CAddress(addr, NODE_NONE));
267267

268268
//Test: No collision in tried table yet.
@@ -271,11 +271,11 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
271271

272272
//Test: tried table collision!
273273
CService addr1 = ResolveService("250.1.1.80");
274-
addrman.Add(CAddress(addr1, NODE_NONE), source);
274+
BOOST_CHECK(addrman.Add(CAddress(addr1, NODE_NONE), source));
275275
BOOST_CHECK_EQUAL(addrman.size(), 79U);
276276

277277
CService addr2 = ResolveService("250.1.1.81");
278-
addrman.Add(CAddress(addr2, NODE_NONE), source);
278+
BOOST_CHECK(addrman.Add(CAddress(addr2, NODE_NONE), source));
279279
BOOST_CHECK_EQUAL(addrman.size(), 80U);
280280
}
281281

@@ -292,9 +292,9 @@ BOOST_AUTO_TEST_CASE(addrman_find)
292292
CNetAddr source1 = ResolveIP("250.1.2.1");
293293
CNetAddr source2 = ResolveIP("250.1.2.2");
294294

295-
addrman.Add(addr1, source1);
296-
addrman.Add(addr2, source2);
297-
addrman.Add(addr3, source1);
295+
BOOST_CHECK(addrman.Add(addr1, source1));
296+
BOOST_CHECK(!addrman.Add(addr2, source2));
297+
BOOST_CHECK(addrman.Add(addr3, source1));
298298

299299
// Test: ensure Find returns an IP matching what we searched on.
300300
CAddrInfo* info1 = addrman.Find(addr1);
@@ -376,11 +376,11 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
376376
CNetAddr source2 = ResolveIP("250.2.3.3");
377377

378378
// Test: Ensure GetAddr works with new addresses.
379-
addrman.Add(addr1, source1);
380-
addrman.Add(addr2, source2);
381-
addrman.Add(addr3, source1);
382-
addrman.Add(addr4, source2);
383-
addrman.Add(addr5, source1);
379+
BOOST_CHECK(addrman.Add(addr1, source1));
380+
BOOST_CHECK(addrman.Add(addr2, source2));
381+
BOOST_CHECK(addrman.Add(addr3, source1));
382+
BOOST_CHECK(addrman.Add(addr4, source2));
383+
BOOST_CHECK(addrman.Add(addr5, source1));
384384

385385
// GetAddr returns 23% of addresses, 23% of 5 is 1 rounded down.
386386
BOOST_CHECK_EQUAL(addrman.GetAddr().size(), 1U);
@@ -549,7 +549,7 @@ BOOST_AUTO_TEST_CASE(addrman_selecttriedcollision)
549549
CNetAddr source = ResolveIP("252.2.2.2");
550550
for (unsigned int i = 1; i < 23; i++) {
551551
CService addr = ResolveService("250.1.1."+std::to_string(i));
552-
addrman.Add(CAddress(addr, NODE_NONE), source);
552+
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
553553
addrman.Good(addr);
554554

555555
// No collisions yet.
@@ -579,7 +579,7 @@ BOOST_AUTO_TEST_CASE(addrman_noevict)
579579
CNetAddr source = ResolveIP("252.2.2.2");
580580
for (unsigned int i = 1; i < 23; i++) {
581581
CService addr = ResolveService("250.1.1."+std::to_string(i));
582-
addrman.Add(CAddress(addr, NODE_NONE), source);
582+
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
583583
addrman.Good(addr);
584584

585585
// No collision yet.
@@ -589,7 +589,7 @@ BOOST_AUTO_TEST_CASE(addrman_noevict)
589589

590590
// Collision between 23 and 19.
591591
CService addr23 = ResolveService("250.1.1.23");
592-
addrman.Add(CAddress(addr23, NODE_NONE), source);
592+
BOOST_CHECK(addrman.Add(CAddress(addr23, NODE_NONE), source));
593593
addrman.Good(addr23);
594594

595595
BOOST_CHECK(addrman.size() == 23);
@@ -602,7 +602,7 @@ BOOST_AUTO_TEST_CASE(addrman_noevict)
602602
// Lets create two collisions.
603603
for (unsigned int i = 24; i < 33; i++) {
604604
CService addr = ResolveService("250.1.1."+std::to_string(i));
605-
addrman.Add(CAddress(addr, NODE_NONE), source);
605+
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
606606
addrman.Good(addr);
607607

608608
BOOST_CHECK(addrman.size() == i);
@@ -611,14 +611,14 @@ BOOST_AUTO_TEST_CASE(addrman_noevict)
611611

612612
// Cause a collision.
613613
CService addr33 = ResolveService("250.1.1.33");
614-
addrman.Add(CAddress(addr33, NODE_NONE), source);
614+
BOOST_CHECK(addrman.Add(CAddress(addr33, NODE_NONE), source));
615615
addrman.Good(addr33);
616616
BOOST_CHECK(addrman.size() == 33);
617617

618618
BOOST_CHECK(addrman.SelectTriedCollision().ToString() == "250.1.1.27:0");
619619

620620
// Cause a second collision.
621-
addrman.Add(CAddress(addr23, NODE_NONE), source);
621+
BOOST_CHECK(!addrman.Add(CAddress(addr23, NODE_NONE), source));
622622
addrman.Good(addr23);
623623
BOOST_CHECK(addrman.size() == 33);
624624

@@ -643,7 +643,7 @@ BOOST_AUTO_TEST_CASE(addrman_evictionworks)
643643
CNetAddr source = ResolveIP("252.2.2.2");
644644
for (unsigned int i = 1; i < 23; i++) {
645645
CService addr = ResolveService("250.1.1."+std::to_string(i));
646-
addrman.Add(CAddress(addr, NODE_NONE), source);
646+
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
647647
addrman.Good(addr);
648648

649649
// No collision yet.
@@ -653,7 +653,7 @@ BOOST_AUTO_TEST_CASE(addrman_evictionworks)
653653

654654
// Collision between 23 and 19.
655655
CService addr = ResolveService("250.1.1.23");
656-
addrman.Add(CAddress(addr, NODE_NONE), source);
656+
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
657657
addrman.Good(addr);
658658

659659
BOOST_CHECK(addrman.size() == 23);
@@ -668,14 +668,14 @@ BOOST_AUTO_TEST_CASE(addrman_evictionworks)
668668
BOOST_CHECK(addrman.SelectTriedCollision().ToString() == "[::]:0");
669669

670670
// If 23 was swapped for 19, then this should cause no collisions.
671-
addrman.Add(CAddress(addr, NODE_NONE), source);
671+
BOOST_CHECK(!addrman.Add(CAddress(addr, NODE_NONE), source));
672672
addrman.Good(addr);
673673

674674
BOOST_CHECK(addrman.SelectTriedCollision().ToString() == "[::]:0");
675675

676676
// If we insert 19 is should collide with 23.
677677
CService addr19 = ResolveService("250.1.1.19");
678-
addrman.Add(CAddress(addr19, NODE_NONE), source);
678+
BOOST_CHECK(!addrman.Add(CAddress(addr19, NODE_NONE), source));
679679
addrman.Good(addr19);
680680

681681
BOOST_CHECK(addrman.SelectTriedCollision().ToString() == "250.1.1.23:0");

‎src/test/checkqueue_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ BOOST_AUTO_TEST_CASE(test_CheckQueue_FrozenCleanup)
355355
// would get called twice).
356356
vChecks[0].should_freeze = true;
357357
control.Add(vChecks);
358-
control.Wait(); // Hangs here
358+
BOOST_CHECK(control.Wait()); // Hangs here
359359
});
360360
{
361361
std::unique_lock<std::mutex> l(FrozenCleanupCheck::m);

‎src/test/coins_tests.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ BOOST_AUTO_TEST_CASE(coins_cache_simulation_test)
176176
} else {
177177
removed_an_entry = true;
178178
coin.Clear();
179-
stack.back()->SpendCoin(COutPoint(txid, 0));
179+
BOOST_CHECK(stack.back()->SpendCoin(COutPoint(txid, 0)));
180180
}
181181
}
182182

@@ -211,14 +211,14 @@ BOOST_AUTO_TEST_CASE(coins_cache_simulation_test)
211211
// Every 100 iterations, flush an intermediate cache
212212
if (stack.size() > 1 && InsecureRandBool() == 0) {
213213
unsigned int flushIndex = InsecureRandRange(stack.size() - 1);
214-
stack[flushIndex]->Flush();
214+
BOOST_CHECK(stack[flushIndex]->Flush());
215215
}
216216
}
217217
if (InsecureRandRange(100) == 0) {
218218
// Every 100 iterations, change the cache stack.
219219
if (stack.size() > 0 && InsecureRandBool() == 0) {
220220
//Remove the top cache
221-
stack.back()->Flush();
221+
BOOST_CHECK(stack.back()->Flush());
222222
delete stack.back();
223223
stack.pop_back();
224224
}
@@ -403,7 +403,7 @@ BOOST_AUTO_TEST_CASE(updatecoins_simulation_test)
403403
// Disconnect the tx from the current UTXO
404404
// See code in DisconnectBlock
405405
// remove outputs
406-
stack.back()->SpendCoin(utxod->first);
406+
BOOST_CHECK(stack.back()->SpendCoin(utxod->first));
407407
// restore inputs
408408
if (!tx.IsCoinBase()) {
409409
const COutPoint &out = tx.vin[0].prevout;
@@ -444,13 +444,13 @@ BOOST_AUTO_TEST_CASE(updatecoins_simulation_test)
444444
// Every 100 iterations, flush an intermediate cache
445445
if (stack.size() > 1 && InsecureRandBool() == 0) {
446446
unsigned int flushIndex = InsecureRandRange(stack.size() - 1);
447-
stack[flushIndex]->Flush();
447+
BOOST_CHECK(stack[flushIndex]->Flush());
448448
}
449449
}
450450
if (InsecureRandRange(100) == 0) {
451451
// Every 100 iterations, change the cache stack.
452452
if (stack.size() > 0 && InsecureRandBool() == 0) {
453-
stack.back()->Flush();
453+
BOOST_CHECK(stack.back()->Flush());
454454
delete stack.back();
455455
stack.pop_back();
456456
}
@@ -589,7 +589,7 @@ void WriteCoinsViewEntry(CCoinsView& view, CAmount value, char flags)
589589
{
590590
CCoinsMap map;
591591
InsertCoinsMapEntry(map, value, flags);
592-
view.BatchWrite(map, {});
592+
BOOST_CHECK(view.BatchWrite(map, {}));
593593
}
594594

595595
class SingleEntryCacheTest

‎src/test/cuckoocache_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ static void test_cache_erase(size_t megabytes)
141141
set.insert(hashes_insert_copy[i]);
142142
/** Erase the first quarter */
143143
for (uint32_t i = 0; i < (n_insert / 4); ++i)
144-
set.contains(hashes[i], true);
144+
BOOST_CHECK(set.contains(hashes[i], true));
145145
/** Insert the second half */
146146
for (uint32_t i = (n_insert / 2); i < n_insert; ++i)
147147
set.insert(hashes_insert_copy[i]);
@@ -221,7 +221,7 @@ static void test_cache_erase_parallel(size_t megabytes)
221221
size_t start = ntodo*x;
222222
size_t end = ntodo*(x+1);
223223
for (uint32_t i = start; i < end; ++i)
224-
set.contains(hashes[i], true);
224+
BOOST_CHECK(set.contains(hashes[i], true));
225225
});
226226

227227
/** Wait for all threads to finish

‎src/test/dbwrapper_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_batch)
6767
// Remove key3 before it's even been written
6868
batch.Erase(key3);
6969

70-
dbw.WriteBatch(batch);
70+
BOOST_CHECK(dbw.WriteBatch(batch));
7171

7272
BOOST_CHECK(dbw.Read(key, res));
7373
BOOST_CHECK_EQUAL(res.ToString(), in.ToString());

0 commit comments

Comments
 (0)