f1ap-du: remove redundant test function

Author: frankist

tests/unittests/f1ap/du/f1ap_du_test_helpers.cpp

@@ -74,38 +74,6 @@ asn1::f1ap::drbs_to_be_setup_item_s srsran::srs_du::generate_drb_am_setup_item(d
   return drb;
 }
 
-f1ap_message srsran::srs_du::generate_ue_context_setup_request(const std::initializer_list<drb_id_t>& drbs_to_add)
-{
-  using namespace asn1::f1ap;
-  f1ap_message msg;
-
-  msg.pdu.set_init_msg().load_info_obj(ASN1_F1AP_ID_UE_CONTEXT_SETUP);
-  ue_context_setup_request_s& dl_msg    = msg.pdu.init_msg().value.ue_context_setup_request();
-  dl_msg->gnb_cu_ue_f1ap_id             = 0;
-  dl_msg->gnb_du_ue_f1ap_id_present     = true;
-  dl_msg->gnb_du_ue_f1ap_id             = 0;
-  dl_msg->srbs_to_be_setup_list_present = true;
-  dl_msg->srbs_to_be_setup_list.resize(1);
-  dl_msg->srbs_to_be_setup_list[0].load_info_obj(ASN1_F1AP_ID_SRBS_SETUP_ITEM);
-  srbs_to_be_setup_item_s& srb2 = dl_msg->srbs_to_be_setup_list[0]->srbs_to_be_setup_item();
-  srb2.srb_id                   = 2;
-
-  dl_msg->drbs_to_be_setup_list_present = drbs_to_add.size() > 0;
-  dl_msg->drbs_to_be_setup_list.resize(drbs_to_add.size());
-  unsigned count = 0;
-  for (drb_id_t drbid : drbs_to_add) {
-    dl_msg->drbs_to_be_setup_list[count].load_info_obj(ASN1_F1AP_ID_DRB_INFO);
-    dl_msg->drbs_to_be_setup_list[count]->drbs_to_be_setup_item() = generate_drb_am_setup_item(drbid);
-    ++count;
-  }
-
-  dl_msg->rrc_container_present = true;
-  EXPECT_TRUE(
-      dl_msg->rrc_container.append(test_rgen::random_vector<uint8_t>(test_rgen::uniform_int<unsigned>(3, 100))));
-
-  return msg;
-}
-
 asn1::f1ap::drbs_to_be_setup_mod_item_s srsran::srs_du::generate_drb_am_mod_item(drb_id_t drbid)
 {
   using namespace asn1::f1ap;

tests/unittests/f1ap/du/f1ap_du_test_helpers.h

@@ -133,9 +133,6 @@ f1_setup_request_message generate_f1_setup_request_message();
 /// \brief Generate F1AP ASN.1 DRB AM Setup configuration.
 asn1::f1ap::drbs_to_be_setup_item_s generate_drb_am_setup_item(drb_id_t drbid);
 
-/// \brief Generate an F1AP UE Context Setup Request message with specified list of DRBs.
-f1ap_message generate_ue_context_setup_request(const std::initializer_list<drb_id_t>& drbs_to_add);
-
 /// \brief Generate F1AP ASN.1 DRB AM Setup configuration.
 asn1::f1ap::drbs_to_be_setup_mod_item_s generate_drb_am_mod_item(drb_id_t drbid);
 

tests/unittests/f1ap/du/f1ap_du_ue_context_setup_procedure_test.cpp

@@ -87,7 +87,8 @@ class f1ap_du_ue_context_setup_test : public f1ap_du_test
 TEST_F(f1ap_du_ue_context_setup_test, when_f1ap_receives_request_then_f1ap_notifies_du_of_ue_context_update)
 {
   du_creates_f1_logical_connection();
-  start_procedure(generate_ue_context_setup_request({drb_id_t::drb1}));
+  start_procedure(test_helpers::create_ue_context_setup_request(
+      gnb_cu_ue_f1ap_id_t{0}, gnb_du_ue_f1ap_id_t{0}, 1, {drb_id_t::drb1}));
 
   // DU manager receives UE Context Update Request.
   ASSERT_TRUE(this->f1ap_du_cfg_handler.last_ue_context_update_req.has_value());
@@ -105,7 +106,8 @@ TEST_F(f1ap_du_ue_context_setup_test, when_f1ap_receives_request_then_f1ap_notif
 TEST_F(f1ap_du_ue_context_setup_test, when_f1ap_receives_request_then_f1ap_responds_back_with_ue_context_setup_response)
 {
   du_creates_f1_logical_connection();
-  auto msg = generate_ue_context_setup_request({drb_id_t::drb1});
+  f1ap_message msg = test_helpers::create_ue_context_setup_request(
+      gnb_cu_ue_f1ap_id_t{0}, gnb_du_ue_f1ap_id_t{0}, 1, {drb_id_t::drb1});
   start_procedure(msg);
 
   // F1AP sends UE CONTEXT SETUP RESPONSE to CU-CP.
@@ -135,7 +137,8 @@ TEST_F(f1ap_du_ue_context_setup_test, when_f1ap_receives_request_then_f1ap_respo
 TEST_F(f1ap_du_ue_context_setup_test, when_f1ap_receives_request_then_the_rrc_container_is_sent_dl_via_srb1)
 {
   du_creates_f1_logical_connection();
-  f1ap_message msg = generate_ue_context_setup_request({drb_id_t::drb1});
+  f1ap_message msg = test_helpers::create_ue_context_setup_request(
+      gnb_cu_ue_f1ap_id_t{0}, gnb_du_ue_f1ap_id_t{0}, 1, {drb_id_t::drb1});
   start_procedure(msg);
 
   // F1AP sends RRC Container present in UE CONTEXT SETUP REQUEST via SRB1.
@@ -165,7 +168,8 @@ TEST_F(f1ap_du_ue_context_setup_test, when_f1ap_receives_request_then_new_srbs_b
 
 TEST_F(f1ap_du_ue_context_setup_test, when_f1ap_receives_request_without_gnb_du_ue_f1ap_id_then_ue_is_created)
 {
-  f1ap_message msg = generate_ue_context_setup_request({drb_id_t::drb1});
+  f1ap_message msg = test_helpers::create_ue_context_setup_request(
+      gnb_cu_ue_f1ap_id_t{0}, gnb_du_ue_f1ap_id_t{0}, 1, {drb_id_t::drb1});
   msg.pdu.init_msg().value.ue_context_setup_request()->gnb_du_ue_f1ap_id_present = false;
 
   start_procedure(msg);
@@ -176,7 +180,8 @@ TEST_F(f1ap_du_ue_context_setup_test, when_f1ap_receives_request_without_gnb_du_
 
 TEST_F(f1ap_du_ue_context_setup_test, when_f1ap_receives_request_without_gnb_du_ue_f1ap_id_then_ue_context_is_updated)
 {
-  f1ap_message msg = generate_ue_context_setup_request({drb_id_t::drb1});
+  f1ap_message msg = test_helpers::create_ue_context_setup_request(
+      gnb_cu_ue_f1ap_id_t{0}, gnb_du_ue_f1ap_id_t{0}, 1, {drb_id_t::drb1});
   msg.pdu.init_msg().value.ue_context_setup_request()->gnb_du_ue_f1ap_id_present = false;
 
   start_procedure(msg);
@@ -194,7 +199,8 @@ TEST_F(
     f1ap_du_ue_context_setup_test,
     when_f1ap_receives_request_without_gnb_du_ue_f1ap_id_then_ue_context_setup_response_is_sent_to_cu_cp_with_crnti_ie)
 {
-  f1ap_message msg = generate_ue_context_setup_request({drb_id_t::drb1});
+  f1ap_message msg = test_helpers::create_ue_context_setup_request(
+      gnb_cu_ue_f1ap_id_t{0}, gnb_du_ue_f1ap_id_t{0}, 1, {drb_id_t::drb1});
   msg.pdu.init_msg().value.ue_context_setup_request()->gnb_du_ue_f1ap_id_present = false;
 
   start_procedure(msg);