From ac4571ed52f61955ae66af8733c91dd42c21242a Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Sat, 19 Aug 2017 10:44:33 +0900 Subject: [PATCH] update it --- test/Makefile.am | 8 +++----- test/abts_tests.h | 6 +++--- test/{nas_sm_test.c => attach_test.c} | 16 ++++++++-------- test/s1ap_message_test.c | 2 +- test/{s1ap_sm_test.c => s1setup_test.c} | 12 ++++++------ test/{tests1ap.c => testpacket.c} | 0 test/{tests1ap.h => testpacket.h} | 0 test/testutil.h | 6 +++--- 8 files changed, 24 insertions(+), 26 deletions(-) rename test/{nas_sm_test.c => attach_test.c} (98%) rename test/{s1ap_sm_test.c => s1setup_test.c} (90%) rename test/{tests1ap.c => testpacket.c} (100%) rename test/{tests1ap.h => testpacket.h} (100%) diff --git a/test/Makefile.am b/test/Makefile.am index 5f7839c93..447fe9bd7 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -4,11 +4,9 @@ bin_PROGRAMS = testepc testepc_SOURCES = \ abts.h abts_tests.h testutil.h \ - abts.c testutil.c tests1ap.h tests1ap.c \ - base_test.c \ - s1ap_message_test.c nas_message_test.c gtp_message_test.c \ - security_test.c \ - s1ap_sm_test.c nas_sm_test.c + abts.c testutil.c testpacket.h testpacket.c \ + base_test.c s1ap_message_test.c nas_message_test.c gtp_message_test.c \ + security_test.c s1setup_test.c attach_test.c testepc_LDADD = \ $(top_srcdir)/src/libepc.la diff --git a/test/abts_tests.h b/test/abts_tests.h index 6920d8e0e..a96f8e25a 100644 --- a/test/abts_tests.h +++ b/test/abts_tests.h @@ -25,11 +25,11 @@ const struct testlist { } alltests[] = { {test_base}, {test_s1ap_message}, - {test_s1ap_sm}, {test_nas_message}, - {test_nas_sm}, - {test_security}, {test_gtp_message}, + {test_security}, + {test_s1setup}, + {test_attach}, }; #endif /* APR_TEST_INCLUDES */ diff --git a/test/nas_sm_test.c b/test/attach_test.c similarity index 98% rename from test/nas_sm_test.c rename to test/attach_test.c index 63249218e..0c63c95ea 100644 --- a/test/nas_sm_test.c +++ b/test/attach_test.c @@ -9,13 +9,13 @@ #include "s1ap_message.h" #include "testutil.h" -#include "tests1ap.h" +#include "testpacket.h" /************************************************************** * eNB : MACRO * UE : IMSI * Protocol Configuration Options in ESM information response */ -static void nas_sm_test1(abts_case *tc, void *data) +static void attach_test1(abts_case *tc, void *data) { status_t rv; net_sock_t *sock; @@ -384,7 +384,7 @@ static void nas_sm_test1(abts_case *tc, void *data) * eNB : HOME * UE : IMSI * Protocol Configuration Options in PDN Connectivity Request */ -static void nas_sm_test2(abts_case *tc, void *data) +static void attach_test2(abts_case *tc, void *data) { status_t rv; net_sock_t *sock; @@ -602,7 +602,7 @@ static void nas_sm_test2(abts_case *tc, void *data) /************************************************************** * Attach -> Release -> Service Request */ -static void nas_sm_test3(abts_case *tc, void *data) +static void attach_test3(abts_case *tc, void *data) { status_t rv; net_sock_t *sock; @@ -893,13 +893,13 @@ static void nas_sm_test3(abts_case *tc, void *data) d_log_set_level(D_MSG_TO_STDOUT, D_LOG_LEVEL_FULL); } -abts_suite *test_nas_sm(abts_suite *suite) +abts_suite *test_attach(abts_suite *suite) { suite = ADD_SUITE(suite) - abts_run_test(suite, nas_sm_test1, NULL); - abts_run_test(suite, nas_sm_test2, NULL); - abts_run_test(suite, nas_sm_test3, NULL); + abts_run_test(suite, attach_test1, NULL); + abts_run_test(suite, attach_test2, NULL); + abts_run_test(suite, attach_test3, NULL); return suite; } diff --git a/test/s1ap_message_test.c b/test/s1ap_message_test.c index ae8d0c778..8d8c9a0ee 100644 --- a/test/s1ap_message_test.c +++ b/test/s1ap_message_test.c @@ -8,7 +8,7 @@ #include "types.h" #include "testutil.h" -#include "tests1ap.h" +#include "testpacket.h" static void s1ap_message_test1(abts_case *tc, void *data) { diff --git a/test/s1ap_sm_test.c b/test/s1setup_test.c similarity index 90% rename from test/s1ap_sm_test.c rename to test/s1setup_test.c index 98f53fd28..744e1f486 100644 --- a/test/s1ap_sm_test.c +++ b/test/s1setup_test.c @@ -7,11 +7,11 @@ #include "types.h" #include "testutil.h" -#include "tests1ap.h" +#include "testpacket.h" #define NUM_OF_TEST_DUPLICATED_ENB 4 -static void s1ap_sm_test1(abts_case *tc, void *data) +static void s1setup_test1(abts_case *tc, void *data) { status_t rv; net_sock_t *sock[NUM_OF_TEST_DUPLICATED_ENB]; @@ -62,7 +62,7 @@ static void s1ap_sm_test1(abts_case *tc, void *data) #define NUM_OF_TEST_ENB 32 -static void s1ap_sm_test2(abts_case *tc, void *data) +static void s1setup_test2(abts_case *tc, void *data) { status_t rv; net_sock_t *sock[NUM_OF_TEST_ENB]; @@ -111,12 +111,12 @@ static void s1ap_sm_test2(abts_case *tc, void *data) d_log_set_level(D_MSG_TO_STDOUT, D_LOG_LEVEL_FULL); } -abts_suite *test_s1ap_sm(abts_suite *suite) +abts_suite *test_s1setup(abts_suite *suite) { suite = ADD_SUITE(suite) - abts_run_test(suite, s1ap_sm_test1, NULL); - abts_run_test(suite, s1ap_sm_test2, NULL); + abts_run_test(suite, s1setup_test1, NULL); + abts_run_test(suite, s1setup_test2, NULL); return suite; } diff --git a/test/tests1ap.c b/test/testpacket.c similarity index 100% rename from test/tests1ap.c rename to test/testpacket.c diff --git a/test/tests1ap.h b/test/testpacket.h similarity index 100% rename from test/tests1ap.h rename to test/testpacket.h diff --git a/test/testutil.h b/test/testutil.h index a1785e976..21a20ef8e 100644 --- a/test/testutil.h +++ b/test/testutil.h @@ -59,10 +59,10 @@ status_t test_initialize(void); abts_suite *test_base(abts_suite *suite); abts_suite *test_s1ap_message(abts_suite *suite); -abts_suite *test_s1ap_sm(abts_suite *suite); abts_suite *test_nas_message(abts_suite *suite); -abts_suite *test_nas_sm(abts_suite *suite); -abts_suite *test_security(abts_suite *suite); abts_suite *test_gtp_message(abts_suite *suite); +abts_suite *test_security(abts_suite *suite); +abts_suite *test_s1setup(abts_suite *suite); +abts_suite *test_attach(abts_suite *suite); #endif /* __TESTUTIL_H__ */