Skip to content

Commit c84c2b8

Browse files
practicalswiftpracticalswift
committed
tests: Test for expected return values when calling functions returning a success code
1 parent 6d0a147 commit c84c2b8

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
@@ -154,11 +154,11 @@ BOOST_AUTO_TEST_CASE(addrman_ports)
154154

155155
// Test 7; Addr with same IP but diff port does not replace existing addr.
156156
CService addr1 = ResolveService("250.1.1.1", 8333);
157-
addrman.Add(CAddress(addr1, NODE_NONE), source);
157+
BOOST_CHECK(addrman.Add(CAddress(addr1, NODE_NONE), source));
158158
BOOST_CHECK_EQUAL(addrman.size(), 1U);
159159

160160
CService addr1_port = ResolveService("250.1.1.1", 8334);
161-
addrman.Add(CAddress(addr1_port, NODE_NONE), source);
161+
BOOST_CHECK(!addrman.Add(CAddress(addr1_port, NODE_NONE), source));
162162
BOOST_CHECK_EQUAL(addrman.size(), 1U);
163163
CAddrInfo addr_ret2 = addrman.Select();
164164
BOOST_CHECK_EQUAL(addr_ret2.ToString(), "250.1.1.1:8333");
@@ -181,7 +181,7 @@ BOOST_AUTO_TEST_CASE(addrman_select)
181181

182182
// Test: Select from new with 1 addr in new.
183183
CService addr1 = ResolveService("250.1.1.1", 8333);
184-
addrman.Add(CAddress(addr1, NODE_NONE), source);
184+
BOOST_CHECK(addrman.Add(CAddress(addr1, NODE_NONE), source));
185185
BOOST_CHECK_EQUAL(addrman.size(), 1U);
186186

187187
bool newOnly = true;
@@ -205,20 +205,20 @@ BOOST_AUTO_TEST_CASE(addrman_select)
205205
CService addr3 = ResolveService("250.3.2.2", 9999);
206206
CService addr4 = ResolveService("250.3.3.3", 9999);
207207

208-
addrman.Add(CAddress(addr2, NODE_NONE), ResolveService("250.3.1.1", 8333));
209-
addrman.Add(CAddress(addr3, NODE_NONE), ResolveService("250.3.1.1", 8333));
210-
addrman.Add(CAddress(addr4, NODE_NONE), ResolveService("250.4.1.1", 8333));
208+
BOOST_CHECK(addrman.Add(CAddress(addr2, NODE_NONE), ResolveService("250.3.1.1", 8333)));
209+
BOOST_CHECK(addrman.Add(CAddress(addr3, NODE_NONE), ResolveService("250.3.1.1", 8333)));
210+
BOOST_CHECK(addrman.Add(CAddress(addr4, NODE_NONE), ResolveService("250.4.1.1", 8333)));
211211

212212
// Add three addresses to tried table.
213213
CService addr5 = ResolveService("250.4.4.4", 8333);
214214
CService addr6 = ResolveService("250.4.5.5", 7777);
215215
CService addr7 = ResolveService("250.4.6.6", 8333);
216216

217-
addrman.Add(CAddress(addr5, NODE_NONE), ResolveService("250.3.1.1", 8333));
217+
BOOST_CHECK(addrman.Add(CAddress(addr5, NODE_NONE), ResolveService("250.3.1.1", 8333)));
218218
addrman.Good(CAddress(addr5, NODE_NONE));
219-
addrman.Add(CAddress(addr6, NODE_NONE), ResolveService("250.3.1.1", 8333));
219+
BOOST_CHECK(addrman.Add(CAddress(addr6, NODE_NONE), ResolveService("250.3.1.1", 8333)));
220220
addrman.Good(CAddress(addr6, NODE_NONE));
221-
addrman.Add(CAddress(addr7, NODE_NONE), ResolveService("250.1.1.3", 8333));
221+
BOOST_CHECK(addrman.Add(CAddress(addr7, NODE_NONE), ResolveService("250.1.1.3", 8333)));
222222
addrman.Good(CAddress(addr7, NODE_NONE));
223223

224224
// Test: 6 addrs + 1 addr from last test = 7.
@@ -242,19 +242,19 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions)
242242

243243
for (unsigned int i = 1; i < 18; i++) {
244244
CService addr = ResolveService("250.1.1." + std::to_string(i));
245-
addrman.Add(CAddress(addr, NODE_NONE), source);
245+
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
246246

247247
//Test: No collision in new table yet.
248248
BOOST_CHECK_EQUAL(addrman.size(), i);
249249
}
250250

