tests: Fix a Boost header deprecation warning.

[pulseview.git] / test / view / ruler.cpp

diff --git a/test/view/ruler.cpp b/test/view/ruler.cpp
index 34bf20b72820e54b6d99d38338e8775aa3a138ac..4a4eac8f34d5822cacec1b622c4fe8c8f9f047bc 100644 (file)
--- a/test/view/ruler.cpp
+++ b/test/view/ruler.cpp
@@ -17,13 +17,18 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <boost/test/unit_test.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107100 // 1.71 deprecated the old header location.
+#include <boost/test/tools/floating_point_comparison.hpp>
+#else
 #include <boost/test/floating_point_comparison.hpp>
+#endif
+#include <boost/test/unit_test.hpp>
 
-#include "pv/view/ruler.hpp"
+#include "pv/views/trace/ruler.hpp"
 #include "test/test.hpp"
 
-using namespace pv::views::TraceView;
+using namespace pv::views::trace;
 
 namespace {
        QString format(const pv::util::Timestamp& t)
@@ -42,9 +47,10 @@ BOOST_AUTO_TEST_CASE(tick_position_test_0)
        const pv::util::Timestamp offset("0");
        const double scale(0.001);
        const int width(500);
+       const unsigned int minor_tick_count(4);
 
-       const Ruler::TickPositions ts = Ruler::calculate_tick_positions(
-               major_period, offset, scale, width, format);
+       const TickPositions ts = Ruler::calculate_tick_positions(
+               major_period, offset, scale, width, minor_tick_count, format);
 
        BOOST_REQUIRE_EQUAL(ts.major.size(), 6);
 
@@ -88,9 +94,10 @@ BOOST_AUTO_TEST_CASE(tick_position_test_1)
        const pv::util::Timestamp offset("-0.463");
        const double scale(0.001);
        const int width(500);
+       const unsigned int minor_tick_count(4);
 
-       const Ruler::TickPositions ts = Ruler::calculate_tick_positions(
-               major_period, offset, scale, width, format);
+       const TickPositions ts = Ruler::calculate_tick_positions(
+               major_period, offset, scale, width, minor_tick_count, format);
 
        BOOST_REQUIRE_EQUAL(ts.major.size(), 5);
 
@@ -132,9 +139,10 @@ BOOST_AUTO_TEST_CASE(tick_position_test_2)
        const pv::util::Timestamp offset("8");
        const double scale(0.129746);
        const int width(580);
+       const unsigned int minor_tick_count(4);
 
-       const Ruler::TickPositions ts = Ruler::calculate_tick_positions(
-               major_period, offset, scale, width, format);
+       const TickPositions ts = Ruler::calculate_tick_positions(
+               major_period, offset, scale, width, minor_tick_count, format);
 
        const double mp = 5;
        const int off = 8;