From 93fcaf93ce92aa8b335705e66c993dc6f9e628b0 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 30 May 2013 23:51:05 -0500 Subject: modem-helpers: handle commas within +COPS response items (bgo #701329) Modems can probably put whatever they want between the quotes for the operator name, including commas. Handle that. https://bugzilla.gnome.org/show_bug.cgi?id=701329 --- src/tests/test-modem-helpers.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/tests/test-modem-helpers.c') diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c index 6666bb63..d0d189e0 100644 --- a/src/tests/test-modem-helpers.c +++ b/src/tests/test-modem-helpers.c @@ -581,6 +581,19 @@ test_cops_response_sek600i (void *f, gpointer d) test_cops_results ("Sony-Ericsson K600i", reply, &expected[0], G_N_ELEMENTS (expected)); } +static void +test_cops_response_samsung_z810 (void *f, gpointer d) +{ + /* Ensure commas within quotes don't trip up the parser */ + const char *reply = "+COPS: (1,\"T-Mobile USA, In\",\"T-Mobile\",\"310260\",0),(1,\"AT&T\",\"AT&T\",\"310410\",0),,(0,1,2,3,4),(0,1,2)"; + static MM3gppNetworkInfo expected[] = { + { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "T-Mobile USA, In", "T-Mobile", "310260", MM_MODEM_ACCESS_TECHNOLOGY_GSM }, + { MM_MODEM_3GPP_NETWORK_AVAILABILITY_AVAILABLE, "AT&T", "AT&T", "310410", MM_MODEM_ACCESS_TECHNOLOGY_GSM }, + }; + + test_cops_results ("Samsung Z810", reply, &expected[0], G_N_ELEMENTS (expected)); +} + static void test_cops_response_gsm_invalid (void *f, gpointer d) { @@ -1883,6 +1896,7 @@ int main (int argc, char **argv) g_test_suite_add (suite, TESTCASE (test_cops_response_n2720, NULL)); g_test_suite_add (suite, TESTCASE (test_cops_response_gobi, NULL)); g_test_suite_add (suite, TESTCASE (test_cops_response_sek600i, NULL)); + g_test_suite_add (suite, TESTCASE (test_cops_response_samsung_z810, NULL)); g_test_suite_add (suite, TESTCASE (test_cops_response_gsm_invalid, NULL)); g_test_suite_add (suite, TESTCASE (test_cops_response_umts_invalid, NULL)); -- cgit v1.2.3-70-g09d2