X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=test%2Fdata%2Flogicsnapshot.cpp;h=5fc17213ba1ca06e2a2d5d0b84686ee0b60957a3;hp=bbc7438338cf6a5df14ef18eebd2ef59c83417d1;hb=6d8b05622f1e422c7193656c9eac3ebae5b6b934;hpb=9ba4ca3540ace02b1b5439ec2f4584f82f2aca77

diff --git a/test/data/logicsnapshot.cpp b/test/data/logicsnapshot.cpp
index bbc74383..5fc17213 100644
--- a/test/data/logicsnapshot.cpp
+++ b/test/data/logicsnapshot.cpp
@@ -20,16 +20,14 @@
 
 #include <extdef.h>
 
-#define __STDC_LIMIT_MACROS
 #include <stdint.h>
 
 #include <boost/test/unit_test.hpp>
 
 #include "../../pv/data/logicsnapshot.h"
 
-using namespace std;
-
 using pv::data::LogicSnapshot;
+using std::vector;
 
 BOOST_AUTO_TEST_SUITE(LogicSnapshotTest)
 
@@ -142,7 +140,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[3].first, 255);
+	BOOST_CHECK_EQUAL(edges[3].first, 256);
 
 	// Test a subset at high zoom
 	edges.clear();
@@ -152,7 +150,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[3].first, 17);
+	BOOST_CHECK_EQUAL(edges[3].first, 18);
 }
 
 BOOST_AUTO_TEST_CASE(LargeData)
@@ -265,7 +263,7 @@ BOOST_AUTO_TEST_CASE(LargeData)
 		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();
@@ -403,7 +401,7 @@ BOOST_AUTO_TEST_CASE(LongPulses)
 		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 -----//
@@ -420,7 +418,7 @@ BOOST_AUTO_TEST_CASE(LongPulses)
 		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);
 }