* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; version 2.1 of
- * the License.
+ * the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
g_object_get_property(G_OBJECT (note),"note_type",&enum_value);
note_type = g_value_get_int(&enum_value);
- fail_if( note_type != HILDON_NOTE_CONFIRMATION_TYPE,
- "hildon-note: Type was not set property on creation (HILDON_NOTE_CONFIRMATION_TYPE)",note_type);
+ fail_if( note_type != HILDON_NOTE_TYPE_CONFIRMATION,
+ "hildon-note: Type was not set property on creation (HILDON_NOTE_TYPE_CONFIRMATION)",note_type);
gtk_widget_destroy (GTK_WIDGET (note));
note=NULL;
g_object_get_property(G_OBJECT (note),"note_type",&enum_value);
note_type = g_value_get_int(&enum_value);
- fail_unless( note_type == HILDON_NOTE_CONFIRMATION_TYPE,
- "hildon-note: Type was not set property on creation (HILDON_NOTE_CONFIRMATION_TYPE)",note_type);
+ fail_unless( note_type == HILDON_NOTE_TYPE_CONFIRMATION,
+ "hildon-note: Type was not set property on creation (HILDON_NOTE_TYPE_CONFIRMATION)",note_type);
gtk_widget_destroy (GTK_WIDGET (note));
note=NULL;
g_object_get_property(G_OBJECT (invalid_note),"note_type",&enum_value);
note_type = g_value_get_int(&enum_value);
- fail_if( note_type != HILDON_NOTE_CONFIRMATION_TYPE,
- "hildon-note: Type was not set property on creation (HILDON_NOTE_CONFIRMATION_TYPE)",note_type);
+ fail_if( note_type != HILDON_NOTE_TYPE_CONFIRMATION,
+ "hildon-note: Type was not set property on creation (HILDON_NOTE_TYPE_CONFIRMATION)",note_type);
gtk_widget_destroy (GTK_WIDGET (invalid_note));
invalid_note=NULL;
g_object_get_property(G_OBJECT (note),"note_type",&enum_value);
note_type = g_value_get_int(&enum_value);
- fail_if( note_type != HILDON_NOTE_INFORMATION_THEME_TYPE,
- "hildon-note: Type was not set property on creation (HILDON_NOTE_INFORMATION_THEME_TYPE)",note_type);
+ fail_if( note_type != HILDON_NOTE_TYPE_INFORMATION_THEME,
+ "hildon-note: Type was not set property on creation (HILDON_NOTE_TYPE_INFORMATION_THEME)",note_type);
gtk_widget_destroy (GTK_WIDGET (note));
note=NULL;
g_object_get_property(G_OBJECT (note),"note_type",&enum_value);
note_type = g_value_get_int(&enum_value);
- fail_if( note_type != HILDON_NOTE_INFORMATION_THEME_TYPE,
- "hildon-note: Type was not set property on creation (HILDON_NOTE_INFORMATION_THEME_TYPE)",note_type);
+ fail_if( note_type != HILDON_NOTE_TYPE_INFORMATION_THEME,
+ "hildon-note: Type was not set property on creation (HILDON_NOTE_TYPE_INFORMATION_THEME)",note_type);
gtk_widget_destroy (GTK_WIDGET (note));
note=NULL;
g_object_get_property(G_OBJECT (invalid_note),"note_type",&enum_value);
note_type = g_value_get_int(&enum_value);
- fail_if( note_type != HILDON_NOTE_INFORMATION_THEME_TYPE,
- "hildon-note: Type was not set property on creation (HILDON_NOTE_INFORMATION_THEME_TYPE)",note_type);
+ fail_if( note_type != HILDON_NOTE_TYPE_INFORMATION_THEME,
+ "hildon-note: Type was not set property on creation (HILDON_NOTE_TYPE_INFORMATION_THEME)",note_type);
gtk_widget_destroy (GTK_WIDGET (invalid_note));
invalid_note=NULL;
}
END_TEST
+#ifndef HILDON_DISABLE_DEPRECATED
/* ----- Test case for new_confirmation_with_icon_name -----*/
/**
* Purpose: Check that note dialog is properly created with description regular values.
g_object_get_property(G_OBJECT (note),"note_type",&enum_value);
note_type = g_value_get_int(&enum_value);
- fail_if( note_type != HILDON_NOTE_CONFIRMATION_TYPE,
- "hildon-note: Type was not set property on creation (HILDON_NOTE_CONFIRMATION_TYPE)",note_type);
+ fail_if( note_type != HILDON_NOTE_TYPE_CONFIRMATION,
+ "hildon-note: Type was not set property on creation (HILDON_NOTE_TYPE_CONFIRMATION)",note_type);
g_object_get_property(G_OBJECT (note),"icon",&icon_name_value);
ret_icon_name = g_value_get_string (&icon_name_value);
g_object_get_property(G_OBJECT (note),"note_type",&enum_value);
note_type = g_value_get_int(&enum_value);
- fail_if( note_type != HILDON_NOTE_CONFIRMATION_TYPE,
- "hildon-note: Type was not set property on creation (HILDON_NOTE_CONFIRMATION_TYPE)",note_type);
+ fail_if( note_type != HILDON_NOTE_TYPE_CONFIRMATION,
+ "hildon-note: Type was not set property on creation (HILDON_NOTE_TYPE_CONFIRMATION)",note_type);
g_object_get_property(G_OBJECT (note),"icon",&icon_name_value);
ret_icon_name = g_value_get_string (&icon_name_value);
GValue icon_name_value={0, };
HildonNoteType note_type;
HildonNote * invalid_note;
-
+
g_value_init (&value, G_TYPE_STRING);
g_value_init (&icon_name_value, G_TYPE_STRING);
g_value_init (&enum_value, G_TYPE_INT);
g_object_get_property(G_OBJECT (invalid_note),"note_type",&enum_value);
note_type = g_value_get_int(&enum_value);
- fail_if( note_type != HILDON_NOTE_CONFIRMATION_TYPE,
- "hildon-note: Type was not set property on creation (HILDON_NOTE_CONFIRMATION_TYPE)",note_type);
+ fail_if( note_type != HILDON_NOTE_TYPE_CONFIRMATION,
+ "hildon-note: Type was not set property on creation (HILDON_NOTE_TYPE_CONFIRMATION)",note_type);
gtk_widget_destroy (GTK_WIDGET (invalid_note));
invalid_note=NULL;
g_value_unset(&enum_value);
}
END_TEST
+#endif
/* ----- Test case for new_cancel_with_progress_bar -----*/
g_object_get_property(G_OBJECT (note),"note_type",&enum_value);
note_type = g_value_get_int(&enum_value);
- fail_if( note_type != HILDON_NOTE_PROGRESSBAR_TYPE,
- "hildon-note: Type was not set property on creation (HILDON_NOTE_PROGRESSBAR_TYPE)",note_type);
+ fail_if( note_type != HILDON_NOTE_TYPE_PROGRESSBAR,
+ "hildon-note: Type was not set property on creation (HILDON_NOTE_TYPE_PROGRESSBAR)",note_type);
gtk_widget_destroy (GTK_WIDGET (note));
note=NULL;
g_object_get_property(G_OBJECT (note),"note_type",&enum_value);
note_type = g_value_get_int(&enum_value);
- fail_if( note_type != HILDON_NOTE_PROGRESSBAR_TYPE,
- "hildon-note: Type was not set property on creation (HILDON_NOTE_PROGRESSBAR_TYPE)",note_type);
+ fail_if( note_type != HILDON_NOTE_TYPE_PROGRESSBAR,
+ "hildon-note: Type was not set property on creation (HILDON_NOTE_TYPE_PROGRESSBAR)",note_type);
gtk_widget_destroy (GTK_WIDGET (progress_bar));
gtk_widget_destroy (GTK_WIDGET (note));
g_object_get_property(G_OBJECT (note),"note_type",&enum_value);
note_type = g_value_get_int(&enum_value);
- fail_if( note_type != HILDON_NOTE_PROGRESSBAR_TYPE,
- "hildon-note: Type was not set property on creation (HILDON_NOTE_PROGRESSBAR_TYPE)",note_type);
+ fail_if( note_type != HILDON_NOTE_TYPE_PROGRESSBAR,
+ "hildon-note: Type was not set property on creation (HILDON_NOTE_TYPE_PROGRESSBAR)",note_type);
gtk_widget_destroy (GTK_WIDGET (note));
note=NULL;
/* Create test cases */
TCase *tc1 = tcase_create("new_confirmation");
+#ifndef HILDON_DISABLE_DEPRECATED
TCase *tc2 = tcase_create("new_confirmation_with_icon_name");
+#endif
TCase *tc3 = tcase_create("new_information");
TCase *tc4 = tcase_create("new_cancel_with_progress_bar");
tcase_add_test(tc1, test_new_confirmation_invalid);
suite_add_tcase (s, tc1);
+#ifndef HILDON_DISABLE_DEPRECATED
/* Create test case for hildon_note_new_confirmation_with_icon_name and add it to the suite */
tcase_add_checked_fixture(tc2, fx_setup_default_note, fx_teardown_default_note);
tcase_add_test(tc2, test_new_confirmation_with_icon_name_regular);
tcase_add_test(tc2, test_new_confirmation_with_icon_name_invalid);
suite_add_tcase (s, tc2);
+#endif
/* Create test case for hildon_note_new_with_information and add it to the suite */
tcase_add_checked_fixture(tc3, fx_setup_default_note, fx_teardown_default_note);