Skip to content

Commit eb8d68c

Browse files
zajozajo
committed
Replaced BOOST_TEST with BOOST_TEST_EQ, etc. where appropriate
1 parent 4c8c5ec commit eb8d68c

File tree

7 files changed

+24
-25
lines changed

7 files changed

+24
-25
lines changed

‎include/boost/leaf/config/tls_array.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ namespace tls
151151
write_void_ptr(tls_idx, p);
152152
BOOST_LEAF_ASSERT(read_void_ptr(tls_idx) == p);
153153
}
154-
} // namespace tls
155154

156155
template <class T>
157156
BOOST_LEAF_ALWAYS_INLINE T * read_ptr() noexcept

‎test/on_error_dynamic_reserve_test1.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ struct info
2323

2424
leaf::result<void> f()
2525
{
26-
BOOST_TEST(leaf::tls::read_ptr<leaf::detail::slot<info<42>>>() == nullptr);
27-
BOOST_TEST(leaf::tls::read_ptr<leaf::detail::slot<info<43>>>() != nullptr);
26+
BOOST_TEST_EQ(leaf::tls::read_ptr<leaf::detail::slot<info<42>>>(), nullptr);
27+
BOOST_TEST_NE(leaf::tls::read_ptr<leaf::detail::slot<info<43>>>(), nullptr);
2828
auto load = leaf::on_error( info<42>{42} );
29-
BOOST_TEST(leaf::tls::read_ptr<leaf::detail::slot<info<42>>>() == nullptr);
29+
BOOST_TEST_EQ(leaf::tls::read_ptr<leaf::detail::slot<info<42>>>(), nullptr);
3030
return leaf::new_error(info<43>{});
3131
}
3232

‎test/on_error_dynamic_reserve_test2.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ struct info
2424

2525
leaf::result<void> f()
2626
{
27-
BOOST_TEST(leaf::tls::read_ptr<leaf::detail::slot<info<42>>>() == nullptr);
28-
BOOST_TEST(leaf::tls::read_ptr<leaf::detail::slot<info<43>>>() != nullptr);
27+
BOOST_TEST_EQ(leaf::tls::read_ptr<leaf::detail::slot<info<42>>>(), nullptr);
28+
BOOST_TEST_NE(leaf::tls::read_ptr<leaf::detail::slot<info<43>>>(), nullptr);
2929
auto load = leaf::on_error( info<42>{42} );
30-
BOOST_TEST(leaf::tls::read_ptr<leaf::detail::slot<info<42>>>() == nullptr);
30+
BOOST_TEST_EQ(leaf::tls::read_ptr<leaf::detail::slot<info<42>>>(), nullptr);
3131
auto e = leaf::new_error(info<43>{});
3232
BOOST_TEST(
3333
(BOOST_LEAF_CFG_CAPTURE == 0 || BOOST_LEAF_CFG_DIAGNOSTICS == 0)

‎test/on_error_dynamic_reserve_test3.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ struct info
3737

3838
leaf::result<void> f()
3939
{
40-
BOOST_TEST(leaf::tls::read_ptr<leaf::detail::slot<info<42>>>() == nullptr);
41-
BOOST_TEST(leaf::tls::read_ptr<leaf::detail::slot<info<43>>>() != nullptr);
40+
BOOST_TEST_EQ(leaf::tls::read_ptr<leaf::detail::slot<info<42>>>(), nullptr);
41+
BOOST_TEST_NE(leaf::tls::read_ptr<leaf::detail::slot<info<43>>>(), nullptr);
4242
auto load = leaf::on_error( info<42>{42} );
43-
BOOST_TEST(leaf::tls::read_ptr<leaf::detail::slot<info<42>>>() == nullptr);
43+
BOOST_TEST_EQ(leaf::tls::read_ptr<leaf::detail::slot<info<42>>>(), nullptr);
4444
auto e = leaf::new_error(info<43>{});
45-
BOOST_TEST(leaf::tls::read_ptr<leaf::detail::slot<info<42>>>() != nullptr);
45+
BOOST_TEST_NE(leaf::tls::read_ptr<leaf::detail::slot<info<42>>>(), nullptr);
4646
return e;
4747
}
4848

‎test/on_error_preload_basic_test.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ int main()
7676
[]() -> leaf::result<void>
7777
{
7878
leaf::detail::dynamic_allocator * da = leaf::detail::get_dynamic_allocator();
79-
BOOST_TEST(da != nullptr);
80-
BOOST_TEST(da->preloaded_list() == nullptr);
79+
BOOST_TEST_NE(da, nullptr);
80+
BOOST_TEST_EQ(da->preloaded_list(), nullptr);
8181
{
8282
auto load = leaf::on_error( info<42>{42} );
83-
BOOST_TEST(da->preloaded_list() != nullptr);
83+
BOOST_TEST_NE(da->preloaded_list(), nullptr);
8484
}
85-
BOOST_TEST(da->preloaded_list() == nullptr);
85+
BOOST_TEST_EQ(da->preloaded_list(), nullptr);
8686
return { };
8787
} );
8888
#endif

‎test/result_state_test.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ int main()
269269
BOOST_TEST(!r2);
270270
{
271271
val x;
272-
BOOST_TEST(ctx.handle_error<val>(r2.error(), [&]{ return x; }) == x);
272+
BOOST_TEST_EQ(ctx.handle_error<val>(r2.error(), [&]{ return x; }), x);
273273
}
274274
BOOST_TEST_EQ(err::count, 1);
275275
BOOST_TEST_EQ(val::count, 0);
@@ -418,7 +418,7 @@ int main()
418418
leaf::error_id r2e = r2.error();
419419
BOOST_TEST_EQ(r1e, r2e);
420420
BOOST_TEST(!r2);
421-
BOOST_TEST(r2.operator->() == 0);
421+
BOOST_TEST_EQ(r2.operator->(), nullptr);
422422
}
423423
BOOST_TEST_EQ(err::count, 0);
424424
{ // void error copy -> move
@@ -434,7 +434,7 @@ int main()
434434
leaf::error_id r2e = r2.error();
435435
BOOST_TEST_EQ(r1e, r2e);
436436
BOOST_TEST(!r2);
437-
BOOST_TEST(r2.operator->() == 0);
437+
BOOST_TEST_EQ(r2.operator->(), nullptr);
438438
}
439439
BOOST_TEST_EQ(err::count, 0);
440440

