rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=81025c1c523b7976d89c7454b3e2537a2c7404da
commit 81025c1c523b7976d89c7454b3e2537a2c7404da Author: Andrii Kroitor <an.kroi...@samsung.com> Date: Fri Jul 17 13:12:09 2015 +0300 UTC: fix ui_state_list tests --- tests/edj_build/Makefile.am | 1 + tests/test_ui_states_list/test_ui_states_list.c | 12 - tests/test_ui_states_list/test_ui_states_list.h | 12 - tests/test_ui_states_list/ui_states_list_add.c | 30 --- .../test_ui_states_list/ui_states_list_data_set.c | 242 --------------------- .../ui_states_list_data_unset.c | 32 +-- .../test_ui_states_list/ui_states_list_part_get.c | 34 --- .../ui_states_list_selected_state_del.c | 31 --- .../ui_states_list_selected_state_get.c | 30 --- .../test_ui_states_list/ui_states_list_state_add.c | 99 +-------- 10 files changed, 3 insertions(+), 520 deletions(-) diff --git a/tests/edj_build/Makefile.am b/tests/edj_build/Makefile.am index 0839c88..11238f2 100644 --- a/tests/edj_build/Makefile.am +++ b/tests/edj_build/Makefile.am @@ -49,6 +49,7 @@ check: Makefile $(builddir)/test_project_manager.edj \ $(builddir)/image_editor.edj \ $(builddir)/ui_states_list_data_set.edj \ + $(builddir)/ui_states_list_data_unset.edj \ $(builddir)/ui_states_list_part_get.edj \ $(builddir)/ui_states_list_selected_state_get.edj \ $(builddir)/ui_states_list_selected_states_del.edj \ diff --git a/tests/test_ui_states_list/test_ui_states_list.c b/tests/test_ui_states_list/test_ui_states_list.c index 55bc7cc..45ea3c6 100644 --- a/tests/test_ui_states_list/test_ui_states_list.c +++ b/tests/test_ui_states_list/test_ui_states_list.c @@ -23,31 +23,19 @@ Suite* test_suite (void) { Suite *suite = suite_create("ui_states_list_test"); TCase *tcase = tcase_create("TCase"); tcase_add_test(tcase, ui_states_list_add_test_p); - tcase_add_test(tcase, ui_states_list_add_test_n); tcase_add_test(tcase, ui_states_list_data_set_test_p); - tcase_add_test(tcase, ui_states_list_data_set_test_n1); - tcase_add_test(tcase, ui_states_list_data_set_test_n2); - tcase_add_test(tcase, ui_states_list_data_set_test_n3); - tcase_add_test(tcase, ui_states_list_data_set_test_n4); - tcase_add_test(tcase, ui_states_list_data_set_test_n5); tcase_add_test(tcase, ui_states_list_part_get_test_p1); tcase_add_test(tcase, ui_states_list_part_get_test_p2); tcase_add_test(tcase, ui_states_list_part_get_test_n1); - tcase_add_test(tcase, ui_states_list_part_get_test_n2); tcase_add_test(tcase, ui_states_list_state_add_test_p); tcase_add_test(tcase, ui_states_list_state_add_test_n1); - tcase_add_test(tcase, ui_states_list_state_add_test_n2); - tcase_add_test(tcase, ui_states_list_state_add_test_n3); tcase_add_test(tcase, ui_states_list_selected_state_get_test_p1); tcase_add_test(tcase, ui_states_list_selected_state_get_test_p2); tcase_add_test(tcase, ui_states_list_selected_state_get_test_n1); - tcase_add_test(tcase, ui_states_list_selected_state_get_test_n2); tcase_add_test(tcase, ui_states_list_selected_state_del_test_p); tcase_add_test(tcase, ui_states_list_selected_state_del_test_n1); - tcase_add_test(tcase, ui_states_list_selected_state_del_test_n2); tcase_add_test(tcase, ui_states_list_data_unset_test_p1); tcase_add_test(tcase, ui_states_list_data_unset_test_p2); - tcase_add_test(tcase, ui_states_list_data_unset_test_n); suite_add_tcase(suite, tcase); return suite; } diff --git a/tests/test_ui_states_list/test_ui_states_list.h b/tests/test_ui_states_list/test_ui_states_list.h index b13bb5f..76678c7 100644 --- a/tests/test_ui_states_list/test_ui_states_list.h +++ b/tests/test_ui_states_list/test_ui_states_list.h @@ -26,28 +26,16 @@ */ void ui_states_list_add_test_p(int); -void ui_states_list_add_test_n(int); void ui_states_list_data_set_test_p(int); -void ui_states_list_data_set_test_n1(int); -void ui_states_list_data_set_test_n2(int); -void ui_states_list_data_set_test_n3(int); -void ui_states_list_data_set_test_n4(int); -void ui_states_list_data_set_test_n5(int); void ui_states_list_part_get_test_p1(int); void ui_states_list_part_get_test_p2(int); void ui_states_list_part_get_test_n1(int); -void ui_states_list_part_get_test_n2(int); void ui_states_list_state_add_test_p(int); void ui_states_list_state_add_test_n1(int); -void ui_states_list_state_add_test_n2(int); -void ui_states_list_state_add_test_n3(int); void ui_states_list_selected_state_get_test_p1(int); void ui_states_list_selected_state_get_test_p2(int); void ui_states_list_selected_state_get_test_n1(int); -void ui_states_list_selected_state_get_test_n2(int); void ui_states_list_selected_state_del_test_p(int); void ui_states_list_selected_state_del_test_n1(int); -void ui_states_list_selected_state_del_test_n2(int); void ui_states_list_data_unset_test_p1(int); void ui_states_list_data_unset_test_p2(int); -void ui_states_list_data_unset_test_n(int); diff --git a/tests/test_ui_states_list/ui_states_list_add.c b/tests/test_ui_states_list/ui_states_list_add.c index 517c8de..68eff1c 100644 --- a/tests/test_ui_states_list/ui_states_list_add.c +++ b/tests/test_ui_states_list/ui_states_list_add.c @@ -67,36 +67,6 @@ END_TEST /** * @addtogroup ui_states_list_add * @{ - * <tr> - * <td>ui_states_list_add</td> - * <td>ui_states_list_add_test_n</td> - * <td> - * @precondition - * @step 1 initialize elementary library - * - * @procedure - * @step 1 call ui_states_list_add - * @step 2 check returned pointer - * </td> - * <td>NULL</td> - * <td>Returned pointer is NULL</td> - * </tr> - * @} - */ -EFLETE_TEST(ui_states_list_add_test_n) -{ - elm_init(0,0); - - ck_assert_msg(ui_states_list_add(NULL) == NULL, - "States List created with parent NULL."); - - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup ui_states_list_add - * @{ * </TABLE> * @} * @} diff --git a/tests/test_ui_states_list/ui_states_list_data_set.c b/tests/test_ui_states_list/ui_states_list_data_set.c index e676614..57d0e75 100644 --- a/tests/test_ui_states_list/ui_states_list_data_set.c +++ b/tests/test_ui_states_list/ui_states_list_data_set.c @@ -88,248 +88,6 @@ END_TEST /** * @addtogroup ui_states_list_data_set * @{ - * <tr> - * <td>ui_states_list_data_set</td> - * <td>ui_states_list_data_set_test_n1</td> - * <td> - * @precondition - * @step 1 initialized elm. - * @step 2 add theme extension "eflete theme". - * @step 3 created Window. - * @step 4 Mmap edj file. - * @step 5 Style filled with data. - * @step 6 created States List - * - * @procedure - * @step 1 Call function ui_states_list_data_set(gl_states, style, NULL). - * @step 2 Check returned value. - * </td> - * <td>(Evas_Object *) gl_states, (Style *) style, NULL</td> - * <td>EINA_FALSE</td> - * </tr> - * @} - */ -EFLETE_TEST(ui_states_list_data_set_test_n1) -{ - Evas_Object *window, *gl_states; - Evas *e; - Style *style; - const char *edj = "./edj_build/ui_states_list_data_set.edj"; - const char *style_name = "def"; - const char *full_style_name = "elm/radio/base/def"; - Eina_File *mmap_file = NULL; - - elm_init(0,0); - elm_theme_extension_add(NULL, EFLETE_THEME); - window = elm_win_add(NULL, "test", ELM_WIN_BASIC); - mmap_file = eina_file_open(edj, EINA_FALSE); - e = evas_object_evas_get(window); - style = wm_style_add(style_name, full_style_name, STYLE, NULL); - wm_style_data_load(style, e, mmap_file); - gl_states = ui_states_list_add(window); - - ck_assert_msg(ui_states_list_data_set(gl_states, style, NULL) == EINA_FALSE, - "Data was set to the State List"); - - elm_theme_extension_del(NULL, EFLETE_THEME); - - eina_file_close(mmap_file); - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup ui_states_list_data_set - * @{ - * <tr> - * <td>ui_states_list_data_set</td> - * <td>ui_states_list_data_set_test_n2</td> - * <td> - * @precondition - * @step 1 initialized elm. - * @step 2 add theme extension "eflete theme". - * @step 3 created Window. - * @step 4 Mmap edj file. - * @step 5 Style filled with data. - * @step 6 created States List - * @step 7 Part which states will be shown and set. - * - * @procedure - * @step 1 Call function ui_states_list_data_set(gl_states, NULL, part). - * @step 2 Check returned value. - * </td> - * <td>(Evas_Object *) gl_states, NULL, (Part *) part</td> - * <td>EINA_FALSE</td> - * </tr> - * @} - */ -EFLETE_TEST(ui_states_list_data_set_test_n2) -{ - Evas_Object *window, *gl_states; - Evas *e; - Style *style; - Part *part; - const char *edj = "./edj_build/ui_states_list_data_set.edj"; - const char *style_name = "def"; - const char *full_style_name = "elm/radio/base/def"; - Eina_File *mmap_file = NULL; - - elm_init(0,0); - elm_theme_extension_add(NULL, EFLETE_THEME); - window = elm_win_add(NULL, "test", ELM_WIN_BASIC); - mmap_file = eina_file_open(edj, EINA_FALSE); - e = evas_object_evas_get(window); - style = wm_style_add(style_name, full_style_name, STYLE, NULL); - wm_style_data_load(style, e, mmap_file); - gl_states = ui_states_list_add(window); - part = EINA_INLIST_CONTAINER_GET(style->parts, Part); - - ck_assert_msg(ui_states_list_data_set(gl_states, NULL, part) == EINA_FALSE, - "Data was set to the State List"); - - elm_theme_extension_del(NULL, EFLETE_THEME); - - eina_file_close(mmap_file); - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup ui_states_list_data_set - * @{ - * <tr> - * <td>ui_states_list_data_set</td> - * <td>ui_states_list_data_set_test_n3</td> - * <td> - * @precondition - * @step 1 initialized elm. - * @step 2 add theme extension "eflete theme". - * @step 3 created Window. - * @step 4 Mmap edj file. - * @step 5 Style filled with data. - * @step 6 Part which states will be shown and set. - * - * @procedure - * @step 1 Call function ui_states_list_data_set(NULL, style, part). - * @step 2 Check returned value. - * </td> - * <td>NULL, (Style *) style, (Part *) part</td> - * <td>EINA_FALSE</td> - * </tr> - * @} - */ -EFLETE_TEST(ui_states_list_data_set_test_n3) -{ - Evas_Object *window; - Evas *e; - Style *style; - Part *part; - const char *edj = "./edj_build/ui_states_list_data_set.edj"; - const char *style_name = "def"; - const char *full_style_name = "elm/radio/base/def"; - Eina_File *mmap_file = NULL; - - elm_init(0,0); - elm_theme_extension_add(NULL, EFLETE_THEME); - window = elm_win_add(NULL, "test", ELM_WIN_BASIC); - mmap_file = eina_file_open(edj, EINA_FALSE); - e = evas_object_evas_get(window); - style = wm_style_add(style_name, full_style_name, STYLE, NULL); - wm_style_data_load(style, e, mmap_file); - part = EINA_INLIST_CONTAINER_GET(style->parts, Part); - - ck_assert_msg(ui_states_list_data_set(NULL, style, part) == EINA_FALSE, - "Data was set to the State List"); - - elm_theme_extension_del(NULL, EFLETE_THEME); - - eina_file_close(mmap_file); - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup ui_states_list_data_set - * @{ - * <tr> - * <td>ui_states_list_data_set</td> - * <td>ui_states_list_data_set_test_n4</td> - * <td> - * @precondition - * @step 1 initialized elm. - * - * @procedure - * @step 1 Call function ui_states_list_data_set(gl_states, style, part). - * @step 2 Check returned value. - * </td> - * <td>NULL, NULL, NULL</td> - * <td>EINA_FALSE</td> - * </tr> - * @} - */ -EFLETE_TEST(ui_states_list_data_set_test_n4) -{ - elm_init(0,0); - - ck_assert_msg(ui_states_list_data_set(NULL, NULL, NULL) == EINA_FALSE, - "Data was set to the State List"); - - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup ui_states_list_data_set - * @{ - * <tr> - * <td>ui_states_list_data_set</td> - * <td>ui_states_list_data_set_test_n5</td> - * <td> - * @precondition - * @step 1 initialized elm. - * @step 2 add theme extension "eflete theme". - * @step 3 created Window. - * @step 4 Empty Style. - * @step 5 created States List - * @step 6 Part which states will be shown and set. - * - * @procedure - * @step 1 Call function ui_states_list_data_set(gl_states, style, part). - * @step 2 Check returned value. - * </td> - * <td>(Evas_Object *) gl_states, (Style *) style, (Part *) part</td> - * <td>EINA_TRUE</td> - * </tr> - * @} - */ -EFLETE_TEST(ui_states_list_data_set_test_n5) -{ - Evas_Object *window, *gl_states; - Style *style; - Part *part; - const char *style_name = "def"; - const char *full_style_name = "elm/radio/base/def"; - - elm_init(0,0); - elm_theme_extension_add(NULL, EFLETE_THEME); - window = elm_win_add(NULL, "test", ELM_WIN_BASIC); - style = wm_style_add(style_name, full_style_name, STYLE, NULL); - gl_states = ui_states_list_add(window); - part = EINA_INLIST_CONTAINER_GET(style->parts, Part); - - ck_assert_msg(ui_states_list_data_set(gl_states, style, part) == EINA_FALSE, - "Data was setted to the State List with empty Style"); - - elm_theme_extension_del(NULL, EFLETE_THEME); - - elm_shutdown(); -} -END_TEST - - -/** - * @addtogroup ui_states_list_data_set - * @{ * </TABLE> * @} * @} diff --git a/tests/test_ui_states_list/ui_states_list_data_unset.c b/tests/test_ui_states_list/ui_states_list_data_unset.c index 493f9cd..e696f62 100644 --- a/tests/test_ui_states_list/ui_states_list_data_unset.c +++ b/tests/test_ui_states_list/ui_states_list_data_unset.c @@ -74,7 +74,7 @@ EFLETE_TEST(ui_states_list_data_unset_test_p1) style = wm_style_add(style_name, full_style_name, STYLE, NULL); wm_style_data_load(style, e, mmap_file); gl_states = ui_states_list_add(window); - part = EINA_INLIST_CONTAINER_GET(style->parts, Part); + part = EINA_INLIST_CONTAINER_GET(style->parts->next->next, Part); ui_states_list_data_set(gl_states, style, part); ck_assert_msg(ui_states_list_data_unset(gl_states) == EINA_TRUE, @@ -129,36 +129,6 @@ END_TEST /** * @addtogroup ui_states_list_data_unset * @{ - * <tr> - * <td>ui_states_list_data_unset</td> - * <td>ui_states_list_data_unset_test_n</td> - * <td> - * @precondition - * @step 1 initialized elm. - * - * @procedure - * @step 1 Call function ui_states_list_data_unset(NULL). - * @step 2 Check returned value. - * </td> - * <td>NULL</td> - * <td>EINA_FALSE</td> - * </tr> - * @} - */ -EFLETE_TEST(ui_states_list_data_unset_test_n) -{ - elm_init(0,0); - - ck_assert_msg(ui_states_list_data_unset(NULL) == EINA_FALSE, - "Data was unset from NULL"); - - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup ui_states_list_data_unset - * @{ * </TABLE> * @} * @} diff --git a/tests/test_ui_states_list/ui_states_list_part_get.c b/tests/test_ui_states_list/ui_states_list_part_get.c index 0c1078e..725bb07 100644 --- a/tests/test_ui_states_list/ui_states_list_part_get.c +++ b/tests/test_ui_states_list/ui_states_list_part_get.c @@ -176,40 +176,6 @@ END_TEST /** * @addtogroup ui_states_list_part_get * @{ - * <tr> - * <td>ui_states_list_part_get</td> - * <td>ui_states_list_part_get_test_n2</td> - * <td> - * @precondition - * @step 1 initialized elm. - * - * @procedure - * @step 1 Call function ui_states_list_part_get(NULL). - * @step 2 Check returned value. - * </td> - * <td>(Evas_Object *) window</td> - * <td>NULL</td> - * </tr> - * @} - */ -EFLETE_TEST(ui_states_list_part_get_test_n2) -{ - Part *states_list_part; - - elm_init(0,0); - - states_list_part = ui_states_list_part_get(NULL); - ck_assert_msg(states_list_part == NULL, - "Wrong object contain part."); - - elm_shutdown(); -} -END_TEST - - -/** - * @addtogroup ui_states_list_part_get - * @{ * </TABLE> * @} * @} diff --git a/tests/test_ui_states_list/ui_states_list_selected_state_del.c b/tests/test_ui_states_list/ui_states_list_selected_state_del.c index ec12915..31e8f2e 100644 --- a/tests/test_ui_states_list/ui_states_list_selected_state_del.c +++ b/tests/test_ui_states_list/ui_states_list_selected_state_del.c @@ -132,37 +132,6 @@ END_TEST /** * @addtogroup ui_states_list_selected_state_del * @{ - * <tr> - * <td>ui_states_list_selected_state_del</td> - * <td>ui_states_list_selected_state_del_test_n2</td> - * <td> - * @precondition - * @step 1 initialized elm. - * - * @procedure - * @step 1 Call function ui_states_list_selected_state_del(window). - * @step 2 Check returned value. - * @step 3 Check new number of states. - * </td> - * <td>(Evas_Object *) gl_states</td> - * <td>All checks passed</td> - * </tr> - * @} - */ -EFLETE_TEST(ui_states_list_selected_state_del_test_n2) -{ - elm_init(0,0); - - ck_assert_msg(ui_states_list_selected_state_del(NULL) == EINA_FALSE, - "Deleting state from not state list was successfull."); - - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup ui_states_list_selected_state_del - * @{ * </TABLE> * @} * @} diff --git a/tests/test_ui_states_list/ui_states_list_selected_state_get.c b/tests/test_ui_states_list/ui_states_list_selected_state_get.c index 685ceb5..e40c39c 100644 --- a/tests/test_ui_states_list/ui_states_list_selected_state_get.c +++ b/tests/test_ui_states_list/ui_states_list_selected_state_get.c @@ -186,36 +186,6 @@ END_TEST /** * @addtogroup ui_states_list_selected_state_get * @{ - * <tr> - * <td>ui_states_list_selected_state_get</td> - * <td>ui_states_list_selected_state_get_test_n2</td> - * <td> - * @precondition - * @step 1 initialized elm. - * - * @procedure - * @step 1 Call function ui_states_list_selected_state_get(NULL). - * @step 2 Check returned value. - * </td> - * <td>NULL</td> - * <td>NULL</td> - * </tr> - * @} - */ -EFLETE_TEST(ui_states_list_selected_state_get_test_n2) -{ - elm_init(0,0); - - ck_assert_msg(ui_states_list_selected_state_get(NULL) == NULL, - "Got selected state from Nothing!"); - - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup ui_states_list_selected_state_get - * @{ * </TABLE> * @} * @} diff --git a/tests/test_ui_states_list/ui_states_list_state_add.c b/tests/test_ui_states_list/ui_states_list_state_add.c index ed1f934..2724e32 100644 --- a/tests/test_ui_states_list/ui_states_list_state_add.c +++ b/tests/test_ui_states_list/ui_states_list_state_add.c @@ -71,7 +71,7 @@ EFLETE_TEST(ui_states_list_state_add_test_p) elm_init(0,0); elm_theme_extension_add(NULL, EFLETE_THEME); window = elm_win_add(NULL, "test", ELM_WIN_BASIC); - mmap_file = eina_file_open(edj, true); + mmap_file = eina_file_open(edj, false); e = evas_object_evas_get(window); style = wm_style_add(style_name, full_style_name, STYLE, NULL); wm_style_data_load(style, e, mmap_file); @@ -138,103 +138,6 @@ END_TEST /** * @addtogroup ui_states_list_state_add * @{ - * <tr> - * <td>ui_states_list_state_add</td> - * <td>ui_states_list_state_add_test_n2</td> - * <td> - * @precondition - * @step 1 initialized elm. - * - * @procedure - * @step 1 Call function ui_states_list_state_add(gl_states, "new_state"). - * @step 2 Check returned value. - * </td> - * <td>NULL, (const char *) state = "new_state"</td> - * <td>EINA_TRUE returned</td> - * </tr> - * @} - */ -EFLETE_TEST(ui_states_list_state_add_test_n2) -{ - const char *state = "new_state"; - - elm_init(0,0); - - ck_assert_msg(ui_states_list_state_add(NULL, state) == EINA_FALSE, - "New state added successfully."); - - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup ui_states_list_state_add - * @{ - * <tr> - * <td>ui_states_list_state_add</td> - * <td>ui_states_list_state_add_test_n3</td> - * <td> - * @precondition - * @step 1 initialized elm. - * @step 2 add theme extension "eflete theme". - * @step 3 created Window. - * @step 4 Mmap edj file. - * @step 5 Style filled with data. - * @step 6 created States List - * @step 7 Part which states will be shown and set. - * @step 8 Part was set into states list. - * - * @procedure - * @step 1 Get number of states in states list. - * @step 2 Call function ui_states_list_state_add(gl_states, NULL). - * @step 3 Check that number of states wasn't changed. - * </td> - * <td>(Evas_Object *) gl_states, NULL</td> - * <td>All checks passed</td> - * </tr> - * @} - */ -EFLETE_TEST(ui_states_list_state_add_test_n3) -{ - Evas_Object *window, *gl_states; - Evas *e; - Style *style; - Part *part; - const char *edj = "./edj_build/ui_states_list_state_add.edj"; - const char *style_name = "def"; - const char *full_style_name = "elm/radio/base/def"; - int count_before, count_after; - Eina_File *mmap_file = NULL; - - elm_init(0,0); - elm_theme_extension_add(NULL, EFLETE_THEME); - window = elm_win_add(NULL, "test", ELM_WIN_BASIC); - mmap_file = eina_file_open(edj, true); - e = evas_object_evas_get(window); - style = wm_style_add(style_name, full_style_name, STYLE, NULL); - wm_style_data_load(style, e, mmap_file); - gl_states = ui_states_list_add(window); - part = EINA_INLIST_CONTAINER_GET(style->parts, Part); - ui_states_list_data_set(gl_states, style, part); - - count_before = elm_genlist_items_count(gl_states); - ck_assert_msg(ui_states_list_state_add(gl_states, NULL) == EINA_FALSE, - "New state added successfully."); - count_after = elm_genlist_items_count(gl_states); - ck_assert_msg(count_before == count_after, - "New state was added."); - - elm_theme_extension_del(NULL, EFLETE_THEME); - - eina_file_close(mmap_file); - elm_shutdown(); -} -END_TEST - - -/** - * @addtogroup ui_states_list_state_add - * @{ * </TABLE> * @} * @} --