Renamed C++ headers to .hpp

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

diff --git a/test/data/analogsnapshot.cpp b/test/data/analogsnapshot.cpp
index 97d7518dc7ad67b0dba019d0fdb1b6e91140a46f..3dd04ed6508f6a18a416bbb0445fd8a0172b9dd9 100644 (file)
--- a/test/data/analogsnapshot.cpp
+++ b/test/data/analogsnapshot.cpp
@@ -24,7 +24,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include "../../pv/data/analogsnapshot.h"
+#include <pv/data/analogsnapshot.hpp>
 
 using pv::data::AnalogSnapshot;
 
@@ -33,33 +33,25 @@ 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 *const data = new float[num_samples];
+       for (unsigned int i = 0; i < num_samples; i++)
+               data[i] = value;
 
-       float *data = new float[num_samples];
-       analog.data = data;
-       while(num_samples-- != 0)
-               *data++ = 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 -----//
 
        BOOST_CHECK(s.get_sample_count() == 0);
        for (unsigned int i = 0; i < AnalogSnapshot::ScaleStepCount; i++)
        {
-               const AnalogSnapshot::Envelope &m = s._envelope_levels[i];
+               const AnalogSnapshot::Envelope &m = s.envelope_levels_[i];
                BOOST_CHECK_EQUAL(m.length, 0);
                BOOST_CHECK_EQUAL(m.data_length, 0);
                BOOST_CHECK(m.samples == NULL);
@@ -73,7 +65,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 < AnalogSnapshot::ScaleStepCount; i++)
        {
-               const AnalogSnapshot::Envelope &m = s._envelope_levels[i];
+               const AnalogSnapshot::Envelope &m = s.envelope_levels_[i];
                BOOST_CHECK_EQUAL(m.length, 0);
                BOOST_CHECK_EQUAL(m.data_length, 0);
                BOOST_CHECK(m.samples == NULL);
@@ -84,7 +76,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
-       const AnalogSnapshot::Envelope &e0 = s._envelope_levels[0];
+       const AnalogSnapshot::Envelope &e0 = s.envelope_levels_[0];
        BOOST_CHECK_EQUAL(e0.length, 1);
        BOOST_CHECK_EQUAL(e0.data_length, AnalogSnapshot::EnvelopeDataUnit);
        BOOST_REQUIRE(e0.samples != NULL);
@@ -94,7 +86,7 @@ BOOST_AUTO_TEST_CASE(Basic)
        // The higher levels should still be empty
        for (unsigned int i = 1; i < AnalogSnapshot::ScaleStepCount; i++)
        {
-               const AnalogSnapshot::Envelope &m = s._envelope_levels[i];
+               const AnalogSnapshot::Envelope &m = s.envelope_levels_[i];
                BOOST_CHECK_EQUAL(m.length, 0);
                BOOST_CHECK_EQUAL(m.data_length, 0);
                BOOST_CHECK(m.samples == NULL);
@@ -111,7 +103,7 @@ BOOST_AUTO_TEST_CASE(Basic)
                BOOST_CHECK_EQUAL(e0.samples[i].max, -1.0f);
        }
 
-       const AnalogSnapshot::Envelope &e1 = s._envelope_levels[1];
+       const AnalogSnapshot::Envelope &e1 = s.envelope_levels_[1];
        BOOST_CHECK_EQUAL(e1.length, 1);
        BOOST_CHECK_EQUAL(e1.data_length, AnalogSnapshot::EnvelopeDataUnit);
        BOOST_REQUIRE(e1.samples != NULL);