@@ -451,7 +451,7 @@ int main()
451451
leaf::error_id r2e = r2.error();
452452
BOOST_TEST_EQ(r1e, r2e);
453453
BOOST_TEST(!r2);
454-
BOOST_TEST(r2.operator->() == 0);
454+
BOOST_TEST_EQ(r2.operator->(), nullptr);
455455
ctx.handle_error<void>(r2.error(), []{ });
456456
BOOST_TEST_EQ(err::count, 1);
457457
}
@@ -469,7 +469,7 @@ int main()
469469
leaf::error_id r2e = r2.error();
470470
BOOST_TEST_EQ(r1e, r2e);
471471
BOOST_TEST(!r2);
472-
BOOST_TEST(r2.operator->() == 0);
472+
BOOST_TEST_EQ(r2.operator->(), nullptr);
473473
}
474474
BOOST_TEST_EQ(err::count, 0);
475475

@@ -488,7 +488,7 @@ int main()
488488
leaf::error_id r2e = r2.error();
489489
BOOST_TEST_EQ(r1e, r2e);
490490
BOOST_TEST(!r2);
491-
BOOST_TEST(r2.operator->() == 0);
491+
BOOST_TEST_EQ(r2.operator->(), nullptr);
492492
}
493493
BOOST_TEST_EQ(err::count, 0);
494494
{ // void error copy -> capture -> move
@@ -506,7 +506,7 @@ int main()
506506
leaf::error_id r2e = r2.error();
507507
BOOST_TEST_EQ(r1e, r2e);
508508
BOOST_TEST(!r2);
509-
BOOST_TEST(r2.operator->() == 0);
509+
BOOST_TEST_EQ(r2.operator->(), nullptr);
510510
}
511511
BOOST_TEST_EQ(err::count, 0);
512512

@@ -524,7 +524,7 @@ int main()
524524
leaf::error_id r2e = r2.error();
525525
BOOST_TEST_EQ(r1e, r2e);
526526
BOOST_TEST(!r2);
527-
BOOST_TEST(r2.operator->() == 0);
527+
BOOST_TEST_EQ(r2.operator->(), nullptr);
528528
}
529529
BOOST_TEST_EQ(err::count, 0);
530530
{ // void error copy -> capture -> assign-move
@@ -542,7 +542,7 @@ int main()
542542
leaf::error_id r2e = r2.error();
543543
BOOST_TEST_EQ(r1e, r2e);
544544
BOOST_TEST(!r2);
545-
BOOST_TEST(r2.operator->() == 0);
545+
BOOST_TEST_EQ(r2.operator->(), nullptr);
546546
}
547547
BOOST_TEST_EQ(err::count, 0);
548548
#endif // #if BOOST_LEAF_CFG_CAPTURE

‎test/to_variant_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ int main()
4848
{
4949
return leaf::new_error(E1::e12, E3::e31);
5050
} );
51-
BOOST_TEST(v.index() == 1);
51+
BOOST_TEST_EQ(v.index(), 1);
5252
auto t = std::get<1>(v);
5353

5454
BOOST_TEST(std::get<0>(t).has_value());

0 commit comments

Comments
 (0)