* mu: unbreak unit test after flag changes (fixes #247)

This commit is contained in:
djcb
2013-07-07 10:46:35 +03:00
parent e7e38e9053
commit b17f26537b
3 changed files with 2 additions and 9 deletions

View File

@ -61,7 +61,6 @@ mu_flag_type (MuFlags flag)
if (FLAG_INFO[u].flag == flag) if (FLAG_INFO[u].flag == flag)
return FLAG_INFO[u].flag_type; return FLAG_INFO[u].flag_type;
g_warning ("%s: invalid flag %u", __FUNCTION__, flag);
return MU_FLAG_TYPE_INVALID; return MU_FLAG_TYPE_INVALID;
} }
@ -74,8 +73,6 @@ mu_flag_char (MuFlags flag)
for (u = 0; u != G_N_ELEMENTS (FLAG_INFO); ++u) for (u = 0; u != G_N_ELEMENTS (FLAG_INFO); ++u)
if (FLAG_INFO[u].flag == flag) if (FLAG_INFO[u].flag == flag)
return FLAG_INFO[u].kar; return FLAG_INFO[u].kar;
g_warning ("%s: invalid flag %u", __FUNCTION__, flag);
return 0; return 0;
} }
@ -90,7 +87,6 @@ mu_flag_from_char (char kar)
if (FLAG_INFO[u].kar == kar) if (FLAG_INFO[u].kar == kar)
return FLAG_INFO[u].flag; return FLAG_INFO[u].flag;
g_warning ("%s: invalid kar %c", __FUNCTION__, kar);
return MU_FLAG_INVALID; return MU_FLAG_INVALID;
} }
@ -104,7 +100,6 @@ mu_flag_name (MuFlags flag)
if (FLAG_INFO[u].flag == flag) if (FLAG_INFO[u].flag == flag)
return FLAG_INFO[u].name; return FLAG_INFO[u].name;
g_warning ("%s: invalid flags %u", __FUNCTION__, flag);
return NULL; return NULL;
} }

View File

@ -87,7 +87,7 @@ MuFlagType mu_flag_type (MuFlags flag) G_GNUC_CONST;
* *
* @param flag a MuFlag (single) * @param flag a MuFlag (single)
* *
* @return the character, or 0 in case of error * @return the character, or 0 if it's not a valid flag
*/ */
char mu_flag_char (MuFlags flag) G_GNUC_CONST; char mu_flag_char (MuFlags flag) G_GNUC_CONST;

View File

@ -175,9 +175,7 @@ test_mu_msg_02 (void)
(MuMsgContactForeachFunc)check_contact_02, (MuMsgContactForeachFunc)check_contact_02,
&i); &i);
g_assert_cmpint (i,==,2); g_assert_cmpint (i,==,2);
g_assert_cmpuint (mu_msg_get_flags(msg), ==, MU_FLAG_SEEN|MU_FLAG_LIST);
g_assert_cmpuint (mu_msg_get_flags(msg),
==, MU_FLAG_SEEN);
mu_msg_unref (msg); mu_msg_unref (msg);
} }