X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=test%2Flogicdatasnapshot.cpp;h=3dd72285e52d85dba5f8a134150beb61dd170498;hp=32bbe81aefbee117cfcfd0fc89d12d595aa05aad;hb=fe48aaeba282c95336583aa9dfe31c8c259480c6;hpb=a126c277beab53c79d1ce8a24bdc979ec13d1bad diff --git a/test/logicdatasnapshot.cpp b/test/logicdatasnapshot.cpp index 32bbe81a..3dd72285 100644 --- a/test/logicdatasnapshot.cpp +++ b/test/logicdatasnapshot.cpp @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the PulseView project. * * Copyright (C) 2012 Joel Holdsworth * @@ -18,16 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #define __STDC_LIMIT_MACROS #include #include -#include "../extdef.h" -#include "../logicdatasnapshot.h" +#include "../pv/logicdatasnapshot.h" using namespace std; +using pv::LogicDataSnapshot; + BOOST_AUTO_TEST_SUITE(LogicDataSnapshotTest) void push_logic(LogicDataSnapshot &s, unsigned int length, uint8_t value) @@ -43,8 +46,6 @@ void push_logic(LogicDataSnapshot &s, unsigned int length, uint8_t value) BOOST_AUTO_TEST_CASE(Pow2) { - BOOST_CHECK_EQUAL(LogicDataSnapshot::pow2_ceil(-2, 0), -2); - BOOST_CHECK_EQUAL(LogicDataSnapshot::pow2_ceil(-1, 0), -1); BOOST_CHECK_EQUAL(LogicDataSnapshot::pow2_ceil(0, 0), 0); BOOST_CHECK_EQUAL(LogicDataSnapshot::pow2_ceil(1, 0), 1); BOOST_CHECK_EQUAL(LogicDataSnapshot::pow2_ceil(2, 0), 2); @@ -54,9 +55,6 @@ BOOST_AUTO_TEST_CASE(Pow2) BOOST_CHECK_EQUAL( LogicDataSnapshot::pow2_ceil(INT64_MAX, 0), INT64_MAX); - BOOST_CHECK_EQUAL(LogicDataSnapshot::pow2_ceil(-3, 1), -2); - BOOST_CHECK_EQUAL(LogicDataSnapshot::pow2_ceil(-2, 1), -2); - BOOST_CHECK_EQUAL(LogicDataSnapshot::pow2_ceil(-1, 1), 0); BOOST_CHECK_EQUAL(LogicDataSnapshot::pow2_ceil(0, 1), 0); BOOST_CHECK_EQUAL(LogicDataSnapshot::pow2_ceil(1, 1), 2); BOOST_CHECK_EQUAL(LogicDataSnapshot::pow2_ceil(2, 1), 2); @@ -76,7 +74,7 @@ BOOST_AUTO_TEST_CASE(Basic) //----- Test LogicDataSnapshot::push_logic -----// BOOST_CHECK(s.get_sample_count() == 0); - for(int i = 0; i < LogicDataSnapshot::ScaleStepCount; i++) + for(unsigned int i = 0; i < LogicDataSnapshot::ScaleStepCount; i++) { const LogicDataSnapshot::MipMapLevel &m = s._mip_map[i]; BOOST_CHECK_EQUAL(m.length, 0); @@ -90,7 +88,7 @@ BOOST_AUTO_TEST_CASE(Basic) BOOST_CHECK(s.get_sample_count() == 8); // There should not be enough samples to have a single mip map sample - for(int i = 0; i < LogicDataSnapshot::ScaleStepCount; i++) + for(unsigned int i = 0; i < LogicDataSnapshot::ScaleStepCount; i++) { const LogicDataSnapshot::MipMapLevel &m = s._mip_map[i]; BOOST_CHECK_EQUAL(m.length, 0); @@ -110,7 +108,7 @@ BOOST_AUTO_TEST_CASE(Basic) BOOST_CHECK_EQUAL(((uint8_t*)m0.data)[0], 0x11); // The higher levels should still be empty - for(int i = 1; i < LogicDataSnapshot::ScaleStepCount; i++) + for(unsigned int i = 1; i < LogicDataSnapshot::ScaleStepCount; i++) { const LogicDataSnapshot::MipMapLevel &m = s._mip_map[i]; BOOST_CHECK_EQUAL(m.length, 0); @@ -125,7 +123,7 @@ BOOST_AUTO_TEST_CASE(Basic) BOOST_CHECK_EQUAL(m0.data_length, LogicDataSnapshot::MipMapDataUnit); BOOST_CHECK_EQUAL(((uint8_t*)m0.data)[1], 0x11); - for(int i = 2; i < m0.length; i++) + for(unsigned int i = 2; i < m0.length; i++) BOOST_CHECK_EQUAL(((uint8_t*)m0.data)[i], 0); const LogicDataSnapshot::MipMapLevel &m1 = s._mip_map[1]; @@ -160,7 +158,7 @@ BOOST_AUTO_TEST_CASE(Basic) BOOST_AUTO_TEST_CASE(LargeData) { uint8_t prev_sample; - const int Length = 1000000; + const unsigned int Length = 1000000; sr_datafeed_logic logic; logic.unitsize = 1; @@ -168,7 +166,7 @@ BOOST_AUTO_TEST_CASE(LargeData) logic.data = new uint8_t[Length]; uint8_t *data = (uint8_t*)logic.data; - for(int i = 0; i < Length; i++) + for(unsigned int i = 0; i < Length; i++) *data++ = (uint8_t)(i >> 8); LogicDataSnapshot s(logic); @@ -183,7 +181,7 @@ BOOST_AUTO_TEST_CASE(LargeData) BOOST_REQUIRE(s._mip_map[0].data != NULL); prev_sample = 0; - for(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 << "]"); @@ -206,7 +204,7 @@ BOOST_AUTO_TEST_CASE(LargeData) BOOST_REQUIRE(s._mip_map[1].data != NULL); prev_sample = 0; - for(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 << "]"); @@ -224,7 +222,7 @@ BOOST_AUTO_TEST_CASE(LargeData) BOOST_REQUIRE(s._mip_map[2].data != NULL); prev_sample = 0; - for(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 << "]"); @@ -241,12 +239,12 @@ BOOST_AUTO_TEST_CASE(LargeData) LogicDataSnapshot::MipMapDataUnit); BOOST_REQUIRE(s._mip_map[3].data != NULL); - for(int i = 0; i < s._mip_map[3].length; 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(int i = 4; i < LogicDataSnapshot::ScaleStepCount; i++) + for(unsigned int i = 4; i < LogicDataSnapshot::ScaleStepCount; i++) { const LogicDataSnapshot::MipMapLevel &m = s._mip_map[i]; BOOST_CHECK_EQUAL(m.length, 0); @@ -255,19 +253,25 @@ BOOST_AUTO_TEST_CASE(LargeData) } //----- Test LogicDataSnapshot::get_subsampled_edges -----// + // Check in normal case vector edges; - s.get_subsampled_edges(edges, 0, Length-1, 1, 7); BOOST_CHECK_EQUAL(edges.size(), 32); - for(int i = 0; i < edges.size() - 1; i++) + for(unsigned int i = 0; i < edges.size() - 1; i++) { BOOST_CHECK_EQUAL(edges[i].first, i * 32768); BOOST_CHECK_EQUAL(edges[i].second, i & 1); } BOOST_CHECK_EQUAL(edges[31].first, 999999); + + // Check in very low zoom case + edges.clear(); + s.get_subsampled_edges(edges, 0, Length-1, 50e6f, 7); + + BOOST_CHECK_EQUAL(edges.size(), 2); } BOOST_AUTO_TEST_CASE(Pulses) @@ -301,7 +305,7 @@ BOOST_AUTO_TEST_CASE(Pulses) LogicDataSnapshot::MipMapDataUnit); BOOST_REQUIRE(s._mip_map[0].data != NULL); - for(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); @@ -315,7 +319,7 @@ BOOST_AUTO_TEST_CASE(Pulses) } // Check the higher levels are all inactive - for(int i = 1; i < LogicDataSnapshot::ScaleStepCount; i++) { + for(unsigned int i = 1; i < LogicDataSnapshot::ScaleStepCount; i++) { const LogicDataSnapshot::MipMapLevel &m = s._mip_map[i]; BOOST_CHECK_EQUAL(m.length, 0); BOOST_CHECK_EQUAL(m.data_length, 0); @@ -327,7 +331,7 @@ BOOST_AUTO_TEST_CASE(Pulses) BOOST_REQUIRE_EQUAL(edges.size(), Cycles + 2); BOOST_CHECK_EQUAL(0, false); - for(int i = 1; i < edges.size(); i++) + for(unsigned int i = 1; i < edges.size(); i++) BOOST_CHECK_EQUAL(edges[i].second, false); } @@ -351,7 +355,7 @@ BOOST_AUTO_TEST_CASE(LongPulses) for(int i = 0; i < Cycles; i++) { for(j = 0; j < PulseWidth; j++) *p++ = ~0; - for(j; j < Period; j++) + for(; j < Period; j++) *p++ = 0; } @@ -365,14 +369,14 @@ BOOST_AUTO_TEST_CASE(LongPulses) LogicDataSnapshot::MipMapDataUnit); BOOST_REQUIRE(s._mip_map[0].data != NULL); - for(int i = 0; i < s._mip_map[0].length;) { + 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); } - for(j; i < s._mip_map[0].length && + for(; i < s._mip_map[0].length && j < Period/LogicDataSnapshot::MipMapScaleFactor; j++) { BOOST_TEST_MESSAGE( "Testing mip_map[0].data[" << i << "]"); @@ -381,7 +385,7 @@ BOOST_AUTO_TEST_CASE(LongPulses) } // Check the higher levels are all inactive - for(int i = 1; i < LogicDataSnapshot::ScaleStepCount; i++) { + for(unsigned int i = 1; i < LogicDataSnapshot::ScaleStepCount; i++) { const LogicDataSnapshot::MipMapLevel &m = s._mip_map[i]; BOOST_CHECK_EQUAL(m.length, 0); BOOST_CHECK_EQUAL(m.data_length, 0); @@ -443,7 +447,7 @@ BOOST_AUTO_TEST_CASE(LisaMUsbHid) logic.data = new uint8_t[Length]; uint8_t *data = (uint8_t*)logic.data; - for(int i = 0; i < countof(Edges); i++) { + for(unsigned int i = 0; i < countof(Edges); i++) { const int edgePos = Edges[i]; memset(&data[lastEdgePos], state ? 0x02 : 0, edgePos - lastEdgePos - 1);