move rrc unit tests to rrc/ folder

srsenb/test/rrc/CMakeLists.txt

@@ -6,7 +6,22 @@
 # the distribution.
 #
 
+add_library(test_helpers test_helpers.cc)
+target_link_libraries(test_helpers srsenb_rrc srsenb_common rrc_asn1 s1ap_asn1 srsran_common enb_cfg_parser ${LIBCONFIGPP_LIBRARIES})
+
 add_executable(rrc_nr_test rrc_nr_test.cc)
 target_link_libraries(rrc_nr_test srsgnb_rrc srsran_common rrc_nr_asn1)
 add_test(rrc_nr_test rrc_nr_test)
 
+add_executable(rrc_meascfg_test rrc_meascfg_test.cc)
+target_link_libraries(rrc_meascfg_test test_helpers)
+
+add_executable(erab_setup_test erab_setup_test.cc)
+target_link_libraries(erab_setup_test test_helpers ${LIBCONFIGPP_LIBRARIES})
+
+add_executable(rrc_mobility_test rrc_mobility_test.cc)
+target_link_libraries(rrc_mobility_test srsran_asn1 test_helpers)
+
+add_test(rrc_mobility_test rrc_mobility_test -i ${CMAKE_CURRENT_SOURCE_DIR}/../..)
+add_test(erab_setup_test erab_setup_test -i ${CMAKE_CURRENT_SOURCE_DIR}/../..)
+add_test(rrc_meascfg_test rrc_meascfg_test -i ${CMAKE_CURRENT_SOURCE_DIR}/../..)

srsenb/test/rrc/erab_setup_test.cc

@@ -12,9 +12,9 @@
 
 #include "srsenb/hdr/enb.h"
 #include "srsenb/src/enb_cfg_parser.h"
+#include "srsenb/test/rrc/test_helpers.h"
 #include "srsran/asn1/rrc_utils.h"
 #include "srsran/common/test_common.h"
-#include "test_helpers.h"
 #include <iostream>
 
 int test_erab_setup(srsran::log_sink_spy& spy, bool qci_exists)

srsenb/test/upper/CMakeLists.txt

@@ -6,28 +6,13 @@
 # the distribution.
 #
 
-add_library(test_helpers test_helpers.cc)
-target_link_libraries(test_helpers srsenb_rrc srsenb_common rrc_asn1 s1ap_asn1 srsran_common enb_cfg_parser ${LIBCONFIGPP_LIBRARIES})
-
 # Simple PLMN -> MCC/MNC test
 add_executable(plmn_test plmn_test.cc)
 target_link_libraries(plmn_test rrc_asn1)
 
-add_executable(rrc_mobility_test rrc_mobility_test.cc)
-target_link_libraries(rrc_mobility_test srsran_asn1 test_helpers)
-
-add_executable(erab_setup_test erab_setup_test.cc)
-target_link_libraries(erab_setup_test test_helpers ${LIBCONFIGPP_LIBRARIES})
-
-add_executable(rrc_meascfg_test rrc_meascfg_test.cc)
-target_link_libraries(rrc_meascfg_test test_helpers)
-
 add_executable(gtpu_test gtpu_test.cc)
 target_link_libraries(gtpu_test srsran_common s1ap_asn1 srsenb_upper srsran_upper ${SCTP_LIBRARIES})
 
-add_test(rrc_mobility_test rrc_mobility_test -i ${CMAKE_CURRENT_SOURCE_DIR}/../..)
-add_test(erab_setup_test erab_setup_test -i ${CMAKE_CURRENT_SOURCE_DIR}/../..)
-add_test(rrc_meascfg_test rrc_meascfg_test -i ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 add_test(plmn_test plmn_test)
 add_test(gtpu_test gtpu_test)