aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc/tests
diff options
context:
space:
mode:
Diffstat (limited to 'openbsc/tests')
-rw-r--r--openbsc/tests/channel/channel_test.c5
-rw-r--r--openbsc/tests/db/db_test.c10
2 files changed, 11 insertions, 4 deletions
diff --git a/openbsc/tests/channel/channel_test.c b/openbsc/tests/channel/channel_test.c
index 9fb1e9e9a..236933949 100644
--- a/openbsc/tests/channel/channel_test.c
+++ b/openbsc/tests/channel/channel_test.c
@@ -74,7 +74,10 @@ int main(int argc, char **argv)
/* Create a dummy subscriber */
struct gsm_subscriber *subscr = subscr_alloc();
subscr->lac = 23;
- subscr->net = network;
+ subscr->group = network->subscr_group;
+
+ OSMO_ASSERT(subscr->group);
+ OSMO_ASSERT(subscr->group->net == network);
/* Ask for a channel... */
subscr_get_channel(subscr, RSL_CHANNEED_TCH_F, subscr_cb, (void*)0x2342L);
diff --git a/openbsc/tests/db/db_test.c b/openbsc/tests/db/db_test.c
index 75c92d309..62fbb732e 100644
--- a/openbsc/tests/db/db_test.c
+++ b/openbsc/tests/db/db_test.c
@@ -31,9 +31,10 @@
#include <inttypes.h>
static struct gsm_network dummy_net;
+static struct gsm_subscriber_group dummy_sgrp;
#define SUBSCR_PUT(sub) \
- sub->net = &dummy_net; \
+ sub->group = &dummy_sgrp; \
subscr_put(sub);
#define COMPARE(original, copy) \
@@ -70,7 +71,7 @@ static void test_sms(void)
struct gsm_subscriber *subscr;
subscr = db_get_subscriber(GSM_SUBSCRIBER_IMSI, "9993245423445");
OSMO_ASSERT(subscr);
- subscr->net = &dummy_net;
+ subscr->group = &dummy_sgrp;
sms = sms_alloc();
sms->receiver = subscr_get(subscr);
@@ -130,7 +131,7 @@ static void test_sms_migrate(void)
0xd0, 0xf1, 0xfd, 0x06, 0x00 };
rcv_subscr = db_get_subscriber(GSM_SUBSCRIBER_IMSI, "901010000001111");
- rcv_subscr->net = &dummy_net;
+ rcv_subscr->group = &dummy_sgrp;
sms = db_sms_get(&dummy_net, 1);
OSMO_ASSERT(sms->id == 1);
@@ -159,6 +160,9 @@ int main()
osmo_init_logging(&log_info);
log_set_print_filename(osmo_stderr_target, 0);
+ dummy_net.subscr_group = &dummy_sgrp;
+ dummy_sgrp.net = &dummy_net;
+
if (db_init("hlr.sqlite3")) {
printf("DB: Failed to init database. Please check the option settings.\n");
return 1;