rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=d5377143ccd5a3eea227ca3c26d0714244449a74
commit d5377143ccd5a3eea227ca3c26d0714244449a74
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date: Thu Jul 23 11:47:58 2015 +0300
UTC: fix ui_block tests
---
tests/test_ui_block/test_ui_block.c | 23 ++--------
tests/test_ui_block/test_ui_block.h | 24 ++--------
tests/test_ui_block/test_ui_block_macro.h | 61 ++++----------------------
tests/test_ui_block/ui_block_add.c | 26 -----------
tests/test_ui_block/ui_block_content_visible.c | 28 ------------
tests/test_ui_block/ui_block_title_visible.c | 28 ------------
6 files changed, 16 insertions(+), 174 deletions(-)
diff --git a/tests/test_ui_block/test_ui_block.c
b/tests/test_ui_block/test_ui_block.c
index aafa2d0..0e3ea98 100644
--- a/tests/test_ui_block/test_ui_block.c
+++ b/tests/test_ui_block/test_ui_block.c
@@ -23,29 +23,14 @@ Suite* test_suite (void) {
Suite *suite = suite_create("ui_block_test");
TCase *tcase = tcase_create("TCase");
tcase_add_test(tcase, ui_block_add_test_p);
- tcase_add_test(tcase, ui_block_add_test_n);
- tcase_add_test(tcase, ui_block_title_visible_p);
- tcase_add_test(tcase, ui_block_title_visible_n);
tcase_add_test(tcase, ui_block_content_visible_p);
- tcase_add_test(tcase, ui_block_content_visible_n);
- tcase_add_test(tcase, ui_block_widget_list_test_p);
- tcase_add_test(tcase, ui_block_widget_list_test_n1);
- tcase_add_test(tcase, ui_block_widget_list_test_n2);
- tcase_add_test(tcase, ui_block_signal_list_test_p);
- tcase_add_test(tcase, ui_block_signal_list_test_n1);
- tcase_add_test(tcase, ui_block_signal_list_test_n2);
- tcase_add_test(tcase, ui_block_property_test_p);
- tcase_add_test(tcase, ui_block_property_test_n1);
- tcase_add_test(tcase, ui_block_property_test_n2);
tcase_add_test(tcase, ui_block_history_test_p);
- tcase_add_test(tcase, ui_block_history_test_n1);
- tcase_add_test(tcase, ui_block_history_test_n2);
tcase_add_test(tcase, ui_block_live_view_test_p);
- tcase_add_test(tcase, ui_block_live_view_test_n1);
- tcase_add_test(tcase, ui_block_live_view_test_n2);
+ tcase_add_test(tcase, ui_block_property_test_p);
+ tcase_add_test(tcase, ui_block_signal_list_test_p);
+ tcase_add_test(tcase, ui_block_title_visible_p);
+ tcase_add_test(tcase, ui_block_widget_list_test_p);
tcase_add_test(tcase, ui_block_ws_test_p);
- tcase_add_test(tcase, ui_block_ws_test_n1);
- tcase_add_test(tcase, ui_block_ws_test_n2);
suite_add_tcase(suite, tcase);
return suite;
}
diff --git a/tests/test_ui_block/test_ui_block.h
b/tests/test_ui_block/test_ui_block.h
index 52f03b5..427b735 100644
--- a/tests/test_ui_block/test_ui_block.h
+++ b/tests/test_ui_block/test_ui_block.h
@@ -26,27 +26,11 @@
*/
void ui_block_add_test_p(int);
-void ui_block_add_test_n(int);
-void ui_block_title_visible_p(int);
-void ui_block_title_visible_n(int);
void ui_block_content_visible_p(int);
-void ui_block_content_visible_n(int);
-void ui_block_widget_list_test_p(int);
-void ui_block_widget_list_test_n1(int);
-void ui_block_widget_list_test_n2(int);
-void ui_block_signal_list_test_p(int);
-void ui_block_signal_list_test_n1(int);
-void ui_block_signal_list_test_n2(int);
-void ui_block_property_test_p(int);
-void ui_block_property_test_n1(int);
-void ui_block_property_test_n2(int);
void ui_block_history_test_p(int);
-void ui_block_history_test_n1(int);
-void ui_block_history_test_n2(int);
void ui_block_live_view_test_p(int);
-void ui_block_live_view_test_n1(int);
-void ui_block_live_view_test_n2(int);
+void ui_block_property_test_p(int);
+void ui_block_signal_list_test_p(int);
+void ui_block_title_visible_p(int);
+void ui_block_widget_list_test_p(int);
void ui_block_ws_test_p(int);
-void ui_block_ws_test_n1(int);
-void ui_block_ws_test_n2(int);
-
diff --git a/tests/test_ui_block/test_ui_block_macro.h
b/tests/test_ui_block/test_ui_block_macro.h
index ec93ef9..daa6e7e 100644
--- a/tests/test_ui_block/test_ui_block_macro.h
+++ b/tests/test_ui_block/test_ui_block_macro.h
@@ -17,8 +17,8 @@
* along with this program; If not, see www.gnu.org/licenses/lgpl.html.
*/
-#define
TEST_UI_BLOCK_CONTENT_TC(_func_,tst,bl,block_obj,cont,result,pass_cond) \
-EFLETE_TEST (_func_##_test_##tst) \
+#define TEST_UI_BLOCK_CONTENT_TC(_func_,bl) \
+EFLETE_TEST (_func_##_test_p) \
{ \
elm_init(0, 0); \
Evas_Object *parent, *content; \
@@ -27,15 +27,15 @@ EFLETE_TEST (_func_##_test_##tst) \
apd = app_data_get(); \
parent = elm_win_add(NULL, "test", ELM_WIN_BASIC); \
elm_object_theme_set(parent, apd->theme); \
- content = cont; \
- apd->block.bl = block_obj; \
- ck_assert_msg(_func_##_set(apd, content) == pass_cond, "Function is not
working right"); \
- ck_assert_msg(_func_##_get(apd) == result,"Content isn't set or returned
properly"); \
+ content = ui_block_add(parent); \
+ apd->block.bl = ui_block_add(parent); \
+ ck_assert_msg(_func_##_set(apd, content) == EINA_TRUE, "Function is not
working right"); \
+ ck_assert_msg(_func_##_get(apd) == content,"Content isn't set or returned
properly"); \
elm_shutdown(); \
} \
END_TEST
-#define TEST_UI_BLOCK_CONTENT(_func_,_block_) \
+#define TEST_UI_BLOCK_CONTENT(_func_, _block_) \
/** \
* @addtogroup _func_\
* @{ \
@@ -58,49 +58,4 @@ END_TEST
* </tr> \
* @} \
*/ \
-TEST_UI_BLOCK_CONTENT_TC(_func_,p,_block_,ui_block_add(parent),ui_block_add(parent),content,EINA_TRUE)
\
-/** \
- * @addtogroup _func_\
- * @{ \
- * <tr> \
- * <td> ## _func_## </td> \
- * <td> ## _func_##_test_n1</td> \
- * <td> \
- * @precondition \
- * @step 1 initialized elm \
- * @step 2 Created window. \
- * @step 3 Block object is not created. \
- * \
- * @procedure \
- * @step 1 Create content to set. \
- * @step 2 Call _func_##_set(app_data, content) \
- * @step 3 Call _func_##_get(app_data) \
- * </td> \
- * <td>App_Data *app_data, Evas_Object *content</td> \
- * <td>all checks passed</td> \
- * </tr> \
- * @} \
- */ \
-TEST_UI_BLOCK_CONTENT_TC(_func_,n1,_block_,NULL,ui_block_add(parent),NULL,EINA_FALSE)
\
-/** \
- * @addtogroup _func_\
- * @{ \
- * <tr> \
- * <td> ##_func_## </td> \
- * <td> ##_func_##_test_n2</td> \
- * <td> \
- * @precondition \
- * @step 1 initialized elm \
- * @step 2 Created window. \
- * @step 3 Created block object. \
- * \
- * @procedure \
- * @step 1 Call _func_##_set(app_data, NULL) \
- * @step 2 Call _func_##_get(app_data) \
- * </td> \
- * <td>App_Data *app_data, NULL</td> \
- * <td>all checks passed</td> \
- * </tr> \
- * @} \
- */ \
-TEST_UI_BLOCK_CONTENT_TC(_func_,n2,_block_,ui_block_add(parent),NULL,NULL,EINA_FALSE)
+TEST_UI_BLOCK_CONTENT_TC(_func_,_block_)
diff --git a/tests/test_ui_block/ui_block_add.c
b/tests/test_ui_block/ui_block_add.c
index bc9b921..d7b2f94 100644
--- a/tests/test_ui_block/ui_block_add.c
+++ b/tests/test_ui_block/ui_block_add.c
@@ -62,32 +62,6 @@ END_TEST
/**
* @addtogroup ui_block_add
* @{
- * <tr>
- * <td>ui_block_add</td>
- * <td>ui_block_add_test_n</td>
- * <td>
- * @precondition
- * @step 1 initialized elm
- *
- * @procedure
- * @step 1 Call ui_block_add(NULL)
- * </td>
- * <td>NULL</td>
- * <td>NULL returned value</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (ui_block_add_test_n)
-{
- elm_init(0, 0);
- ck_assert_msg(!ui_block_add(NULL), "Not NULL returned\n");
- elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup ui_block_add
- * @{
* </TABLE>
* @}
* @}
diff --git a/tests/test_ui_block/ui_block_content_visible.c
b/tests/test_ui_block/ui_block_content_visible.c
index cd0024e..92849a1 100644
--- a/tests/test_ui_block/ui_block_content_visible.c
+++ b/tests/test_ui_block/ui_block_content_visible.c
@@ -67,34 +67,6 @@ END_TEST
/**
* @addtogroup ui_block_content_visible
* @{
- * <tr>
- * <td>ui_block_content_visible</td>
- * <td>ui_block_content_visible_n</td>
- * <td>
- * @precondition
- * @step 1 initialized elm
- *
- * @procedure
- * @step 1 Call ui_block_content_visible(NULL, EINA_FALSE)
- * @step 2 Call ui_block_content_visible(NULL, EINA_TRUE)
- * </td>
- * <td>NULL, EINA_TRUE</td>
- * <td>all checks passed</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (ui_block_content_visible_n)
-{
- elm_init(0, 0);
- ck_assert_msg(!ui_block_content_visible(NULL, EINA_TRUE), "Set visible to
not existing object\n");
- ck_assert_msg(!ui_block_content_visible(NULL, EINA_FALSE), "Set visible to
not existing object\n");
- elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup ui_block_content_visible
- * @{
* </TABLE>
* @}
* @}
diff --git a/tests/test_ui_block/ui_block_title_visible.c
b/tests/test_ui_block/ui_block_title_visible.c
index 10979d3..ab0c877 100644
--- a/tests/test_ui_block/ui_block_title_visible.c
+++ b/tests/test_ui_block/ui_block_title_visible.c
@@ -67,34 +67,6 @@ END_TEST
/**
* @addtogroup ui_block_title_visible
* @{
- * <tr>
- * <td>ui_block_title_visible</td>
- * <td>ui_block_title_visible_n</td>
- * <td>
- * @precondition
- * @step 1 initialized elm
- *
- * @procedure
- * @step 1 Call ui_block_title_visible(NULL, EINA_FALSE)
- * @step 2 Call ui_block_title_visible(NULL, EINA_TRUE)
- * </td>
- * <td>NULL, EINA_TRUE</td>
- * <td>all checks passed</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (ui_block_title_visible_n)
-{
- elm_init(0, 0);
- ck_assert_msg(!ui_block_title_visible(NULL, EINA_TRUE), "Set visible to not
existing object\n");
- ck_assert_msg(!ui_block_title_visible(NULL, EINA_FALSE), "Set visible to
not existing object\n");
- elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup ui_block_title_visible
- * @{
* </TABLE>
* @}
* @}
--
