X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=tests%2Fcheck-hildon-note.c;h=1d4dc476e36419c60846cd0c7de23f533fd19a06;hb=e7ee40166cd2f77507326ef258b84c65d52c32f3;hp=8f1ad9b86b7d67e5a3a557bf0df13a97da14907b;hpb=e332a589ad93718efce61bee7d7c09314a0004b8;p=hildon

diff --git a/tests/check-hildon-note.c b/tests/check-hildon-note.c
index 8f1ad9b..1d4dc47 100644
--- a/tests/check-hildon-note.c
+++ b/tests/check-hildon-note.c
@@ -8,7 +8,7 @@
  * 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
@@ -27,8 +27,8 @@
 #include <check.h>
 #include <gtk/gtkmain.h>
 #include "test_suites.h"
-#include "hildon-window.h"
-#include "hildon-note.h"
+#include <hildon/hildon-window.h>
+#include <hildon/hildon-note.h>
 
 /* -------------------- Fixtures -------------------- */
 
@@ -89,8 +89,8 @@ START_TEST (test_new_confirmation_regular)
     
   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;
@@ -109,8 +109,8 @@ START_TEST (test_new_confirmation_regular)
 
   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;
@@ -152,8 +152,8 @@ START_TEST (test_new_confirmation_invalid)
 
   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;
@@ -201,8 +201,8 @@ START_TEST (test_new_information_regular)
 
   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;
@@ -221,8 +221,8 @@ START_TEST (test_new_information_regular)
 
   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;
@@ -264,8 +264,8 @@ START_TEST (test_new_information_invalid)
 
   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;
@@ -280,11 +280,12 @@ START_TEST (test_new_information_invalid)
 }
 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. 
  * Cases considered:
- *    - Create new confirmation note with description set to TEST_STRING and icon name "qgn_list_cp_calibration".
+ *    - Create new confirmation note with description set to TEST_STRING and icon name "control_calibration_target".
  *    - Create new confirmation note with description set to "" and icon name NULL.
  *
  */
@@ -305,7 +306,7 @@ START_TEST (test_new_confirmation_with_icon_name_regular)
 
   /* Test 1: create new confirmation note with description set to TEST_STRING */
   description = TEST_STRING;
-  icon_name="qgn_list_cp_calibration";
+  icon_name="control_calibration_target";
   note = HILDON_NOTE(hildon_note_new_confirmation_with_icon_name(n_window,description,icon_name));
   fail_if(!HILDON_IS_NOTE(note),
           "hildon-note: Creation failed with hildon_note_new_confirmation_with_icon_name");
@@ -318,8 +319,8 @@ START_TEST (test_new_confirmation_with_icon_name_regular)
   
   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);
@@ -345,8 +346,8 @@ START_TEST (test_new_confirmation_with_icon_name_regular)
   
   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);
@@ -380,7 +381,7 @@ START_TEST (test_new_confirmation_with_icon_name_invalid)
   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);
@@ -404,14 +405,14 @@ START_TEST (test_new_confirmation_with_icon_name_invalid)
 
   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;
 
   /* Test 2: create new confirmation note with description set to "NULL" */
-  invalid_note = HILDON_NOTE(hildon_note_new_confirmation_with_icon_name(n_window,NULL,"qgn_list_cp_calibration"));
+  invalid_note = HILDON_NOTE(hildon_note_new_confirmation_with_icon_name(n_window,NULL,"control_calibration_target"));
   fail_if(HILDON_IS_NOTE(invalid_note),
           "hildon-note: Creation succeeded with hildon_note_new_confirmation_with_icon_name with message == NULL");
 
@@ -420,6 +421,7 @@ START_TEST (test_new_confirmation_with_icon_name_invalid)
   g_value_unset(&enum_value);
 }
 END_TEST
+#endif
 
 /* ----- Test case for new_cancel_with_progress_bar -----*/
 
@@ -457,8 +459,8 @@ START_TEST (test_new_cancel_with_progress_bar_regular)
 
   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;
@@ -483,8 +485,8 @@ START_TEST (test_new_cancel_with_progress_bar_regular)
 
   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));
@@ -534,8 +536,8 @@ START_TEST (test_new_cancel_with_progress_bar_invalid)
 
   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;
@@ -555,7 +557,9 @@ Suite *create_hildon_note_suite()
 
   /* 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");
 
@@ -565,11 +569,13 @@ Suite *create_hildon_note_suite()
   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);