From 7a64f53ddfa672fcdc99a4b29e80df4c6a1862e8 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 13 Jul 2020 15:17:15 +0200 Subject: [PATCH] Avoid redundancy, and possible errors, in block factory public API --- src/core/receiver/gnss_block_factory.cc | 43 ++++++++++--------- src/core/receiver/gnss_block_factory.h | 7 +-- .../control-plane/gnss_block_factory_test.cc | 35 +++++++++------ .../beidou_b1i_pcps_acquisition_test.cc | 3 -- .../beidou_b3i_pcps_acquisition_test.cc | 3 -- ...8ms_ambiguous_acquisition_gsoc2013_test.cc | 8 ++-- ...cps_ambiguous_acquisition_gsoc2013_test.cc | 8 ++-- ...e1_pcps_ambiguous_acquisition_gsoc_test.cc | 6 +-- ...ileo_e1_pcps_ambiguous_acquisition_test.cc | 6 +-- ...e1_pcps_ambiguous_acquisition_test_fpga.cc | 1 - ...wsr_ambiguous_acquisition_gsoc2013_test.cc | 8 ++-- ...ync_ambiguous_acquisition_gsoc2014_test.cc | 10 ++--- ...ong_ambiguous_acquisition_gsoc2013_test.cc | 8 ++-- .../galileo_e5b_pcps_acquisition_test.cc | 5 +-- .../glonass_l1_ca_pcps_acquisition_test.cc | 3 -- .../gps_l1_ca_pcps_acquisition_test.cc | 3 -- .../gps_l1_ca_pcps_acquisition_test_fpga.cc | 1 - ...cps_quicksync_acquisition_gsoc2014_test.cc | 3 -- .../gps_l2_m_pcps_acquisition_test.cc | 3 -- .../observables/hybrid_observables_test.cc | 4 +- .../hybrid_observables_test_fpga.cc | 4 +- .../gps_l1_ca_telemetry_decoder_test.cc | 3 -- .../galileo_e1_dll_pll_veml_tracking_test.cc | 6 +-- .../tracking/galileo_e5a_tracking_test.cc | 2 +- ...onass_l1_ca_dll_pll_c_aid_tracking_test.cc | 3 -- .../glonass_l1_ca_dll_pll_tracking_test.cc | 3 -- .../gps_l1_ca_dll_pll_tracking_test.cc | 2 +- .../gps_l1_ca_dll_pll_tracking_test_fpga.cc | 3 -- .../tracking/gps_l1_ca_kf_tracking_test.cc | 2 +- .../gps_l2_m_dll_pll_tracking_test.cc | 3 -- .../tracking/tracking_pull-in_test.cc | 2 +- .../tracking/tracking_pull-in_test_fpga.cc | 2 +- 32 files changed, 87 insertions(+), 116 deletions(-) diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index 7d85e6b5f..d05544768 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -172,7 +172,7 @@ std::unique_ptr GNSSBlockFactory::GetSignalSource( const ConfigurationInterface* configuration, Concurrent_Queue* queue, int ID) { - const std::string default_implementation("File_Signal_Source"); + const std::string empty_implementation; std::string role = "SignalSource"; // backwards compatibility for old conf files try { @@ -185,16 +185,16 @@ std::unique_ptr GNSSBlockFactory::GetSignalSource( { LOG(WARNING) << e.what(); } - std::string implementation = configuration->property(role + ".implementation", default_implementation); + std::string implementation = configuration->property(role + ".implementation", empty_implementation); LOG(INFO) << "Getting SignalSource with implementation " << implementation; - return GetBlock(configuration, role, implementation, 0, 1, queue); + return GetBlock(configuration, role, 0, 1, queue); } std::unique_ptr GNSSBlockFactory::GetSignalConditioner( const ConfigurationInterface* configuration, int ID) { - const std::string default_implementation("Pass_Through"); + const std::string empty_implementation; // backwards compatibility for old conf files std::string role_conditioner = "SignalConditioner"; std::string role_datatypeadapter = "DataTypeAdapter"; @@ -214,7 +214,7 @@ std::unique_ptr GNSSBlockFactory::GetSignalConditioner( { LOG(WARNING) << e.what(); } - std::string signal_conditioner = configuration->property(role_conditioner + ".implementation", default_implementation); + std::string signal_conditioner = configuration->property(role_conditioner + ".implementation", empty_implementation); std::string data_type_adapter; std::string input_filter; @@ -227,9 +227,9 @@ std::unique_ptr GNSSBlockFactory::GetSignalConditioner( } else { - data_type_adapter = configuration->property(role_datatypeadapter + ".implementation", default_implementation); - input_filter = configuration->property(role_inputfilter + ".implementation", default_implementation); - resampler = configuration->property(role_resampler + ".implementation", default_implementation); + data_type_adapter = configuration->property(role_datatypeadapter + ".implementation", empty_implementation); + input_filter = configuration->property(role_inputfilter + ".implementation", empty_implementation); + resampler = configuration->property(role_resampler + ".implementation", empty_implementation); } LOG(INFO) << "Getting SignalConditioner with DataTypeAdapter implementation: " @@ -241,18 +241,18 @@ std::unique_ptr GNSSBlockFactory::GetSignalConditioner( { // instantiate the array version std::unique_ptr conditioner_ = std::make_unique(configuration, - GetBlock(configuration, role_datatypeadapter, data_type_adapter, 1, 1), - GetBlock(configuration, role_inputfilter, input_filter, 1, 1), - GetBlock(configuration, role_resampler, resampler, 1, 1), + GetBlock(configuration, role_datatypeadapter, 1, 1), + GetBlock(configuration, role_inputfilter, 1, 1), + GetBlock(configuration, role_resampler, 1, 1), role_conditioner, "Signal_Conditioner"); return conditioner_; } // single-antenna version std::unique_ptr conditioner_ = std::make_unique(configuration, - GetBlock(configuration, role_datatypeadapter, data_type_adapter, 1, 1), - GetBlock(configuration, role_inputfilter, input_filter, 1, 1), - GetBlock(configuration, role_resampler, resampler, 1, 1), + GetBlock(configuration, role_datatypeadapter, 1, 1), + GetBlock(configuration, role_inputfilter, 1, 1), + GetBlock(configuration, role_resampler, 1, 1), role_conditioner, "Signal_Conditioner"); return conditioner_; } @@ -260,8 +260,8 @@ std::unique_ptr GNSSBlockFactory::GetSignalConditioner( std::unique_ptr GNSSBlockFactory::GetObservables(const ConfigurationInterface* configuration) { - const std::string default_implementation("Hybrid_Observables"); - std::string implementation = configuration->property("Observables.implementation", default_implementation); + const std::string empty_implementation; + std::string implementation = configuration->property("Observables.implementation", empty_implementation); LOG(INFO) << "Getting Observables with implementation " << implementation; unsigned int Galileo_channels = configuration->property("Channels_1B.count", 0); Galileo_channels += configuration->property("Channels_5X.count", 0); @@ -274,7 +274,7 @@ std::unique_ptr GNSSBlockFactory::GetObservables(const Confi unsigned int Beidou_channels = configuration->property("Channels_B1.count", 0); Beidou_channels += configuration->property("Channels_B3.count", 0); unsigned int extra_channels = 1; // For monitor channel sample counter - return GetBlock(configuration, "Observables", implementation, + return GetBlock(configuration, "Observables", Galileo_channels + GPS_channels + Glonass_channels + @@ -289,8 +289,8 @@ std::unique_ptr GNSSBlockFactory::GetObservables(const Confi std::unique_ptr GNSSBlockFactory::GetPVT(const ConfigurationInterface* configuration) { - const std::string default_implementation("RTKLIB_PVT"); - std::string implementation = configuration->property("PVT.implementation", default_implementation); + const std::string empty_implementation; + std::string implementation = configuration->property("PVT.implementation", empty_implementation); LOG(INFO) << "Getting PVT with implementation " << implementation; unsigned int Galileo_channels = configuration->property("Channels_1B.count", 0); Galileo_channels += configuration->property("Channels_5X.count", 0); @@ -302,7 +302,7 @@ std::unique_ptr GNSSBlockFactory::GetPVT(const Configuration Glonass_channels += configuration->property("Channels_2G.count", 0); unsigned int Beidou_channels = configuration->property("Channels_B1.count", 0); Beidou_channels += configuration->property("Channels_B3.count", 0); - return GetBlock(configuration, "PVT", implementation, + return GetBlock(configuration, "PVT", Galileo_channels + GPS_channels + Glonass_channels + Beidou_channels, 0); } @@ -551,12 +551,13 @@ std::unique_ptr>> GNSSBlockFacto std::unique_ptr GNSSBlockFactory::GetBlock( const ConfigurationInterface* configuration, const std::string& role, - const std::string& implementation, unsigned int in_streams, unsigned int out_streams, Concurrent_Queue* queue) { std::unique_ptr block; + const std::string defaut_implementation("Pass_Through"); + const std::string implementation = configuration->property(role + ".implementation", defaut_implementation); // PASS THROUGH ------------------------------------------------------------ if (implementation == "Pass_Through") diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h index 3f439b9eb..0c2c877af 100644 --- a/src/core/receiver/gnss_block_factory.h +++ b/src/core/receiver/gnss_block_factory.h @@ -62,11 +62,12 @@ public: std::unique_ptr GetPVT(const ConfigurationInterface* configuration); /*! - * \brief Returns the block with the required configuration and implementation + * \brief Returns the block with the required role implementation and its configuration parameters */ std::unique_ptr GetBlock(const ConfigurationInterface* configuration, - const std::string& role, const std::string& implementation, - unsigned int in_streams, unsigned int out_streams, + const std::string& role, + unsigned int in_streams, + unsigned int out_streams, Concurrent_Queue* queue = nullptr); private: diff --git a/src/tests/unit-tests/control-plane/gnss_block_factory_test.cc b/src/tests/unit-tests/control-plane/gnss_block_factory_test.cc index 167924425..68ed6a3ab 100644 --- a/src/tests/unit-tests/control-plane/gnss_block_factory_test.cc +++ b/src/tests/unit-tests/control-plane/gnss_block_factory_test.cc @@ -105,12 +105,13 @@ TEST(GNSSBlockFactoryTest, InstantiateFIRFilter) configuration->set_property("InputFilter.grid_density", "16"); std::unique_ptr factory = std::make_unique(); - std::unique_ptr input_filter = factory->GetBlock(configuration.get(), "InputFilter", "Fir_Filter", 1, 1); + std::unique_ptr input_filter = factory->GetBlock(configuration.get(), "InputFilter", 1, 1); EXPECT_STREQ("InputFilter", input_filter->role().c_str()); EXPECT_STREQ("Fir_Filter", input_filter->implementation().c_str()); } + TEST(GNSSBlockFactoryTest, InstantiateFreqXlatingFIRFilter) { std::shared_ptr configuration = std::make_shared(); @@ -140,12 +141,13 @@ TEST(GNSSBlockFactoryTest, InstantiateFreqXlatingFIRFilter) configuration->set_property("InputFilter.sampling_frequency", "4000000"); configuration->set_property("InputFilter.IF", "34000"); std::unique_ptr factory = std::make_unique(); - std::unique_ptr input_filter = factory->GetBlock(configuration.get(), "InputFilter", "Freq_Xlating_Fir_Filter", 1, 1); + std::unique_ptr input_filter = factory->GetBlock(configuration.get(), "InputFilter", 1, 1); EXPECT_STREQ("InputFilter", input_filter->role().c_str()); EXPECT_STREQ("Freq_Xlating_Fir_Filter", input_filter->implementation().c_str()); } + TEST(GNSSBlockFactoryTest, InstantiatePulseBlankingFilter) { std::shared_ptr configuration = std::make_shared(); @@ -153,12 +155,13 @@ TEST(GNSSBlockFactoryTest, InstantiatePulseBlankingFilter) configuration->set_property("InputFilter.implementation", "Pulse_Blanking_Filter"); std::unique_ptr factory = std::make_unique(); - std::unique_ptr input_filter = factory->GetBlock(configuration.get(), "InputFilter", "Pulse_Blanking_Filter", 1, 1); + std::unique_ptr input_filter = factory->GetBlock(configuration.get(), "InputFilter", 1, 1); EXPECT_STREQ("InputFilter", input_filter->role().c_str()); EXPECT_STREQ("Pulse_Blanking_Filter", input_filter->implementation().c_str()); } + TEST(GNSSBlockFactoryTest, InstantiateNotchFilter) { std::shared_ptr configuration = std::make_shared(); @@ -166,12 +169,13 @@ TEST(GNSSBlockFactoryTest, InstantiateNotchFilter) configuration->set_property("InputFilter.implementation", "Notch_Filter"); std::unique_ptr factory = std::make_unique(); - std::unique_ptr input_filter = factory->GetBlock(configuration.get(), "InputFilter", "Notch_Filter", 1, 1); + std::unique_ptr input_filter = factory->GetBlock(configuration.get(), "InputFilter", 1, 1); EXPECT_STREQ("InputFilter", input_filter->role().c_str()); EXPECT_STREQ("Notch_Filter", input_filter->implementation().c_str()); } + TEST(GNSSBlockFactoryTest, InstantiateNotchFilterLite) { std::shared_ptr configuration = std::make_shared(); @@ -179,28 +183,30 @@ TEST(GNSSBlockFactoryTest, InstantiateNotchFilterLite) configuration->set_property("InputFilter.implementation", "Notch_Filter_Lite"); std::unique_ptr factory = std::make_unique(); - std::unique_ptr input_filter = factory->GetBlock(configuration.get(), "InputFilter", "Notch_Filter_Lite", 1, 1); + std::unique_ptr input_filter = factory->GetBlock(configuration.get(), "InputFilter", 1, 1); EXPECT_STREQ("InputFilter", input_filter->role().c_str()); EXPECT_STREQ("Notch_Filter_Lite", input_filter->implementation().c_str()); } + TEST(GNSSBlockFactoryTest, InstantiateDirectResampler) { std::shared_ptr configuration = std::make_shared(); configuration->set_property("Resampler.implementation", "Direct_Resampler"); std::unique_ptr factory = std::make_unique(); - std::unique_ptr resampler = factory->GetBlock(configuration.get(), "Resampler", "Direct_Resampler", 1, 1); + std::unique_ptr resampler = factory->GetBlock(configuration.get(), "Resampler", 1, 1); EXPECT_STREQ("Resampler", resampler->role().c_str()); EXPECT_STREQ("Direct_Resampler", resampler->implementation().c_str()); } + TEST(GNSSBlockFactoryTest, InstantiateGpsL1CaPcpsAcquisition) { std::shared_ptr configuration = std::make_shared(); configuration->set_property("Acquisition.implementation", "GPS_L1_CA_PCPS_Acquisition"); std::unique_ptr factory = std::make_unique(); - std::shared_ptr acq_ = factory->GetBlock(configuration.get(), "Acquisition", "GPS_L1_CA_PCPS_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(configuration.get(), "Acquisition", 1, 0); std::shared_ptr acquisition = std::dynamic_pointer_cast(acq_); EXPECT_STREQ("Acquisition", acquisition->role().c_str()); EXPECT_STREQ("GPS_L1_CA_PCPS_Acquisition", acquisition->implementation().c_str()); @@ -212,18 +218,19 @@ TEST(GNSSBlockFactoryTest, InstantiateGpsL1CaPcpsQuickSyncAcquisition) std::shared_ptr configuration = std::make_shared(); configuration->set_property("Acquisition.implementation", "GPS_L1_CA_PCPS_QuickSync_Acquisition"); std::shared_ptr factory = std::make_shared(); - std::shared_ptr acq_ = factory->GetBlock(configuration.get(), "Acquisition", "GPS_L1_CA_PCPS_QuickSync_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(configuration.get(), "Acquisition", 1, 0); std::shared_ptr acquisition = std::dynamic_pointer_cast(acq_); EXPECT_STREQ("Acquisition", acquisition->role().c_str()); EXPECT_STREQ("GPS_L1_CA_PCPS_QuickSync_Acquisition", acquisition->implementation().c_str()); } + TEST(GNSSBlockFactoryTest, InstantiateGalileoE1PcpsQuickSyncAmbiguousAcquisition) { std::shared_ptr configuration = std::make_shared(); configuration->set_property("Acquisition.implementation", "Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition"); std::shared_ptr factory = std::make_shared(); - std::shared_ptr acq_ = factory->GetBlock(configuration.get(), "Acquisition", "Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(configuration.get(), "Acquisition", 1, 0); std::shared_ptr acquisition = std::dynamic_pointer_cast(acq_); EXPECT_STREQ("Acquisition", acquisition->role().c_str()); EXPECT_STREQ("Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition", acquisition->implementation().c_str()); @@ -235,7 +242,7 @@ TEST(GNSSBlockFactoryTest, InstantiateGalileoE1PcpsAmbiguousAcquisition) std::shared_ptr configuration = std::make_shared(); configuration->set_property("Acquisition.implementation", "Galileo_E1_PCPS_Ambiguous_Acquisition"); std::unique_ptr factory = std::make_unique(); - std::shared_ptr acq_ = factory->GetBlock(configuration.get(), "Acquisition", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(configuration.get(), "Acquisition", 1, 0); std::shared_ptr acquisition = std::dynamic_pointer_cast(acq_); EXPECT_STREQ("Acquisition", acquisition->role().c_str()); EXPECT_STREQ("Galileo_E1_PCPS_Ambiguous_Acquisition", acquisition->implementation().c_str()); @@ -247,7 +254,7 @@ TEST(GNSSBlockFactoryTest, InstantiateGpsL1CaDllPllTracking) std::shared_ptr configuration = std::make_shared(); configuration->set_property("Tracking.implementation", "GPS_L1_CA_DLL_PLL_Tracking"); std::unique_ptr factory = std::make_unique(); - std::shared_ptr trk_ = factory->GetBlock(configuration.get(), "Tracking", "GPS_L1_CA_DLL_PLL_Tracking", 1, 1); + std::shared_ptr trk_ = factory->GetBlock(configuration.get(), "Tracking", 1, 1); std::shared_ptr tracking = std::dynamic_pointer_cast(trk_); EXPECT_STREQ("Tracking", tracking->role().c_str()); EXPECT_STREQ("GPS_L1_CA_DLL_PLL_Tracking", tracking->implementation().c_str()); @@ -259,7 +266,7 @@ TEST(GNSSBlockFactoryTest, InstantiateGpsL1CaTcpConnectorTracking) std::shared_ptr configuration = std::make_shared(); configuration->set_property("Tracking.implementation", "GPS_L1_CA_TCP_CONNECTOR_Tracking"); std::unique_ptr factory = std::make_unique(); - std::shared_ptr trk_ = factory->GetBlock(configuration.get(), "Tracking", "GPS_L1_CA_TCP_CONNECTOR_Tracking", 1, 1); + std::shared_ptr trk_ = factory->GetBlock(configuration.get(), "Tracking", 1, 1); std::shared_ptr tracking = std::dynamic_pointer_cast(trk_); EXPECT_STREQ("Tracking", tracking->role().c_str()); EXPECT_STREQ("GPS_L1_CA_TCP_CONNECTOR_Tracking", tracking->implementation().c_str()); @@ -271,7 +278,7 @@ TEST(GNSSBlockFactoryTest, InstantiateGalileoE1DllPllVemlTracking) std::shared_ptr configuration = std::make_shared(); configuration->set_property("Tracking.implementation", "Galileo_E1_DLL_PLL_VEML_Tracking"); std::unique_ptr factory = std::make_unique(); - std::shared_ptr trk_ = factory->GetBlock(configuration.get(), "Tracking", "Galileo_E1_DLL_PLL_VEML_Tracking", 1, 1); + std::shared_ptr trk_ = factory->GetBlock(configuration.get(), "Tracking", 1, 1); std::shared_ptr tracking = std::dynamic_pointer_cast(trk_); EXPECT_STREQ("Tracking", tracking->role().c_str()); EXPECT_STREQ("Galileo_E1_DLL_PLL_VEML_Tracking", tracking->implementation().c_str()); @@ -283,7 +290,7 @@ TEST(GNSSBlockFactoryTest, InstantiateGpsL1CaTelemetryDecoder) std::shared_ptr configuration = std::make_shared(); configuration->set_property("TelemetryDecoder.implementation", "GPS_L1_CA_Telemetry_Decoder"); std::unique_ptr factory = std::make_unique(); - std::shared_ptr telemetry_decoder = factory->GetBlock(configuration.get(), "TelemetryDecoder", "GPS_L1_CA_Telemetry_Decoder", 1, 1); + std::shared_ptr telemetry_decoder = factory->GetBlock(configuration.get(), "TelemetryDecoder", 1, 1); EXPECT_STREQ("TelemetryDecoder", telemetry_decoder->role().c_str()); EXPECT_STREQ("GPS_L1_CA_Telemetry_Decoder", telemetry_decoder->implementation().c_str()); } diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc index f88c636ff..d272200c5 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1i_pcps_acquisition_test.cc @@ -24,7 +24,6 @@ #include "acquisition_dump_reader.h" #include "beidou_b1i_pcps_acquisition.h" #include "concurrent_queue.h" -#include "gnss_block_factory.h" #include "gnss_block_interface.h" #include "gnss_sdr_valve.h" #include "gnss_synchro.h" @@ -134,7 +133,6 @@ class BeidouB1iPcpsAcquisitionTest : public ::testing::Test protected: BeidouB1iPcpsAcquisitionTest() { - factory = std::make_shared(); config = std::make_shared(); item_size = sizeof(gr_complex); gnss_synchro = Gnss_Synchro(); @@ -148,7 +146,6 @@ protected: void plot_grid(); gr::top_block_sptr top_block; - std::shared_ptr factory; std::shared_ptr config; Gnss_Synchro gnss_synchro{}; size_t item_size; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc index 7b4b86a9c..40e06fe57 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b3i_pcps_acquisition_test.cc @@ -24,7 +24,6 @@ #include "acquisition_dump_reader.h" #include "beidou_b3i_pcps_acquisition.h" #include "concurrent_queue.h" -#include "gnss_block_factory.h" #include "gnss_block_interface.h" #include "gnss_sdr_valve.h" #include "gnss_synchro.h" @@ -134,7 +133,6 @@ class BeidouB3iPcpsAcquisitionTest : public ::testing::Test protected: BeidouB3iPcpsAcquisitionTest() { - factory = std::make_shared(); config = std::make_shared(); item_size = sizeof(gr_complex); gnss_synchro = Gnss_Synchro(); @@ -148,7 +146,6 @@ protected: void plot_grid(); gr::top_block_sptr top_block; - std::shared_ptr factory; std::shared_ptr config; Gnss_Synchro gnss_synchro{}; size_t item_size; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc index 513034900..ad40add4d 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc @@ -433,7 +433,7 @@ void GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test::stop_queue() TEST_F(GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test, Instantiate) { config_1(); - auto acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_8ms_Ambiguous_Acquisition", 1, 0); + auto acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); } @@ -447,7 +447,7 @@ TEST_F(GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test, ConnectAndRun) queue = std::make_shared>(); top_block = gr::make_top_block("Acquisition test"); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_8ms_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); @@ -497,7 +497,7 @@ TEST_F(GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test, ValidationOfResults) queue = std::make_shared>(); top_block = gr::make_top_block("Acquisition test"); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_8ms_Ambiguous_Acquisition", 1, 0, queue.get()); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0, queue.get()); acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); @@ -584,7 +584,7 @@ TEST_F(GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test, ValidationOfResultsProb config_2(); queue = std::make_shared>(); top_block = gr::make_top_block("Acquisition test"); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_8ms_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc index d4f25bdf6..f1359cb7d 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc @@ -434,7 +434,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test::stop_queue() TEST_F(GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test, Instantiate) { config_1(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); } @@ -448,7 +448,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test, ConnectAndRun) queue = std::make_shared>(); config_1(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); @@ -477,7 +477,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test, ValidationOfResults) config_1(); top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); @@ -557,7 +557,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test, ValidationOfResultsProbabi config_2(); top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc index 8df75e7e0..e76d322d6 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc @@ -216,7 +216,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoCTest::stop_queue() TEST_F(GalileoE1PcpsAmbiguousAcquisitionGSoCTest, Instantiate) { init(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); std::shared_ptr acquisition = std::dynamic_pointer_cast(acq_); EXPECT_STREQ("Galileo_E1_PCPS_Ambiguous_Acquisition", acquisition->implementation().c_str()); } @@ -232,7 +232,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionGSoCTest, ConnectAndRun) top_block = gr::make_top_block("Acquisition test"); init(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); std::shared_ptr acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(channel_internal_queue); @@ -263,7 +263,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionGSoCTest, ValidationOfResults) top_block = gr::make_top_block("Acquisition test"); init(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); std::shared_ptr acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(channel_internal_queue); 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 0b40fa83e..3cc2167f2 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 @@ -268,7 +268,7 @@ void GalileoE1PcpsAmbiguousAcquisitionTest::plot_grid() TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, Instantiate) { init(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); std::shared_ptr acquisition = std::dynamic_pointer_cast(acq_); } @@ -282,7 +282,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ConnectAndRun) top_block = gr::make_top_block("Acquisition test"); std::shared_ptr> queue = std::make_shared>(); init(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); std::shared_ptr acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_make(); @@ -324,7 +324,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ValidationOfResults) double expected_doppler_hz = -632; init(); top_block = gr::make_top_block("Acquisition test"); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); std::shared_ptr acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_make(); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc index dc262017d..e148f6048 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc @@ -26,7 +26,6 @@ #include "concurrent_queue.h" #include "fpga_switch.h" #include "galileo_e1_pcps_ambiguous_acquisition_fpga.h" -#include "gnss_block_factory.h" #include "gnss_block_interface.h" #include "gnss_signal.h" #include "gnss_synchro.h" diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc index 1d1844ee8..3a7aa6f00 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc @@ -436,7 +436,7 @@ void GalileoE1PcpsCccwsrAmbiguousAcquisitionTest::stop_queue() TEST_F(GalileoE1PcpsCccwsrAmbiguousAcquisitionTest, Instantiate) { config_1(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_CCCWSR_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); } @@ -451,7 +451,7 @@ TEST_F(GalileoE1PcpsCccwsrAmbiguousAcquisitionTest, ConnectAndRun) top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_CCCWSR_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(channel_internal_queue); @@ -480,7 +480,7 @@ TEST_F(GalileoE1PcpsCccwsrAmbiguousAcquisitionTest, ValidationOfResults) config_1(); top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_CCCWSR_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(channel_internal_queue); @@ -572,7 +572,7 @@ TEST_F(GalileoE1PcpsCccwsrAmbiguousAcquisitionTest, ValidationOfResultsProbabili config_2(); top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_CCCWSR_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(channel_internal_queue); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc index a2a6f9a37..cdebc6f68 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc @@ -555,7 +555,7 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::stop_queue() TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, Instantiate) { config_1(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); } @@ -571,7 +571,7 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ConnectAndRun) config_1(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(channel_internal_queue); @@ -606,7 +606,7 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(channel_internal_queue); @@ -696,7 +696,7 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(channel_internal_queue); @@ -783,7 +783,7 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ValidationOfResul top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_QuickSync_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(channel_internal_queue); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc index 175033150..b0ebf08c6 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc @@ -434,7 +434,7 @@ void GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test::stop_queue() TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, Instantiate) { config_1(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_Tong_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); } @@ -447,7 +447,7 @@ TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ConnectAndRun) top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); config_1(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_Tong_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); ASSERT_NO_THROW({ @@ -474,7 +474,7 @@ TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ValidationOfResults) config_1(); top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_Tong_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); @@ -562,7 +562,7 @@ TEST_F(GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test, ValidationOfResultsPro config_2(); top_block = gr::make_top_block("Acquisition test"); queue = std::make_shared>(); - std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", "Galileo_E1_PCPS_Tong_Ambiguous_Acquisition", 1, 0); + std::shared_ptr acq_ = factory->GetBlock(config.get(), "Acquisition_1B", 1, 0); acquisition = std::dynamic_pointer_cast(acq_); auto msg_rx = GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(channel_internal_queue); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc index 9f75b1295..cd0b31833 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5b_pcps_acquisition_test.cc @@ -23,7 +23,6 @@ #include "concurrent_queue.h" #include "fir_filter.h" #include "galileo_e5b_pcps_acquisition.h" -#include "gnss_block_factory.h" #include "gnss_block_interface.h" #include "gnss_sdr_valve.h" #include "gnss_synchro.h" @@ -132,7 +131,6 @@ class GalileoE5bPcpsAcquisitionTest : public ::testing::Test protected: GalileoE5bPcpsAcquisitionTest() { - factory = std::make_shared(); config = std::make_shared(); item_size = sizeof(gr_complex); gnss_synchro = Gnss_Synchro(); @@ -156,7 +154,6 @@ protected: boost::shared_ptr acquisition; #endif gr::top_block_sptr top_block; - std::shared_ptr factory; std::shared_ptr config; std::thread ch_thread; @@ -474,4 +471,4 @@ TEST_F(GalileoE5bPcpsAcquisitionTest, ValidationOfResults) EXPECT_EQ(2, message) << "Acquisition failure. Expected message: 2=ACQ FAIL."; } } -} \ No newline at end of file +} diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc index 263ce4b28..c2a0c873f 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc @@ -22,7 +22,6 @@ #include "concurrent_queue.h" #include "freq_xlating_fir_filter.h" #include "glonass_l1_ca_pcps_acquisition.h" -#include "gnss_block_factory.h" #include "gnss_block_interface.h" #include "gnss_sdr_valve.h" #include "gnss_synchro.h" @@ -120,7 +119,6 @@ class GlonassL1CaPcpsAcquisitionTest : public ::testing::Test protected: GlonassL1CaPcpsAcquisitionTest() { - factory = std::make_shared(); config = std::make_shared(); item_size = sizeof(gr_complex); gnss_synchro = Gnss_Synchro(); @@ -131,7 +129,6 @@ protected: void init(); gr::top_block_sptr top_block; - std::shared_ptr factory; std::shared_ptr config; Gnss_Synchro gnss_synchro; size_t item_size; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc index fea15c66c..232f961bf 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc @@ -23,7 +23,6 @@ #include "GPS_L1_CA.h" #include "acquisition_dump_reader.h" #include "concurrent_queue.h" -#include "gnss_block_factory.h" #include "gnss_block_interface.h" #include "gnss_sdr_valve.h" #include "gnss_synchro.h" @@ -144,7 +143,6 @@ class GpsL1CaPcpsAcquisitionTest : public ::testing::Test protected: GpsL1CaPcpsAcquisitionTest() { - factory = std::make_shared(); config = std::make_shared(); item_size = sizeof(gr_complex); gnss_synchro = Gnss_Synchro(); @@ -158,7 +156,6 @@ protected: void plot_grid(); gr::top_block_sptr top_block; - std::shared_ptr factory; std::shared_ptr config; Gnss_Synchro gnss_synchro{}; size_t item_size; diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc index 7a2c6c1e6..6be8afa99 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc @@ -25,7 +25,6 @@ #include "acquisition_dump_reader.h" #include "concurrent_queue.h" #include "fpga_switch.h" -#include "gnss_block_factory.h" #include "gnss_block_interface.h" #include "gnss_synchro.h" #include "gps_l1_ca_pcps_acquisition_fpga.h" diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc index 25e5f47b9..4deef62e6 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc @@ -21,7 +21,6 @@ #include "concurrent_queue.h" -#include "gnss_block_factory.h" #include "gnss_block_interface.h" #include "gnss_sdr_valve.h" #include "gnss_synchro.h" @@ -128,7 +127,6 @@ class GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test : public ::testing::Test protected: GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test() { - factory = std::make_shared(); item_size = sizeof(gr_complex); stop = false; message = 0; @@ -149,7 +147,6 @@ protected: Concurrent_Queue channel_internal_queue; std::shared_ptr> queue; gr::top_block_sptr top_block; - std::shared_ptr factory; std::shared_ptr acquisition; std::shared_ptr config; Gnss_Synchro gnss_synchro; 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 a771a5a58..6b78954fc 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 @@ -23,7 +23,6 @@ #include "GPS_L2C.h" #include "acquisition_dump_reader.h" #include "concurrent_queue.h" -#include "gnss_block_factory.h" #include "gnss_block_interface.h" #include "gnss_sdr_valve.h" #include "gnss_synchro.h" @@ -135,7 +134,6 @@ class GpsL2MPcpsAcquisitionTest : public ::testing::Test protected: GpsL2MPcpsAcquisitionTest() { - factory = std::make_shared(); config = std::make_shared(); item_size = sizeof(gr_complex); sampling_frequency_hz = 5000000; @@ -152,7 +150,6 @@ protected: std::shared_ptr> queue; gr::top_block_sptr top_block; - std::shared_ptr factory; std::shared_ptr config; Gnss_Synchro gnss_synchro; size_t item_size; diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc index cade85ca4..3cde64fa9 100644 --- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc @@ -1806,9 +1806,9 @@ TEST_F(HybridObservablesTest, ValidationOfResults) // create the tracking channels and create the telemetry decoders - std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking", config->property("Tracking.implementation", std::string("undefined")), 1, 1); + std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking", 1, 1); tracking_ch_vec.push_back(std::dynamic_pointer_cast(trk_)); - std::shared_ptr tlm_ = factory->GetBlock(config.get(), "TelemetryDecoder", config->property("TelemetryDecoder.implementation", std::string("undefined")), 1, 1); + std::shared_ptr tlm_ = factory->GetBlock(config.get(), "TelemetryDecoder", 1, 1); tlm_ch_vec.push_back(std::dynamic_pointer_cast(tlm_)); // create null sinks for observables output diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc index d616f2bc1..81d7018c9 100644 --- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test_fpga.cc @@ -1935,9 +1935,9 @@ TEST_F(HybridObservablesTestFpga, ValidationOfResults) gnss_synchro_vec.at(n).Channel_ID = n; // create the tracking channels and create the telemetry decoders - std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking", config->property("Tracking.implementation", std::string("undefined")), 1, 1); + std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking", 1, 1); tracking_ch_vec.push_back(std::dynamic_pointer_cast(trk_)); - std::shared_ptr tlm_ = factory->GetBlock(config.get(), "TelemetryDecoder", config->property("TelemetryDecoder.implementation", std::string("undefined")), 1, 1); + std::shared_ptr tlm_ = factory->GetBlock(config.get(), "TelemetryDecoder", 1, 1); tlm_ch_vec.push_back(std::dynamic_pointer_cast(tlm_)); // create null sinks for observables output diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc index c9ba88913..c92f7672e 100644 --- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc @@ -34,7 +34,6 @@ #include #endif #include "GPS_L1_CA.h" -#include "gnss_block_factory.h" #include "gnss_block_interface.h" #include "gnss_synchro.h" #include "gps_l1_ca_dll_pll_tracking.h" @@ -205,7 +204,6 @@ public: GpsL1CATelemetryDecoderTest() { - factory = std::make_shared(); config = std::make_shared(); item_size = sizeof(gr_complex); gnss_synchro = Gnss_Synchro(); @@ -216,7 +214,6 @@ public: void configure_receiver(); gr::top_block_sptr top_block; - std::shared_ptr factory; std::shared_ptr config; Gnss_Synchro gnss_synchro; size_t item_size; diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc index 9c158bb65..efa03de1e 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc @@ -91,7 +91,7 @@ void GalileoE1DllPllVemlTrackingInternalTest::init() TEST_F(GalileoE1DllPllVemlTrackingInternalTest, Instantiate) { init(); - auto tracking = factory->GetBlock(config.get(), "Tracking_1B", "Galileo_E1_DLL_PLL_VEML_Tracking", 1, 1); + auto tracking = factory->GetBlock(config.get(), "Tracking_1B", 1, 1); EXPECT_STREQ("Galileo_E1_DLL_PLL_VEML_Tracking", tracking->implementation().c_str()); } @@ -108,7 +108,7 @@ TEST_F(GalileoE1DllPllVemlTrackingInternalTest, ConnectAndRun) top_block = gr::make_top_block("Tracking test"); // Example using smart pointers and the block factory - std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking_1B", "Galileo_E1_DLL_PLL_VEML_Tracking", 1, 1); + std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking_1B", 1, 1); std::shared_ptr tracking = std::dynamic_pointer_cast(trk_); ASSERT_NO_THROW({ @@ -156,7 +156,7 @@ TEST_F(GalileoE1DllPllVemlTrackingInternalTest, ValidationOfResults) top_block = gr::make_top_block("Tracking test"); // Example using smart pointers and the block factory - std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking_1B", "Galileo_E1_DLL_PLL_VEML_Tracking", 1, 1); + std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking_1B", 1, 1); std::shared_ptr tracking = std::dynamic_pointer_cast(trk_); // gnss_synchro.Acq_delay_samples = 1753; // 4 Msps diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc index 5db62ed90..b271c2824 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc @@ -103,7 +103,7 @@ TEST_F(GalileoE5aTrackingTest, ValidationOfResults) top_block = gr::make_top_block("Tracking test"); // Example using smart pointers and the block factory - std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking_5X", "Galileo_E5a_DLL_PLL_Tracking", 1, 1); + std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking_5X", 1, 1); std::shared_ptr tracking = std::dynamic_pointer_cast(trk_); // REAL diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc index 514cc953f..d2ba471a9 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc @@ -22,7 +22,6 @@ #include "concurrent_queue.h" #include "glonass_l1_ca_dll_pll_c_aid_tracking.h" -#include "gnss_block_factory.h" #include "gnss_block_interface.h" #include "gnss_sdr_valve.h" #include "gnss_synchro.h" @@ -109,7 +108,6 @@ class GlonassL1CaDllPllCAidTrackingTest : public ::testing::Test protected: GlonassL1CaDllPllCAidTrackingTest() { - factory = std::make_shared(); config = std::make_shared(); item_size = sizeof(gr_complex); gnss_synchro = Gnss_Synchro(); @@ -121,7 +119,6 @@ protected: std::shared_ptr> queue; gr::top_block_sptr top_block; - std::shared_ptr factory; std::shared_ptr config; Gnss_Synchro gnss_synchro; size_t item_size; diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc index eb0ae14b5..13e634fa5 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc @@ -22,7 +22,6 @@ #include "concurrent_queue.h" #include "glonass_l1_ca_dll_pll_tracking.h" -#include "gnss_block_factory.h" #include "gnss_block_interface.h" #include "gnss_sdr_valve.h" #include "gnss_synchro.h" @@ -116,7 +115,6 @@ class GlonassL1CaDllPllTrackingTest : public ::testing::Test protected: GlonassL1CaDllPllTrackingTest() { - factory = std::make_shared(); config = std::make_shared(); item_size = sizeof(gr_complex); gnss_synchro = Gnss_Synchro(); @@ -128,7 +126,6 @@ protected: std::shared_ptr> queue; gr::top_block_sptr top_block; - std::shared_ptr factory; std::shared_ptr config; Gnss_Synchro gnss_synchro; size_t item_size; diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc index 6783b151b..1d910f86b 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc @@ -610,7 +610,7 @@ TEST_F(GpsL1CADllPllTrackingTest, ValidationOfResults) top_block = gr::make_top_block("Tracking test"); - std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking_1C", implementation, 1, 1); + std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking_1C", 1, 1); std::shared_ptr tracking = std::dynamic_pointer_cast(trk_); auto msg_rx = GpsL1CADllPllTrackingTest_msg_rx_make(); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc index 2558aad3a..c0207ea5c 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc @@ -21,7 +21,6 @@ */ #include "GPS_L1_CA.h" -#include "gnss_block_factory.h" #include "gnss_block_interface.h" #include "gnss_synchro.h" #include "gps_l1_ca_dll_pll_tracking_fpga.h" @@ -254,7 +253,6 @@ public: GpsL1CADllPllTrackingTestFpga() { - factory = std::make_shared(); config = std::make_shared(); item_size = sizeof(gr_complex); gnss_synchro = Gnss_Synchro(); @@ -265,7 +263,6 @@ public: void configure_receiver(); gr::top_block_sptr top_block; - std::shared_ptr factory; std::shared_ptr config; Gnss_Synchro gnss_synchro; size_t item_size; diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc index bc3154f67..e91bc38e4 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc @@ -411,7 +411,7 @@ TEST_F(GpsL1CAKfTrackingTest, ValidationOfResults) top_block = gr::make_top_block("Tracking test"); - std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking_1C", implementation, 1, 1); + std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking_1C", 1, 1); std::shared_ptr tracking = std::dynamic_pointer_cast(trk_); // std::make_shared(config.get(), "Tracking_1C", 1, 1); auto msg_rx = GpsL1CAKfTrackingTest_msg_rx_make(); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc index ff201892d..7a86260b4 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc @@ -21,7 +21,6 @@ #include "concurrent_queue.h" -#include "gnss_block_factory.h" #include "gnss_block_interface.h" #include "gnss_sdr_valve.h" #include "gnss_synchro.h" @@ -123,7 +122,6 @@ class GpsL2MDllPllTrackingTest : public ::testing::Test protected: GpsL2MDllPllTrackingTest() { - factory = std::make_shared(); config = std::make_shared(); item_size = sizeof(gr_complex); gnss_synchro = Gnss_Synchro(); @@ -135,7 +133,6 @@ protected: std::shared_ptr> queue; gr::top_block_sptr top_block; - std::shared_ptr factory; std::shared_ptr config; Gnss_Synchro gnss_synchro; size_t item_size; diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc index 6a36a6597..685004857 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc @@ -828,7 +828,7 @@ TEST_F(TrackingPullInTest, ValidationOfResults) // create flowgraph auto top_block_trk = gr::make_top_block("Tracking test"); - std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking", config->property("Tracking.implementation", std::string("undefined")), 1, 1); + std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking", 1, 1); std::shared_ptr tracking = std::dynamic_pointer_cast(trk_); auto msg_rx = TrackingPullInTest_msg_rx_make(); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc index 74b0eba55..7acf14baa 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc @@ -1007,7 +1007,7 @@ TEST_F(TrackingPullInTestFpga, ValidationOfResults) // create flowgraph top_block = gr::make_top_block("Tracking test"); - std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking", config->property("Tracking.implementation", std::string("undefined")), 1, 1); + std::shared_ptr trk_ = factory->GetBlock(config.get(), "Tracking", 1, 1); std::shared_ptr tracking = std::dynamic_pointer_cast(trk_); auto msg_rx = TrackingPullInTest_msg_rx_Fpga_make();