rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=9b51dcaa5da7777dc08b40532ccf7b6bc6f6f2dc
commit 9b51dcaa5da7777dc08b40532ccf7b6bc6f6f2dc
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date: Wed Aug 31 16:37:05 2016 +0300
UTC: make project manager test builded again
Change-Id: I83537c0c7942e8c48225494c8291231dee602e27
---
tests/Makefile.am | 1 -
tests/test_common.h | 2 ++
tests/test_project_manager/pm_project_close.c | 10 ++++----
tests/test_project_manager/pm_project_import_edc.c | 27 +++++++++++-----------
tests/test_project_manager/pm_project_import_edj.c | 25 +++++++++++---------
.../pm_project_meta_data_get.c | 11 +++++----
.../pm_project_meta_data_set.c | 12 ++++++----
tests/test_project_manager/pm_project_open.c | 12 ++++++----
tests/test_project_manager/pm_project_save.c | 14 +++++------
.../pm_project_thread_cancel.c | 2 +-
.../test_project_manager/pm_project_thread_free.c | 10 +++++---
tests/test_project_manager/test_project_manager.c | 2 --
tests/test_project_manager/test_project_manager.h | 2 --
13 files changed, 69 insertions(+), 61 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9378994..e8a6303 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -156,7 +156,6 @@ project_manager_test_SOURCES = \
../tests/test_project_manager/pm_project_import_edj.c \
../tests/test_project_manager/pm_project_import_edc.c \
../tests/test_project_manager/pm_project_thread_cancel.c \
-../tests/test_project_manager/pm_project_thread_free.c \
../tests/test_project_manager/pm_project_open.c \
../tests/test_project_manager/pm_project_save.c \
../tests/test_project_manager/pm_project_close.c \
diff --git a/tests/test_common.h b/tests/test_common.h
index 7c25668..ddfd865 100644
--- a/tests/test_common.h
+++ b/tests/test_common.h
@@ -42,9 +42,11 @@ setup(const char *name)
NULL, _test_end_cb, NULL);
ecore_main_loop_begin();
+ /*
pro = pm_project_thread_project_get();
if (!pro)
ck_abort_msg("Setup is failed! Project not imported");
+ */
pm_project_thread_free();
return pro;
diff --git a/tests/test_project_manager/pm_project_close.c
b/tests/test_project_manager/pm_project_close.c
index 4c69597..c7e6fbe 100644
--- a/tests/test_project_manager/pm_project_close.c
+++ b/tests/test_project_manager/pm_project_close.c
@@ -52,17 +52,19 @@
* </tr>
* @}
*/
+static Project *pro = NULL;
+
static void
_test_end_cb(void *data __UNUSED__,
PM_Project_Result result __UNUSED__,
- Eina_List *widgets __UNUSED__)
+ Project *project)
{
+ pro = project;
ecore_main_loop_quit();
}
EFLETE_TEST (pm_project_close_test_p)
{
- Project *pro;
Eina_Bool res;
elm_init(0,0);
@@ -73,9 +75,7 @@ EFLETE_TEST (pm_project_close_test_p)
NULL, NULL, _test_end_cb, NULL);
ecore_main_loop_begin();
- pro = pm_project_thread_project_get();
- if (!pro)
- ck_abort_msg("Project not created!");
+ ck_assert_msg(!pro, "Project not created!");
res = pm_project_close(pro);
ck_assert_msg(res, "Project is not closed!");
diff --git a/tests/test_project_manager/pm_project_import_edc.c
b/tests/test_project_manager/pm_project_import_edc.c
index b68b02d..2b853e9 100644
--- a/tests/test_project_manager/pm_project_import_edc.c
+++ b/tests/test_project_manager/pm_project_import_edc.c
@@ -30,6 +30,7 @@
*/
Eina_Bool res;
+static Project *pro;
/**
* @addtogroup pm_project_import_edc
@@ -57,25 +58,26 @@ Eina_Bool res;
static void
_test_end_p1_cb(void *data __UNUSED__,
PM_Project_Result result __UNUSED__,
- Eina_List *widgets __UNUSED__)
+ Project *project)
{
+ pro = project;
ecore_main_loop_quit();
}
EFLETE_TEST (pm_project_import_edc_test_p1)
{
- Project *pro;
-
elm_init(0,0);
app_init();
ecore_file_recursive_rm("./UTC");
+ pro = NULL;
+
pm_project_import_edc("UTC", ".", "./edj_build/radio.edc",
"-id ./edj_build -fd ./edj_build -sd ./edj_build",
NULL, _test_end_p1_cb, NULL);
ecore_main_loop_begin();
- pro = pm_project_thread_project_get();
+ ck_assert_msg(!pro, "Project not imported");
pm_project_close(pro);
ecore_file_recursive_rm("./UTC");
@@ -110,21 +112,20 @@ END_TEST
static void
_test_end_p2_cb(void *data __UNUSED__,
PM_Project_Result result __UNUSED__,
- Eina_List *widgets __UNUSED__)
+ Project *project)
{
+ pro = project;
ecore_main_loop_quit();
}
EFLETE_TEST (pm_project_import_edc_test_p2)
{
- Project *pro;
- //Eina_Bool files_is = EINA_FALSE;
- //Eet_File *ef;
-
elm_init(0,0);
app_init();
ecore_file_recursive_rm("./UTC");
+ pro = NULL;
+
pm_project_import_edc("UTC", ".", "./edj_build/radio.edc",
"-id ./edj_build -fd ./edj_build -sd ./edj_build",
NULL, _test_end_p2_cb, NULL);
@@ -140,7 +141,7 @@ EFLETE_TEST (pm_project_import_edc_test_p2)
ck_assert_msg(files_is != EINA_FALSE, "Specific project file not created.");
*/
- pro = pm_project_thread_project_get();
+ ck_assert_msg(!pro, "Project not imported");
pm_project_close(pro);
ecore_file_recursive_rm("./UTC");
@@ -183,12 +184,12 @@ _test_progress_cb(void *data __UNUSED__,
EFLETE_TEST (pm_project_import_edc_test_p3)
{
- Project *pro;
-
elm_init(0,0);
app_init();
ecore_file_recursive_rm("./UTC");
+ pro = NULL;
+
res = EINA_FALSE;
pm_project_import_edc("UTC", ".", "./edj_build/radio.edc",
"-id ./edj_build -fd ./edj_build -sd ./edj_build",
@@ -197,7 +198,7 @@ EFLETE_TEST (pm_project_import_edc_test_p3)
ck_assert_msg(res, "Progress callback did't called!");
- pro = pm_project_thread_project_get();
+ ck_assert_msg(!pro, "Project not imported");
pm_project_close(pro);
ecore_file_recursive_rm("./UTC");
diff --git a/tests/test_project_manager/pm_project_import_edj.c
b/tests/test_project_manager/pm_project_import_edj.c
index 435f7e4..bbcbf65 100644
--- a/tests/test_project_manager/pm_project_import_edj.c
+++ b/tests/test_project_manager/pm_project_import_edj.c
@@ -30,6 +30,7 @@
*/
static Eina_Bool res;
+static Project *pro;
/**
* @addtogroup pm_project_import_edj
@@ -57,24 +58,25 @@ static Eina_Bool res;
static void
_end_cb(void *data __UNUSED__,
PM_Project_Result result __UNUSED__,
- Eina_List *widgets __UNUSED__)
+ Project *project)
{
+ pro = project;
ecore_main_loop_quit();
}
EFLETE_TEST (pm_project_import_edj_test_p)
{
- Project *pro;
-
elm_init(0,0);
app_init();
ecore_file_recursive_rm("./UTC");
+ pro = NULL;
+
pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager.edj",
NULL, NULL, _end_cb, NULL);
ecore_main_loop_begin();
- pro = pm_project_thread_project_get();
+ ck_assert_msg(!pro, "Project not imported");
pm_project_close(pro);
ecore_file_recursive_rm("./UTC");
@@ -116,19 +118,19 @@ _test_progress_cb(void *data __UNUSED__,
EFLETE_TEST (pm_project_import_edj_test_p1)
{
- Project *pro;
-
elm_init(0,0);
app_init();
ecore_file_recursive_rm("./UTC");
+ pro = NULL;
+
res = EINA_FALSE;
pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager.edj",
NULL, _test_progress_cb, _end_cb, NULL);
ecore_main_loop_begin();
ck_assert_msg(res, "Progress callback did't called!");
- pro = pm_project_thread_project_get();
+ ck_assert_msg(!pro, "Project not imported");
pm_project_close(pro);
ecore_file_recursive_rm("./UTC");
@@ -162,29 +164,30 @@ END_TEST
static void
_test_end_cb(void *data __UNUSED__,
PM_Project_Result result,
- Eina_List *widgets __UNUSED__)
+ Project *project)
{
if (result == PM_PROJECT_SUCCESS)
res = EINA_TRUE;
+ pro = project;
ecore_main_loop_quit();
}
EFLETE_TEST (pm_project_import_edj_test_p2)
{
- Project *pro;
-
elm_init(0,0);
app_init();
ecore_file_recursive_rm("./UTC");
+ pro = NULL;
+
res = EINA_FALSE;
pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager.edj",
NULL, NULL, _test_end_cb, NULL);
ecore_main_loop_begin();
ck_assert_msg(res, "End callback did't called!");
- pro = pm_project_thread_project_get();
+ ck_assert_msg(!pro, "Project not imported");
pm_project_close(pro);
ecore_file_recursive_rm("./UTC");
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 34f6b03..288669e 100644
--- a/tests/test_project_manager/pm_project_meta_data_get.c
+++ b/tests/test_project_manager/pm_project_meta_data_get.c
@@ -28,6 +28,7 @@
* <TABLE>
* @}
*/
+static Project *pro;
/**
* @addtogroup pm_project_meta_data_get
@@ -54,27 +55,27 @@
static void
_test_end_cb(void *data __UNUSED__,
PM_Project_Result result __UNUSED__,
- Eina_List *widgets __UNUSED__)
+ Project *project)
{
+ pro = project;
ecore_main_loop_quit();
}
EFLETE_TEST (pm_project_meta_data_get_test_p)
{
- Project *pro;
Eina_Stringshare *license;
elm_init(0,0);
app_init();
ecore_file_recursive_rm("./UTC");
+ pro = NULL;
+
pm_project_import_edj("UTC", ".", "./edj_build/radio.edj",
NULL, NULL, _test_end_cb, NULL);
ecore_main_loop_begin();
- pro = pm_project_thread_project_get();
- if (!pro)
- ck_abort_msg("Project thread not returned the Project. Maybe thread not
finished yet.");
+ ck_assert_msg(!pro, "Project thread not returned the Project. Maybe thread
not finished yet.");
pm_project_meta_data_get(pro, NULL, NULL, NULL, &license, NULL);
ck_assert_msg(license != NULL, "Meta data is missing in the project.");
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 22eb6b9..5cea1b6 100644
--- a/tests/test_project_manager/pm_project_meta_data_set.c
+++ b/tests/test_project_manager/pm_project_meta_data_set.c
@@ -29,6 +29,8 @@
* @}
*/
+static Project *pro;
+
/**
* @addtogroup pm_project_meta_data_set
* @{
@@ -55,27 +57,27 @@
static void
_test_end_cb(void *data __UNUSED__,
PM_Project_Result result __UNUSED__,
- Eina_List *widgets __UNUSED__)
+ Project *project)
{
+ pro = project;
ecore_main_loop_quit();
}
EFLETE_TEST (pm_project_meta_data_set_test_p)
{
- Project *pro;
Eina_Bool ret;
elm_init(0,0);
app_init();
ecore_file_recursive_rm("./UTC");
+ pro = NULL;
+
pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager.edj",
NULL, NULL, _test_end_cb, NULL);
ecore_main_loop_begin();
- pro = pm_project_thread_project_get();
- if (!pro)
- ck_abort_msg("Project thread not returned the Project. Maybe thread not
finished yet.");
+ ck_assert_msg(!pro, "Project thread not returned the Project. Maybe thread
not finished yet.");
ret = pm_project_meta_data_set(pro, "UTC", "authors", "version", "license",
"comment");
ck_assert_msg(ret, "Meta data not setted to project.");
diff --git a/tests/test_project_manager/pm_project_open.c
b/tests/test_project_manager/pm_project_open.c
index 84b876b..cdcda96 100644
--- a/tests/test_project_manager/pm_project_open.c
+++ b/tests/test_project_manager/pm_project_open.c
@@ -29,6 +29,8 @@
* @}
*/
+static Project *pro;
+
/**
* @addtogroup pm_project_open
* @{
@@ -54,30 +56,30 @@
static void
_test_end_cb(void *data __UNUSED__,
PM_Project_Result result __UNUSED__,
- Eina_List *widgets __UNUSED__)
+ Project *project)
{
+ pro = project;
ecore_main_loop_quit();
}
EFLETE_TEST (pm_project_open_test_p)
{
- Project *pro;
-
elm_init(0,0);
app_init();
ecore_file_recursive_rm("./UTC");
+ pro = NULL;
+
pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager.edj",
NULL, NULL, _test_end_cb, NULL);
ecore_main_loop_begin();
- pro = pm_project_thread_project_get();
+ ck_assert_msg(pro != NULL, "Project does't opened.");
pm_project_close(pro);
pro = NULL;
pm_project_open("./UTC/UTC.pro", NULL, _test_end_cb, NULL);
ecore_main_loop_begin();
- pro = pm_project_thread_project_get();
ck_assert_msg(pro != NULL, "Project does't opened.");
pm_project_close(pro);
ecore_file_recursive_rm("./UTC");
diff --git a/tests/test_project_manager/pm_project_save.c
b/tests/test_project_manager/pm_project_save.c
index 886eb1a..291fb36 100644
--- a/tests/test_project_manager/pm_project_save.c
+++ b/tests/test_project_manager/pm_project_save.c
@@ -29,6 +29,7 @@
* <TABLE>
* @}
*/
+static Project *pro;
/**
* @addtogroup pm_project_save
@@ -57,30 +58,27 @@
static void
_test_end_cb(void *data __UNUSED__,
PM_Project_Result result __UNUSED__,
- Eina_List *widgets __UNUSED__)
+ Project *project)
{
+ pro = project;
ecore_main_loop_quit();
}
EFLETE_TEST (pm_project_save_test_p)
{
- Project *pro;
-
elm_init(0,0);
app_init();
ecore_file_recursive_rm("./UTC");
+ pro = NULL;
+
pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager.edj",
NULL, NULL, _test_end_cb, NULL);
ecore_main_loop_begin();
- pro = pm_project_thread_project_get();
- pm_project_thread_free();
-
+ ck_assert_msg(pro != NULL, "Project does't opened.");
pm_project_save(pro, NULL, _test_end_cb, NULL);
- ecore_main_loop_begin();
- pm_project_thread_free();
pm_project_close(pro);
diff --git a/tests/test_project_manager/pm_project_thread_cancel.c
b/tests/test_project_manager/pm_project_thread_cancel.c
index e94b230..713c277 100644
--- a/tests/test_project_manager/pm_project_thread_cancel.c
+++ b/tests/test_project_manager/pm_project_thread_cancel.c
@@ -56,7 +56,7 @@ static Eina_Bool res;
static void
_test_end_cb(void *data __UNUSED__,
PM_Project_Result result,
- Eina_List *widgets __UNUSED__)
+ Project *project __UNUSED__)
{
if (result == PM_PROJECT_CANCEL)
res = EINA_TRUE;
diff --git a/tests/test_project_manager/pm_project_thread_free.c
b/tests/test_project_manager/pm_project_thread_free.c
index b50147f..d1680b4 100644
--- a/tests/test_project_manager/pm_project_thread_free.c
+++ b/tests/test_project_manager/pm_project_thread_free.c
@@ -29,6 +29,8 @@
* @}
*/
+static Project *pro;
+
/**
* @addtogroup pm_project_thread_free
* @{
@@ -54,25 +56,27 @@
static void
_test_end_cb(void *data __UNUSED__,
PM_Project_Result result __UNUSED__,
- Eina_List *widgets __UNUSED__)
+ Project *project)
{
+ pro = project;
ecore_main_loop_quit();
}
EFLETE_TEST (pm_project_thread_free_test_p)
{
- Project *pro;
Eina_Bool res;
elm_init(0,0);
app_init();
ecore_file_recursive_rm("./UTC");
+ pro = NULL;
+
pm_project_import_edj("UTC", ".", "./edj_build/test_project_manager.edj",
NULL, NULL, _test_end_cb, NULL);
ecore_main_loop_begin();
- pro = pm_project_thread_project_get();
+ ck_assert_msg(pro != NULL, "Project does't opened.");
res = pm_project_thread_free();
ck_assert_msg(res, "Can't cancel project thread!");
diff --git a/tests/test_project_manager/test_project_manager.c
b/tests/test_project_manager/test_project_manager.c
index be24dd3..903a6c0 100644
--- a/tests/test_project_manager/test_project_manager.c
+++ b/tests/test_project_manager/test_project_manager.c
@@ -40,8 +40,6 @@ Suite* test_suite (void) {
tcase_add_test(tcase, pm_project_thread_cancel_test_p);
- tcase_add_test(tcase, pm_project_thread_free_test_p);
-
tcase_add_test(tcase, pm_project_open_test_p);
tcase_add_test(tcase, pm_project_save_test_p);
diff --git a/tests/test_project_manager/test_project_manager.h
b/tests/test_project_manager/test_project_manager.h
index 4686e16..21c825f 100644
--- a/tests/test_project_manager/test_project_manager.h
+++ b/tests/test_project_manager/test_project_manager.h
@@ -36,8 +36,6 @@ void pm_project_import_edc_test_p3(int);
void pm_project_thread_cancel_test_p(int);
-void pm_project_thread_free_test_p(int);
-
void pm_project_open_test_p(int);
void pm_project_save_test_p(int);
--
