mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-09-27 14:48:24 +00:00
Code Issues Releases Wiki Activity

Update tests with the new tracking blocks, removing old ones

Browse Source
This commit is contained in:
Carles Fernandez 2016-04-08 11:46:39 +02:00
parent 5aebc90ff7
commit b8f984292a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
View File

@ -67,10 +67,10 @@ public:
return role_;
}
//! Returns "gps_l1_ca_dll_pll_c_aid_tracking"
//! Returns "GPS_L1_CA_DLL_PLL_C_Aid_Tracking"
std::string implementation()
{
return "gps_l1_ca_dll_pll_c_aid_tracking";
return "GPS_L1_CA_DLL_PLL_C_Aid_Tracking";
}
size_t item_size()
{

2
src/tests/control_thread/control_thread_test.cc
View File

@ -136,7 +136,7 @@ TEST(Control_Thread_Test, InstantiateRunControlMessages2)
config->set_property("Acquisition_GPS.threshold", "1");
config->set_property("Acquisition_GPS.doppler_max", "5000");
config->set_property("Acquisition_GPS.doppler_min", "-5000");
config->set_property("Tracking_GPS.implementation", "GPS_L1_CA_DLL_FLL_PLL_Tracking");
config->set_property("Tracking_GPS.implementation", "GPS_L1_CA_DLL_PLL_C_Aid_Tracking");
config->set_property("Tracking_GPS.item_type", "gr_complex");
config->set_property("TelemetryDecoder_GPS.implementation", "GPS_L1_CA_Telemetry_Decoder");
config->set_property("TelemetryDecoder_GPS.item_type", "gr_complex");

10
src/tests/gnss_block/gnss_block_factory_test.cc
View File

@ -218,16 +218,16 @@ TEST(GNSS_Block_Factory_Test, InstantiateGalileoE1PcpsAmbiguousAcquisition)
}
TEST(GNSS_Block_Factory_Test, InstantiateGpsL1CaDllFllPllTracking)
TEST(GNSS_Block_Factory_Test, InstantiateGpsL1CaDllPllCAidTracking)
{
std::shared_ptr<InMemoryConfiguration> configuration = std::make_shared<InMemoryConfiguration>();
configuration->set_property("Tracking.implementation", "GPS_L1_CA_DLL_FLL_PLL_Tracking");
configuration->set_property("Tracking.implementation", "GPS_L1_CA_DLL_PLL_C_Aid_Tracking");
gr::msg_queue::sptr queue = gr::msg_queue::make(0);
std::unique_ptr<GNSSBlockFactory> factory;
std::shared_ptr<GNSSBlockInterface> trk_ = factory->GetBlock(configuration, "Tracking", "GPS_L1_CA_DLL_FLL_PLL_Tracking", 1, 1, queue);
std::shared_ptr<GNSSBlockInterface> trk_ = factory->GetBlock(configuration, "Tracking", "GPS_L1_CA_DLL_PLL_C_Aid_Tracking", 1, 1, queue);
std::shared_ptr<TrackingInterface> tracking = std::dynamic_pointer_cast<TrackingInterface>(trk_);
EXPECT_STREQ("Tracking", tracking->role().c_str());
EXPECT_STREQ("GPS_L1_CA_DLL_FLL_PLL_Tracking", tracking->implementation().c_str());
EXPECT_STREQ("GPS_L1_CA_DLL_PLL_C_Aid_Tracking", tracking->implementation().c_str());
}
@ -288,7 +288,7 @@ TEST(GNSS_Block_Factory_Test, InstantiateChannels)
configuration->set_property("Channels_GPS.count", "2");
configuration->set_property("Channels_Galileo.count", "0");
configuration->set_property("Channels.in_acquisition", "2");
configuration->set_property("Tracking_GPS.implementation","GPS_L1_CA_DLL_FLL_PLL_Tracking");
configuration->set_property("Tracking_GPS.implementation","GPS_L1_CA_DLL_PLL_C_Aid_Tracking");
configuration->set_property("TelemetryDecoder_GPS.implementation","GPS_L1_CA_Telemetry_Decoder");
configuration->set_property("Channel0.item_type", "gr_complex");
configuration->set_property("Acquisition_GPS.implementation", "GPS_L1_CA_PCPS_Acquisition");