From e3a369009d19e59ff060084e7824f7f34f048b88 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@cttc.es>
Date: Fri, 7 Aug 2026 15:30:18 +0200
Subject: [PATCH] Fix tests

---
 .../acquisition/beidou_b1c_pcps_acquisition_test.cc         | 6 ++----
 .../tracking/beidou_b1c_dll_pll_veml_tracking_test.cc       | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1c_pcps_acquisition_test.cc b/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1c_pcps_acquisition_test.cc
index fc920667b..73e027041 100644
--- a/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1c_pcps_acquisition_test.cc
+++ b/tests/unit-tests/signal-processing-blocks/acquisition/beidou_b1c_pcps_acquisition_test.cc
@@ -15,7 +15,7 @@
  */
 #include "acquisition_interface.h"
 #include "gnss_block_factory.h"
-#include "gnss_block_interface.h"
+#include "gnss_sdr_make_unique.h"  // for std::make_unique in C++11
 #include "in_memory_configuration.h"
 #include <gtest/gtest.h>
 #include <memory>
@@ -25,9 +25,7 @@ TEST(BeidouB1cPcpsAcquisitionTest, Instantiate)
     auto configuration = std::make_shared<InMemoryConfiguration>();
     configuration->set_property("Acquisition_1D.implementation", "BEIDOU_B1C_PCPS_Ambiguous_Acquisition");
     configuration->set_property("Acquisition_1D.item_type", "gr_complex");
-    auto factory = std::make_unique<GNSSBlockFactory>();
-    std::shared_ptr<GNSSBlockInterface> acq_ = factory->GetBlock(configuration.get(), "Acquisition_1D", 1, 0);
-    auto acquisition = std::dynamic_pointer_cast<AcquisitionInterface>(acq_);
+    std::unique_ptr<AcquisitionInterface> acquisition = block_factory::GetAcqBlock(configuration.get(), "Acquisition_1D", 1, 0);
     ASSERT_NE(acquisition, nullptr);
     EXPECT_STREQ("BEIDOU_B1C_PCPS_Ambiguous_Acquisition", acquisition->implementation().c_str());
 }
diff --git a/tests/unit-tests/signal-processing-blocks/tracking/beidou_b1c_dll_pll_veml_tracking_test.cc b/tests/unit-tests/signal-processing-blocks/tracking/beidou_b1c_dll_pll_veml_tracking_test.cc
index ea3b63ddc..80bebc6ae 100644
--- a/tests/unit-tests/signal-processing-blocks/tracking/beidou_b1c_dll_pll_veml_tracking_test.cc
+++ b/tests/unit-tests/signal-processing-blocks/tracking/beidou_b1c_dll_pll_veml_tracking_test.cc
@@ -14,7 +14,7 @@
  * -----------------------------------------------------------------------------
  */
 #include "gnss_block_factory.h"
-#include "gnss_block_interface.h"
+#include "gnss_sdr_make_unique.h"  // for std::make_unique in C++11
 #include "in_memory_configuration.h"
 #include "tracking_interface.h"
 #include <gtest/gtest.h>
@@ -26,9 +26,7 @@ TEST(BeidouB1cDllPllVemlTrackingTest, Instantiate)
     configuration->set_property("Tracking_1D.implementation", "BEIDOU_B1C_DLL_PLL_VEML_Tracking");
     configuration->set_property("Tracking_1D.item_type", "gr_complex");
     configuration->set_property("GNSS-SDR.internal_fs_sps", "2046000");
-    auto factory = std::make_unique<GNSSBlockFactory>();
-    std::shared_ptr<GNSSBlockInterface> trk_ = factory->GetBlock(configuration.get(), "Tracking_1D", 1, 1);
-    auto tracking = std::dynamic_pointer_cast<TrackingInterface>(trk_);
+    std::unique_ptr<TrackingInterface> tracking = block_factory::GetTrkBlock(configuration.get(), "Tracking_1D", 1, 1);
     ASSERT_NE(tracking, nullptr);
     EXPECT_STREQ("BEIDOU_B1C_DLL_PLL_VEML_Tracking", tracking->implementation().c_str());
 }