coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-11-10 07:09:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Finished bit_stream_reader tests

Browse Source
This commit is contained in:
John Wellbelove 2022-06-10 18:16:30 +01:00
parent f88999bb12
commit bf49fe60e6
3 changed files with 58 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/etl/bit_stream.h
View File

@ -1285,12 +1285,12 @@ namespace etl
for (size_t i = 0UL; i < sizeof(T); ++i) for (size_t i = 0UL; i < sizeof(T); ++i)
{ {
get(data.raw[i], CHAR_BIT); data.raw[i] = read_unchecked<char>();
} }
from_bytes(reinterpret_cast<const unsigned char*>(data.raw), value); from_bytes(reinterpret_cast<const unsigned char*>(data.raw), value);
return success; return value;
} }
//*************************************************************************** //***************************************************************************

52
test/test_bit_stream_reader.cpp
View File

@ -38,21 +38,21 @@ namespace
//*********************************** //***********************************
struct Object struct Object
{ {
int16_t i; int16_t s;
double d; int32_t i;
uint8_t c; uint8_t c;
}; };
bool operator ==(const Object& lhs, const Object& rhs) bool operator ==(const Object& lhs, const Object& rhs)
{ {
return (lhs.i == rhs.i) && return (lhs.s == rhs.s) &&
(lhs.d == rhs.d) && (lhs.i == rhs.i) &&
(lhs.c == rhs.c); (lhs.c == rhs.c);
} }
std::ostream& operator << (std::ostream& os, const Object& object) std::ostream& operator << (std::ostream& os, const Object& object)
{ {
os << object.i << "," << object.d << "," << (int)object.c; os << object.s << "," << object.i << "," << (int)object.c;
return os; return os;
} }
} }
@ -792,13 +792,55 @@ namespace
//************************************************************************* //*************************************************************************
TEST(test_read_object) TEST(test_read_object)
{ {
std::array storage = { char(0xEC), char(0xBA), char(0xDE), char(0x68),
char(0xAF), char(0xD2), char(0xC5), char(0xC8),
char(0x65), char(0xD3), char(0xDF), char(0x80) };
etl::bit_stream_reader bit_stream(storage.data(), storage.size());
Object object1 = { -1234, 123456789, 250 };
Object object2 = { 5678, -987654321, 126 };
CHECK(etl::read(bit_stream, object1));
CHECK(etl::read(bit_stream, object2));
CHECK_EQUAL(-1234, object1.s);
CHECK_EQUAL(123456789, object1.i);
CHECK_EQUAL(250, object1.c);
CHECK_EQUAL(5678, object2.s);
CHECK_EQUAL(-987654321, object2.i);
CHECK_EQUAL(126, object2.c);
} }
//************************************************************************* //*************************************************************************
TEST(test_read_multiple_floating_point) TEST(test_read_multiple_floating_point)
{ {
float f = 3.1415927f;
double d = 3.1415927;
long double ld = 3.1415927l;
std::array<char, sizeof(float) + sizeof(double) + sizeof(long double)> storage;
storage.fill(0);
memcpy(storage.data(), &f, sizeof(float));
std::reverse(storage.data(), storage.data() + sizeof(float));
memcpy(storage.data() + sizeof(float), &d, sizeof(double));
std::reverse(storage.data() + sizeof(float), storage.data() + sizeof(float) + sizeof(double));
memcpy(storage.data() + sizeof(float) + sizeof(double), &d, sizeof(long double));
std::reverse(storage.data() + sizeof(float) + sizeof(double), storage.data() + sizeof(float) + sizeof(double) + sizeof(long double));
etl::bit_stream_reader bit_stream(storage.data(), storage.size());
auto result_f = bit_stream.read<float>();
auto result_d = bit_stream.read<double>();
auto result_ld = bit_stream.read<long double>();
CHECK_CLOSE(3.1415927f, result_f.value(), 0.0000001f);
CHECK_CLOSE(3.1415927, result_d.value(), 0.0000001);
CHECK_CLOSE(3.1415927l, result_ld.value(), 0.0000001);
} }
}; };
} }

13
test/test_bit_stream_writer.cpp
View File

@ -799,13 +799,14 @@ namespace
//************************************************************************* //*************************************************************************
TEST(test_write_multiple_floating_point) TEST(test_write_multiple_floating_point)
{ {
float f = 3.1415927f; float f = 3.1415927f;
double d = 3.1415927; double d = 3.1415927;
long double ld = 3.1415927l;
std::array<char, sizeof(float) + sizeof(double)> storage; std::array<char, sizeof(float) + sizeof(double) + sizeof(long double)> storage;
storage.fill(0); storage.fill(0);
std::array<char, sizeof(float) + sizeof(double)> expected; std::array<char, sizeof(float) + sizeof(double) + sizeof(long double)> expected;
expected.fill(0); expected.fill(0);
memcpy(expected.data(), &f, sizeof(float)); memcpy(expected.data(), &f, sizeof(float));
@ -814,10 +815,14 @@ namespace
memcpy(expected.data() + sizeof(float), &d, sizeof(double)); memcpy(expected.data() + sizeof(float), &d, sizeof(double));
std::reverse(expected.data() + sizeof(float), expected.data() + sizeof(float) + sizeof(double)); std::reverse(expected.data() + sizeof(float), expected.data() + sizeof(float) + sizeof(double));
memcpy(expected.data() + sizeof(float) + sizeof(double), &d, sizeof(double));
std::reverse(expected.data() + sizeof(float) + sizeof(double), expected.data() + sizeof(float) + sizeof(double) + sizeof(long double));
etl::bit_stream_writer bit_stream(storage.data(), storage.size()); etl::bit_stream_writer bit_stream(storage.data(), storage.size());
bit_stream.write(f); bit_stream.write(f);
bit_stream.write(d); bit_stream.write(d);
bit_stream.write(ld);
for (size_t i = 0; i < storage.size(); ++i) for (size_t i = 0; i < storage.size(); ++i)
{ {