projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
INSTALL: Mention optional libboost-stacktrace.
[pulseview.git]
/
test
/
data
/
segment.cpp
diff --git
a/test/data/segment.cpp
b/test/data/segment.cpp
index c3c0d1b5f473b66c9a6503396e3984264d8130ec..1a67899c952c7bd6a95378ab027bc47d6e59f6a5 100644
(file)
--- a/
test/data/segment.cpp
+++ b/
test/data/segment.cpp
@@
-34,7
+34,7
@@
BOOST_AUTO_TEST_SUITE(SegmentTest)
/* --- For debugging only
BOOST_AUTO_TEST_CASE(SmallSize8Single)
{
/* --- For debugging only
BOOST_AUTO_TEST_CASE(SmallSize8Single)
{
- Segment s(1, sizeof(uint8_t));
+ Segment s(
0,
1, sizeof(uint8_t));
uint32_t num_samples = 10;
//----- Chunk size << pv::data::Segment::MaxChunkSize @ 8bit, added in 1 call ----//
uint32_t num_samples = 10;
//----- Chunk size << pv::data::Segment::MaxChunkSize @ 8bit, added in 1 call ----//
@@
-58,7
+58,7
@@
BOOST_AUTO_TEST_CASE(SmallSize8Single)
/* --- For debugging only
BOOST_AUTO_TEST_CASE(MediumSize8Single)
{
/* --- For debugging only
BOOST_AUTO_TEST_CASE(MediumSize8Single)
{
- Segment s(1, sizeof(uint8_t));
+ Segment s(
0,
1, sizeof(uint8_t));
uint32_t num_samples = pv::data::Segment::MaxChunkSize;
//----- Chunk size == pv::data::Segment::MaxChunkSize @ 8bit, added in 1 call ----//
uint32_t num_samples = pv::data::Segment::MaxChunkSize;
//----- Chunk size == pv::data::Segment::MaxChunkSize @ 8bit, added in 1 call ----//
@@
-82,7
+82,7
@@
BOOST_AUTO_TEST_CASE(MediumSize8Single)
/* --- For debugging only
BOOST_AUTO_TEST_CASE(MaxSize8Single)
{
/* --- For debugging only
BOOST_AUTO_TEST_CASE(MaxSize8Single)
{
- Segment s(1, sizeof(uint8_t));
+ Segment s(
0,
1, sizeof(uint8_t));
// We want to see proper behavior across chunk boundaries
uint32_t num_samples = 2*pv::data::Segment::MaxChunkSize;
// We want to see proper behavior across chunk boundaries
uint32_t num_samples = 2*pv::data::Segment::MaxChunkSize;
@@
-108,7
+108,7
@@
BOOST_AUTO_TEST_CASE(MaxSize8Single)
/* --- For debugging only
BOOST_AUTO_TEST_CASE(MediumSize24Single)
{
/* --- For debugging only
BOOST_AUTO_TEST_CASE(MediumSize24Single)
{
- Segment s(1, 3);
+ Segment s(
0,
1, 3);
// Chunk size is num*unit_size, so with pv::data::Segment::MaxChunkSize/unit_size, we reach the maximum size
uint32_t num_samples = pv::data::Segment::MaxChunkSize / 3;
// Chunk size is num*unit_size, so with pv::data::Segment::MaxChunkSize/unit_size, we reach the maximum size
uint32_t num_samples = pv::data::Segment::MaxChunkSize / 3;
@@
-136,7
+136,7
@@
BOOST_AUTO_TEST_CASE(MediumSize24Single)
/* --- For debugging only
BOOST_AUTO_TEST_CASE(MediumSize32Single)
{
/* --- For debugging only
BOOST_AUTO_TEST_CASE(MediumSize32Single)
{
- Segment s(1, sizeof(uint32_t));
+ Segment s(
0,
1, sizeof(uint32_t));
// Chunk size is num*unit_size, so with pv::data::Segment::MaxChunkSize/unit_size, we reach the maximum size
uint32_t num_samples = pv::data::Segment::MaxChunkSize / sizeof(uint32_t);
// Chunk size is num*unit_size, so with pv::data::Segment::MaxChunkSize/unit_size, we reach the maximum size
uint32_t num_samples = pv::data::Segment::MaxChunkSize / sizeof(uint32_t);
@@
-162,7
+162,7
@@
BOOST_AUTO_TEST_CASE(MediumSize32Single)
/* --- For debugging only
BOOST_AUTO_TEST_CASE(MaxSize32Single)
{
/* --- For debugging only
BOOST_AUTO_TEST_CASE(MaxSize32Single)
{
- Segment s(1, sizeof(uint32_t));
+ Segment s(
0,
1, sizeof(uint32_t));
// Chunk size is num*unit_size, so with pv::data::Segment::MaxChunkSize/unit_size, we reach the maximum size
// Also, we want to see proper behavior across chunk boundaries
// Chunk size is num*unit_size, so with pv::data::Segment::MaxChunkSize/unit_size, we reach the maximum size
// Also, we want to see proper behavior across chunk boundaries
@@
-189,7
+189,7
@@
BOOST_AUTO_TEST_CASE(MaxSize32Single)
/* --- For debugging only
BOOST_AUTO_TEST_CASE(MediumSize32Multi)
{
/* --- For debugging only
BOOST_AUTO_TEST_CASE(MediumSize32Multi)
{
- Segment s(1, sizeof(uint32_t));
+ Segment s(
0,
1, sizeof(uint32_t));
// Chunk size is num*unit_size, so with pv::data::Segment::MaxChunkSize/unit_size, we reach the maximum size
uint32_t num_samples = pv::data::Segment::MaxChunkSize / sizeof(uint32_t);
// Chunk size is num*unit_size, so with pv::data::Segment::MaxChunkSize/unit_size, we reach the maximum size
uint32_t num_samples = pv::data::Segment::MaxChunkSize / sizeof(uint32_t);
@@
-213,7
+213,7
@@
BOOST_AUTO_TEST_CASE(MediumSize32Multi)
BOOST_AUTO_TEST_CASE(MaxSize32Multi)
{
BOOST_AUTO_TEST_CASE(MaxSize32Multi)
{
- Segment s(1, sizeof(uint32_t));
+ Segment s(
0,
1, sizeof(uint32_t));
// Chunk size is num*unit_size, so with pv::data::Segment::MaxChunkSize/unit_size, we reach the maximum size
uint32_t num_samples = 2*(pv::data::Segment::MaxChunkSize / sizeof(uint32_t));
// Chunk size is num*unit_size, so with pv::data::Segment::MaxChunkSize/unit_size, we reach the maximum size
uint32_t num_samples = 2*(pv::data::Segment::MaxChunkSize / sizeof(uint32_t));
@@
-242,7
+242,7
@@
BOOST_AUTO_TEST_CASE(MaxSize32Multi)
BOOST_AUTO_TEST_CASE(MaxSize32MultiAtOnce)
{
BOOST_AUTO_TEST_CASE(MaxSize32MultiAtOnce)
{
- Segment s(1, sizeof(uint32_t));
+ Segment s(
0,
1, sizeof(uint32_t));
// Chunk size is num*unit_size, so with pv::data::Segment::MaxChunkSize/unit_size, we reach the maximum size
uint32_t num_samples = 3*(pv::data::Segment::MaxChunkSize / sizeof(uint32_t));
// Chunk size is num*unit_size, so with pv::data::Segment::MaxChunkSize/unit_size, we reach the maximum size
uint32_t num_samples = 3*(pv::data::Segment::MaxChunkSize / sizeof(uint32_t));
@@
-272,7
+272,7
@@
BOOST_AUTO_TEST_CASE(MaxSize32MultiAtOnce)
BOOST_AUTO_TEST_CASE(MaxSize32MultiIterated)
{
BOOST_AUTO_TEST_CASE(MaxSize32MultiIterated)
{
- Segment s(1, sizeof(uint32_t));
+ Segment s(
0,
1, sizeof(uint32_t));
// Chunk size is num*unit_size, so with pv::data::Segment::MaxChunkSize/unit_size, we reach the maximum size
uint32_t num_samples = 2*(pv::data::Segment::MaxChunkSize / sizeof(uint32_t));
// Chunk size is num*unit_size, so with pv::data::Segment::MaxChunkSize/unit_size, we reach the maximum size
uint32_t num_samples = 2*(pv::data::Segment::MaxChunkSize / sizeof(uint32_t));
@@
-286,15
+286,14
@@
BOOST_AUTO_TEST_CASE(MaxSize32MultiIterated)
BOOST_CHECK(s.get_sample_count() == num_samples);
BOOST_CHECK(s.get_sample_count() == num_samples);
- pv::data::Segment
RawDataIterator* it = s.begin_raw
_sample_iteration(0);
+ pv::data::Segment
DataIterator* it = s.begin
_sample_iteration(0);
for (uint32_t i = 0; i < num_samples; i++) {
for (uint32_t i = 0; i < num_samples; i++) {
- uint8_t* sample_data = it->value;
- BOOST_CHECK_EQUAL(*((uint32_t*)sample_data), i);
- s.continue_raw_sample_iteration(it, 1);
+ BOOST_CHECK_EQUAL(*((uint32_t*)s.get_iterator_value(it)), i);
+ s.continue_sample_iteration(it, 1);
}
}
- s.end_
raw_
sample_iteration(it);
+ s.end_sample_iteration(it);
}
BOOST_AUTO_TEST_SUITE_END()
}
BOOST_AUTO_TEST_SUITE_END()