test/CMakeLists.txt: Fix MinGW build of the tests.

[pulseview.git] / test / data / analogsnapshot.cpp

diff --git a/test/data/analogsnapshot.cpp b/test/data/analogsnapshot.cpp
index cd1fd773fc5759b1b6b6c87f57c300ed8b005937..200d262bf88726090857687e899c8e666135f764 100644 (file)
--- a/test/data/analogsnapshot.cpp
+++ b/test/data/analogsnapshot.cpp
@@ -20,15 +20,12 @@
 
 #include <extdef.h>
 
-#define __STDC_LIMIT_MACROS
 #include <stdint.h>
 
 #include <boost/test/unit_test.hpp>
 
 #include "../../pv/data/analogsnapshot.h"
 
-using namespace std;
-
 using pv::data::AnalogSnapshot;
 
 BOOST_AUTO_TEST_SUITE(AnalogSnapshotTest)
@@ -36,26 +33,18 @@ BOOST_AUTO_TEST_SUITE(AnalogSnapshotTest)
 void push_analog(AnalogSnapshot &s, unsigned int num_samples,
        float value)
 {
-       sr_datafeed_analog analog;
-       analog.num_samples = num_samples;
-
-       float *data = new float[num_samples];
-       analog.data = data;
-       while(num_samples-- != 0)
-               *data++ = value;
+       float *const data = new float[num_samples];
+       for (unsigned int i = 0; i < num_samples; i++)
+               data[i] = value;
 
-       s.append_payload(analog);
-       delete[] (float*)analog.data;
+       s.append_interleaved_samples(data, num_samples, 1);
+       delete[] data;
 }
 
 BOOST_AUTO_TEST_CASE(Basic)
 {
        // Create an empty AnalogSnapshot object
-       sr_datafeed_analog analog;
-       analog.num_samples = 0;
-       analog.data = NULL;
-
-       AnalogSnapshot s(analog);
+       AnalogSnapshot s;
 
        //----- Test AnalogSnapshot::push_analog -----//