name changes

This commit is contained in:
Sukchan Lee 2017-02-13 19:14:04 +09:00
parent 31e4aa6237
commit d4d0548694
7 changed files with 19 additions and 19 deletions

View File

@ -6,7 +6,7 @@ testcellwire_SOURCES = \
abts.h abts_tests.h testutil.h \
abts.c testutil.c \
s1ap_enb_message.c \
s1ap_test.c enb_setup_test.c
s1ap_message_test.c enb_setup_test.c
testcellwire_LDADD = \
$(top_srcdir)/lib/core/src/libcore.la \

View File

@ -23,7 +23,7 @@
const struct testlist {
abts_suite *(*func)(abts_suite *suite);
} alltests[] = {
{test_s1ap},
{test_s1ap_message},
{test_enb_setup},
};

View File

@ -62,7 +62,7 @@ static void enb_setup_test1(abts_case *tc, void *data)
sock = enb_s1ap_connect();
ABTS_PTR_NOTNULL(tc, sock);
rv = s1ap_build_setup_req(&sendbuf);
rv = s1ap_build_setup_req(&sendbuf, 0x54f64);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
rv = s1ap_send(sock, sendbuf);

View File

@ -6,7 +6,7 @@
#include "s1ap_message.h"
#include "s1ap_conv.h"
status_t s1ap_build_setup_req(pkbuf_t **pkbuf)
status_t s1ap_build_setup_req(pkbuf_t **pkbuf, c_uint32_t enb_id)
{
int erval = -1;
@ -20,7 +20,7 @@ status_t s1ap_build_setup_req(pkbuf_t **pkbuf)
ies = &message.msg.s1ap_S1SetupRequestIEs;
ies->global_ENB_ID.eNB_ID.present = S1ap_ENB_ID_PR_macroENB_ID;
s1ap_conv_macro_enb_id_to_bit_string(0x5f123,
s1ap_conv_macro_enb_id_to_bit_string(enb_id,
&ies->global_ENB_ID.eNB_ID.choice.macroENB_ID);
s1ap_conv_plmn_id_to_tbcd_string(
&mme_self()->plmn_id, &ies->global_ENB_ID.pLMNidentity);

View File

@ -7,7 +7,7 @@
extern "C" {
#endif /* __cplusplus */
CORE_DECLARE(status_t) s1ap_build_setup_req(pkbuf_t **pkbuf);
CORE_DECLARE(status_t) s1ap_build_setup_req(pkbuf_t **pkbuf, c_uint32_t enb_id);
#ifdef __cplusplus
}

View File

@ -10,7 +10,7 @@
#include "s1ap_enb_message.h"
#include "s1ap_conv.h"
static void s1ap_test1(abts_case *tc, void *data)
static void s1ap_message_test1(abts_case *tc, void *data)
{
/* S1SetupRequest */
char *payload[] = {
@ -33,7 +33,7 @@ static void s1ap_test1(abts_case *tc, void *data)
pkbuf_free(pkbuf);
}
static void s1ap_test2(abts_case *tc, void *data)
static void s1ap_message_test2(abts_case *tc, void *data)
{
/* InitialUE(Attach Request) */
char *payload[] = {
@ -56,7 +56,7 @@ static void s1ap_test2(abts_case *tc, void *data)
pkbuf_free(pkbuf);
}
static void s1ap_test3(abts_case *tc, void *data)
static void s1ap_message_test3(abts_case *tc, void *data)
{
/* initial context setup response */
char *payload[] = {
@ -79,7 +79,7 @@ static void s1ap_test3(abts_case *tc, void *data)
pkbuf_free(pkbuf);
}
static void s1ap_test4(abts_case *tc, void *data)
static void s1ap_message_test4(abts_case *tc, void *data)
{
s1ap_message message;
status_t rv;
@ -100,14 +100,14 @@ static void s1ap_test4(abts_case *tc, void *data)
pkbuf_free(pkbuf);
}
static void s1ap_test5(abts_case *tc, void *data)
static void s1ap_message_test5(abts_case *tc, void *data)
{
s1ap_message message;
status_t rv;
pkbuf_t *pkbuf;
int result;
rv = s1ap_build_setup_req(&pkbuf);
rv = s1ap_build_setup_req(&pkbuf, 0x54f64);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
ABTS_PTR_NOTNULL(tc, pkbuf);
@ -121,7 +121,7 @@ static void s1ap_test5(abts_case *tc, void *data)
pkbuf_free(pkbuf);
}
abts_suite *test_s1ap(abts_suite *suite)
abts_suite *test_s1ap_message(abts_suite *suite)
{
suite = ADD_SUITE(suite)
{
@ -131,11 +131,11 @@ abts_suite *test_s1ap(abts_suite *suite)
d_trace_level(&_s1dec, 0);
}
abts_run_test(suite, s1ap_test1, NULL);
abts_run_test(suite, s1ap_test2, NULL);
abts_run_test(suite, s1ap_test3, NULL);
abts_run_test(suite, s1ap_test4, NULL);
abts_run_test(suite, s1ap_test5, NULL);
abts_run_test(suite, s1ap_message_test1, NULL);
abts_run_test(suite, s1ap_message_test2, NULL);
abts_run_test(suite, s1ap_message_test3, NULL);
abts_run_test(suite, s1ap_message_test4, NULL);
abts_run_test(suite, s1ap_message_test5, NULL);
return suite;
}

View File

@ -57,7 +57,7 @@ void core_assert_ok(abts_case* tc, const char *context,
void test_initialize(void);
abts_suite *test_s1ap(abts_suite *suite);
abts_suite *test_s1ap_message(abts_suite *suite);
abts_suite *test_enb_setup(abts_suite *suite);
#endif /* CORE_TEST_INCLUDES */