diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2018-07-31 00:21:05 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2018-09-22 10:09:18 +0200 |
| commit | d12fb36f526a5d4a269568b760da29df58778e51 (patch) | |
| tree | a2d5e5c8bae655da8fcc0e53c615f3f0809c338e | |
| parent | 895c62609e9ec201a8bf712948d5415d8aa6c929 (diff) | |
| download | ModemManager-d12fb36f526a5d4a269568b760da29df58778e51.tar.gz | |
cinterion: fix band related unit tests
The sort_band() method used in the tester was totally wrong, it was
comparing the addresses of the variables instead of the MMModemBand
values.
Use the common mm_common_bands_garray_sort() instead, which works as
expected.
(cherry picked from commit b8c7773a74f0c460ff19742a29dbf0060119e584)
| -rw-r--r-- | plugins/cinterion/tests/test-modem-helpers-cinterion.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/plugins/cinterion/tests/test-modem-helpers-cinterion.c b/plugins/cinterion/tests/test-modem-helpers-cinterion.c index 2806ec458..2578eb005 100644 --- a/plugins/cinterion/tests/test-modem-helpers-cinterion.c +++ b/plugins/cinterion/tests/test-modem-helpers-cinterion.c @@ -25,12 +25,6 @@ #include "mm-modem-helpers.h" #include "mm-modem-helpers-cinterion.h" -static gint -sort_band (MMModemBand a, MMModemBand b) -{ - return a - b; -} - /*****************************************************************************/ /* Test ^SCFG test responses */ @@ -52,8 +46,8 @@ common_test_scfg (const gchar *response, g_assert (res == TRUE); g_assert (bands != NULL); - g_array_sort (bands, (GCompareFunc)sort_band); - g_array_sort (expected_bands, (GCompareFunc)sort_band); + mm_common_bands_garray_sort (bands); + mm_common_bands_garray_sort (expected_bands); expected_bands_str = mm_common_build_bands_string ((const MMModemBand *)expected_bands->data, expected_bands->len); @@ -205,8 +199,8 @@ common_test_scfg_response (const gchar *response, g_assert (res == TRUE); g_assert (bands != NULL); - g_array_sort (bands, (GCompareFunc)sort_band); - g_array_sort (expected_bands, (GCompareFunc)sort_band); + mm_common_bands_garray_sort (bands); + mm_common_bands_garray_sort (expected_bands); expected_bands_str = mm_common_build_bands_string ((const MMModemBand *)expected_bands->data, expected_bands->len); |