From dfdc61de68f9b2942994b4cfe6af4ebb52ffc96e Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Fri, 2 Mar 2018 00:40:58 +0100 Subject: msc_vlr_tests: revert IMSI parameter and test nr output Three recently merged commits take the msc_vlr_tests in a wrong direction. The IMSI is usually encoded in the hex streams. The rationale behind hex streams is that it is a) easily copied from a wireshark trace and b) exactly the bytes as sent by an actual phone. It is hard to parameterize the IMSI because we would have to employ our encoding functions, which I intentionally want to keep out of the loop here. The test number should not appear in the normal test output, so that adding a test or changing their order does not affect expected output for following tests. The nr is simply for manual invocation, only seen when invoked with -v. Revert - "VLR tests: always print test parameters" b0a4314911140b1599cccfc8171fcdab4cd9bfab. - "Expand VLR tests" d5feadeee8dd24f991df2892d6bcf0be8b0cf707. - "Move IMSI into test parameters" 093300d141c300651954473d73138b72de04d931. Change-Id: Ie1b49237746751021da88f6f07bbb9f780d077c9 --- tests/msc_vlr/msc_vlr_test_hlr_reject.c | 51 +++++++++++++++++---------------- 1 file changed, 27 insertions(+), 24 deletions(-) (limited to 'tests/msc_vlr/msc_vlr_test_hlr_reject.c') diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.c b/tests/msc_vlr/msc_vlr_test_hlr_reject.c index 2d9b863a6..6cf4afc42 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.c +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.c @@ -23,9 +23,9 @@ #include "msc_vlr_tests.h" -void test_hlr_rej_auth_info_unknown_imsi(uint8_t nr, const char *imsi) +void test_hlr_rej_auth_info_unknown_imsi() { - comment_start(nr, imsi); + comment_start(); net->authentication_required = true; @@ -46,12 +46,12 @@ void test_hlr_rej_auth_info_unknown_imsi(uint8_t nr, const char *imsi) EXPECT_CONN_COUNT(0); clear_vlr(); - comment_end(nr, imsi); + comment_end(); } -void test_hlr_rej_auth_info_net_fail(uint8_t nr, const char *imsi) +void test_hlr_rej_auth_info_net_fail() { - comment_start(nr, imsi); + comment_start(); net->authentication_required = true; @@ -72,14 +72,15 @@ void test_hlr_rej_auth_info_net_fail(uint8_t nr, const char *imsi) EXPECT_CONN_COUNT(0); clear_vlr(); - comment_end(nr, imsi); + comment_end(); } -void test_hlr_rej_auth_info_net_fail_no_reuse_tuples(uint8_t nr, const char *imsi) +void test_hlr_rej_auth_info_net_fail_no_reuse_tuples() { struct vlr_subscr *vsub; + const char *imsi = "901700000004620"; - comment_start(nr, imsi); + comment_start(); net->authentication_required = true; net->vlr->cfg.auth_reuse_old_sets_on_error = false; @@ -158,14 +159,15 @@ void test_hlr_rej_auth_info_net_fail_no_reuse_tuples(uint8_t nr, const char *ims EXPECT_CONN_COUNT(0); clear_vlr(); - comment_end(nr, imsi); + comment_end(); } -void test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples(uint8_t nr, const char *imsi) +void test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples() { struct vlr_subscr *vsub; + const char *imsi = "901700000004620"; - comment_start(nr, imsi); + comment_start(); net->authentication_required = true; net->vlr->cfg.auth_reuse_old_sets_on_error = true; @@ -245,12 +247,12 @@ void test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples(uint8_t nr, const char * EXPECT_CONN_COUNT(0); clear_vlr(); - comment_end(nr, imsi); + comment_end(); } -void test_hlr_acc_but_no_auth_tuples(uint8_t nr, const char *imsi) +void test_hlr_acc_but_no_auth_tuples() { - comment_start(nr, imsi); + comment_start(); net->authentication_required = true; net->vlr->cfg.auth_reuse_old_sets_on_error = true; @@ -277,14 +279,15 @@ void test_hlr_acc_but_no_auth_tuples(uint8_t nr, const char *imsi) EXPECT_CONN_COUNT(0); clear_vlr(); - comment_end(nr, imsi); + comment_end(); } -void test_hlr_rej_auth_info_net_fail_reuse_tuples(uint8_t nr, const char *imsi) +void test_hlr_rej_auth_info_net_fail_reuse_tuples() { struct vlr_subscr *vsub; + const char *imsi = "901700000004620"; - comment_start(nr, imsi); + comment_start(); net->authentication_required = true; net->vlr->cfg.auth_reuse_old_sets_on_error = true; @@ -379,12 +382,12 @@ void test_hlr_rej_auth_info_net_fail_reuse_tuples(uint8_t nr, const char *imsi) EXPECT_CONN_COUNT(0); clear_vlr(); - comment_end(nr, imsi); + comment_end(); } -void test_hlr_rej_lu(uint8_t nr, const char *imsi) +void test_hlr_rej_lu() { - comment_start(nr, imsi); + comment_start(); btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; @@ -402,12 +405,12 @@ void test_hlr_rej_lu(uint8_t nr, const char *imsi) EXPECT_CONN_COUNT(0); clear_vlr(); - comment_end(nr, imsi); + comment_end(); } -void test_hlr_no_insert_data(uint8_t nr, const char *imsi) +void test_hlr_no_insert_data() { - comment_start(nr, imsi); + comment_start(); btw("Location Update request causes a GSUP LU request to HLR"); lu_result_sent = RES_NONE; @@ -428,7 +431,7 @@ void test_hlr_no_insert_data(uint8_t nr, const char *imsi) EXPECT_CONN_COUNT(0); clear_vlr(); - comment_end(nr, imsi); + comment_end(); } msc_vlr_test_func_t msc_vlr_tests[] = { -- cgit v1.2.3