rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=2b666433c87df7d1ec8bc2f491cb2274fea47fd4
commit 2b666433c87df7d1ec8bc2f491cb2274fea47fd4 Author: Andrii Kroitor <an.kroi...@samsung.com> Date: Mon Jul 27 10:56:22 2015 +0300 UTC: fix project_manager chain-failing tests --- tests/test_project_manager/pm_project_close.c | 2 ++ tests/test_project_manager/pm_project_import_edc.c | 6 ++++++ tests/test_project_manager/pm_project_import_edj.c | 6 ++++++ tests/test_project_manager/pm_project_meta_data_get.c | 2 ++ tests/test_project_manager/pm_project_meta_data_set.c | 2 ++ tests/test_project_manager/pm_project_open.c | 2 ++ tests/test_project_manager/pm_project_save.c | 2 ++ tests/test_project_manager/pm_project_thread_cancel.c | 2 ++ tests/test_project_manager/pm_project_thread_free.c | 4 ++++ tests/test_project_manager/pm_style_resource_export.c | 2 ++ 10 files changed, 30 insertions(+) diff --git a/tests/test_project_manager/pm_project_close.c b/tests/test_project_manager/pm_project_close.c index a23b315..5f8146d 100644 --- a/tests/test_project_manager/pm_project_close.c +++ b/tests/test_project_manager/pm_project_close.c @@ -67,6 +67,7 @@ EFLETE_TEST (pm_project_close_test_p) elm_init(0,0); app_init(); + ecore_file_recursive_rm("./UTC"); thread = pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager.edj", NULL, _test_end_cb, NULL); @@ -80,6 +81,7 @@ EFLETE_TEST (pm_project_close_test_p) res = pm_project_close(pro); ck_assert_msg(res, "Project is not closed!"); + ecore_file_recursive_rm("./UTC"); app_shutdown(); elm_shutdown(); diff --git a/tests/test_project_manager/pm_project_import_edc.c b/tests/test_project_manager/pm_project_import_edc.c index 9447fc0..d203aa3 100644 --- a/tests/test_project_manager/pm_project_import_edc.c +++ b/tests/test_project_manager/pm_project_import_edc.c @@ -68,6 +68,7 @@ EFLETE_TEST (pm_project_import_edc_test_p1) elm_init(0,0); app_init(); + ecore_file_recursive_rm("./UTC"); thread = pm_project_import_edc("UTC", ".", "./edj_build/radio.edc", "-id ./edj_build -fd ./edj_build -sd ./edj_build", @@ -78,6 +79,7 @@ EFLETE_TEST (pm_project_import_edc_test_p1) pro = pm_project_thread_project_get(thread); pm_project_close(pro); + ecore_file_recursive_rm("./UTC"); app_shutdown(); elm_shutdown(); @@ -123,6 +125,7 @@ EFLETE_TEST (pm_project_import_edc_test_p2) elm_init(0,0); app_init(); + ecore_file_recursive_rm("./UTC"); thread = pm_project_import_edc("UTC", ".", "./edj_build/radio.edc", "-id ./edj_build -fd ./edj_build -sd ./edj_build", @@ -143,6 +146,7 @@ EFLETE_TEST (pm_project_import_edc_test_p2) pro = pm_project_thread_project_get(thread); pm_project_close(pro); + ecore_file_recursive_rm("./UTC"); app_shutdown(); elm_shutdown(); @@ -188,6 +192,7 @@ EFLETE_TEST (pm_project_import_edc_test_p3) elm_init(0,0); app_init(); + ecore_file_recursive_rm("./UTC"); res = EINA_FALSE; thread = pm_project_import_edc("UTC", ".", "./edj_build/radio.edc", @@ -201,6 +206,7 @@ EFLETE_TEST (pm_project_import_edc_test_p3) pro = pm_project_thread_project_get(thread); pm_project_close(pro); + ecore_file_recursive_rm("./UTC"); app_shutdown(); elm_shutdown(); diff --git a/tests/test_project_manager/pm_project_import_edj.c b/tests/test_project_manager/pm_project_import_edj.c index fc99dbd..053cb05 100644 --- a/tests/test_project_manager/pm_project_import_edj.c +++ b/tests/test_project_manager/pm_project_import_edj.c @@ -68,6 +68,7 @@ EFLETE_TEST (pm_project_import_edj_test_p) elm_init(0,0); app_init(); + ecore_file_recursive_rm("./UTC"); thread = pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager.edj", NULL, _end_cb, NULL); @@ -76,6 +77,7 @@ EFLETE_TEST (pm_project_import_edj_test_p) pro = pm_project_thread_project_get(thread); pm_project_close(pro); + ecore_file_recursive_rm("./UTC"); app_shutdown(); elm_shutdown(); @@ -120,6 +122,7 @@ EFLETE_TEST (pm_project_import_edj_test_p1) elm_init(0,0); app_init(); + ecore_file_recursive_rm("./UTC"); res = EINA_FALSE; thread = pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager.edj", @@ -131,6 +134,7 @@ EFLETE_TEST (pm_project_import_edj_test_p1) pro = pm_project_thread_project_get(thread); pm_project_close(pro); + ecore_file_recursive_rm("./UTC"); app_shutdown(); elm_shutdown(); @@ -176,6 +180,7 @@ EFLETE_TEST (pm_project_import_edj_test_p2) elm_init(0,0); app_init(); + ecore_file_recursive_rm("./UTC"); res = EINA_FALSE; thread = pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager.edj", @@ -187,6 +192,7 @@ EFLETE_TEST (pm_project_import_edj_test_p2) pro = pm_project_thread_project_get(thread); pm_project_close(pro); + ecore_file_recursive_rm("./UTC"); app_shutdown(); elm_shutdown(); diff --git a/tests/test_project_manager/pm_project_meta_data_get.c b/tests/test_project_manager/pm_project_meta_data_get.c index b6ffbe8..8a41307 100644 --- a/tests/test_project_manager/pm_project_meta_data_get.c +++ b/tests/test_project_manager/pm_project_meta_data_get.c @@ -66,6 +66,7 @@ EFLETE_TEST (pm_project_meta_data_get_test_p) elm_init(0,0); app_init(); + ecore_file_recursive_rm("./UTC"); thread = pm_project_import_edj("UTC", ".", "./edj_build/radio.edj", NULL, _test_end_cb, NULL); @@ -81,6 +82,7 @@ EFLETE_TEST (pm_project_meta_data_get_test_p) ck_assert_msg(license != NULL, "Meta data is missing in the project."); pm_project_close(pro); + ecore_file_recursive_rm("./UTC"); app_shutdown(); elm_shutdown(); } diff --git a/tests/test_project_manager/pm_project_meta_data_set.c b/tests/test_project_manager/pm_project_meta_data_set.c index ebc2cfa..8626c9f 100644 --- a/tests/test_project_manager/pm_project_meta_data_set.c +++ b/tests/test_project_manager/pm_project_meta_data_set.c @@ -67,6 +67,7 @@ EFLETE_TEST (pm_project_meta_data_set_test_p) elm_init(0,0); app_init(); + ecore_file_recursive_rm("./UTC"); thread = pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager.edj", NULL, _test_end_cb, NULL); @@ -82,6 +83,7 @@ EFLETE_TEST (pm_project_meta_data_set_test_p) ck_assert_msg(ret, "Meta data not setted to project."); pm_project_close(pro); + ecore_file_recursive_rm("./UTC"); app_shutdown(); elm_shutdown(); } diff --git a/tests/test_project_manager/pm_project_open.c b/tests/test_project_manager/pm_project_open.c index 13e32f9..141c082 100644 --- a/tests/test_project_manager/pm_project_open.c +++ b/tests/test_project_manager/pm_project_open.c @@ -65,6 +65,7 @@ EFLETE_TEST (pm_project_open_test_p) elm_init(0,0); app_init(); + ecore_file_recursive_rm("./UTC"); thread = pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager.edj", NULL, _test_end_cb, NULL); @@ -79,6 +80,7 @@ EFLETE_TEST (pm_project_open_test_p) pro = pm_project_open("./UTC/UTC.pro"); ck_assert_msg(pro != NULL, "Project does't opened."); pm_project_close(pro); + ecore_file_recursive_rm("./UTC"); app_shutdown(); elm_shutdown(); diff --git a/tests/test_project_manager/pm_project_save.c b/tests/test_project_manager/pm_project_save.c index 4b1660e..4826da4 100644 --- a/tests/test_project_manager/pm_project_save.c +++ b/tests/test_project_manager/pm_project_save.c @@ -72,6 +72,7 @@ EFLETE_TEST (pm_project_save_test_p) elm_init(0,0); app_init(); + ecore_file_recursive_rm("./UTC"); thread = pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager.edj", NULL, _test_end_cb, NULL); @@ -104,6 +105,7 @@ EFLETE_TEST (pm_project_save_test_p) eet_close(ef); pm_project_close(pro); + ecore_file_recursive_rm("./UTC"); app_shutdown(); elm_shutdown(); diff --git a/tests/test_project_manager/pm_project_thread_cancel.c b/tests/test_project_manager/pm_project_thread_cancel.c index cc4b46a..d78166e 100644 --- a/tests/test_project_manager/pm_project_thread_cancel.c +++ b/tests/test_project_manager/pm_project_thread_cancel.c @@ -69,6 +69,7 @@ EFLETE_TEST (pm_project_thread_cancel_test_p) elm_init(0,0); app_init(); + ecore_file_recursive_rm("./UTC"); res = EINA_FALSE; thread = pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager_thread_cancel.edj", @@ -78,6 +79,7 @@ EFLETE_TEST (pm_project_thread_cancel_test_p) ck_assert_msg(res, "Project thread did't canceled!"); + ecore_file_recursive_rm("./UTC"); app_shutdown(); elm_shutdown(); } diff --git a/tests/test_project_manager/pm_project_thread_free.c b/tests/test_project_manager/pm_project_thread_free.c index cc143a2..361c189 100644 --- a/tests/test_project_manager/pm_project_thread_free.c +++ b/tests/test_project_manager/pm_project_thread_free.c @@ -66,6 +66,7 @@ EFLETE_TEST (pm_project_thread_free_test_p) elm_init(0,0); app_init(); + ecore_file_recursive_rm("./UTC"); worker = pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager.edj", NULL, _test_end_cb, NULL); @@ -76,6 +77,7 @@ EFLETE_TEST (pm_project_thread_free_test_p) ck_assert_msg(res, "Can't cancel project thread!"); pm_project_close(pro); + ecore_file_recursive_rm("./UTC"); app_shutdown(); elm_shutdown(); @@ -119,6 +121,7 @@ EFLETE_TEST (pm_project_thread_free_test_n) elm_init(0,0); app_init(); + ecore_file_recursive_rm("./UTC"); worker = pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager.edj", NULL, _test_end_n_cb, NULL); @@ -129,6 +132,7 @@ EFLETE_TEST (pm_project_thread_free_test_n) pro = pm_project_thread_project_get(worker); pm_project_close(pro); + ecore_file_recursive_rm("./UTC"); app_shutdown(); elm_shutdown(); diff --git a/tests/test_project_manager/pm_style_resource_export.c b/tests/test_project_manager/pm_style_resource_export.c index a6a6bff..a230ed2 100644 --- a/tests/test_project_manager/pm_style_resource_export.c +++ b/tests/test_project_manager/pm_style_resource_export.c @@ -72,6 +72,7 @@ EFLETE_TEST(pm_style_resource_export_test_p) elm_init(0,0); app_init(); + ecore_file_recursive_rm("./UTC"); setup("pm_style_resource_export_test_p"); path = eina_stringshare_add("./pm_style_resource_export_test_p/export"); check_resource = eina_stringshare_printf("%s/images/radio.png", path); @@ -101,6 +102,7 @@ EFLETE_TEST(pm_style_resource_export_test_p) ck_assert_msg(result, "Exported font does not exist"); pm_project_close(ap->project); + ecore_file_recursive_rm("./UTC"); ap->project = NULL; ui_main_window_del(ap); app_shutdown(); --