Merge branch 'work' of git@ettus.sourcerepo.com:ettus/uhdpriv

4 files changed, 129 insertions, 2 deletions

diff --git a/host/test/CMakeLists.txt b/host/test/CMakeLists.txt
index 1791d9082..61b0b503d 100644
--- a/host/test/CMakeLists.txt
+++ b/host/test/CMakeLists.txt
@@ -21,6 +21,8 @@
 ADD_EXECUTABLE(main_test
     main_test.cpp
     addr_test.cpp
+    dict_test.cpp
+    error_test.cpp
     gain_handler_test.cpp
     vrt_test.cpp
     wax_test.cpp
diff --git a/host/test/addr_test.cpp b/host/test/addr_test.cpp
index 93b7cc0df..0c50200d6 100644
--- a/host/test/addr_test.cpp
+++ b/host/test/addr_test.cpp
@@ -18,6 +18,7 @@
 #include <boost/test/unit_test.hpp>
 #include <uhd/types/mac_addr.hpp>
 #include <uhd/types/device_addr.hpp>
+#include <uhd/usrp/dboard_id.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
 #include <algorithm>
@@ -41,8 +42,8 @@ BOOST_AUTO_TEST_CASE(test_device_addr){
     dev_addr["key2"] = "val2";
 
     //convert to and from args string
-    std::cout << "Pretty Print: " << std::endl << dev_addr.to_string();
-    std::string args_str = dev_addr.to_args_str();
+    std::cout << "Pretty Print: " << std::endl << dev_addr.to_pp_string();
+    std::string args_str = dev_addr.to_string();
     std::cout << "Args String: " << args_str << std::endl;
     uhd::device_addr_t new_dev_addr(args_str);
 
@@ -65,3 +66,15 @@ BOOST_AUTO_TEST_CASE(test_device_addr){
         new_dev_addr_vals.begin(), new_dev_addr_vals.end()
     );
 }
+
+BOOST_AUTO_TEST_CASE(test_dboard_id){
+    std::cout << "Testing dboard id..." << std::endl;
+
+    using namespace uhd::usrp;
+
+    BOOST_CHECK(dboard_id_t() == dboard_id_t::none());
+    BOOST_CHECK_EQUAL(dboard_id_t().to_uint16(), dboard_id_t::none().to_uint16());
+    BOOST_CHECK_EQUAL(dboard_id_t::from_string("0x1234").to_uint16(), 0x1234);
+    BOOST_CHECK_EQUAL(dboard_id_t::from_string("1234").to_uint16(), 1234);
+    std::cout << "Pretty Print: " << std::endl << dboard_id_t::none().to_pp_string();
+}
diff --git a/host/test/dict_test.cpp b/host/test/dict_test.cpp
new file mode 100644
index 000000000..0501a7878
--- /dev/null
+++ b/host/test/dict_test.cpp
@@ -0,0 +1,72 @@
+//
+// 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/dict.hpp>
+#include <boost/assign/list_of.hpp>
+
+BOOST_AUTO_TEST_CASE(test_dict_init){
+    uhd::dict<int, int> d;
+    d[-1] = 3;
+    d[0] = 4;
+    d[1] = 5;
+    BOOST_CHECK(d.has_key(0));
+    BOOST_CHECK(not d.has_key(2));
+    BOOST_CHECK(d.keys()[1] == 0);
+    BOOST_CHECK(d.vals()[1] == 4);
+    BOOST_CHECK_EQUAL(d[-1], 3);
+}
+
+BOOST_AUTO_TEST_CASE(test_dict_assign){
+    uhd::dict<int, int> d = boost::assign::map_list_of
+        (-1, 3)
+        (0, 4)
+        (1, 5)
+    ;
+    BOOST_CHECK(d.has_key(0));
+    BOOST_CHECK(not d.has_key(2));
+    BOOST_CHECK(d.keys()[1] == 0);
+    BOOST_CHECK(d.vals()[1] == 4);
+    BOOST_CHECK_EQUAL(d[-1], 3);
+}
+
+BOOST_AUTO_TEST_CASE(test_const_dict){
+    const uhd::dict<int, int> d = boost::assign::map_list_of
+        (-1, 3)
+        (0, 4)
+        (1, 5)
+    ;
+    BOOST_CHECK(d.has_key(0));
+    BOOST_CHECK(not d.has_key(2));
+    BOOST_CHECK(d.keys()[1] == 0);
+    BOOST_CHECK(d.vals()[1] == 4);
+    BOOST_CHECK_EQUAL(d[-1], 3);
+    BOOST_CHECK_THROW(d[2], std::exception);
+}
+
+BOOST_AUTO_TEST_CASE(test_dict_pop){
+    uhd::dict<int, int> d = boost::assign::map_list_of
+        (-1, 3)
+        (0, 4)
+        (1, 5)
+    ;
+    BOOST_CHECK(d.has_key(0));
+    BOOST_CHECK_EQUAL(d.pop(0), 4);
+    BOOST_CHECK(not d.has_key(0));
+    BOOST_CHECK(d.keys()[0] == -1);
+    BOOST_CHECK(d.keys()[1] == 1);
+}
diff --git a/host/test/error_test.cpp b/host/test/error_test.cpp
new file mode 100644
index 000000000..c5b0af45e
--- /dev/null
+++ b/host/test/error_test.cpp
@@ -0,0 +1,40 @@
+//
+// 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/utils/assert.hpp>
+#include <boost/exception/diagnostic_information.hpp>
+#include <vector>
+#include <iostream>
+
+BOOST_AUTO_TEST_CASE(test_assert_has){
+    std::vector<int> vec;
+    vec.push_back(2);
+    vec.push_back(3);
+    vec.push_back(5);
+
+    //verify the std::has utility
+    BOOST_CHECK(std::has(vec, 2));
+    BOOST_CHECK(not std::has(vec, 1));
+
+    std::cout << "The output of the assert_has error:" << std::endl;
+    try{
+        uhd::assert_has(vec, 1, "prime");
+    }catch(const boost::exception &e){
+        std::cout << boost::diagnostic_information(e) << std::endl;
+    }
+}