rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=dd881c78d034dd6bbdf6a465b0b23c5cdaa8c132
commit dd881c78d034dd6bbdf6a465b0b23c5cdaa8c132 Author: Andrii Kroitor <an.kroi...@samsung.com> Date: Tue Jul 21 10:59:15 2015 +0300 UTC: fix config tests --- tests/test_config/config_init.c | 28 ---------------- tests/test_config/config_panes_sizes_data_update.c | 37 ---------------------- tests/test_config/profile_get.c | 33 ------------------- tests/test_config/profile_load.c | 37 ---------------------- tests/test_config/profile_save.c | 31 ------------------ tests/test_config/test_config.c | 21 ++++-------- tests/test_config/test_config.h | 22 ++++--------- 7 files changed, 12 insertions(+), 197 deletions(-) diff --git a/tests/test_config/config_init.c b/tests/test_config/config_init.c index 467385c..ba233bb 100644 --- a/tests/test_config/config_init.c +++ b/tests/test_config/config_init.c @@ -63,34 +63,6 @@ END_TEST /** * @addtogroup config_init * @{ - * <tr> - * <td>config_init</td> - * <td>config_init_test_n</td> - * <td> - * @precondition - * @step 1 initialize elementary library - * - * @procedure - * @step 1 call config_init - * </td> - * <td>NULL</td> - * <td>EINA_FALSE</td> - * </tr> - * @} - */ -EFLETE_TEST(config_init_test_n) -{ - elm_init(0,0); - - ck_assert_msg(!config_init(NULL), "Config was initialized."); - - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup config_init - * @{ * </TABLE> * @} * @} diff --git a/tests/test_config/config_panes_sizes_data_update.c b/tests/test_config/config_panes_sizes_data_update.c index caeea5f..98767c8 100644 --- a/tests/test_config/config_panes_sizes_data_update.c +++ b/tests/test_config/config_panes_sizes_data_update.c @@ -73,43 +73,6 @@ END_TEST /** * @addtogroup config_panes_sizes_data_update * @{ - * <tr> - * <td>config_panes_sizes_data_update</td> - * <td>config_panes_sizes_data_update_test_n</td> - * <td> - * @precondition - * @step 1 initialize elementary library - * @step 2 create application data - * @step 3 init config - * - * @procedure - * @step 1 Call config_panes_sizes_data_update(ap) - * @step 2 Check returned value - * </td> - * <td>App_Data *app_data</td> - * <td>EINA_FALSE</td> - * </tr> - * @} - */ -EFLETE_TEST(config_panes_sizes_data_update_test_n) -{ - App_Data *app_data; - Eina_Bool result = EINA_FALSE; - elm_init(0,0); - app_init(); - app_data = app_data_get(); - config_init(app_data); - - result = config_panes_sizes_data_update(app_data); - ck_assert_msg(result == EINA_FALSE, "Should not update Panes sizes data if main window is not added"); - - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup config_panes_sizes_data_update - * @{ * </TABLE> * @} * @} diff --git a/tests/test_config/profile_get.c b/tests/test_config/profile_get.c index 2b86a55..29f7fcb 100644 --- a/tests/test_config/profile_get.c +++ b/tests/test_config/profile_get.c @@ -34,39 +34,6 @@ * @{ * <tr> * <td>profile_get</td> - * <td>profile_get_test_p1</td> - * <td> - * @precondition - * @step 1 initialize elementary library - * @step 2 initialize application data - * @step 3 initialize config - * - * @procedure - * @step 1 call profile_get - * </td> - * <td>void</td> - * <td>NULL</td> - * </tr> - * @} - */ -EFLETE_TEST(profile_get_test_p1) -{ - elm_init(0,0); - app_init(); - App_Data *app = app_data_get(); - config_init(app); - - ck_assert_msg(profile_get() == NULL, "Profile not NULL"); - - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup profile_get - * @{ - * <tr> - * <td>profile_get</td> * <td>profile_get_test_p2</td> * <td> * @precondition diff --git a/tests/test_config/profile_load.c b/tests/test_config/profile_load.c index c5d8590..4f5c589 100644 --- a/tests/test_config/profile_load.c +++ b/tests/test_config/profile_load.c @@ -102,43 +102,6 @@ END_TEST /** * @addtogroup profile_load * @{ - * <tr> - * <td>profile_load</td> - * <td>profile_load_test_n</td> - * <td> - * @precondition - * @step 1 initialize elementary library - * @step 2 initialize application data - * - * @procedure - * @step 1 call profile_load - * </td> - * <td>NULL</td> - * <td>NULL</td> - * </tr> - * @} - */ -EFLETE_TEST(profile_load_test_n) -{ - Profile *profile; - - elm_init(0,0); - app_init(); - - profile_load(NULL); - profile = profile_get(); - ck_assert_msg(profile == NULL, "Profile is loaded."); - - config_shutdown(app_data_get()); - elm_shutdown(); -} -END_TEST - - - -/** - * @addtogroup profile_load - * @{ * </TABLE> * @} * @} diff --git a/tests/test_config/profile_save.c b/tests/test_config/profile_save.c index f7cd27a..a246ad0 100644 --- a/tests/test_config/profile_save.c +++ b/tests/test_config/profile_save.c @@ -66,37 +66,6 @@ END_TEST /** * @addtogroup profile_save * @{ - * <tr> - * <td>profile_save</td> - * <td>profile_save_test_n</td> - * <td> - * @precondition - * @step 1 initialize elementary library - * @step 2 initialize application data - * - * @procedure - * @step 1 call profile_save - * </td> - * <td>NULL</td> - * <td>NULL</td> - * </tr> - * @} - */ -EFLETE_TEST(profile_save_test_n) -{ - elm_init(0,0); - app_init(); - - ck_assert_msg(!profile_save(NULL), "Profile is saved."); - - config_shutdown(app_data_get()); - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup profile_save - * @{ * </TABLE> * @} * @} diff --git a/tests/test_config/test_config.c b/tests/test_config/test_config.c index 9f57614..856c1e0 100644 --- a/tests/test_config/test_config.c +++ b/tests/test_config/test_config.c @@ -23,28 +23,19 @@ Suite* test_suite (void) { Suite *suite = suite_create("config_test"); TCase *tcase = tcase_create("TCase"); + tcase_add_test(tcase, config_get_test_p1); + tcase_add_test(tcase, config_get_test_p2); tcase_add_test(tcase, config_init_test_p); - tcase_add_test(tcase, config_init_test_n); - + tcase_add_test(tcase, config_load_test_p); + tcase_add_test(tcase, config_panes_sizes_data_update_test_p); + tcase_add_test(tcase, config_save_test_p); tcase_add_test(tcase, config_shutdown_test_p); - + tcase_add_test(tcase, profile_get_test_p2); tcase_add_test(tcase, profile_load_test_p1); tcase_add_test(tcase, profile_load_test_p2); - tcase_add_test(tcase, profile_load_test_n); tcase_add_test(tcase, profile_save_test_p); - tcase_add_test(tcase, profile_save_test_n); - tcase_add_test(tcase, profile_get_test_p1); - tcase_add_test(tcase, profile_get_test_p2); tcase_add_test(tcase, profiles_get_test_p); - tcase_add_test(tcase, config_save_test_p); - tcase_add_test(tcase, config_load_test_p); - tcase_add_test(tcase, config_get_test_p1); - tcase_add_test(tcase, config_get_test_p2); - - tcase_add_test(tcase, config_panes_sizes_data_update_test_p); - tcase_add_test(tcase, config_panes_sizes_data_update_test_n); - suite_add_tcase(suite, tcase); return suite; } diff --git a/tests/test_config/test_config.h b/tests/test_config/test_config.h index fb237e4..bb9fc86 100644 --- a/tests/test_config/test_config.h +++ b/tests/test_config/test_config.h @@ -21,25 +21,15 @@ #include "config.h" #include "main_window.h" +void config_get_test_p1(int); +void config_get_test_p2(int); void config_init_test_p(int); -void config_init_test_n(int); - +void config_load_test_p(int); +void config_panes_sizes_data_update_test_p(int); +void config_save_test_p(int); void config_shutdown_test_p(int); - +void profile_get_test_p2(int); void profile_load_test_p1(int); void profile_load_test_p2(int); -void profile_load_test_n(int); void profile_save_test_p(int); -void profile_save_test_n(int); -void profile_get_test_p1(int); -void profile_get_test_p2(int); void profiles_get_test_p(int); - -void config_save_test_p(int); -void config_load_test_p(int); -void config_get_test_p1(int); -void config_get_test_p2(int); - -void config_panes_sizes_data_update_test_p(int); -void config_panes_sizes_data_update_test_n(int); - --