From a8f5b505b732e770f9d7d2658e493f047b60772b Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 3 Feb 2017 09:17:53 +0100 Subject: [PATCH] Fix tests gps_ls_m_pcps_acquisition moved to extra unit tests since it requires an external data file. Fixed a bug in galileo_e1_pcps_ambiguous_acquisition_test --- src/tests/test_main.cc | 2 +- .../acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc | 4 ++-- .../acquisition/gps_l2_m_pcps_acquisition_test.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc index ecd50cc8f..e35d32a1d 100644 --- a/src/tests/test_main.cc +++ b/src/tests/test_main.cc @@ -94,7 +94,6 @@ DECLARE_string(log_dir); #include "unit-tests/signal-processing-blocks/resampler/direct_resampler_conditioner_cc_test.cc" #include "unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc" -#include "unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc" #include "unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc" #include "unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc" #include "unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc" @@ -125,6 +124,7 @@ DECLARE_string(log_dir); #include "unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc" #if EXTRA_TESTS +#include "unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc" #include "unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc" #include "unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc" #include "unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc" diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc index 8fa66b0c7..3adec6673 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc @@ -172,7 +172,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ConnectAndRun) init(); std::shared_ptr acq_ = factory->GetBlock(config, "Acquisition", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 1); std::shared_ptr acquisition = std::dynamic_pointer_cast(acq_); - boost::shared_ptr msg_rx = GpsL2MPcpsAcquisitionTest_msg_rx_make(); + boost::shared_ptr msg_rx = GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_make(); ASSERT_NO_THROW( { acquisition->connect(top_block); @@ -206,7 +206,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ValidationOfResults) top_block = gr::make_top_block("Acquisition test"); std::shared_ptr acq_ = factory->GetBlock(config, "Acquisition", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 1); std::shared_ptr acquisition = std::dynamic_pointer_cast(acq_); - boost::shared_ptr msg_rx = GpsL2MPcpsAcquisitionTest_msg_rx_make(); + boost::shared_ptr msg_rx = GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_make(); ASSERT_NO_THROW( { acquisition->set_channel(gnss_synchro.Channel_ID); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc index f3b5d0d0b..bdfc0dd9a 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc @@ -241,7 +241,7 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ValidationOfResults) ASSERT_NO_THROW( { std::string path = std::string(TEST_PATH); //std::string file = path + "signal_samples/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat"; - std::string file = path + "/data/gps_l2c_m_prn7_5msps.dat"; + std::string file = path + "signal_samples/gps_l2c_m_prn7_5msps.dat"; //std::string file = "/datalogger/signals/Fraunhofer/L125_III1b_210s_L2_resampled.bin"; const char * file_name = file.c_str(); gr::blocks::file_source::sptr file_source = gr::blocks::file_source::make(sizeof(gr_complex), file_name, false);