diff options
| author | Milan Crha <mcrha@redhat.com> | 2018-05-14 18:18:19 +0200 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2018-05-15 08:16:40 +0200 |
| commit | e518b439848748fc65f3e89afcb4b0feebbc3902 (patch) | |
| tree | 8b82c569408a6845d82de92f380412d4495acaa9 /tests | |
| parent | d037843e9e6189c6b5e04367ccb95e3388e52f10 (diff) | |
| download | evolution-data-server-e518b439848748fc65f3e89afcb4b0feebbc3902.tar.gz | |
Address some of the clang warnings
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/libebook-contacts/test-phone-number.c | 4 | ||||
| -rw-r--r-- | tests/libedata-cal/test-cal-cache-intervals.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tests/libebook-contacts/test-phone-number.c b/tests/libebook-contacts/test-phone-number.c index 2f0fbc792..3b235d285 100644 --- a/tests/libebook-contacts/test-phone-number.c +++ b/tests/libebook-contacts/test-phone-number.c @@ -43,6 +43,7 @@ static const gchar *match_candidates[] = { "+1-857-4663489" }; +#ifdef ENABLE_PHONENUMBER static const EPhoneNumberMatch expected_matches[] = { /* not a number */ E_PHONE_NUMBER_MATCH_NONE, @@ -124,6 +125,7 @@ static const EPhoneNumberMatch expected_matches[] = { E_PHONE_NUMBER_MATCH_NONE, E_PHONE_NUMBER_MATCH_EXACT }; +#endif /* ENABLE_PHONENUMBER */ typedef struct { gchar *phone_number; @@ -500,9 +502,11 @@ main (gint argc, "/ebook-phone-number/parse-and-format/auto-region", test_parse_auto_region); + #ifdef ENABLE_PHONENUMBER g_assert_cmpint ( G_N_ELEMENTS (match_candidates) * G_N_ELEMENTS (match_candidates), ==, G_N_ELEMENTS (expected_matches)); + #endif for (i = 0; i < G_N_ELEMENTS (match_candidates); ++i) { for (j = 0; j < G_N_ELEMENTS (match_candidates); ++j) { diff --git a/tests/libedata-cal/test-cal-cache-intervals.c b/tests/libedata-cal/test-cal-cache-intervals.c index 7d32622f2..449bc0c13 100644 --- a/tests/libedata-cal/test-cal-cache-intervals.c +++ b/tests/libedata-cal/test-cal-cache-intervals.c @@ -209,7 +209,7 @@ test_intervals (TCUFixture *fixture, intervals = g_slist_prepend (intervals, interval); - success = e_cal_cache_put_component (fixture->cal_cache, comp, NULL, E_OFFLINE_STATE_SYNCED, NULL, &error); + success = e_cal_cache_put_component (fixture->cal_cache, comp, NULL, E_CACHE_IS_ONLINE, NULL, &error); g_assert_no_error (error); g_assert (success); } @@ -229,7 +229,7 @@ test_intervals (TCUFixture *fixture, intervals = g_slist_prepend (intervals, interval); - success = e_cal_cache_put_component (fixture->cal_cache, comp, NULL, E_OFFLINE_STATE_SYNCED, NULL, &error); + success = e_cal_cache_put_component (fixture->cal_cache, comp, NULL, E_CACHE_IS_ONLINE, NULL, &error); g_assert_no_error (error); g_assert (success); } @@ -287,7 +287,7 @@ test_intervals (TCUFixture *fixture, id = e_cal_component_get_id (comp); g_assert (id != NULL); - success = e_cal_cache_remove_component (fixture->cal_cache, id->uid, id->rid, E_OFFLINE_STATE_SYNCED, NULL, &error); + success = e_cal_cache_remove_component (fixture->cal_cache, id->uid, id->rid, E_CACHE_IS_ONLINE, NULL, &error); g_assert_no_error (error); g_assert (success); |