251251
//Test: new table collision!
252252
CService addr1 = ResolveService("250.1.1.18");
253-
addrman.Add(CAddress(addr1, NODE_NONE), source);
253+
BOOST_CHECK(addrman.Add(CAddress(addr1, NODE_NONE), source));
254254
BOOST_CHECK_EQUAL(addrman.size(), 17U);
255255

256256
CService addr2 = ResolveService("250.1.1.19");
257-
addrman.Add(CAddress(addr2, NODE_NONE), source);
257+
BOOST_CHECK(addrman.Add(CAddress(addr2, NODE_NONE), source));
258258
BOOST_CHECK_EQUAL(addrman.size(), 18U);
259259
}
260260

@@ -268,7 +268,7 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
268268

269269
for (unsigned int i = 1; i < 80; i++) {
270270
CService addr = ResolveService("250.1.1." + std::to_string(i));
271-
addrman.Add(CAddress(addr, NODE_NONE), source);
271+
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
272272
addrman.Good(CAddress(addr, NODE_NONE));
273273

274274
//Test: No collision in tried table yet.
@@ -277,11 +277,11 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
277277

278278
//Test: tried table collision!
279279
CService addr1 = ResolveService("250.1.1.80");
280-
addrman.Add(CAddress(addr1, NODE_NONE), source);
280+
BOOST_CHECK(addrman.Add(CAddress(addr1, NODE_NONE), source));
281281
BOOST_CHECK_EQUAL(addrman.size(), 79U);
282282

283283
CService addr2 = ResolveService("250.1.1.81");
284-
addrman.Add(CAddress(addr2, NODE_NONE), source);
284+
BOOST_CHECK(addrman.Add(CAddress(addr2, NODE_NONE), source));
285285
BOOST_CHECK_EQUAL(addrman.size(), 80U);
286286
}
287287

@@ -298,9 +298,9 @@ BOOST_AUTO_TEST_CASE(addrman_find)
298298
CNetAddr source1 = ResolveIP("250.1.2.1");
299299
CNetAddr source2 = ResolveIP("250.1.2.2");
300300

301-
addrman.Add(addr1, source1);
302-
addrman.Add(addr2, source2);
303-
addrman.Add(addr3, source1);
301+
BOOST_CHECK(addrman.Add(addr1, source1));
302+
BOOST_CHECK(!addrman.Add(addr2, source2));
303+
BOOST_CHECK(addrman.Add(addr3, source1));
304304

305305
// Test: ensure Find returns an IP matching what we searched on.
306306
CAddrInfo* info1 = addrman.Find(addr1);
@@ -382,11 +382,11 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
382382
CNetAddr source2 = ResolveIP("250.2.3.3");
383383

384384
// Test: Ensure GetAddr works with new addresses.
385-
addrman.Add(addr1, source1);
386-
addrman.Add(addr2, source2);
387-
addrman.Add(addr3, source1);
388-
addrman.Add(addr4, source2);
389-
addrman.Add(addr5, source1);
385+
BOOST_CHECK(addrman.Add(addr1, source1));
386+
BOOST_CHECK(addrman.Add(addr2, source2));
387+
BOOST_CHECK(addrman.Add(addr3, source1));
388+
BOOST_CHECK(addrman.Add(addr4, source2));
389+
BOOST_CHECK(addrman.Add(addr5, source1));
390390

