pespin has uploaded this change for review.

View Change

tests: Run smscb/gsm0341_test during make check

Some initial testing for that module was writen to apparently do some
manual tests (rand()) but were never added to testsuite.at.
Let's make sure they run during make check (make the test deterministic
by removing rand()).

Change-Id: Icd4feced06afb749de994195c6b338df006749ad
---
M tests/Makefile.am
M tests/smscb/gsm0341_test.c
A tests/smscb/gsm0341_test.ok
M tests/testsuite.at
4 files changed, 16 insertions(+), 4 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/39/28939/1

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7d62615..1e8d9d8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -169,6 +169,9 @@
 smscb_gsm0341_test_SOURCES = smscb/gsm0341_test.c
 smscb_gsm0341_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
 
+smscb_cbsp_test_SOURCES = smscb/cbsp_test.c
+smscb_cbsp_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+
 sms_sms_test_SOURCES = sms/sms_test.c
 sms_sms_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
 
diff --git a/tests/smscb/gsm0341_test.c b/tests/smscb/gsm0341_test.c
index d11336f..966a00f 100644
--- a/tests/smscb/gsm0341_test.c
+++ b/tests/smscb/gsm0341_test.c
@@ -25,7 +25,7 @@
 #include <osmocom/core/utils.h>
 #include <osmocom/core/msgb.h>
 
-struct gsm341_ms_message *gen_msg_from_text(uint16_t msg_id, const char *text)
+struct gsm341_ms_message *gen_msg_from_text(uint16_t msg_id, uint8_t msg_code, const char *text)
 {
 	struct gsm341_ms_message *cbmsg;
 	int text_len = strlen(text);
@@ -34,11 +34,11 @@
 	uint8_t payload[text_len];
 	int payload_octets;
 
-	srand(time(NULL));
+	//srand(time(NULL));
 
 	gsm_7bit_encode_n(payload, sizeof(payload), text, &payload_octets);
 	//cbmsg = gsm0341_build_msg(NULL, 0, rand(), 0, msg_id, 0x0f, 1, 1, payload, payload_octets);
-	cbmsg = gsm0341_build_msg(NULL, 0, rand(), 0, msg_id, 0x00, 1, 1, payload, payload_octets);
+	cbmsg = gsm0341_build_msg(NULL, 0, msg_code, 0, msg_id, 0x00, 1, 1, payload, payload_octets);
 
 	printf("%s\n", osmo_hexdump_nospc((uint8_t *)cbmsg, sizeof(*cbmsg)+payload_octets));
 
@@ -50,6 +50,7 @@
 	uint16_t msg_id = GSM341_MSGID_ETWS_CMAS_MONTHLY_TEST;
 	char *text = "Mahlzeit!";
 	char tbuf[GSM341_MAX_CHARS+1];
+	struct gsm341_ms_message *cbmsg;
 
 	if (argc > 1)
 		msg_id = atoi(argv[1]);
@@ -63,7 +64,8 @@
 			sizeof(tbuf)-strlen(text));
 	tbuf[GSM341_MAX_CHARS] = 0;
 
-	gen_msg_from_text(msg_id, tbuf);
+	cbmsg = gen_msg_from_text(msg_id, 1, tbuf);
+	talloc_free(cbmsg);
 
 	return EXIT_SUCCESS;
 }
diff --git a/tests/smscb/gsm0341_test.ok b/tests/smscb/gsm0341_test.ok
new file mode 100644
index 0000000..600797c
--- /dev/null
+++ b/tests/smscb/gsm0341_test.ok
@@ -0,0 +1 @@
+0010111c0011cd309aad2fa7e9a146a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d100
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 44ae539..cc0b8c3 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -102,6 +102,12 @@
 AT_CHECK([$abs_top_builddir/tests/smscb/smscb_test], [0], [expout])
 AT_CLEANUP
 
+AT_SETUP([smscb_gsm0341])
+AT_KEYWORDS([smscb_gsm0341])
+cat $abs_srcdir/smscb/gsm0341_test.ok > expout
+AT_CHECK([$abs_top_builddir/tests/smscb/gsm0341_test], [0], [expout])
+AT_CLEANUP
+
 AT_SETUP([ussd])
 AT_KEYWORDS([ussd])
 cat $abs_srcdir/ussd/ussd_test.ok > expout

To view, visit change 28939. To unsubscribe, or for help writing mail filters, visit settings.