[hamradio-commits] [gnss-sdr] 175/236: Update tests with the new tracking blocks, removing old ones

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit b8f984292a630f9d21febd5e1bb5c578e1d17549
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Apr 8 11:46:39 2016 +0200

    Update tests with the new tracking blocks, removing old ones
---
 .../tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h       |  4 ++--
 src/tests/control_thread/control_thread_test.cc                |  2 +-
 src/tests/gnss_block/gnss_block_factory_test.cc                | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
index efb5325..95b8b2e 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
@@ -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()
     {
diff --git a/src/tests/control_thread/control_thread_test.cc b/src/tests/control_thread/control_thread_test.cc
index 1548e27..b31e180 100644
--- a/src/tests/control_thread/control_thread_test.cc
+++ b/src/tests/control_thread/control_thread_test.cc
@@ -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");
diff --git a/src/tests/gnss_block/gnss_block_factory_test.cc b/src/tests/gnss_block/gnss_block_factory_test.cc
index 22ed142..24f8f00 100644
--- a/src/tests/gnss_block/gnss_block_factory_test.cc
+++ b/src/tests/gnss_block/gnss_block_factory_test.cc
@@ -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");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git