projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
decoderstack.cpp: Fix incorrect #inludes.
[pulseview.git]
/
test
/
data
/
logicsnapshot.cpp
diff --git
a/test/data/logicsnapshot.cpp
b/test/data/logicsnapshot.cpp
index 67321c863557c564dbe57b92ab1d0663fc3815f3..33727029b3188d49a2157885602f6adf903582bf 100644
(file)
--- a/
test/data/logicsnapshot.cpp
+++ b/
test/data/logicsnapshot.cpp
@@
-20,17
+20,16
@@
#include <extdef.h>
#include <extdef.h>
-#define __STDC_LIMIT_MACROS
#include <stdint.h>
#include <boost/test/unit_test.hpp>
#include <stdint.h>
#include <boost/test/unit_test.hpp>
-#include "../../pv/data/logicsnapshot.h"
-
-using namespace std;
+#include <pv/data/logicsnapshot.hpp>
using pv::data::LogicSnapshot;
using pv::data::LogicSnapshot;
+using std::vector;
+#if 0
BOOST_AUTO_TEST_SUITE(LogicSnapshotTest)
void push_logic(LogicSnapshot &s, unsigned int length, uint8_t value)
BOOST_AUTO_TEST_SUITE(LogicSnapshotTest)
void push_logic(LogicSnapshot &s, unsigned int length, uint8_t value)
@@
-76,7
+75,7
@@
BOOST_AUTO_TEST_CASE(Basic)
BOOST_CHECK(s.get_sample_count() == 0);
for (unsigned int i = 0; i < LogicSnapshot::ScaleStepCount; i++)
{
BOOST_CHECK(s.get_sample_count() == 0);
for (unsigned int i = 0; i < LogicSnapshot::ScaleStepCount; i++)
{
- const LogicSnapshot::MipMapLevel &m = s.
_mip_map
[i];
+ const LogicSnapshot::MipMapLevel &m = s.
mip_map_
[i];
BOOST_CHECK_EQUAL(m.length, 0);
BOOST_CHECK_EQUAL(m.data_length, 0);
BOOST_CHECK(m.data == NULL);
BOOST_CHECK_EQUAL(m.length, 0);
BOOST_CHECK_EQUAL(m.data_length, 0);
BOOST_CHECK(m.data == NULL);
@@
-90,7
+89,7
@@
BOOST_AUTO_TEST_CASE(Basic)
// There should not be enough samples to have a single mip map sample
for (unsigned int i = 0; i < LogicSnapshot::ScaleStepCount; i++)
{
// There should not be enough samples to have a single mip map sample
for (unsigned int i = 0; i < LogicSnapshot::ScaleStepCount; i++)
{
- const LogicSnapshot::MipMapLevel &m = s.
_mip_map
[i];
+ const LogicSnapshot::MipMapLevel &m = s.
mip_map_
[i];
BOOST_CHECK_EQUAL(m.length, 0);
BOOST_CHECK_EQUAL(m.data_length, 0);
BOOST_CHECK(m.data == NULL);
BOOST_CHECK_EQUAL(m.length, 0);
BOOST_CHECK_EQUAL(m.data_length, 0);
BOOST_CHECK(m.data == NULL);
@@
-101,7
+100,7
@@
BOOST_AUTO_TEST_CASE(Basic)
// There should now be enough data for exactly one sample
// in mip map level 0, and that sample should be 0
// There should now be enough data for exactly one sample
// in mip map level 0, and that sample should be 0
- const LogicSnapshot::MipMapLevel &m0 = s.
_mip_map
[0];
+ const LogicSnapshot::MipMapLevel &m0 = s.
mip_map_
[0];
BOOST_CHECK_EQUAL(m0.length, 1);
BOOST_CHECK_EQUAL(m0.data_length, LogicSnapshot::MipMapDataUnit);
BOOST_REQUIRE(m0.data != NULL);
BOOST_CHECK_EQUAL(m0.length, 1);
BOOST_CHECK_EQUAL(m0.data_length, LogicSnapshot::MipMapDataUnit);
BOOST_REQUIRE(m0.data != NULL);
@@
-110,7
+109,7
@@
BOOST_AUTO_TEST_CASE(Basic)
// The higher levels should still be empty
for (unsigned int i = 1; i < LogicSnapshot::ScaleStepCount; i++)
{
// The higher levels should still be empty
for (unsigned int i = 1; i < LogicSnapshot::ScaleStepCount; i++)
{
- const LogicSnapshot::MipMapLevel &m = s.
_mip_map
[i];
+ const LogicSnapshot::MipMapLevel &m = s.
mip_map_
[i];
BOOST_CHECK_EQUAL(m.length, 0);
BOOST_CHECK_EQUAL(m.data_length, 0);
BOOST_CHECK(m.data == NULL);
BOOST_CHECK_EQUAL(m.length, 0);
BOOST_CHECK_EQUAL(m.data_length, 0);
BOOST_CHECK(m.data == NULL);
@@
-126,7
+125,7
@@
BOOST_AUTO_TEST_CASE(Basic)
for (unsigned int i = 2; i < m0.length; i++)
BOOST_CHECK_EQUAL(((uint8_t*)m0.data)[i], 0);
for (unsigned int i = 2; i < m0.length; i++)
BOOST_CHECK_EQUAL(((uint8_t*)m0.data)[i], 0);
- const LogicSnapshot::MipMapLevel &m1 = s.
_mip_map
[1];
+ const LogicSnapshot::MipMapLevel &m1 = s.
mip_map_
[1];
BOOST_CHECK_EQUAL(m1.length, 1);
BOOST_CHECK_EQUAL(m1.data_length, LogicSnapshot::MipMapDataUnit);
BOOST_REQUIRE(m1.data != NULL);
BOOST_CHECK_EQUAL(m1.length, 1);
BOOST_CHECK_EQUAL(m1.data_length, LogicSnapshot::MipMapDataUnit);
BOOST_REQUIRE(m1.data != NULL);
@@
-142,7
+141,7
@@
BOOST_AUTO_TEST_CASE(Basic)
BOOST_CHECK_EQUAL(edges[0].first, 0);
BOOST_CHECK_EQUAL(edges[1].first, 8);
BOOST_CHECK_EQUAL(edges[2].first, 16);
BOOST_CHECK_EQUAL(edges[0].first, 0);
BOOST_CHECK_EQUAL(edges[1].first, 8);
BOOST_CHECK_EQUAL(edges[2].first, 16);
- BOOST_CHECK_EQUAL(edges[3].first, 25
5
);
+ BOOST_CHECK_EQUAL(edges[3].first, 25
6
);
// Test a subset at high zoom
edges.clear();
// Test a subset at high zoom
edges.clear();
@@
-152,7
+151,7
@@
BOOST_AUTO_TEST_CASE(Basic)
BOOST_CHECK_EQUAL(edges[0].first, 6);
BOOST_CHECK_EQUAL(edges[1].first, 8);
BOOST_CHECK_EQUAL(edges[2].first, 16);
BOOST_CHECK_EQUAL(edges[0].first, 6);
BOOST_CHECK_EQUAL(edges[1].first, 8);
BOOST_CHECK_EQUAL(edges[2].first, 16);
- BOOST_CHECK_EQUAL(edges[3].first, 1
7
);
+ BOOST_CHECK_EQUAL(edges[3].first, 1
8
);
}
BOOST_AUTO_TEST_CASE(LargeData)
}
BOOST_AUTO_TEST_CASE(LargeData)
@@
-175,13
+174,13
@@
BOOST_AUTO_TEST_CASE(LargeData)
BOOST_CHECK(s.get_sample_count() == Length);
// Check mip map level 0
BOOST_CHECK(s.get_sample_count() == Length);
// Check mip map level 0
- BOOST_CHECK_EQUAL(s.
_mip_map
[0].length, 62500);
- BOOST_CHECK_EQUAL(s.
_mip_map
[0].data_length,
+ BOOST_CHECK_EQUAL(s.
mip_map_
[0].length, 62500);
+ BOOST_CHECK_EQUAL(s.
mip_map_
[0].data_length,
LogicSnapshot::MipMapDataUnit);
LogicSnapshot::MipMapDataUnit);
- BOOST_REQUIRE(s.
_mip_map
[0].data != NULL);
+ BOOST_REQUIRE(s.
mip_map_
[0].data != NULL);
prev_sample = 0;
prev_sample = 0;
- for (unsigned int i = 0; i < s.
_mip_map
[0].length;)
+ for (unsigned int i = 0; i < s.
mip_map_
[0].length;)
{
BOOST_TEST_MESSAGE("Testing mip_map[0].data[" << i << "]");
{
BOOST_TEST_MESSAGE("Testing mip_map[0].data[" << i << "]");
@@
-190,7
+189,7
@@
BOOST_AUTO_TEST_CASE(LargeData)
prev_sample ^ sample);
prev_sample = sample;
prev_sample ^ sample);
prev_sample = sample;
- for (int j = 1; i < s.
_mip_map
[0].length && j < 16; j++)
+ for (int j = 1; i < s.
mip_map_
[0].length && j < 16; j++)
{
BOOST_TEST_MESSAGE("Testing mip_map[0].data[" << i << "]");
BOOST_CHECK_EQUAL(s.get_subsample(0, i++) & 0xFF, 0);
{
BOOST_TEST_MESSAGE("Testing mip_map[0].data[" << i << "]");
BOOST_CHECK_EQUAL(s.get_subsample(0, i++) & 0xFF, 0);
@@
-198,13
+197,13
@@
BOOST_AUTO_TEST_CASE(LargeData)
}
// Check mip map level 1
}
// Check mip map level 1
- BOOST_CHECK_EQUAL(s.
_mip_map
[1].length, 3906);
- BOOST_CHECK_EQUAL(s.
_mip_map
[1].data_length,
+ BOOST_CHECK_EQUAL(s.
mip_map_
[1].length, 3906);
+ BOOST_CHECK_EQUAL(s.
mip_map_
[1].data_length,
LogicSnapshot::MipMapDataUnit);
LogicSnapshot::MipMapDataUnit);
- BOOST_REQUIRE(s.
_mip_map
[1].data != NULL);
+ BOOST_REQUIRE(s.
mip_map_
[1].data != NULL);
prev_sample = 0;
prev_sample = 0;
- for (unsigned int i = 0; i < s.
_mip_map
[1].length; i++)
+ for (unsigned int i = 0; i < s.
mip_map_
[1].length; i++)
{
BOOST_TEST_MESSAGE("Testing mip_map[1].data[" << i << "]");
{
BOOST_TEST_MESSAGE("Testing mip_map[1].data[" << i << "]");
@@
-216,13
+215,13
@@
BOOST_AUTO_TEST_CASE(LargeData)
}
// Check mip map level 2
}
// Check mip map level 2
- BOOST_CHECK_EQUAL(s.
_mip_map
[2].length, 244);
- BOOST_CHECK_EQUAL(s.
_mip_map
[2].data_length,
+ BOOST_CHECK_EQUAL(s.
mip_map_
[2].length, 244);
+ BOOST_CHECK_EQUAL(s.
mip_map_
[2].data_length,
LogicSnapshot::MipMapDataUnit);
LogicSnapshot::MipMapDataUnit);
- BOOST_REQUIRE(s.
_mip_map
[2].data != NULL);
+ BOOST_REQUIRE(s.
mip_map_
[2].data != NULL);
prev_sample = 0;
prev_sample = 0;
- for (unsigned int i = 0; i < s.
_mip_map
[2].length; i++)
+ for (unsigned int i = 0; i < s.
mip_map_
[2].length; i++)
{
BOOST_TEST_MESSAGE("Testing mip_map[2].data[" << i << "]");
{
BOOST_TEST_MESSAGE("Testing mip_map[2].data[" << i << "]");
@@
-234,19
+233,19
@@
BOOST_AUTO_TEST_CASE(LargeData)
}
// Check mip map level 3
}
// Check mip map level 3
- BOOST_CHECK_EQUAL(s.
_mip_map
[3].length, 15);
- BOOST_CHECK_EQUAL(s.
_mip_map
[3].data_length,
+ BOOST_CHECK_EQUAL(s.
mip_map_
[3].length, 15);
+ BOOST_CHECK_EQUAL(s.
mip_map_
[3].data_length,
LogicSnapshot::MipMapDataUnit);
LogicSnapshot::MipMapDataUnit);
- BOOST_REQUIRE(s.
_mip_map
[3].data != NULL);
+ BOOST_REQUIRE(s.
mip_map_
[3].data != NULL);
- for (unsigned int i = 0; i < s.
_mip_map
[3].length; i++)
- BOOST_CHECK_EQUAL(*((uint8_t*)s.
_mip_map
[3].data + i),
+ for (unsigned int i = 0; i < s.
mip_map_
[3].length; i++)
+ BOOST_CHECK_EQUAL(*((uint8_t*)s.
mip_map_
[3].data + i),
0xFF);
// Check the higher levels
for (unsigned int i = 4; i < LogicSnapshot::ScaleStepCount; i++)
{
0xFF);
// Check the higher levels
for (unsigned int i = 4; i < LogicSnapshot::ScaleStepCount; i++)
{
- const LogicSnapshot::MipMapLevel &m = s.
_mip_map
[i];
+ const LogicSnapshot::MipMapLevel &m = s.
mip_map_
[i];
BOOST_CHECK_EQUAL(m.length, 0);
BOOST_CHECK_EQUAL(m.data_length, 0);
BOOST_CHECK(m.data == NULL);
BOOST_CHECK_EQUAL(m.length, 0);
BOOST_CHECK_EQUAL(m.data_length, 0);
BOOST_CHECK(m.data == NULL);
@@
-265,7
+264,7
@@
BOOST_AUTO_TEST_CASE(LargeData)
BOOST_CHECK_EQUAL(edges[i].second, i & 1);
}
BOOST_CHECK_EQUAL(edges[i].second, i & 1);
}
- BOOST_CHECK_EQUAL(edges[31].first,
999999
);
+ BOOST_CHECK_EQUAL(edges[31].first,
1000000
);
// Check in very low zoom case
edges.clear();
// Check in very low zoom case
edges.clear();
@@
-300,17
+299,17
@@
BOOST_AUTO_TEST_CASE(Pulses)
//----- Check the mip-map -----//
// Check mip map level 0
//----- Check the mip-map -----//
// Check mip map level 0
- BOOST_CHECK_EQUAL(s.
_mip_map
[0].length, 12);
- BOOST_CHECK_EQUAL(s.
_mip_map
[0].data_length,
+ BOOST_CHECK_EQUAL(s.
mip_map_
[0].length, 12);
+ BOOST_CHECK_EQUAL(s.
mip_map_
[0].data_length,
LogicSnapshot::MipMapDataUnit);
LogicSnapshot::MipMapDataUnit);
- BOOST_REQUIRE(s.
_mip_map
[0].data != NULL);
+ BOOST_REQUIRE(s.
mip_map_
[0].data != NULL);
- for (unsigned int i = 0; i < s.
_mip_map
[0].length;) {
+ for (unsigned int i = 0; i < s.
mip_map_
[0].length;) {
BOOST_TEST_MESSAGE("Testing mip_map[0].data[" << i << "]");
BOOST_CHECK_EQUAL(s.get_subsample(0, i++) & 0xFF, 0xFF);
for (int j = 1;
BOOST_TEST_MESSAGE("Testing mip_map[0].data[" << i << "]");
BOOST_CHECK_EQUAL(s.get_subsample(0, i++) & 0xFF, 0xFF);
for (int j = 1;
- i < s.
_mip_map
[0].length &&
+ i < s.
mip_map_
[0].length &&
j < Period/LogicSnapshot::MipMapScaleFactor; j++) {
BOOST_TEST_MESSAGE(
"Testing mip_map[0].data[" << i << "]");
j < Period/LogicSnapshot::MipMapScaleFactor; j++) {
BOOST_TEST_MESSAGE(
"Testing mip_map[0].data[" << i << "]");
@@
-320,7
+319,7
@@
BOOST_AUTO_TEST_CASE(Pulses)
// Check the higher levels are all inactive
for (unsigned int i = 1; i < LogicSnapshot::ScaleStepCount; i++) {
// Check the higher levels are all inactive
for (unsigned int i = 1; i < LogicSnapshot::ScaleStepCount; i++) {
- const LogicSnapshot::MipMapLevel &m = s.
_mip_map
[i];
+ const LogicSnapshot::MipMapLevel &m = s.
mip_map_
[i];
BOOST_CHECK_EQUAL(m.length, 0);
BOOST_CHECK_EQUAL(m.data_length, 0);
BOOST_CHECK(m.data == NULL);
BOOST_CHECK_EQUAL(m.length, 0);
BOOST_CHECK_EQUAL(m.data_length, 0);
BOOST_CHECK(m.data == NULL);
@@
-364,19
+363,19
@@
BOOST_AUTO_TEST_CASE(LongPulses)
//----- Check the mip-map -----//
// Check mip map level 0
//----- Check the mip-map -----//
// Check mip map level 0
- BOOST_CHECK_EQUAL(s.
_mip_map
[0].length, 12);
- BOOST_CHECK_EQUAL(s.
_mip_map
[0].data_length,
+ BOOST_CHECK_EQUAL(s.
mip_map_
[0].length, 12);
+ BOOST_CHECK_EQUAL(s.
mip_map_
[0].data_length,
LogicSnapshot::MipMapDataUnit);
LogicSnapshot::MipMapDataUnit);
- BOOST_REQUIRE(s.
_mip_map
[0].data != NULL);
+ BOOST_REQUIRE(s.
mip_map_
[0].data != NULL);
- for (unsigned int i = 0; i < s.
_mip_map
[0].length;) {
- for (j = 0; i < s.
_mip_map
[0].length && j < 2; j++) {
+ for (unsigned int i = 0; i < s.
mip_map_
[0].length;) {
+ for (j = 0; i < s.
mip_map_
[0].length && j < 2; j++) {
BOOST_TEST_MESSAGE(
"Testing mip_map[0].data[" << i << "]");
BOOST_CHECK_EQUAL(s.get_subsample(0, i++), ~0);
}
BOOST_TEST_MESSAGE(
"Testing mip_map[0].data[" << i << "]");
BOOST_CHECK_EQUAL(s.get_subsample(0, i++), ~0);
}
- for (; i < s.
_mip_map
[0].length &&
+ for (; i < s.
mip_map_
[0].length &&
j < Period/LogicSnapshot::MipMapScaleFactor; j++) {
BOOST_TEST_MESSAGE(
"Testing mip_map[0].data[" << i << "]");
j < Period/LogicSnapshot::MipMapScaleFactor; j++) {
BOOST_TEST_MESSAGE(
"Testing mip_map[0].data[" << i << "]");
@@
-386,7
+385,7
@@
BOOST_AUTO_TEST_CASE(LongPulses)
// Check the higher levels are all inactive
for (unsigned int i = 1; i < LogicSnapshot::ScaleStepCount; i++) {
// Check the higher levels are all inactive
for (unsigned int i = 1; i < LogicSnapshot::ScaleStepCount; i++) {
- const LogicSnapshot::MipMapLevel &m = s.
_mip_map
[i];
+ const LogicSnapshot::MipMapLevel &m = s.
mip_map_
[i];
BOOST_CHECK_EQUAL(m.length, 0);
BOOST_CHECK_EQUAL(m.data_length, 0);
BOOST_CHECK(m.data == NULL);
BOOST_CHECK_EQUAL(m.length, 0);
BOOST_CHECK_EQUAL(m.data_length, 0);
BOOST_CHECK(m.data == NULL);
@@
-403,7
+402,7
@@
BOOST_AUTO_TEST_CASE(LongPulses)
BOOST_CHECK_EQUAL(edges[i*2+1].second, false);
}
BOOST_CHECK_EQUAL(edges[i*2+1].second, false);
}
- BOOST_CHECK_EQUAL(edges.back().first, Length
-1
);
+ BOOST_CHECK_EQUAL(edges.back().first, Length);
BOOST_CHECK_EQUAL(edges.back().second, false);
//----- Test get_subsampled_edges at a simplified scale -----//
BOOST_CHECK_EQUAL(edges.back().second, false);
//----- Test get_subsampled_edges at a simplified scale -----//
@@
-420,7
+419,7
@@
BOOST_AUTO_TEST_CASE(LongPulses)
BOOST_CHECK_EQUAL(edges[i+1].second, false);
}
BOOST_CHECK_EQUAL(edges[i+1].second, false);
}
- BOOST_CHECK_EQUAL(edges.back().first, Length
-1
);
+ BOOST_CHECK_EQUAL(edges.back().first, Length);
BOOST_CHECK_EQUAL(edges.back().second, false);
}
BOOST_CHECK_EQUAL(edges.back().second, false);
}
@@
-472,9
+471,9
@@
BOOST_AUTO_TEST_CASE(LisaMUsbHid)
}
/*
}
/*
- * This test checks the rendering of wide data (more than 8
probe
s)
+ * This test checks the rendering of wide data (more than 8
channel
s)
* Probe signals are either all-high, or all-low, but are interleaved such that
* Probe signals are either all-high, or all-low, but are interleaved such that
- * they would toggle during every sample if treated like 8
probe
s.
+ * they would toggle during every sample if treated like 8
channel
s.
* The packet contains a large number of samples, so the mipmap generation kicks
* in.
*
* The packet contains a large number of samples, so the mipmap generation kicks
* in.
*
@@
-490,7
+489,7
@@
BOOST_AUTO_TEST_CASE(WideData)
logic.length = Length * sizeof(data[0]);
logic.data = data;
logic.length = Length * sizeof(data[0]);
logic.data = data;
- for(int i = 0; i < Length; i++)
+ for
(int i = 0; i < Length; i++)
data[i] = 0x0FF0;
LogicSnapshot s(logic);
data[i] = 0x0FF0;
LogicSnapshot s(logic);
@@
-522,7
+521,7
@@
BOOST_AUTO_TEST_CASE(Sixteen)
logic.length = Length * sizeof(data[0]);
logic.data = data;
logic.length = Length * sizeof(data[0]);
logic.data = data;
- for(int i = 0; i < Length; i++)
+ for
(int i = 0; i < Length; i++)
data[i] = 0xFFFE;
LogicSnapshot s(logic);
data[i] = 0xFFFE;
LogicSnapshot s(logic);
@@
-534,3
+533,4
@@
BOOST_AUTO_TEST_CASE(Sixteen)
}
BOOST_AUTO_TEST_SUITE_END()
}
BOOST_AUTO_TEST_SUITE_END()
+#endif