diff options
| author | Ryan Schutt <rschutt@users.noreply.github.com> | 2019-08-14 14:27:57 -0400 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2019-09-05 13:18:20 +0200 |
| commit | a5df144a2c4098b7681b0d83235d343483419dc9 (patch) | |
| tree | 5e53b336ef41b5ee891288ef68f78616b182847d /gr-fft | |
| parent | dc0028172a3b33e87684a06c81ddab3a9166f8f1 (diff) | |
fft_shift: use unit test macros that exist in Boost 1.53
gr-fft mixes in Boost 1.59 dependency, but we only guarantee 1.53
Addresses https://github.com/gnuradio/gnuradio/issues/2685
Diffstat (limited to 'gr-fft')
| -rw-r--r-- | gr-fft/lib/qa_fft_shift.cc | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/gr-fft/lib/qa_fft_shift.cc b/gr-fft/lib/qa_fft_shift.cc index fb587ec1dc..d219ce0a66 100644 --- a/gr-fft/lib/qa_fft_shift.cc +++ b/gr-fft/lib/qa_fft_shift.cc @@ -39,12 +39,24 @@ BOOST_AUTO_TEST_CASE(t1) std::vector<int> y_even{ -4, -3, -2, -1, 0, 1, 2, 3 }; // expected result s.shift(x_even); - BOOST_TEST(x_even == y_even, boost::test_tools::per_element()); + if (x_even.size() == y_even.size()) { + for (unsigned int i = 0; i < x_even.size(); i++) { + BOOST_CHECK(x_even[i] == y_even[i]); + } + } else { + BOOST_CHECK(x_even.size() == y_even.size()); + } // two shifts should not change the result s.shift(x_even); s.shift(x_even); - BOOST_TEST(x_even == y_even, boost::test_tools::per_element()); + if (x_even.size() == y_even.size()) { + for (unsigned int i = 0; i < x_even.size(); i++) { + BOOST_CHECK(x_even[i] == y_even[i]); + } + } else { + BOOST_CHECK(x_even.size() == y_even.size()); + } } BOOST_AUTO_TEST_CASE(t2) @@ -55,7 +67,13 @@ BOOST_AUTO_TEST_CASE(t2) std::vector<int> y_odd{ -3, -2, -1, 0, 1, 2, 3 }; // expected result s.shift(x_odd); - BOOST_TEST(x_odd == y_odd, boost::test_tools::per_element()); + if (x_odd.size() == y_odd.size()) { + for (unsigned int i = 0; i < x_odd.size(); i++) { + BOOST_CHECK(x_odd[i] == y_odd[i]); + } + } else { + BOOST_CHECK(x_odd.size() == y_odd.size()); + } } } /* namespace fft */ |