Skip to content

Commit fad9dd1

Browse files
author
MarcoFalke
committed
test: kernel test fixups
* Allow byte arrays; Adjust size check, which would otherwise fail, because two byte arrays of a type are always of the same size: bitcoin#30595 (comment) * Require empty range: bitcoin#30595 (comment)
1 parent fabb58d commit fad9dd1

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/test/kernel/test_kernel.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,7 @@ void run_verify_test(
265265
}
266266

267267
template <typename T>
268-
concept HasToBytes = requires(T t) {
269-
{ t.ToBytes() } -> std::convertible_to<std::vector<std::byte>>;
270-
};
268+
concept HasToBytes = requires(T t) { t.ToBytes(); };
271269

272270
template <typename T>
273271
void CheckHandle(T object, T distinct_object)
@@ -277,7 +275,9 @@ void CheckHandle(T object, T distinct_object)
277275
BOOST_CHECK(object.get() != distinct_object.get());
278276

279277
if constexpr (HasToBytes<T>) {
280-
BOOST_CHECK_NE(object.ToBytes().size(), distinct_object.ToBytes().size());
278+
const auto object_bytes = object.ToBytes();
279+
const auto distinct_bytes = distinct_object.ToBytes();
280+
BOOST_CHECK(!std::ranges::equal(object_bytes, distinct_bytes));
281281
}
282282

283283
// Copy constructor
@@ -321,7 +321,8 @@ void CheckRange(const RangeType& range, size_t expected_size)
321321
using value_type = std::ranges::range_value_t<RangeType>;
322322

323323
BOOST_CHECK_EQUAL(range.size(), expected_size);
324-
BOOST_CHECK_EQUAL(range.empty(), (expected_size == 0));
324+
BOOST_REQUIRE(range.size() > 0); // Some checks below assume a non-empty range
325+
BOOST_REQUIRE(!range.empty());
325326

326327
BOOST_CHECK(range.begin() != range.end());
327328
BOOST_CHECK_EQUAL(std::distance(range.begin(), range.end()), static_cast<std::ptrdiff_t>(expected_size));
@@ -332,7 +333,6 @@ void CheckRange(const RangeType& range, size_t expected_size)
332333
BOOST_CHECK_EQUAL(range[i].get(), (*(range.begin() + i)).get());
333334
}
334335

335-
BOOST_CHECK_NE(range.at(0).get(), range.at(expected_size - 1).get());
336336
BOOST_CHECK_THROW(range.at(expected_size), std::out_of_range);
337337

338338
BOOST_CHECK_EQUAL(range.front().get(), range[0].get());

0 commit comments

Comments
 (0)