colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ublox,tests: define common method to compare bands

Browse Source
This commit is contained in:
Aleksander Morgado
2017-08-22 10:35:01 +02:00
parent ce203a1f74
commit 56e7112712
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
plugins/ublox/tests/test-modem-helpers-ublox.c
View File

@@ -488,18 +488,19 @@ test_urat_write_command (void)
/* Supported bands */ /* Supported bands */
static void static void
common_validate_supported_bands (const gchar *model, common_compare_bands (GArray *bands,
const MMModemBand *expected_bands, const MMModemBand *expected_bands,
guint n_expected_bands) guint n_expected_bands)
{ {
GError *error = NULL;
GArray *bands;
gchar *bands_str; gchar *bands_str;
GArray *expected_bands_array; GArray *expected_bands_array;
gchar *expected_bands_str; gchar *expected_bands_str;
bands = mm_ublox_get_supported_bands (model, &error); if (!expected_bands || !n_expected_bands) {
g_assert_no_error (error); g_assert (!bands);
return;
}
g_assert (bands); g_assert (bands);
mm_common_bands_garray_sort (bands); mm_common_bands_garray_sort (bands);
bands_str = mm_common_build_bands_string ((MMModemBand *)(bands->data), bands->len); bands_str = mm_common_build_bands_string ((MMModemBand *)(bands->data), bands->len);
@@ -516,6 +517,21 @@ common_validate_supported_bands (const gchar *model,
g_free (expected_bands_str); g_free (expected_bands_str);
} }
static void
common_validate_supported_bands (const gchar *model,
const MMModemBand *expected_bands,
guint n_expected_bands)
{
GError *error = NULL;
GArray *bands;
bands = mm_ublox_get_supported_bands (model, &error);
g_assert_no_error (error);
g_assert (bands);
common_compare_bands (bands, expected_bands, n_expected_bands);
}
static void static void
test_supported_bands_all (void) test_supported_bands_all (void)
{ {
@@ -604,26 +620,12 @@ common_validate_ubandsel_response (const gchar *str,
{ {
GError *error = NULL; GError *error = NULL;
GArray *bands; GArray *bands;
gchar *bands_str;
GArray *expected_bands_array;
gchar *expected_bands_str;
bands = mm_ublox_parse_ubandsel_response (str, &error); bands = mm_ublox_parse_ubandsel_response (str, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (bands); g_assert (bands);
mm_common_bands_garray_sort (bands);
bands_str = mm_common_build_bands_string ((MMModemBand *)(bands->data), bands->len);
g_array_unref (bands);
expected_bands_array = g_array_sized_new (FALSE, FALSE, sizeof (MMModemBand), n_expected_bands); common_compare_bands (bands, expected_bands, n_expected_bands);
g_array_append_vals (expected_bands_array, expected_bands, n_expected_bands);
mm_common_bands_garray_sort (expected_bands_array);
expected_bands_str = mm_common_build_bands_string ((MMModemBand *)(expected_bands_array->data), expected_bands_array->len);
g_array_unref (expected_bands_array);
g_assert_cmpstr (bands_str, ==, expected_bands_str);
g_free (bands_str);
g_free (expected_bands_str);
} }
static void static void