Skip to content
Snippets Groups Projects

AST-1637 Support model data in BdaBuffer

Merged AST-1637 Support model data in BdaBuffer
All threads resolved!
Merged Maik Nijhuis requested to merge ast-1637-bda-model-data into master
All threads resolved!
Files
3
+ 12
12
@@ -419,12 +419,12 @@ BOOST_AUTO_TEST_CASE(add_main_data) {
BOOST_AUTO_TEST_CASE(add_data_before_adding_rows) {
BdaBuffer buffer(2 * kDataSize);
BOOST_CHECK(buffer.HasData(""));
BOOST_CHECK(buffer.HasData());
BOOST_CHECK(!buffer.HasData(kDataName));
BOOST_CHECK(!buffer.GetData(kDataName));
buffer.AddData(kDataName);
BOOST_CHECK(buffer.HasData(""));
BOOST_CHECK(buffer.HasData());
BOOST_CHECK(buffer.HasData(kDataName));
// With no rows added, all data buffers are still empty.
BOOST_CHECK(!buffer.GetData());
@@ -456,12 +456,12 @@ BOOST_AUTO_TEST_CASE(add_data_after_adding_rows) {
kNChannels, kNCorrelations));
BOOST_CHECK(buffer.AddRow(kTime, kInterval, kExposure, kBaselineNr + 1,
kNChannels, kNCorrelations));
BOOST_CHECK(buffer.HasData(""));
BOOST_CHECK(buffer.HasData());
BOOST_CHECK(!buffer.HasData(kDataName));
BOOST_CHECK(!buffer.GetData(kDataName));
buffer.AddData(kDataName);
BOOST_CHECK(buffer.HasData(""));
BOOST_CHECK(buffer.HasData());
BOOST_CHECK(buffer.HasData(kDataName));
BOOST_CHECK(buffer.GetData(kDataName));
BOOST_CHECK_EQUAL(buffer.GetData(0, kDataName), buffer.GetData(kDataName));
@@ -475,26 +475,26 @@ BOOST_AUTO_TEST_CASE(add_data_after_adding_rows) {
BOOST_AUTO_TEST_CASE(remove_main_data) {
BdaBuffer buffer(kDataSize);
AddBasicRow(buffer);
BOOST_CHECK(buffer.HasData(""));
BOOST_CHECK(buffer.HasData());
BOOST_CHECK(buffer.GetData());
buffer.RemoveData("");
BOOST_CHECK(!buffer.HasData(""));
buffer.RemoveData();
BOOST_CHECK(!buffer.HasData());
BOOST_CHECK(!buffer.GetData());
BOOST_CHECK_NO_THROW(buffer.RemoveData(""));
BOOST_CHECK_NO_THROW(buffer.RemoveData());
}
BOOST_AUTO_TEST_CASE(remove_named_data) {
BdaBuffer buffer(kDataSize, BdaBuffer::Fields(false));
buffer.AddData(kDataName);
AddBasicRow(buffer);
BOOST_CHECK(!buffer.HasData(""));
BOOST_CHECK(!buffer.HasData());
BOOST_CHECK(buffer.HasData(kDataName));
BOOST_CHECK_EQUAL(buffer.GetNumberOfElements(), kDataSize);
buffer.RemoveData(kDataName);
BOOST_CHECK(!buffer.HasData(""));
BOOST_CHECK(!buffer.HasData());
BOOST_CHECK(!buffer.HasData(kDataName));
BOOST_CHECK_EQUAL(buffer.GetNumberOfElements(), kDataSize);
@@ -516,7 +516,7 @@ BOOST_AUTO_TEST_CASE(clear) {
BOOST_CHECK_EQUAL(buffer.GetNumberOfElements(), 3 * kDataSize);
BOOST_CHECK_EQUAL(buffer.GetRemainingCapacity(), 0u);
BOOST_CHECK_EQUAL(buffer.GetRows().size(), 3u);
BOOST_CHECK(buffer.HasData(""));
BOOST_CHECK(buffer.HasData());
BOOST_CHECK(buffer.HasData(kDataName));
buffer.Clear();
@@ -524,7 +524,7 @@ BOOST_AUTO_TEST_CASE(clear) {
BOOST_CHECK_EQUAL(buffer.GetRemainingCapacity(), 3 * kDataSize);
BOOST_CHECK_EQUAL(buffer.GetRows().size(), 0u);
// Clearing should only clear the content, not the data buffers themselves.
BOOST_CHECK(buffer.HasData(""));
BOOST_CHECK(buffer.HasData());
BOOST_CHECK(buffer.HasData(kDataName));
// Check that 3 rows can be added again.
Loading