Make notification_is_duplicate test icons

Before, it only did test for `ASSERT_FALSE` both times. So a raw_image
wasn't guaranteed to be a condition to falsify the return.

Using the single field function, will test for both cases.
This commit is contained in:
Benedikt Heine 2019-01-03 12:10:39 +01:00
parent c1090ad7dc
commit 84e5a0bf26

View File

@ -30,11 +30,8 @@ TEST test_notification_is_duplicate(struct notification *a,
ASSERT(notification_is_duplicate(a, b)); ASSERT(notification_is_duplicate(a, b));
char *tmp = b->icon;
enum icon_position icon_setting_tmp = settings.icon_position; enum icon_position icon_setting_tmp = settings.icon_position;
b->icon = "Test1";
settings.icon_position = ICON_OFF; settings.icon_position = ICON_OFF;
ASSERT(notification_is_duplicate(a, b)); ASSERT(notification_is_duplicate(a, b));
//Setting pointer to a random value since we are checking for null //Setting pointer to a random value since we are checking for null
@ -43,18 +40,17 @@ TEST test_notification_is_duplicate(struct notification *a,
b->raw_icon = NULL; b->raw_icon = NULL;
settings.icon_position = ICON_LEFT; settings.icon_position = ICON_LEFT;
ASSERT_FALSE(notification_is_duplicate(a, b)); CHECK_CALL(test_notification_is_duplicate_field(&(b->icon), a, b));
b->raw_icon = (struct raw_image*)0xff; b->raw_icon = (struct raw_image*)0xff;
ASSERT_FALSE(notification_is_duplicate(a, b)); ASSERT_FALSE(notification_is_duplicate(a, b));
b->raw_icon = NULL; b->raw_icon = NULL;
settings.icon_position = ICON_RIGHT; settings.icon_position = ICON_RIGHT;
ASSERT_FALSE(notification_is_duplicate(a, b)); CHECK_CALL(test_notification_is_duplicate_field(&(b->icon), a, b));
b->raw_icon = (struct raw_image*)0xff; b->raw_icon = (struct raw_image*)0xff;
ASSERT_FALSE(notification_is_duplicate(a, b)); ASSERT_FALSE(notification_is_duplicate(a, b));
b->raw_icon = NULL; b->raw_icon = NULL;
b->icon = tmp;
settings.icon_position = icon_setting_tmp; settings.icon_position = icon_setting_tmp;
ASSERT(notification_is_duplicate(a, b)); ASSERT(notification_is_duplicate(a, b));