391391
// GetAddr returns 23% of addresses, 23% of 5 is 1 rounded down.
392392
BOOST_CHECK_EQUAL(addrman.GetAddr().size(), 1U);
@@ -555,7 +555,7 @@ BOOST_AUTO_TEST_CASE(addrman_selecttriedcollision)
555555
CNetAddr source = ResolveIP("252.2.2.2");
556556
for (unsigned int i = 1; i < 23; i++) {
557557
CService addr = ResolveService("250.1.1."+std::to_string(i));
558-
addrman.Add(CAddress(addr, NODE_NONE), source);
558+
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
559559
addrman.Good(addr);
560560

561561
// No collisions yet.
@@ -585,7 +585,7 @@ BOOST_AUTO_TEST_CASE(addrman_noevict)
585585
CNetAddr source = ResolveIP("252.2.2.2");
586586
for (unsigned int i = 1; i < 23; i++) {
587587
CService addr = ResolveService("250.1.1."+std::to_string(i));
588-
addrman.Add(CAddress(addr, NODE_NONE), source);
588+
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
589589
addrman.Good(addr);
590590

591591
// No collision yet.
@@ -595,7 +595,7 @@ BOOST_AUTO_TEST_CASE(addrman_noevict)
595595

596596
// Collision between 23 and 19.
597597
CService addr23 = ResolveService("250.1.1.23");
598-
addrman.Add(CAddress(addr23, NODE_NONE), source);
598+
BOOST_CHECK(addrman.Add(CAddress(addr23, NODE_NONE), source));
599599
addrman.Good(addr23);
600600

601601
BOOST_CHECK(addrman.size() == 23);
@@ -608,7 +608,7 @@ BOOST_AUTO_TEST_CASE(addrman_noevict)
608608
// Lets create two collisions.
609609
for (unsigned int i = 24; i < 33; i++) {
610610
CService addr = ResolveService("250.1.1."+std::to_string(i));
611-
addrman.Add(CAddress(addr, NODE_NONE), source);
611+
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
612612
addrman.Good(addr);
613613

614614
BOOST_CHECK(addrman.size() == i);
@@ -617,14 +617,14 @@ BOOST_AUTO_TEST_CASE(addrman_noevict)
617617

618618
// Cause a collision.
619619
CService addr33 = ResolveService("250.1.1.33");
620-
addrman.Add(CAddress(addr33, NODE_NONE), source);
620+
BOOST_CHECK(addrman.Add(CAddress(addr33, NODE_NONE), source));
621621
addrman.Good(addr33);
622622
BOOST_CHECK(addrman.size() == 33);
623623

624624
BOOST_CHECK(addrman.SelectTriedCollision().ToString() == "250.1.1.27:0");
625625

626626
// Cause a second collision.
627-
addrman.Add(CAddress(addr23, NODE_NONE), source);
627+
BOOST_CHECK(!addrman.Add(CAddress(addr23, NODE_NONE), source));
628628
addrman.Good(addr23);
629629
BOOST_CHECK(addrman.size() == 33);
630630

@@ -649,7 +649,7 @@ BOOST_AUTO_TEST_CASE(addrman_evictionworks)
649649
CNetAddr source = ResolveIP("252.2.2.2");
650650
for (unsigned int i = 1; i < 23; i++) {
651651
CService addr = ResolveService("250.1.1."+std::to_string(i));
652-
addrman.Add(CAddress(addr, NODE_NONE), source);
652+
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
653653
addrman.Good(addr);
654654

655655
// No collision yet.
@@ -659,7 +659,7 @@ BOOST_AUTO_TEST_CASE(addrman_evictionworks)
659659

660660
// Collision between 23 and 19.
661661
CService addr = ResolveService("250.1.1.23");
662-
addrman.Add(CAddress(addr, NODE_NONE), source);
662+
BOOST_CHECK(addrman.Add(CAddress(addr, NODE_NONE), source));
663663
addrman.Good(addr);
664664

665665
BOOST_CHECK(addrman.size() == 23);
@@ -674,14 +674,14 @@ BOOST_AUTO_TEST_CASE(addrman_evictionworks)
674674
BOOST_CHECK(addrman.SelectTriedCollision().ToString() == "[::]:0");
675675

676676
// If 23 was swapped for 19, then this should cause no collisions.
677-
addrman.Add(CAddress(addr, NODE_NONE), source);
677+
BOOST_CHECK(!addrman.Add(CAddress(addr, NODE_NONE), source));
678678
addrman.Good(addr);
679679

680680
BOOST_CHECK(addrman.SelectTriedCollision().ToString() == "[::]:0");
681681

682682
// If we insert 19 is should collide with 23.
683683
CService addr19 = ResolveService("250.1.1.19");
684-
addrman.Add(CAddress(addr19, NODE_NONE), source);
684+
BOOST_CHECK(!addrman.Add(CAddress(addr19, NODE_NONE), source));
685685
addrman.Good(addr19);
686686

687687
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
@@ -158,7 +158,7 @@ static void test_cache_erase(size_t megabytes)
158158
set.insert(hashes_insert_copy[i]);
159159
/** Erase the first quarter */
160160
for (uint32_t i = 0; i < (n_insert / 4); ++i)
161-
set.contains(hashes[i], true);
161+
BOOST_CHECK(set.contains(hashes[i], true));
162162
/** Insert the second half */
163163
for (uint32_t i = (n_insert / 2); i < n_insert; ++i)
164164
set.insert(hashes_insert_copy[i]);
@@ -238,7 +238,7 @@ static void test_cache_erase_parallel(size_t megabytes)
238238
size_t start = ntodo*x;
239239
size_t end = ntodo*(x+1);
240240
for (uint32_t i = start; i < end; ++i)
241-
set.contains(hashes[i], true);
241+
BOOST_CHECK(set.contains(hashes[i], true));
242242
});
243243

244244
/** 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)