3 files changed, 60 insertions, 2 deletions
diff --git a/host/include/uhd/types/ranges.ipp b/host/include/uhd/types/ranges.ipp
index 7fd1bf2eb..8b602a24d 100644
--- a/host/include/uhd/types/ranges.ipp
+++ b/host/include/uhd/types/ranges.ipp
@@ -130,10 +130,10 @@ namespace uhd{
         range_t<T> last = this->front();
         BOOST_FOREACH(const range_t<T> &r, (*this)){
             //steps at each range
-            if (r.step() != T(0)) non_zero_steps.push_back(r.step());
+            if (r.step() > T(0)) non_zero_steps.push_back(r.step());
             //and steps in-between ranges
             T ibtw_step = r.start() - last.stop();
-            if (ibtw_step != T(0)) non_zero_steps.push_back(ibtw_step);
+            if (ibtw_step > T(0)) non_zero_steps.push_back(ibtw_step);
             //store ref to last
             last = r;
         }
diff --git a/host/test/CMakeLists.txt b/host/test/CMakeLists.txt
index d67399e5b..5d7433c67 100644
--- a/host/test/CMakeLists.txt
+++ b/host/test/CMakeLists.txt
@@ -26,6 +26,7 @@ SET(test_sources
     dict_test.cpp
     error_test.cpp
     gain_group_test.cpp
+    ranges_test.cpp
     subdev_spec_test.cpp
     time_spec_test.cpp
     tune_helper_test.cpp
diff --git a/host/test/ranges_test.cpp b/host/test/ranges_test.cpp
new file mode 100644
index 000000000..ad61867e1
--- /dev/null
+++ b/host/test/ranges_test.cpp
@@ -0,0 +1,57 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <boost/test/unit_test.hpp>
+#include <uhd/types/ranges.hpp>
+#include <iostream>
+
+using namespace uhd;
+
+static const double tolerance = 0.001;
+
+BOOST_AUTO_TEST_CASE(test_ranges_bounds){
+    meta_range_t<double> mr;
+    mr.push_back(range_t<double>(-1.0, +1.0, 0.1));
+    BOOST_CHECK_CLOSE(mr.start(), -1.0, tolerance);
+    BOOST_CHECK_CLOSE(mr.stop(), +1.0, tolerance);
+    BOOST_CHECK_CLOSE(mr.step(), 0.1, tolerance);
+
+    mr.push_back(range_t<double>(40.0, 60.0, 1.0));
+    BOOST_CHECK_CLOSE(mr.start(), -1.0, tolerance);
+    BOOST_CHECK_CLOSE(mr.stop(), 60.0, tolerance);
+    BOOST_CHECK_CLOSE(mr.step(), 0.1, tolerance);
+
+    BOOST_CHECK_EQUAL(mr.size(), 2);
+
+    BOOST_CHECK_CLOSE(mr[0].start(), -1.0, tolerance);
+    BOOST_CHECK_CLOSE(mr[0].stop(), +1.0, tolerance);
+    BOOST_CHECK_CLOSE(mr[0].step(), 0.1, tolerance);
+}
+
+BOOST_AUTO_TEST_CASE(test_ranges_clip){
+    meta_range_t<double> mr;
+    mr.push_back(range_t<double>(-1.0, +1.0, 0.1));
+    mr.push_back(range_t<double>(40.0, 60.0, 1.0));
+
+    BOOST_CHECK_CLOSE(mr.clip(-30.0), -1.0, tolerance);
+    BOOST_CHECK_CLOSE(mr.clip(70.0), 60.0, tolerance);
+    BOOST_CHECK_CLOSE(mr.clip(20.0), 1.0, tolerance);
+    BOOST_CHECK_CLOSE(mr.clip(50.0), 50.0, tolerance);
+
+    BOOST_CHECK_CLOSE(mr.clip(50.9, false), 50.9, tolerance);
+    BOOST_CHECK_CLOSE(mr.clip(50.9, true), 51.0, tolerance);
+}