From ad16c5ab35bc915bc4bf72d0fb200a827befb06e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 1 May 2016 12:39:40 +0200 Subject: [PATCH] some test fixes --- .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc | 4 ++-- src/tests/formats/rtcm_test.cc | 14 ++++++++++---- .../gnss_block/gps_l2_m_dll_pll_tracking_test.cc | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc index 9f0e62427..ea832052f 100644 --- a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc +++ b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc @@ -335,7 +335,7 @@ int gps_l1_ca_pvt_cc::general_work (int noutput_items __attribute__((unused)), g gps_ephemeris_iter = d_ls_pvt->gps_ephemeris_map.begin(); if (gps_ephemeris_iter != d_ls_pvt->gps_ephemeris_map.end()) { - d_rtcm_printer->Print_Rtcm_MT1002(gps_ephemeris_iter->second, d_rx_time, gnss_pseudoranges_map); + d_rtcm_printer->Print_Rtcm_MSM(4, gps_ephemeris_iter->second, {}, {}, d_rx_time, gnss_pseudoranges_map, 1234, 0, 0, 0, 0, 0); } } if((d_sample_counter % 5000) == 0) @@ -356,7 +356,7 @@ int gps_l1_ca_pvt_cc::general_work (int noutput_items __attribute__((unused)), g if (gps_ephemeris_iter != d_ls_pvt->gps_ephemeris_map.end()) { d_rtcm_printer->Print_Rtcm_MT1019(gps_ephemeris_iter->second); - d_rtcm_printer->Print_Rtcm_MSM(1, gps_ephemeris_iter->second, {}, {}, d_rx_time, gnss_pseudoranges_map, 1234, 0, 0, 0, 0, 0); + d_rtcm_printer->Print_Rtcm_MSM(4, gps_ephemeris_iter->second, {}, {}, d_rx_time, gnss_pseudoranges_map, 1234, 0, 0, 0, 0, 0); } b_rtcm_writing_started = true; } diff --git a/src/tests/formats/rtcm_test.cc b/src/tests/formats/rtcm_test.cc index f44942d1f..0da51d545 100644 --- a/src/tests/formats/rtcm_test.cc +++ b/src/tests/formats/rtcm_test.cc @@ -158,8 +158,14 @@ TEST(Rtcm_Test, Bin_to_int) TEST(Rtcm_Test, Bin_to_binary_data) { auto rtcm = std::make_shared(); - std::string bin_str("01011010"); + std::string bin_str("11011010"); std::string data_str = rtcm->bin_to_binary_data(bin_str); + + std::string test_binary = data_str.substr(0,1); + std::string test_bin = rtcm->binary_data_to_bin(test_binary); + std::string test_hex = rtcm->bin_to_hex(test_bin); + EXPECT_EQ(0, test_hex.compare("D")); + std::string recovered_str = rtcm->binary_data_to_bin(data_str); EXPECT_EQ(0, recovered_str.compare(bin_str)); } @@ -266,7 +272,7 @@ TEST(Rtcm_Test, MT1019) EXPECT_DOUBLE_EQ(4, gps_eph_read.d_IODC); EXPECT_DOUBLE_EQ( 2.0 * E_LSB, gps_eph_read.d_e_eccentricity); EXPECT_EQ(expected_true, gps_eph_read.b_fit_interval_flag); - EXPECT_EQ(1, rtcm->read_MT1019("FFFFFFFFFFF", gps_eph_read)); + EXPECT_EQ(1, rtcm->read_MT1019(rtcm->bin_to_binary_data(rtcm->hex_to_bin("FFFFFFFFFFF")), gps_eph_read)); } @@ -306,7 +312,7 @@ TEST(Rtcm_Test, MT1045) EXPECT_EQ(expected_true, gal_eph_read.E5a_DVS); EXPECT_DOUBLE_EQ( 53.0 * OMEGA_dot_3_LSB, gal_eph_read.OMEGA_dot_3); EXPECT_EQ(5, gal_eph_read.i_satellite_PRN); - EXPECT_EQ(1, rtcm->read_MT1045("FFFFFFFFFFF", gal_eph_read)); + EXPECT_EQ(1, rtcm->read_MT1045(rtcm->bin_to_binary_data(rtcm->hex_to_bin("FFFFFFFFFFF")), gal_eph_read)); } @@ -571,7 +577,7 @@ TEST(Rtcm_Test, InstantiateServer) EXPECT_EQ(expected1, rtcm->bin_to_uint("00101010")); rtcm->run_server(); std::string test4_bin = rtcm->hex_to_bin(test3); - std::string s("Testing"); + std::string s = rtcm->bin_to_binary_data(test4_bin); rtcm->send_message(s); rtcm->stop_server(); EXPECT_EQ(0, test4_bin.compare("11111111")); diff --git a/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc b/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc index 3e08f22d8..12643576b 100644 --- a/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc +++ b/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc @@ -84,7 +84,7 @@ void GpsL2MDllPllTrackingTest_msg_rx::msg_handler_events(pmt::pmt_t msg) } catch(boost::bad_any_cast& e) { - LOG(WARNING) << "msg_handler_telemetry Bad any cast!\n"; + LOG(WARNING) << "msg_handler_telemetry Bad any cast!"; rx_message = 0; } }