diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-11-11 14:06:56 -0800 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-11-11 14:06:56 -0800 |
| commit | 5a3b5a06082e90a68b993a765b91a7c288ab19c0 (patch) | |
| tree | 5219c55ea239203514fc0a699f7f7ceb21c48781 /host/test/gain_group_test.cpp | |
| parent | 6eef331543022efa5723e677cd3140e652ea67d7 (diff) | |
| parent | 5da1e3e2d683eecce1f0e888d90caef40661e98e (diff) | |
| download | uhd-5a3b5a06082e90a68b993a765b91a7c288ab19c0.tar.gz uhd-5a3b5a06082e90a68b993a765b91a7c288ab19c0.tar.bz2 uhd-5a3b5a06082e90a68b993a765b91a7c288ab19c0.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
Diffstat (limited to 'host/test/gain_group_test.cpp')
| -rw-r--r-- | host/test/gain_group_test.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/host/test/gain_group_test.cpp b/host/test/gain_group_test.cpp index 555ccaed3..dbb585987 100644 --- a/host/test/gain_group_test.cpp +++ b/host/test/gain_group_test.cpp @@ -40,7 +40,7 @@ public: } void set_value(float gain){ - float step = get_range().step; + float step = get_range().step(); _gain = step*rint(gain/step); } @@ -60,7 +60,7 @@ public: } void set_value(float gain){ - float step = get_range().step; + float step = get_range().step(); _gain = step*rint(gain/step); } @@ -102,9 +102,9 @@ BOOST_AUTO_TEST_CASE(test_gain_group_overall){ //test the overall stuff gg->set_value(80); BOOST_CHECK_CLOSE(gg->get_value(), float(80), tolerance); - BOOST_CHECK_CLOSE(gg->get_range().min, float(-20), tolerance); - BOOST_CHECK_CLOSE(gg->get_range().max, float(100), tolerance); - BOOST_CHECK_CLOSE(gg->get_range().step, float(0.1), tolerance); + BOOST_CHECK_CLOSE(gg->get_range().start(), float(-20), tolerance); + BOOST_CHECK_CLOSE(gg->get_range().stop(), float(100), tolerance); + BOOST_CHECK_CLOSE(gg->get_range().step(), float(0.1), tolerance); } BOOST_AUTO_TEST_CASE(test_gain_group_priority){ @@ -113,10 +113,10 @@ BOOST_AUTO_TEST_CASE(test_gain_group_priority){ //test the overall stuff gg->set_value(80); BOOST_CHECK_CLOSE(gg->get_value(), float(80), tolerance); - BOOST_CHECK_CLOSE(gg->get_range().min, float(-20), tolerance); - BOOST_CHECK_CLOSE(gg->get_range().max, float(100), tolerance); - BOOST_CHECK_CLOSE(gg->get_range().step, float(0.1), tolerance); + BOOST_CHECK_CLOSE(gg->get_range().start(), float(-20), tolerance); + BOOST_CHECK_CLOSE(gg->get_range().stop(), float(100), tolerance); + BOOST_CHECK_CLOSE(gg->get_range().step(), float(0.1), tolerance); //test the the higher priority gain got filled first (gain 2) - BOOST_CHECK_CLOSE(g2.get_value(), g2.get_range().max, tolerance); + BOOST_CHECK_CLOSE(g2.get_value(), g2.get_range().stop(), tolerance); } |