VLR tests: always print test parameters

For each test print:
* the test number
* IMSI

Unfortunately tests are organized in such a way that we don't know the
number of particular test in advance. Nevertheless, it make sense to
always print it regardless of -v option presense.

Related: OS#2864
Change-Id: I2e1d7701f5322d2311f32b796148a8b414f53b8e

1 files changed, 24 insertions, 24 deletions

diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.c b/tests/msc_vlr/msc_vlr_test_hlr_reject.c
index 76cfb4754..2d9b863a6 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()
+void test_hlr_rej_auth_info_unknown_imsi(uint8_t nr, const char *imsi)
 {
-	comment_start();
+	comment_start(nr, imsi);
 
 	net->authentication_required = true;
 
@@ -46,12 +46,12 @@ void test_hlr_rej_auth_info_unknown_imsi()
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end();
+	comment_end(nr, imsi);
 }
 
-void test_hlr_rej_auth_info_net_fail()
+void test_hlr_rej_auth_info_net_fail(uint8_t nr, const char *imsi)
 {
-	comment_start();
+	comment_start(nr, imsi);
 
 	net->authentication_required = true;
 
@@ -72,14 +72,14 @@ void test_hlr_rej_auth_info_net_fail()
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end();
+	comment_end(nr, imsi);
 }
 
-void test_hlr_rej_auth_info_net_fail_no_reuse_tuples(const char *imsi)
+void test_hlr_rej_auth_info_net_fail_no_reuse_tuples(uint8_t nr, const char *imsi)
 {
 	struct vlr_subscr *vsub;
 
-	comment_start();
+	comment_start(nr, imsi);
 
 	net->authentication_required = true;
 	net->vlr->cfg.auth_reuse_old_sets_on_error = false;
@@ -158,14 +158,14 @@ void test_hlr_rej_auth_info_net_fail_no_reuse_tuples(const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end();
+	comment_end(nr, imsi);
 }
 
-void test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples(const char *imsi)
+void test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples(uint8_t nr, const char *imsi)
 {
 	struct vlr_subscr *vsub;
 
-	comment_start();
+	comment_start(nr, imsi);
 
 	net->authentication_required = true;
 	net->vlr->cfg.auth_reuse_old_sets_on_error = true;
@@ -245,12 +245,12 @@ void test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples(const char *imsi)
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end();
+	comment_end(nr, imsi);
 }
 
-void test_hlr_acc_but_no_auth_tuples()
+void test_hlr_acc_but_no_auth_tuples(uint8_t nr, const char *imsi)
 {
-	comment_start();
+	comment_start(nr, imsi);
 
 	net->authentication_required = true;
 	net->vlr->cfg.auth_reuse_old_sets_on_error = true;
@@ -277,14 +277,14 @@ void test_hlr_acc_but_no_auth_tuples()
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end();
+	comment_end(nr, imsi);
 }
 
-void test_hlr_rej_auth_info_net_fail_reuse_tuples(const char *imsi)
+void test_hlr_rej_auth_info_net_fail_reuse_tuples(uint8_t nr, const char *imsi)
 {
 	struct vlr_subscr *vsub;
 
-	comment_start();
+	comment_start(nr, imsi);
 
 	net->authentication_required = true;
 	net->vlr->cfg.auth_reuse_old_sets_on_error = true;
@@ -379,12 +379,12 @@ void test_hlr_rej_auth_info_net_fail_reuse_tuples(const char *imsi)
 	EXPECT_CONN_COUNT(0);
 
 	clear_vlr();
-	comment_end();
+	comment_end(nr, imsi);
 }
 
-void test_hlr_rej_lu()
+void test_hlr_rej_lu(uint8_t nr, const char *imsi)
 {
-	comment_start();
+	comment_start(nr, imsi);
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
@@ -402,12 +402,12 @@ void test_hlr_rej_lu()
 	EXPECT_CONN_COUNT(0);
 
 	clear_vlr();
-	comment_end();
+	comment_end(nr, imsi);
 }
 
-void test_hlr_no_insert_data()
+void test_hlr_no_insert_data(uint8_t nr, const char *imsi)
 {
-	comment_start();
+	comment_start(nr, imsi);
 
 	btw("Location Update request causes a GSUP LU request to HLR");
 	lu_result_sent = RES_NONE;
@@ -428,7 +428,7 @@ void test_hlr_no_insert_data()
 
 	EXPECT_CONN_COUNT(0);
 	clear_vlr();
-	comment_end();
+	comment_end(nr, imsi);
 }
 
 msc_vlr_test_func_t msc_vlr_tests[] = {