X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=test%2Flogicdatasnapshot.cpp;h=b56f98f098b6b1694eddc47c902527f09867c2f0;hp=6e1f26364d778feb7e16a0e1a8edb306c1d6410a;hb=39f6e56e9b72fc24abac56a12bc4701cb1c9571e;hpb=ecda6ca9b83e5ed9988c64ed9fc4e4a33b8a5457;ds=sidebyside

diff --git a/test/logicdatasnapshot.cpp b/test/logicdatasnapshot.cpp
index 6e1f2636..b56f98f0 100644
--- a/test/logicdatasnapshot.cpp
+++ b/test/logicdatasnapshot.cpp
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#define __STDC_LIMIT_MACROS
+#include <stdint.h>
+
 #include <boost/test/unit_test.hpp>
 
 #include "../logicdatasnapshot.h"
@@ -37,6 +40,28 @@ void push_logic(LogicDataSnapshot &s, unsigned int length, uint8_t value)
 	delete[] (uint8_t*)logic.data;
 }
 
+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);
+
+	BOOST_CHECK_EQUAL(
+		LogicDataSnapshot::pow2_ceil(INT64_MIN, 0), INT64_MIN);
+	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);
+	BOOST_CHECK_EQUAL(LogicDataSnapshot::pow2_ceil(3, 1), 4);
+}
+
 BOOST_AUTO_TEST_CASE(Basic)
 {
 	// Create an empty LogicDataSnapshot object
@@ -162,14 +187,14 @@ BOOST_AUTO_TEST_CASE(LargeData)
 		BOOST_TEST_MESSAGE("Testing mip_map[0].data[" << i << "]");
 
 		const uint8_t sample = (uint8_t)((i*16) >> 8);
-		BOOST_CHECK_EQUAL(*((uint8_t*)s._mip_map[0].data + i++),
+		BOOST_CHECK_EQUAL(s.get_subsample(0, i++) & 0xFF,
 			prev_sample ^ sample);
 		prev_sample = sample;
 
 		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(*((uint8_t*)s._mip_map[0].data + i++), 0);
+			BOOST_CHECK_EQUAL(s.get_subsample(0, i++) & 0xFF, 0);
 		}
 	}
 
@@ -188,8 +213,7 @@ BOOST_AUTO_TEST_CASE(LargeData)
 		const uint8_t expected = sample ^ prev_sample;
 		prev_sample = i;
 
-		BOOST_CHECK_EQUAL(*((uint8_t*)s._mip_map[1].data + i),
-			expected);
+		BOOST_CHECK_EQUAL(s.get_subsample(1, i) & 0xFF, expected);
 	}
 
 	// Check mip map level 2
@@ -207,8 +231,7 @@ BOOST_AUTO_TEST_CASE(LargeData)
 		const uint8_t expected = (sample ^ prev_sample) | 0x0F;
 		prev_sample = sample;
 
-		BOOST_CHECK_EQUAL(*((uint8_t*)s._mip_map[2].data + i),
-			expected);
+		BOOST_CHECK_EQUAL(s.get_subsample(2, i) & 0xFF, expected);
 	}
 
 	// Check mip map level 3
@@ -234,15 +257,16 @@ BOOST_AUTO_TEST_CASE(LargeData)
 	vector<LogicDataSnapshot::EdgePair> edges;
 
 	s.get_subsampled_edges(edges, 0, Length-1, 1, 7);
-	BOOST_REQUIRE_EQUAL(edges.size(), 32);
 
-	for(int i = 0; i < 31; i++)
+	BOOST_CHECK_EQUAL(edges.size(), 32);
+
+	for(int i = 0; i < edges.size() - 1; i++)
 	{
-		BOOST_REQUIRE_EQUAL(edges[i].first, i * 32768);
-		BOOST_REQUIRE_EQUAL(edges[i].second, i & 1);
+		BOOST_CHECK_EQUAL(edges[i].first, i * 32768);
+		BOOST_CHECK_EQUAL(edges[i].second, i & 1);
 	}
 
-	BOOST_REQUIRE_EQUAL(edges[31].first, 999999);
+	BOOST_CHECK_EQUAL(edges[31].first, 999999);
 }
 
 BOOST_AUTO_TEST_SUITE_END()