oxen-io
/
lokinet
mirror of https://github.com/oxen-io/lokinet
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Rewrite generate expressions to make clang-7 happy

This commit is contained in:
Jason Rhinelander 2020-02-24 11:26:35 -04:00
parent dba3ff7fd3
commit 1232f34f90
1 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
test/util/test_llarp_util_bits.cpp
View File

@ -1,59 +1,66 @@
#include <catch2/catch.hpp>
#include <util/bits.hpp>
using namespace llarp::bits;
TEST_CASE("test bit counting, 8-bit", "[bits]") {
auto x = GENERATE(table<std::array<unsigned char, 1>, size_t>({
{{{0b00000000}}, 0},
{{{0b00000001}}, 1},
{{{0b00000010}}, 1},
{{{0b00000100}}, 1},
{{{0b00001000}}, 1},
{{{0b00010000}}, 1},
{{{0b00100000}}, 1},
{{{0b01000000}}, 1},
{{{0b10000000}}, 1},
{{{0b11111111}}, 8},
auto x = GENERATE(table<unsigned char, size_t>({
{0b00000000, 0},
{0b00000001, 1},
{0b00000010, 1},
{0b00000100, 1},
{0b00001000, 1},
{0b00010000, 1},
{0b00100000, 1},
{0b01000000, 1},
{0b10000000, 1},
{0b11111111, 8},
}));
REQUIRE( llarp::bits::count_array_bits(std::get<0>(x)) == std::get<1>(x) );
std::array<unsigned char, 1> arr{{std::get<0>(x)}};
auto expected = std::get<1>(x);
REQUIRE( count_array_bits(arr) == expected );
}
TEST_CASE("test bit counting, 20 x 8-bit", "[bits]") {
auto x = GENERATE(table<std::array<unsigned char, 20>, size_t>({
{{{0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000,
0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000,
0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000,
0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000}},
0},
{{{0b11111111, 0b00000100, 0b00000100, 0b00000100, 0b00000100,
0b11111111, 0b00000100, 0b00000100, 0b00000100, 0b00000100,
0b11111111, 0b00000100, 0b00000100, 0b00000100, 0b00000100,
0b11111111, 0b00000100, 0b00000100, 0b00000100, 0b00000100}},
48},
}));
std::array<unsigned char, 20> x{{
0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000,
0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000,
0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000,
0b00000000, 0b00000000, 0b00000000, 0b00000000, 0b00000000}};
REQUIRE( count_array_bits(x) == 0 );
REQUIRE( llarp::bits::count_array_bits(std::get<0>(x)) == std::get<1>(x) );
x = {{
0b11111111, 0b00000100, 0b00000100, 0b00000100, 0b00000100,
0b11111111, 0b00000100, 0b00000100, 0b00000100, 0b00000100,
0b11111111, 0b00000100, 0b00000100, 0b00000100, 0b00000100,
0b11111111, 0b00000100, 0b00000100, 0b00000100, 0b00000100}};
REQUIRE( count_array_bits(x) == 48 );
}
TEST_CASE("test bit counting, unsigned int", "[bits]") {
auto x = GENERATE(table<std::array<unsigned int, 1>, size_t>({
{{{0b00000000000000000000000000000000}}, 0},
{{{0b00101010101010101010101010101010}}, 15},
{{{0b10101010101010101010101010101010}}, 16},
{{{0b01010101010101010101010101010101}}, 16},
{{{0b11111111111111111111111111111111}}, 32},
auto x = GENERATE(table<unsigned int, size_t>({
{0b00000000000000000000000000000000, 0},
{0b00101010101010101010101010101010, 15},
{0b10101010101010101010101010101010, 16},
{0b01010101010101010101010101010101, 16},
{0b11111111111111111111111111111111, 32},
}));
REQUIRE( llarp::bits::count_array_bits(std::get<0>(x)) == std::get<1>(x) );
std::array<unsigned int, 1> arr{{std::get<0>(x)}};
auto expected = std::get<1>(x);
REQUIRE( llarp::bits::count_array_bits(arr) == expected );
}
TEST_CASE("test bit counting, unsigned long long", "[bits]") {
auto x = GENERATE(table<std::array<unsigned long long, 1>, size_t>({
{{{0b0000000000000000000000000000000000000000000000000000000000000000}}, 0},
{{{0b0010101010101010101010101010101000101010101010101010101010101010}}, 30},
{{{0b1010101010101010101010101010101010101010101010101010101010101010}}, 32},
{{{0b0101010101010101010101010101010101010101010101010101010101010101}}, 32},
{{{0b1111111111111111111111111111111111111111111111111111111111111111}}, 64},
auto x = GENERATE(table<unsigned long long, size_t>({
{0b0000000000000000000000000000000000000000000000000000000000000000, 0},
{0b0010101010101010101010101010101000101010101010101010101010101010, 30},
{0b1010101010101010101010101010101010101010101010101010101010101010, 32},
{0b0101010101010101010101010101010101010101010101010101010101010101, 32},
{0b1111111111111111111111111111111111111111111111111111111111111111, 64},
}));
REQUIRE( llarp::bits::count_array_bits(std::get<0>(x)) == std::get<1>(x) );
std::array<unsigned long long, 1> arr{{std::get<0>(x)}};
auto expected = std::get<1>(x);
REQUIRE( llarp::bits::count_array_bits(arr) == expected );
}