From c6a777d8b75b7b82672b468c523c4d75a9646381 Mon Sep 17 00:00:00 2001 From: "duna.oh" Date: Tue, 9 Aug 2022 13:18:00 +0900 Subject: [PATCH] launch: merge header files in one (launch.h) Change-Id: I37f92da33205a3d8c457483be68f1c2519b3c682 --- examples/tinyds-tdm.c | 48 ++++++------ include/libds-tizen/launch.h | 115 +++++++++++++++++++++++++++ include/libds-tizen/launch/appinfo.h | 42 ---------- include/libds-tizen/launch/effect.h | 92 ---------------------- packaging/libds-tizen.spec | 3 +- src/launch/appinfo.c | 134 +++++++++++++++---------------- src/launch/effect.c | 148 +++++++++++++++++------------------ tests/tc_launch_appinfo.cpp | 112 +++++++++++++------------- tests/tc_launch_effect.cpp | 136 ++++++++++++++++---------------- 9 files changed, 404 insertions(+), 426 deletions(-) create mode 100644 include/libds-tizen/launch.h delete mode 100644 include/libds-tizen/launch/appinfo.h delete mode 100644 include/libds-tizen/launch/effect.h diff --git a/examples/tinyds-tdm.c b/examples/tinyds-tdm.c index 0abb4b0..2158bac 100644 --- a/examples/tinyds-tdm.c +++ b/examples/tinyds-tdm.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #define USE_TDM_BUFFER_QUEUE @@ -90,8 +90,8 @@ struct tinyds_server uint32_t seat_caps; double output_x, output_y; struct ds_tizen_input_devicemgr *devicemgr; - struct ds_tizen_effect *effect; - struct ds_tizen_splash *splash; + struct ds_tizen_launch_effect *effect; + struct ds_tizen_launch_splash *splash; struct tinyds_output *output; struct tinyds_dpms *dpms; @@ -257,8 +257,8 @@ view_populate_pid(struct tinyds_view *view) ds_inf("view pid(%u)", pid); view->pid = pid; - view->effect_type = ds_tizen_effect_get_effect_type(view->server->effect, pid); - ds_tizen_effect_unset_effect_type(view->server->effect, pid); + view->effect_type = ds_tizen_launch_effect_get_effect_type(view->server->effect, pid); + ds_tizen_launch_effect_unset_effect_type(view->server->effect, pid); ds_inf("view effect_type(%d)", view->effect_type); } @@ -605,7 +605,7 @@ static void launch_effect_handle_type_set(struct wl_listener *listener, void *data) { struct tinyds_server *server; - struct ds_tizen_effect_event_type_set *event = data; + struct ds_tizen_launch_effect_event_type_set *event = data; struct tinyds_view *view = NULL; bool existing = false; @@ -621,9 +621,9 @@ launch_effect_handle_type_set(struct wl_listener *listener, void *data) } } if (existing) { - ds_tizen_effect_unset_effect_type(server->effect, event->pid); + ds_tizen_launch_effect_unset_effect_type(server->effect, event->pid); } else { - ds_tizen_effect_set_effect_type(server->effect, event->pid, event->effect_type); + ds_tizen_launch_effect_set_effect_type(server->effect, event->pid, event->effect_type); } } @@ -631,7 +631,7 @@ static void launch_effect_handle_type_unset(struct wl_listener *listener, void *data) { struct tinyds_server *server; - struct ds_tizen_effect_event_type_unset *event = data; + struct ds_tizen_launch_effect_event_type_unset *event = data; struct tinyds_view *view = NULL; server = wl_container_of(listener, server, effect_type_unset); @@ -644,14 +644,14 @@ launch_effect_handle_type_unset(struct wl_listener *listener, void *data) ds_inf("Launch effect. pid found"); } } - ds_tizen_effect_unset_effect_type(server->effect, event->pid); + ds_tizen_launch_effect_unset_effect_type(server->effect, event->pid); } static void launch_splash_handle_owner(struct wl_listener *listener, void *data) { struct tinyds_server *server; - struct ds_tizen_splash_event_owner *event = data; + struct ds_tizen_launch_splash_event_owner *event = data; struct tinyds_view *view = NULL; server = wl_container_of(listener, server, splash_owner); @@ -660,10 +660,10 @@ launch_splash_handle_owner(struct wl_listener *listener, void *data) wl_list_for_each(view, &server->views, link) { if (view->pid == event->pid) { - if (event->pid == ds_tizen_splash_get_pid(server->splash)) + if (event->pid == ds_tizen_launch_splash_get_pid(server->splash)) ;// else { - ds_tizen_splash_set_pid(server->splash, event->pid); + ds_tizen_launch_splash_set_pid(server->splash, event->pid); } } } @@ -673,24 +673,24 @@ static void launch_effect_handle_new_splash(struct wl_listener *listener, void *data) { struct tinyds_server *server; - struct ds_tizen_effect_event_new_splash *event = data; + struct ds_tizen_launch_splash *splash = data; struct tinyds_view *view = NULL; server = wl_container_of(listener, server, new_splash); - ds_inf("Launch new splash. splash(%p)", event->splash); - if (!event->splash) return; + ds_inf("Launch new splash. splash(%p)", splash); + if (!splash) return; - server->splash = event->splash; + server->splash = splash; // new view for "Launchscreen" view = calloc(1, sizeof *view); assert(view); wl_list_insert(server->views.prev, &view->link); - view->pid = ds_tizen_splash_get_pid(event->splash); + view->pid = ds_tizen_launch_splash_get_pid(splash); server->splash_owner.notify = launch_splash_handle_owner; - ds_tizen_splash_add_owner_listener(server->splash, + ds_tizen_launch_splash_add_owner_listener(server->splash, &server->splash_owner); } @@ -763,25 +763,25 @@ init_server(struct tinyds_server *server, struct wl_display *display) ds_tizen_input_devicemgr_add_pointer_warp_listener(server->devicemgr, &server->pointer_warp); - server->effect = ds_tizen_effect_create(display); + server->effect = ds_tizen_launch_effect_create(display); if (!server->effect) { goto err; } server->effect_destroy.notify = launch_effect_handle_destroy; - ds_tizen_effect_add_destroy_listener(server->effect, + ds_tizen_launch_effect_add_destroy_listener(server->effect, &server->effect_destroy); server->effect_type_set.notify = launch_effect_handle_type_set; - ds_tizen_effect_add_type_set_listener(server->effect, + ds_tizen_launch_effect_add_type_set_listener(server->effect, &server->effect_type_set); server->effect_type_unset.notify = launch_effect_handle_type_unset; - ds_tizen_effect_add_type_unset_listener(server->effect, + ds_tizen_launch_effect_add_type_unset_listener(server->effect, &server->effect_type_unset); server->new_splash.notify = launch_effect_handle_new_splash; - ds_tizen_effect_add_new_splash_listener(server->effect, + ds_tizen_launch_effect_add_new_splash_listener(server->effect, &server->new_splash); return true; diff --git a/include/libds-tizen/launch.h b/include/libds-tizen/launch.h new file mode 100644 index 0000000..1e00348 --- /dev/null +++ b/include/libds-tizen/launch.h @@ -0,0 +1,115 @@ +#ifndef LIBDS_TIZEN_LAUNCH_SPLASH_H +#define LIBDS_TIZEN_LAUNCH_SPLASH_H + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +enum ds_tizen_launch_effect_type +{ + DS_TIZEN_LAUNCH_EFFECT_TYPE_LAUNCH = 0, + DS_TIZEN_LAUNCH_EFFECT_TYPE_DEPTH_IN, +}; + +struct ds_tizen_launch_effect_event_type_set +{ + uint32_t pid; + enum ds_tizen_launch_effect_type effect_type; +}; + +struct ds_tizen_launch_effect_event_type_unset +{ + uint32_t pid; +}; + +enum ds_tizen_launch_splash_file_type +{ + DS_TIZEN_LAUNCH_SPLASH_FILE_TYPE_ERR = -1, + DS_TIZEN_LAUNCH_SPLASH_FILE_TYPE_IMG, + DS_TIZEN_LAUNCH_SPLASH_FILE_TYPE_EDJ, +}; + +struct ds_tizen_launch_splash_event_owner +{ + uint32_t pid; +}; + +struct ds_tizen_launch_appinfo_mgr; +struct ds_tizen_launch_appinfo; + +struct ds_tizen_launch_effect; +struct ds_tizen_launch_splash; + +// launch_appinfo +struct ds_tizen_launch_appinfo_mgr * +ds_tizen_launch_appinfo_mgr_create(struct wl_display *display); + +void +ds_tizen_launch_appinfo_mgr_add_destroy_listener( + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr, struct wl_listener *listener); + +void +ds_tizen_launch_appinfo_mgr_add_set_pid_listener( + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr, struct wl_listener *listener); + +void +ds_tizen_launch_appinfo_mgr_add_set_appid_listener( + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr, struct wl_listener *listener); + +void +ds_tizen_launch_appinfo_mgr_add_metadata_ready_listener( + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr, struct wl_listener *listener); + +//for gtest +struct wl_resource * +ds_tizen_launch_appinfo_mgr_get_appinfo_resource( + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr); + +// launch_effect +struct ds_tizen_launch_effect * +ds_tizen_launch_effect_create(struct wl_display *display); + +void +ds_tizen_launch_effect_add_destroy_listener( + struct ds_tizen_launch_effect *effect, struct wl_listener *listener); +void +ds_tizen_launch_effect_add_type_set_listener( + struct ds_tizen_launch_effect *effect, struct wl_listener *listener); +void +ds_tizen_launch_effect_add_type_unset_listener(struct ds_tizen_launch_effect *effect, + struct wl_listener *listener); +void +ds_tizen_launch_effect_add_new_splash_listener(struct ds_tizen_launch_effect *effect, + struct wl_listener *listener); + +void +ds_tizen_launch_effect_set_effect_type(struct ds_tizen_launch_effect *effect, + uint32_t pid, int effect_type); +void +ds_tizen_launch_effect_unset_effect_type(struct ds_tizen_launch_effect *effect, + uint32_t pid); +int +ds_tizen_launch_effect_get_effect_type(struct ds_tizen_launch_effect *effect, + uint32_t pid); + +// launch_splash +void +ds_tizen_launch_splash_add_destroy_listener( + struct ds_tizen_launch_splash *splash, struct wl_listener *listener); +void +ds_tizen_launch_splash_add_owner_listener( + struct ds_tizen_launch_splash *splash, struct wl_listener *listener); + +uint32_t +ds_tizen_launch_splash_get_pid(struct ds_tizen_launch_splash *splash); +void +ds_tizen_launch_splash_set_pid(struct ds_tizen_launch_splash *splash, uint32_t pid); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/libds-tizen/launch/appinfo.h b/include/libds-tizen/launch/appinfo.h deleted file mode 100644 index bd62e9b..0000000 --- a/include/libds-tizen/launch/appinfo.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef LIBDS_TIZEN_APPINFO_H -#define LIBDS_TIZEN_APPINFO_H - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -struct ds_tizen_appinfo_mgr; -struct ds_tizen_appinfo; - -struct ds_tizen_appinfo_mgr * -ds_tizen_appinfo_mgr_create(struct wl_display *display); - -void -ds_tizen_appinfo_mgr_add_destroy_listener( - struct ds_tizen_appinfo_mgr *appinfo_mgr, struct wl_listener *listener); - -void -ds_tizen_appinfo_mgr_add_set_pid_listener( - struct ds_tizen_appinfo_mgr *appinfo_mgr, struct wl_listener *listener); - -void -ds_tizen_appinfo_mgr_add_set_appid_listener( - struct ds_tizen_appinfo_mgr *appinfo_mgr, struct wl_listener *listener); - -void -ds_tizen_appinfo_mgr_add_metadata_ready_listener( - struct ds_tizen_appinfo_mgr *appinfo_mgr, struct wl_listener *listener); - -//for gtest -struct wl_resource * -ds_tizen_appinfo_mgr_get_appinfo_resource( - struct ds_tizen_appinfo_mgr *appinfo_mgr); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/include/libds-tizen/launch/effect.h b/include/libds-tizen/launch/effect.h deleted file mode 100644 index d49fa33..0000000 --- a/include/libds-tizen/launch/effect.h +++ /dev/null @@ -1,92 +0,0 @@ -#ifndef LIBDS_TIZEN_EFFECT_H -#define LIBDS_TIZEN_EFFECT_H - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -struct ds_tizen_effect; -struct ds_tizen_splash; - -enum ds_tizen_effect_type -{ - DS_TIZEN_EFFECT_TYPE_LAUNCH = 0, - DS_TIZEN_EFFECT_TYPE_DEPTH_IN, -}; - -struct ds_tizen_effect_event_type_set -{ - uint32_t pid; - enum ds_tizen_effect_type effect_type; -}; - -struct ds_tizen_effect_event_type_unset -{ - uint32_t pid; -}; - -struct ds_tizen_effect_event_new_splash -{ - struct ds_tizen_splash *splash; -}; - -enum ds_tizen_splash_file_type -{ - DS_TIZEN_SPLASH_FILE_TYPE_ERR = -1, - DS_TIZEN_SPLASH_FILE_TYPE_IMG, - DS_TIZEN_SPLASH_FILE_TYPE_EDJ, -}; - -struct ds_tizen_splash_event_owner -{ - uint32_t pid; -}; - -// launch_effect -struct ds_tizen_effect * -ds_tizen_effect_create(struct wl_display *display); - -void -ds_tizen_effect_add_destroy_listener( - struct ds_tizen_effect *effect, struct wl_listener *listener); -void -ds_tizen_effect_add_type_set_listener( - struct ds_tizen_effect *effect, struct wl_listener *listener); -void -ds_tizen_effect_add_type_unset_listener(struct ds_tizen_effect *effect, - struct wl_listener *listener); -void -ds_tizen_effect_add_new_splash_listener(struct ds_tizen_effect *effect, - struct wl_listener *listener); - -void -ds_tizen_effect_set_effect_type(struct ds_tizen_effect *effect, - uint32_t pid, int effect_type); -void -ds_tizen_effect_unset_effect_type(struct ds_tizen_effect *effect, - uint32_t pid); -int -ds_tizen_effect_get_effect_type(struct ds_tizen_effect *effect, - uint32_t pid); - -// launch_splash -void -ds_tizen_splash_add_destroy_listener( - struct ds_tizen_splash *splash, struct wl_listener *listener); -void -ds_tizen_splash_add_owner_listener( - struct ds_tizen_splash *splash, struct wl_listener *listener); - -uint32_t -ds_tizen_splash_get_pid(struct ds_tizen_splash *splash); -void -ds_tizen_splash_set_pid(struct ds_tizen_splash *splash, uint32_t pid); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/packaging/libds-tizen.spec b/packaging/libds-tizen.spec index 710ac9b..8b36016 100644 --- a/packaging/libds-tizen.spec +++ b/packaging/libds-tizen.spec @@ -410,8 +410,7 @@ ninja -C builddir install %manifest %{name}.manifest %defattr(-,root,root,-) %license LICENSE -%{_includedir}/libds-tizen/launch/appinfo.h -%{_includedir}/libds-tizen/launch/effect.h +%{_includedir}/libds-tizen/launch.h %{_libdir}/pkgconfig/libds-tizen-launch.pc %{_libdir}/libds-tizen-launch.so %{_bindir}/libds-tizen-launch-appinfo-tests diff --git a/src/launch/appinfo.c b/src/launch/appinfo.c index 0b6c8c2..b079836 100644 --- a/src/launch/appinfo.c +++ b/src/launch/appinfo.c @@ -4,11 +4,11 @@ #include #include "util.h" -#include +#include #define TIZEN_APPINFO_VERSION 1 -struct ds_tizen_appinfo_mgr +struct ds_tizen_launch_appinfo_mgr { struct wl_global *global; @@ -27,34 +27,34 @@ struct ds_tizen_appinfo_mgr struct wl_resource *resource; //for gtest }; -struct ds_tizen_appinfo_client +struct ds_tizen_launch_appinfo_client { - struct ds_tizen_appinfo_mgr *appinfo_mgr; + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr; struct wl_resource *resource; struct wl_client *wl_client; - struct wl_list link; // ds_tizen_appinfo_mgr::clients + struct wl_list link; // ds_tizen_launch_appinfo_mgr::clients }; -enum ds_tizen_appinfo_owner +enum ds_tizen_launch_appinfo_owner { - DS_TIZEN_APPINFO_OWNER_SERVER, - DS_TIZEN_APPINFO_OWNER_CLIENT, + DS_TIZEN_LAUNCH_APPINFO_OWNER_SERVER, + DS_TIZEN_LAUNCH_APPINFO_OWNER_CLIENT, }; -struct ds_tizen_appinfo +struct ds_tizen_launch_appinfo { - struct ds_tizen_appinfo_mgr *appinfo_mgr; + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr; pid_t pid; char *appid; bool base_output_available; int base_output_width; int base_output_height; - enum ds_tizen_appinfo_owner owner; + enum ds_tizen_launch_appinfo_owner owner; - struct wl_list link; //ds_tizen_appinfo_mgr::infos; + struct wl_list link; //ds_tizen_launch_appinfo_mgr::infos; }; static void appinfo_mgr_handle_display_destroy(struct wl_listener *listener, @@ -63,10 +63,10 @@ static void appinfo_mgr_handle_display_destroy(struct wl_listener *listener, static void appinfo_mgr_bind(struct wl_client *wl_client, void *data, uint32_t version, uint32_t id); -WL_EXPORT struct ds_tizen_appinfo_mgr * -ds_tizen_appinfo_mgr_create(struct wl_display *display) +WL_EXPORT struct ds_tizen_launch_appinfo_mgr * +ds_tizen_launch_appinfo_mgr_create(struct wl_display *display) { - struct ds_tizen_appinfo_mgr *appinfo_mgr; + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr; appinfo_mgr = calloc(1, sizeof *appinfo_mgr); if (!appinfo_mgr) { @@ -99,29 +99,29 @@ ds_tizen_appinfo_mgr_create(struct wl_display *display) } WL_EXPORT void -ds_tizen_appinfo_mgr_add_destroy_listener( - struct ds_tizen_appinfo_mgr *appinfo_mgr, struct wl_listener *listener) +ds_tizen_launch_appinfo_mgr_add_destroy_listener( + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr, struct wl_listener *listener) { wl_signal_add(&appinfo_mgr->events.destroy, listener); } WL_EXPORT void -ds_tizen_appinfo_mgr_add_set_pid_listener( - struct ds_tizen_appinfo_mgr *appinfo_mgr, struct wl_listener *listener) +ds_tizen_launch_appinfo_mgr_add_set_pid_listener( + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr, struct wl_listener *listener) { wl_signal_add(&appinfo_mgr->events.set_pid, listener); } WL_EXPORT void -ds_tizen_appinfo_mgr_add_set_appid_listener( - struct ds_tizen_appinfo_mgr *appinfo_mgr, struct wl_listener *listener) +ds_tizen_launch_appinfo_mgr_add_set_appid_listener( + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr, struct wl_listener *listener) { wl_signal_add(&appinfo_mgr->events.set_appid, listener); } WL_EXPORT void -ds_tizen_appinfo_mgr_add_metadata_ready_listener( - struct ds_tizen_appinfo_mgr *appinfo_mgr, struct wl_listener *listener) +ds_tizen_launch_appinfo_mgr_add_metadata_ready_listener( + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr, struct wl_listener *listener) { wl_signal_add(&appinfo_mgr->events.metadata_ready, listener); } @@ -129,9 +129,9 @@ ds_tizen_appinfo_mgr_add_metadata_ready_listener( static void appinfo_mgr_handle_display_destroy(struct wl_listener *listener, void *data) { - struct ds_tizen_appinfo_mgr *appinfo_mgr; - struct ds_tizen_appinfo_client *client, *tmp_client; - struct ds_tizen_appinfo *info, *tmp_info; + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr; + struct ds_tizen_launch_appinfo_client *client, *tmp_client; + struct ds_tizen_launch_appinfo *info, *tmp_info; appinfo_mgr = wl_container_of(listener, appinfo_mgr, destroy); @@ -161,11 +161,11 @@ appinfo_handle_destroy(struct wl_client *wl_client, struct wl_resource *resource wl_resource_destroy(resource); } -static struct ds_tizen_appinfo * -appinfo_mgr_find_with_pid(struct ds_tizen_appinfo_mgr *appinfo_mgr, +static struct ds_tizen_launch_appinfo * +appinfo_mgr_find_with_pid(struct ds_tizen_launch_appinfo_mgr *appinfo_mgr, pid_t pid) { - struct ds_tizen_appinfo *info; + struct ds_tizen_launch_appinfo *info; wl_list_for_each(info, &appinfo_mgr->infos, link) { if (pid == info->pid) @@ -175,11 +175,11 @@ appinfo_mgr_find_with_pid(struct ds_tizen_appinfo_mgr *appinfo_mgr, return NULL; } -static struct ds_tizen_appinfo * -appinfo_mgr_find_with_appid(struct ds_tizen_appinfo_mgr *appinfo_mgr, +static struct ds_tizen_launch_appinfo * +appinfo_mgr_find_with_appid(struct ds_tizen_launch_appinfo_mgr *appinfo_mgr, const char *appid) { - struct ds_tizen_appinfo *info; + struct ds_tizen_launch_appinfo *info; wl_list_for_each(info, &appinfo_mgr->infos, link) { if (appid && !strcmp(appid, info->appid)) @@ -188,11 +188,11 @@ appinfo_mgr_find_with_appid(struct ds_tizen_appinfo_mgr *appinfo_mgr, return NULL; } -static struct ds_tizen_appinfo * -appinfo_mgr_get_info(struct ds_tizen_appinfo_mgr *appinfo_mgr, +static struct ds_tizen_launch_appinfo * +appinfo_mgr_get_info(struct ds_tizen_launch_appinfo_mgr *appinfo_mgr, pid_t pid, const char *appid) { - struct ds_tizen_appinfo *info = NULL; + struct ds_tizen_launch_appinfo *info = NULL; if (pid > 0) info = appinfo_mgr_find_with_pid(appinfo_mgr, pid); @@ -222,7 +222,7 @@ appinfo_mgr_get_info(struct ds_tizen_appinfo_mgr *appinfo_mgr, } static void -appinfo_destroy(struct ds_tizen_appinfo *info) +appinfo_destroy(struct ds_tizen_launch_appinfo *info) { wl_list_remove(&info->link); free(info->appid); @@ -230,10 +230,10 @@ appinfo_destroy(struct ds_tizen_appinfo *info) } static bool -appinfo_set_pid(struct ds_tizen_appinfo *info, pid_t pid) +appinfo_set_pid(struct ds_tizen_launch_appinfo *info, pid_t pid) { - struct ds_tizen_appinfo_mgr *appinfo_mgr; - struct ds_tizen_appinfo *info2, *tmp; + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr; + struct ds_tizen_launch_appinfo *info2, *tmp; if (!info) return false; if (pid < 0) return false; @@ -264,10 +264,10 @@ appinfo_set_pid(struct ds_tizen_appinfo *info, pid_t pid) } static bool -appinfo_set_appid(struct ds_tizen_appinfo *info, const char *appid) +appinfo_set_appid(struct ds_tizen_launch_appinfo *info, const char *appid) { - struct ds_tizen_appinfo_mgr *appinfo_mgr; - struct ds_tizen_appinfo *info2, *tmp; + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr; + struct ds_tizen_launch_appinfo *info2, *tmp; if (!info) return false; if (!appid) return false; @@ -301,7 +301,7 @@ appinfo_set_appid(struct ds_tizen_appinfo *info, const char *appid) } static bool -appinfo_get_base_output_resolution(struct ds_tizen_appinfo *info, int *width, int *height) +appinfo_get_base_output_resolution(struct ds_tizen_launch_appinfo *info, int *width, int *height) { if (!info) return false; if (!width) return false; @@ -319,7 +319,7 @@ appinfo_get_base_output_resolution(struct ds_tizen_appinfo *info, int *width, in } static void -appinfo_set_owner(struct ds_tizen_appinfo *info, enum ds_tizen_appinfo_owner owner) +appinfo_set_owner(struct ds_tizen_launch_appinfo *info, enum ds_tizen_launch_appinfo_owner owner) { if (!info) return; @@ -330,8 +330,8 @@ static void appinfo_handle_register_pid(struct wl_client *wl_client, struct wl_resource *resource, uint32_t pid) { - struct ds_tizen_appinfo_client *client; - struct ds_tizen_appinfo *info; + struct ds_tizen_launch_appinfo_client *client; + struct ds_tizen_launch_appinfo *info; client = wl_resource_get_user_data(resource); @@ -348,7 +348,7 @@ appinfo_handle_register_pid(struct wl_client *wl_client, } appinfo_set_pid(info, pid); - appinfo_set_owner(info, DS_TIZEN_APPINFO_OWNER_CLIENT); + appinfo_set_owner(info, DS_TIZEN_LAUNCH_APPINFO_OWNER_CLIENT); } @@ -356,8 +356,8 @@ static void appinfo_handle_deregister_pid(struct wl_client *wl_client, struct wl_resource *resource, uint32_t pid) { - struct ds_tizen_appinfo_client *client; - struct ds_tizen_appinfo *info; + struct ds_tizen_launch_appinfo_client *client; + struct ds_tizen_launch_appinfo *info; client = wl_resource_get_user_data(resource); @@ -374,8 +374,8 @@ static void appinfo_handle_set_appid(struct wl_client *wl_client, struct wl_resource *resource, uint32_t pid, const char *appid) { - struct ds_tizen_appinfo_client *client; - struct ds_tizen_appinfo *info; + struct ds_tizen_launch_appinfo_client *client; + struct ds_tizen_launch_appinfo *info; client = wl_resource_get_user_data(resource); @@ -397,8 +397,8 @@ appinfo_handle_set_appid(struct wl_client *wl_client, //for gtest WL_EXPORT struct wl_resource * -ds_tizen_appinfo_mgr_get_appinfo_resource( - struct ds_tizen_appinfo_mgr *appinfo_mgr) +ds_tizen_launch_appinfo_mgr_get_appinfo_resource( + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr) { return appinfo_mgr->resource; } @@ -407,8 +407,8 @@ static void appinfo_handle_get_base_output_resolution(struct wl_client *wl_client, struct wl_resource *resource, uint32_t pid) { - struct ds_tizen_appinfo_client *client; - struct ds_tizen_appinfo *info; + struct ds_tizen_launch_appinfo_client *client; + struct ds_tizen_launch_appinfo *info; int width = 0, height = 0; client = wl_resource_get_user_data(resource); @@ -442,8 +442,8 @@ static void appinfo_handle_register_appid(struct wl_client *wl_client, struct wl_resource *resource, const char *appid) { - struct ds_tizen_appinfo_client *client; - struct ds_tizen_appinfo *info; + struct ds_tizen_launch_appinfo_client *client; + struct ds_tizen_launch_appinfo *info; client = wl_resource_get_user_data(resource); @@ -455,15 +455,15 @@ appinfo_handle_register_appid(struct wl_client *wl_client, struct wl_resource *r } appinfo_set_appid(info, appid); - appinfo_set_owner(info, DS_TIZEN_APPINFO_OWNER_CLIENT); + appinfo_set_owner(info, DS_TIZEN_LAUNCH_APPINFO_OWNER_CLIENT); } static void appinfo_handle_deregister_appid(struct wl_client *wl_client, struct wl_resource *resource, const char *appid) { - struct ds_tizen_appinfo_client *client; - struct ds_tizen_appinfo *info; + struct ds_tizen_launch_appinfo_client *client; + struct ds_tizen_launch_appinfo *info; client = wl_resource_get_user_data(resource); @@ -480,8 +480,8 @@ static void appinfo_handle_set_pid(struct wl_client *wl_client, struct wl_resource *resource, const char *appid, uint32_t pid) { - struct ds_tizen_appinfo_client *client; - struct ds_tizen_appinfo *info; + struct ds_tizen_launch_appinfo_client *client; + struct ds_tizen_launch_appinfo *info; client = wl_resource_get_user_data(resource); @@ -498,8 +498,8 @@ static void appinfo_handle_ready_metadata(struct wl_client *wl_client, struct wl_resource *resource, const char *appid, uint32_t pid) { - struct ds_tizen_appinfo_client *client; - struct ds_tizen_appinfo *info; + struct ds_tizen_launch_appinfo_client *client; + struct ds_tizen_launch_appinfo *info; client = wl_resource_get_user_data(resource); @@ -533,7 +533,7 @@ static const struct tizen_launch_appinfo_interface appinfo_impl = static void _tizen_appinfo_client_handle_destroy(struct wl_resource *resource) { - struct ds_tizen_appinfo_client *client; + struct ds_tizen_launch_appinfo_client *client; client = wl_resource_get_user_data(resource); @@ -546,8 +546,8 @@ _tizen_appinfo_client_handle_destroy(struct wl_resource *resource) static void appinfo_mgr_bind(struct wl_client *wl_client, void *data, uint32_t version, uint32_t id) { - struct ds_tizen_appinfo_mgr *appinfo_mgr = data; - struct ds_tizen_appinfo_client *client; + struct ds_tizen_launch_appinfo_mgr *appinfo_mgr = data; + struct ds_tizen_launch_appinfo_client *client; client = calloc(1, sizeof *client); if (client == NULL) { diff --git a/src/launch/effect.c b/src/launch/effect.c index fc38c77..3ad0bea 100644 --- a/src/launch/effect.c +++ b/src/launch/effect.c @@ -4,13 +4,13 @@ #include #include "util.h" -#include +#include #define TIZEN_EFFECT_VERSION 1 #define SPLASH_CLIENT_PID 321 // no meaning #define CUSTOM_EFFECT_CALLEE "_CUSTOM_EFFECT_CALLEE_" -struct ds_tizen_effect +struct ds_tizen_launch_effect { struct wl_global *global; @@ -27,31 +27,31 @@ struct ds_tizen_effect } events; }; -struct ds_tizen_effect_client +struct ds_tizen_launch_effect_client { - struct ds_tizen_effect *effect; + struct ds_tizen_launch_effect *effect; struct wl_resource *resource; struct wl_client *wl_client; struct wl_list splashs; - struct wl_list link; // ds_tizen_effect::clients + struct wl_list link; // ds_tizen_launch_effect::clients }; -struct ds_tizen_effect_info +struct ds_tizen_launch_effect_info { uint32_t pid; int effect_type; - struct wl_list link; // ds_tizen_effect::infos + struct wl_list link; // ds_tizen_launch_effect::infos }; -struct ds_tizen_splash +struct ds_tizen_launch_splash { - struct ds_tizen_effect *effect; + struct ds_tizen_launch_effect *effect; - struct ds_tizen_effect_client *client; + struct ds_tizen_launch_effect_client *client; struct wl_resource *resource; uint32_t pid; @@ -63,7 +63,7 @@ struct ds_tizen_splash struct wl_signal owner; } events; - struct wl_list link; // ds_tizen_effect_client::splashs + struct wl_list link; // ds_tizen_launch_effect_client::splashs }; static void effect_handle_display_destroy(struct wl_listener *listener, @@ -72,10 +72,10 @@ static void effect_handle_display_destroy(struct wl_listener *listener, static void effect_bind(struct wl_client *wl_client, void *data, uint32_t version, uint32_t id); -WL_EXPORT struct ds_tizen_effect * -ds_tizen_effect_create(struct wl_display *display) +WL_EXPORT struct ds_tizen_launch_effect * +ds_tizen_launch_effect_create(struct wl_display *display) { - struct ds_tizen_effect *effect; + struct ds_tizen_launch_effect *effect; effect = calloc(1, sizeof *effect); if (!effect) { @@ -109,40 +109,40 @@ ds_tizen_effect_create(struct wl_display *display) //launch_effect WL_EXPORT void -ds_tizen_effect_add_destroy_listener( - struct ds_tizen_effect *effect, struct wl_listener *listener) +ds_tizen_launch_effect_add_destroy_listener( + struct ds_tizen_launch_effect *effect, struct wl_listener *listener) { wl_signal_add(&effect->events.destroy, listener); } WL_EXPORT void -ds_tizen_effect_add_type_set_listener( - struct ds_tizen_effect *effect, struct wl_listener *listener) +ds_tizen_launch_effect_add_type_set_listener( + struct ds_tizen_launch_effect *effect, struct wl_listener *listener) { wl_signal_add(&effect->events.type_set, listener); } WL_EXPORT void -ds_tizen_effect_add_type_unset_listener( - struct ds_tizen_effect *effect, struct wl_listener *listener) +ds_tizen_launch_effect_add_type_unset_listener( + struct ds_tizen_launch_effect *effect, struct wl_listener *listener) { wl_signal_add(&effect->events.type_unset, listener); } WL_EXPORT void -ds_tizen_effect_add_new_splash_listener( - struct ds_tizen_effect *effect, struct wl_listener *listener) +ds_tizen_launch_effect_add_new_splash_listener( + struct ds_tizen_launch_effect *effect, struct wl_listener *listener) { wl_signal_add(&effect->events.new_splash, listener); } WL_EXPORT void -ds_tizen_effect_set_effect_type(struct ds_tizen_effect *effect, +ds_tizen_launch_effect_set_effect_type(struct ds_tizen_launch_effect *effect, uint32_t pid, int effect_type) { - struct ds_tizen_effect_info *info; + struct ds_tizen_launch_effect_info *info; - ds_inf("ds_tizen_effect_set_effect_type() pid(%u), effect_type(%d)", pid, effect_type); + ds_inf("ds_tizen_launch_effect_set_effect_type() pid(%u), effect_type(%d)", pid, effect_type); info = calloc(1, sizeof *info); if (info == NULL) { @@ -156,16 +156,16 @@ ds_tizen_effect_set_effect_type(struct ds_tizen_effect *effect, } WL_EXPORT void -ds_tizen_effect_unset_effect_type(struct ds_tizen_effect *effect, +ds_tizen_launch_effect_unset_effect_type(struct ds_tizen_launch_effect *effect, uint32_t pid) { - struct ds_tizen_effect_info *info, *tmp; + struct ds_tizen_launch_effect_info *info, *tmp; - ds_inf("ds_tizen_effect_unset_effect_type() pid(%u)", pid); + ds_inf("ds_tizen_launch_effect_unset_effect_type() pid(%u)", pid); wl_list_for_each_safe(info, tmp, &effect->infos, link) { if (info->pid == pid) { - ds_inf("ds_tizen_effect_unset_effect_type() pid found.", pid); + ds_inf("ds_tizen_launch_effect_unset_effect_type() pid found.", pid); wl_list_remove(&info->link); free(info); } @@ -173,12 +173,12 @@ ds_tizen_effect_unset_effect_type(struct ds_tizen_effect *effect, } WL_EXPORT int -ds_tizen_effect_get_effect_type(struct ds_tizen_effect *effect, +ds_tizen_launch_effect_get_effect_type(struct ds_tizen_launch_effect *effect, uint32_t pid) { - struct ds_tizen_effect_info *info; + struct ds_tizen_launch_effect_info *info; - ds_inf("ds_tizen_effect_get_effect_type() pid(%u)", pid); + ds_inf("ds_tizen_launch_effect_get_effect_type() pid(%u)", pid); wl_list_for_each(info, &effect->infos, link) { if (info->pid == pid) { @@ -190,35 +190,35 @@ ds_tizen_effect_get_effect_type(struct ds_tizen_effect *effect, //launch_splash WL_EXPORT void -ds_tizen_splash_add_destroy_listener( - struct ds_tizen_splash *splash, struct wl_listener *listener) +ds_tizen_launch_splash_add_destroy_listener( + struct ds_tizen_launch_splash *splash, struct wl_listener *listener) { wl_signal_add(&splash->events.destroy, listener); } WL_EXPORT void -ds_tizen_splash_add_owner_listener( - struct ds_tizen_splash *splash, struct wl_listener *listener) +ds_tizen_launch_splash_add_owner_listener( + struct ds_tizen_launch_splash *splash, struct wl_listener *listener) { wl_signal_add(&splash->events.owner, listener); } WL_EXPORT uint32_t -ds_tizen_splash_get_pid(struct ds_tizen_splash *splash) +ds_tizen_launch_splash_get_pid(struct ds_tizen_launch_splash *splash) { return splash->pid; } WL_EXPORT void -ds_tizen_splash_set_pid(struct ds_tizen_splash *splash, uint32_t pid) +ds_tizen_launch_splash_set_pid(struct ds_tizen_launch_splash *splash, uint32_t pid) { splash->pid = pid; } static void -effect_client_destroy(struct ds_tizen_effect_client *client) +effect_client_destroy(struct ds_tizen_launch_effect_client *client) { - struct ds_tizen_splash *splash, *tmp; + struct ds_tizen_launch_splash *splash, *tmp; wl_list_for_each_safe(splash, tmp, &client->splashs, link) { wl_signal_emit(&splash->events.destroy, splash); @@ -233,9 +233,9 @@ effect_client_destroy(struct ds_tizen_effect_client *client) static void effect_handle_display_destroy(struct wl_listener *listener, void *data) { - struct ds_tizen_effect *effect; - struct ds_tizen_effect_client *client, *tmp_client; - struct ds_tizen_effect_info *info, *tmp_info; + struct ds_tizen_launch_effect *effect; + struct ds_tizen_launch_effect_client *client, *tmp_client; + struct ds_tizen_launch_effect_info *info, *tmp_info; effect = wl_container_of(listener, effect, destroy); @@ -260,12 +260,12 @@ static void effect_handle_display_destroy(struct wl_listener *listener, static int effect_get_effect_type(const char *effect_type) { - enum ds_tizen_effect_type type = 0; + enum ds_tizen_launch_effect_type type = 0; if (!effect_type) return 0; - if (!strncmp(effect_type, "launch", sizeof("launch"))) type = DS_TIZEN_EFFECT_TYPE_LAUNCH; - else if (!strncmp(effect_type, "depth-in", sizeof("depth-in"))) type = DS_TIZEN_EFFECT_TYPE_DEPTH_IN; + if (!strncmp(effect_type, "launch", sizeof("launch"))) type = DS_TIZEN_LAUNCH_EFFECT_TYPE_LAUNCH; + else if (!strncmp(effect_type, "depth-in", sizeof("depth-in"))) type = DS_TIZEN_LAUNCH_EFFECT_TYPE_DEPTH_IN; return type; } @@ -283,13 +283,13 @@ splash_handle_launch(struct wl_client *wl_client, const char *effect_type, const char *theme_type, struct wl_array *options) { - struct ds_tizen_effect_event_type_set ds_event; - struct ds_tizen_splash *splash; - struct ds_tizen_effect *effect; + struct ds_tizen_launch_effect_event_type_set ds_event; + struct ds_tizen_launch_splash *splash; + struct ds_tizen_launch_effect *effect; ds_inf("splash launch"); ds_inf("path %s(%s), indicator(%d), angle(%d), effect_type(%s)", - pfname, (ftype == DS_TIZEN_SPLASH_FILE_TYPE_IMG) ? "IMG" : "EDC", indicator, angle, effect_type); + pfname, (ftype == DS_TIZEN_LAUNCH_SPLASH_FILE_TYPE_IMG) ? "IMG" : "EDC", indicator, angle, effect_type); ds_inf("theme_type(%s), options(%p)",theme_type, options); splash = wl_resource_get_user_data(resource); @@ -309,8 +309,8 @@ static void splash_handle_owner(struct wl_client *wl_client, struct wl_resource *resource, uint32_t pid) { - struct ds_tizen_splash *splash; - struct ds_tizen_splash_event_owner ds_event; + struct ds_tizen_launch_splash *splash; + struct ds_tizen_launch_splash_event_owner ds_event; ds_inf("splash set owner. pid:%u", pid); @@ -327,13 +327,13 @@ splash_handle_launch_v2(struct wl_client *wl_client, const char *effect_type, const char *theme_type, struct wl_array *options, struct wl_array *extra_config) { - struct ds_tizen_effect_event_type_set ds_event; - struct ds_tizen_splash *splash; - struct ds_tizen_effect *effect; + struct ds_tizen_launch_effect_event_type_set ds_event; + struct ds_tizen_launch_splash *splash; + struct ds_tizen_launch_effect *effect; ds_inf("splash launch_v2"); ds_inf("path %s(%s), indicator(%d), angle(%d), effect_type(%s)", - pfname, (ftype == DS_TIZEN_SPLASH_FILE_TYPE_IMG) ? "IMG" : "EDC", indicator, angle, effect_type); + pfname, (ftype == DS_TIZEN_LAUNCH_SPLASH_FILE_TYPE_IMG) ? "IMG" : "EDC", indicator, angle, effect_type); ds_inf("theme_type(%s) options(%p) extra_config(%p)", theme_type, options, extra_config); splash = wl_resource_get_user_data(resource); @@ -389,7 +389,7 @@ static const struct tizen_launch_splash_interface splash_impl = static void splash_client_handle_destroy(struct wl_resource *resource) { - struct ds_tizen_splash *splash; + struct ds_tizen_launch_splash *splash; splash = wl_resource_get_user_data(resource); @@ -400,10 +400,10 @@ splash_client_handle_destroy(struct wl_resource *resource) free(splash); } -struct ds_tizen_splash* -splash_create_splash_img(struct ds_tizen_effect_client *client, uint32_t id) +struct ds_tizen_launch_splash* +splash_create_splash_img(struct ds_tizen_launch_effect_client *client, uint32_t id) { - struct ds_tizen_splash *splash; + struct ds_tizen_launch_splash *splash; splash = calloc(1, sizeof *splash); if (!splash) { @@ -440,18 +440,16 @@ static void effect_handle_create_splash_img(struct wl_client *wl_client, struct wl_resource *resource, uint32_t id) { - struct ds_tizen_effect *effect; - struct ds_tizen_effect_client *client; - struct ds_tizen_effect_event_new_splash ds_event; - struct ds_tizen_splash *splash; + struct ds_tizen_launch_effect *effect; + struct ds_tizen_launch_effect_client *client; + struct ds_tizen_launch_splash *splash; client = wl_resource_get_user_data(resource); splash = splash_create_splash_img(client, id); if (!splash) return; effect = client->effect; - ds_event.splash = splash; - wl_signal_emit(&effect->events.new_splash, &ds_event); + wl_signal_emit(&effect->events.new_splash, splash); } static void @@ -459,9 +457,9 @@ effect_handle_type_set(struct wl_client *wl_client, struct wl_resource *resource, const char *effect_type, uint32_t pid, struct wl_array *options) { - struct ds_tizen_effect *effect; - struct ds_tizen_effect_client *client; - struct ds_tizen_effect_event_type_set ds_event; + struct ds_tizen_launch_effect *effect; + struct ds_tizen_launch_effect_client *client; + struct ds_tizen_launch_effect_event_type_set ds_event; client = wl_resource_get_user_data(resource); effect = client->effect; @@ -478,9 +476,9 @@ static void effect_handle_type_unset(struct wl_client *wl_client, struct wl_resource *resource, uint32_t pid) { - struct ds_tizen_effect *effect; - struct ds_tizen_effect_client *client; - struct ds_tizen_effect_event_type_unset ds_event; + struct ds_tizen_launch_effect *effect; + struct ds_tizen_launch_effect_client *client; + struct ds_tizen_launch_effect_event_type_unset ds_event; client = wl_resource_get_user_data(resource); effect = client->effect; @@ -510,7 +508,7 @@ static const struct tizen_launch_effect_interface effect_impl = static void effect_client_handle_destroy(struct wl_resource *resource) { - struct ds_tizen_effect_client *client; + struct ds_tizen_launch_effect_client *client; client = wl_resource_get_user_data(resource); @@ -522,8 +520,8 @@ effect_client_handle_destroy(struct wl_resource *resource) static void effect_bind(struct wl_client *wl_client, void *data, uint32_t version, uint32_t id) { - struct ds_tizen_effect *effect = data; - struct ds_tizen_effect_client *client; + struct ds_tizen_launch_effect *effect = data; + struct ds_tizen_launch_effect_client *client; client = calloc(1, sizeof *client); if (client == NULL) { diff --git a/tests/tc_launch_appinfo.cpp b/tests/tc_launch_appinfo.cpp index 9e7bab1..15630d6 100644 --- a/tests/tc_launch_appinfo.cpp +++ b/tests/tc_launch_appinfo.cpp @@ -1,17 +1,17 @@ #include "tc_main.h" #include "mockclient.h" #include "mockcompositor.h" -#include +#include #include #include #define TIZEN_APPINFO_VERSION 1 -class MockAppinfoCompositor : public MockCompositor +class MockLaunchAppinfoCompositor : public MockCompositor { public: - MockAppinfoCompositor() - : MockCompositor(&MockAppinfoCompositor::TestSetup, this) + MockLaunchAppinfoCompositor() + : MockCompositor(&MockLaunchAppinfoCompositor::TestSetup, this) { ds_inf("%s : this(%p)", __func__, this); @@ -23,47 +23,47 @@ public: bMetadataReady = false; } - ~MockAppinfoCompositor() + ~MockLaunchAppinfoCompositor() { ds_inf("%s : this(%p)", __func__, this); } static void TestSetup(void *data) { - MockAppinfoCompositor *mockComp = - static_cast(data); + MockLaunchAppinfoCompositor *mockComp = + static_cast(data); Compositor *comp = mockComp->compositor; ds_inf("%s: mockComp(%p)", __func__, mockComp); - mockComp->mAppinfoMgr = ds_tizen_appinfo_mgr_create(comp->display); + mockComp->mAppinfoMgr = ds_tizen_launch_appinfo_mgr_create(comp->display); // destroy listener mockComp->mDestroyListener.notify = - MockAppinfoCompositor::DestroyCallback; + MockLaunchAppinfoCompositor::DestroyCallback; mockComp->mDestroyListener.parent = mockComp; - ds_tizen_appinfo_mgr_add_destroy_listener(mockComp->mAppinfoMgr, + ds_tizen_launch_appinfo_mgr_add_destroy_listener(mockComp->mAppinfoMgr, &mockComp->mDestroyListener); // set_pid listener mockComp->mSetPidListener.notify = - MockAppinfoCompositor::SetPidCallback; + MockLaunchAppinfoCompositor::SetPidCallback; mockComp->mSetPidListener.parent = mockComp; - ds_tizen_appinfo_mgr_add_set_pid_listener(mockComp->mAppinfoMgr, + ds_tizen_launch_appinfo_mgr_add_set_pid_listener(mockComp->mAppinfoMgr, &mockComp->mSetPidListener); // set_appid listener mockComp->mSetAppidListener.notify = - MockAppinfoCompositor::SetAppidCallback; + MockLaunchAppinfoCompositor::SetAppidCallback; mockComp->mSetAppidListener.parent = mockComp; - ds_tizen_appinfo_mgr_add_set_appid_listener(mockComp->mAppinfoMgr, + ds_tizen_launch_appinfo_mgr_add_set_appid_listener(mockComp->mAppinfoMgr, &mockComp->mSetAppidListener); // metadata_ready listener mockComp->mMetadataReadyListener.notify = - MockAppinfoCompositor::MetadataReadyCallback; + MockLaunchAppinfoCompositor::MetadataReadyCallback; mockComp->mMetadataReadyListener.parent = mockComp; - ds_tizen_appinfo_mgr_add_metadata_ready_listener( + ds_tizen_launch_appinfo_mgr_add_metadata_ready_listener( mockComp->mAppinfoMgr, &mockComp->mMetadataReadyListener); } @@ -72,7 +72,7 @@ public: { ds_inf("%s", __func__); - MockAppinfoCompositor *mockComp = + MockLaunchAppinfoCompositor *mockComp = reinterpret_cast(listener)->parent; mockComp->bDestroyed = true; @@ -82,9 +82,9 @@ public: { ds_inf("%s", __func__); - MockAppinfoCompositor *mockComp = + MockLaunchAppinfoCompositor *mockComp = reinterpret_cast(listener)->parent; - struct ds_tizen_appinfo *info = static_cast(data); + struct ds_tizen_launch_appinfo *info = static_cast(data); ds_inf("%s: mockComp(%p), appinfo(%p)", __func__, mockComp, info); @@ -95,9 +95,9 @@ public: { ds_inf("%s", __func__); - MockAppinfoCompositor *mockComp = + MockLaunchAppinfoCompositor *mockComp = reinterpret_cast(listener)->parent; - struct ds_tizen_appinfo *info = static_cast(data); + struct ds_tizen_launch_appinfo *info = static_cast(data); ds_inf("%s: mockComp(%p), appinfo(%p)", __func__, mockComp, info); @@ -109,9 +109,9 @@ public: { ds_inf("%s", __func__); - MockAppinfoCompositor *mockComp = + MockLaunchAppinfoCompositor *mockComp = reinterpret_cast(listener)->parent; - struct ds_tizen_appinfo *info = static_cast(data); + struct ds_tizen_launch_appinfo *info = static_cast(data); ds_inf("%s: mockComp(%p), appinfo(%p)", __func__, mockComp, info); @@ -122,7 +122,7 @@ public: { ds_inf("%s", __func__); - wl_resource *res_appinfo = ds_tizen_appinfo_mgr_get_appinfo_resource(mAppinfoMgr); + wl_resource *res_appinfo = ds_tizen_launch_appinfo_mgr_get_appinfo_resource(mAppinfoMgr); tizen_launch_appinfo_send_base_output_resolution_done(res_appinfo, pid, width, height); } @@ -134,36 +134,36 @@ public: bool bMetadataReady; private: - struct ds_tizen_appinfo_mgr *mAppinfoMgr; + struct ds_tizen_launch_appinfo_mgr *mAppinfoMgr; struct DestroyListener: ::wl_listener { - MockAppinfoCompositor *parent; + MockLaunchAppinfoCompositor *parent; }; DestroyListener mDestroyListener; struct SetPidListener: ::wl_listener { - MockAppinfoCompositor *parent; + MockLaunchAppinfoCompositor *parent; }; SetPidListener mSetPidListener; struct SetAppidListener: ::wl_listener { - MockAppinfoCompositor *parent; + MockLaunchAppinfoCompositor *parent; }; SetAppidListener mSetAppidListener; struct MetadataReadyListener: ::wl_listener { - MockAppinfoCompositor *parent; + MockLaunchAppinfoCompositor *parent; }; MetadataReadyListener mMetadataReadyListener; }; -class MockAppinfoClient : public MockClient +class MockLaunchAppinfoClient : public MockClient { public: - MockAppinfoClient() + MockLaunchAppinfoClient() : bBaseOutputResolutionDone(false), mBaseOutputResolutionWidth(0), mBaseOutputResolutionHeight(0), compositor_res(nullptr), tizen_launch_appinfo(nullptr) {} - MockAppinfoClient(const struct wl_registry_listener *listener) + MockLaunchAppinfoClient(const struct wl_registry_listener *listener) : MockClient(listener, this) { ds_inf("%s", __func__); @@ -172,7 +172,7 @@ public: mBaseOutputResolutionWidth = 0; mBaseOutputResolutionHeight = 0; } - ~MockAppinfoClient() + ~MockLaunchAppinfoClient() { ds_inf("%s", __func__); } @@ -191,13 +191,13 @@ public: return compositor_res; } - void SetTizenAppinfo(struct tizen_launch_appinfo *global_res) + void SetTizenLaunchAppinfo(struct tizen_launch_appinfo *global_res) { ds_inf("%s", __func__); tizen_launch_appinfo = global_res; } - struct tizen_launch_appinfo *GetTizenAppinfo() + struct tizen_launch_appinfo *GetTizenLaunchAppinfo() { ds_inf("%s", __func__); @@ -221,7 +221,7 @@ client_tizen_appinfo_cb_base_output_resolution_done(void *data, { ds_inf("%s", __func__); - MockAppinfoClient *client = static_cast(data); + MockLaunchAppinfoClient *client = static_cast(data); client->bBaseOutputResolutionDone = true; client->mBaseOutputResolutionWidth = width; @@ -238,7 +238,7 @@ client_registry_cb_global(void *data, struct wl_registry *registry, { ds_inf("%s", __func__); - MockAppinfoClient *client = static_cast(data); + MockLaunchAppinfoClient *client = static_cast(data); struct wl_compositor *compositor_res; struct tizen_launch_appinfo *tizen_launch_appinfo; @@ -257,7 +257,7 @@ client_registry_cb_global(void *data, struct wl_registry *registry, ds_err("wl_registry_bind() failed. tizen_launch_appinfo resource."); return; } - client->SetTizenAppinfo(tizen_launch_appinfo); + client->SetTizenLaunchAppinfo(tizen_launch_appinfo); tizen_launch_appinfo_add_listener(tizen_launch_appinfo, &appinfo_cb_listener, client); @@ -270,9 +270,9 @@ client_registry_cb_global_remove(void *data, struct wl_registry *registry, { ds_inf("%s", __func__); - MockAppinfoClient *client = static_cast(data); + MockLaunchAppinfoClient *client = static_cast(data); struct wl_compositor *compositor_res = client->GetWlCompositor(); - struct tizen_launch_appinfo *appinfo_res = client->GetTizenAppinfo(); + struct tizen_launch_appinfo *appinfo_res = client->GetTizenLaunchAppinfo(); tizen_launch_appinfo_destroy(appinfo_res); wl_compositor_destroy(compositor_res); @@ -283,33 +283,33 @@ static const struct wl_registry_listener registry_listener = { .global_remove = client_registry_cb_global_remove }; -class AppinfoTest : public ::testing::Test +class LaunchAppinfoTest : public ::testing::Test { public: void SetUp(void) override; void TearDown(void) override; - MockAppinfoCompositor *comp; - MockAppinfoClient *client; + MockLaunchAppinfoCompositor *comp; + MockLaunchAppinfoClient *client; struct wl_compositor *compositor_res; struct tizen_launch_appinfo *appinfo_res; }; void -AppinfoTest::SetUp(void) +LaunchAppinfoTest::SetUp(void) { ds_inf("%s", __func__); - comp = new MockAppinfoCompositor(); - client = new MockAppinfoClient(®istry_listener); + comp = new MockLaunchAppinfoCompositor(); + client = new MockLaunchAppinfoClient(®istry_listener); compositor_res = client->GetWlCompositor(); - appinfo_res = client->GetTizenAppinfo(); + appinfo_res = client->GetTizenLaunchAppinfo(); client->RoundTrip(); } void -AppinfoTest::TearDown(void) +LaunchAppinfoTest::TearDown(void) { ds_inf("%s", __func__); @@ -319,12 +319,12 @@ AppinfoTest::TearDown(void) delete comp; } -TEST_F(AppinfoTest, Create_P) +TEST_F(LaunchAppinfoTest, Create_P) { EXPECT_TRUE(true); } -TEST_F(AppinfoTest, Req_TizenAppinfoRegisterPid) +TEST_F(LaunchAppinfoTest, Req_TizenLaunchAppinfoRegisterPid) { uint32_t pid = 1234; @@ -333,7 +333,7 @@ TEST_F(AppinfoTest, Req_TizenAppinfoRegisterPid) EXPECT_TRUE(comp->bSetPid); } -TEST_F(AppinfoTest, Req_TizenAppinfoSetAppid) +TEST_F(LaunchAppinfoTest, Req_TizenLaunchAppinfoSetAppid) { uint32_t pid = 1234; const char *appid = "org.tizen.libds-tizen-appinfo-test"; @@ -347,7 +347,7 @@ TEST_F(AppinfoTest, Req_TizenAppinfoSetAppid) EXPECT_TRUE(comp->bSetAppid); } -TEST_F(AppinfoTest, Req_TizenAppinfoRegisterAppid) +TEST_F(LaunchAppinfoTest, Req_TizenLaunchAppinfoRegisterAppid) { const char *appid = "org.tizen.libds-tizen-appinfo-test"; @@ -356,7 +356,7 @@ TEST_F(AppinfoTest, Req_TizenAppinfoRegisterAppid) EXPECT_TRUE(comp->bSetAppid); } -TEST_F(AppinfoTest, Req_TizenAppinfoSetPid) +TEST_F(LaunchAppinfoTest, Req_TizenLaunchAppinfoSetPid) { uint32_t pid = 1234; const char *appid = "org.tizen.libds-tizen-appinfo-test"; @@ -370,7 +370,7 @@ TEST_F(AppinfoTest, Req_TizenAppinfoSetPid) EXPECT_TRUE(comp->bSetPid); } -TEST_F(AppinfoTest, Req_TizenAppinfoMetadataReady) +TEST_F(LaunchAppinfoTest, Req_TizenLaunchAppinfoMetadataReady) { const char *appid = "org.tizen.libds-tizen-appinfo-test"; uint32_t pid = 1234; @@ -384,7 +384,7 @@ TEST_F(AppinfoTest, Req_TizenAppinfoMetadataReady) EXPECT_TRUE(comp->bMetadataReady); } -TEST_F(AppinfoTest, Req_TizenAppinfoGetBaseOutputResolution) +TEST_F(LaunchAppinfoTest, Req_TizenLaunchAppinfoGetBaseOutputResolution) { uint32_t pid = 1234; @@ -400,7 +400,7 @@ TEST_F(AppinfoTest, Req_TizenAppinfoGetBaseOutputResolution) EXPECT_TRUE(client->mBaseOutputResolutionHeight == 1920); // default value } -TEST_F(AppinfoTest, Ev_TizenAppinfoBaseOutputResolutionDone) +TEST_F(LaunchAppinfoTest, Ev_TizenLaunchAppinfoBaseOutputResolutionDone) { uint32_t pid = 1234, width = 1920, height = 1080; diff --git a/tests/tc_launch_effect.cpp b/tests/tc_launch_effect.cpp index ebfd8ca..e024956 100644 --- a/tests/tc_launch_effect.cpp +++ b/tests/tc_launch_effect.cpp @@ -1,7 +1,7 @@ #include "tc_main.h" #include "mockclient.h" #include "mockcompositor.h" -#include +#include #include #include @@ -15,11 +15,11 @@ char const *path_edc = "/usr/share/e_tizen_unittests/data/launch_splash.edj"; char const *path_img = "/usr/share/e_tizen_unittests/data/launchimg_splash.png"; -class MockEffectCompositor : public MockCompositor +class MockLaunchEffectCompositor : public MockCompositor { public: - MockEffectCompositor() - : MockCompositor(&MockEffectCompositor::TestSetup, this) + MockLaunchEffectCompositor() + : MockCompositor(&MockLaunchEffectCompositor::TestSetup, this) { ds_inf("%s : this(%p)", __func__, this); @@ -33,47 +33,47 @@ public: mEffectType = -1; } - ~MockEffectCompositor() + ~MockLaunchEffectCompositor() { ds_inf("%s : this(%p)", __func__, this); } static void TestSetup(void *data) { - MockEffectCompositor *mockComp = - static_cast(data); + MockLaunchEffectCompositor *mockComp = + static_cast(data); Compositor *comp = mockComp->compositor; ds_inf("%s: mockComp(%p)", __func__, mockComp); - mockComp->mEffect = ds_tizen_effect_create(comp->display); + mockComp->mEffect = ds_tizen_launch_effect_create(comp->display); // destroy listener mockComp->mDestroyListener.notify = - MockEffectCompositor::DestroyCallback; + MockLaunchEffectCompositor::DestroyCallback; mockComp->mDestroyListener.parent = mockComp; - ds_tizen_effect_add_destroy_listener(mockComp->mEffect, + ds_tizen_launch_effect_add_destroy_listener(mockComp->mEffect, &mockComp->mDestroyListener); // type_set listener mockComp->mTypeSetListener.notify = - MockEffectCompositor::TypeSetCallback; + MockLaunchEffectCompositor::TypeSetCallback; mockComp->mTypeSetListener.parent = mockComp; - ds_tizen_effect_add_type_set_listener(mockComp->mEffect, + ds_tizen_launch_effect_add_type_set_listener(mockComp->mEffect, &mockComp->mTypeSetListener); // type_unset listener mockComp->mTypeUnsetListener.notify = - MockEffectCompositor::TypeUnsetCallback; + MockLaunchEffectCompositor::TypeUnsetCallback; mockComp->mTypeUnsetListener.parent = mockComp; - ds_tizen_effect_add_type_unset_listener(mockComp->mEffect, + ds_tizen_launch_effect_add_type_unset_listener(mockComp->mEffect, &mockComp->mTypeUnsetListener); // new_splash listener mockComp->mNewSplashListener.notify = - MockEffectCompositor::NewSplashCallback; + MockLaunchEffectCompositor::NewSplashCallback; mockComp->mNewSplashListener.parent = mockComp; - ds_tizen_effect_add_new_splash_listener(mockComp->mEffect, + ds_tizen_launch_effect_add_new_splash_listener(mockComp->mEffect, &mockComp->mNewSplashListener); } @@ -81,7 +81,7 @@ public: { ds_inf("%s", __func__); - MockEffectCompositor *mockComp = + MockLaunchEffectCompositor *mockComp = reinterpret_cast(listener)->parent; mockComp->bDestroyed = true; @@ -89,10 +89,10 @@ public: static void TypeSetCallback(struct wl_listener *listener, void *data) { - struct ds_tizen_effect_event_type_set *event = (ds_tizen_effect_event_type_set *)data; + struct ds_tizen_launch_effect_event_type_set *event = (ds_tizen_launch_effect_event_type_set *)data; ds_inf("%s", __func__); - MockEffectCompositor *mockComp = + MockLaunchEffectCompositor *mockComp = reinterpret_cast(listener)->parent; mockComp->bTypeSet = true; @@ -102,10 +102,10 @@ public: static void TypeUnsetCallback(struct wl_listener *listener, void *data) { - struct ds_tizen_effect_event_type_unset *event = (ds_tizen_effect_event_type_unset *)data; + struct ds_tizen_launch_effect_event_type_unset *event = (ds_tizen_launch_effect_event_type_unset *)data; ds_inf("%s", __func__); - MockEffectCompositor *mockComp = + MockLaunchEffectCompositor *mockComp = reinterpret_cast(listener)->parent; mockComp->bTypeSet = false; @@ -116,29 +116,29 @@ public: static void NewSplashCallback(struct wl_listener *listener, void *data) { - struct ds_tizen_effect_event_new_splash *event = (ds_tizen_effect_event_new_splash *)data; + struct ds_tizen_launch_splash *splash = (ds_tizen_launch_splash *)data; ds_inf("%s", __func__); - MockEffectCompositor *mockComp = + MockLaunchEffectCompositor *mockComp = reinterpret_cast(listener)->parent; mockComp->bNewSplash = true; - mockComp->mSplash = event->splash; + mockComp->mSplash = splash; // owner listener mockComp->mOwnerListener.notify = - MockEffectCompositor::OwnerCallback; + MockLaunchEffectCompositor::OwnerCallback; mockComp->mOwnerListener.parent = mockComp; - ds_tizen_splash_add_owner_listener(mockComp->mSplash, + ds_tizen_launch_splash_add_owner_listener(mockComp->mSplash, &mockComp->mOwnerListener); } static void OwnerCallback(struct wl_listener *listener, void *data) { - struct ds_tizen_splash_event_owner *event = (ds_tizen_splash_event_owner *)data; + struct ds_tizen_launch_splash_event_owner *event = (ds_tizen_launch_splash_event_owner *)data; ds_inf("%s", __func__); - MockEffectCompositor *mockComp = + MockLaunchEffectCompositor *mockComp = reinterpret_cast(listener)->parent; mockComp->mPid = event->pid; @@ -154,49 +154,49 @@ public: int mEffectType; private: - struct ds_tizen_effect *mEffect; - struct ds_tizen_splash *mSplash; + struct ds_tizen_launch_effect *mEffect; + struct ds_tizen_launch_splash *mSplash; struct DestroyListener: ::wl_listener { - MockEffectCompositor *parent; + MockLaunchEffectCompositor *parent; }; DestroyListener mDestroyListener; struct TypeSetListener: ::wl_listener { - MockEffectCompositor *parent; + MockLaunchEffectCompositor *parent; }; TypeSetListener mTypeSetListener; struct TypeUnsetListener: ::wl_listener { - MockEffectCompositor *parent; + MockLaunchEffectCompositor *parent; }; TypeUnsetListener mTypeUnsetListener; struct NewSplashListener: ::wl_listener { - MockEffectCompositor *parent; + MockLaunchEffectCompositor *parent; }; NewSplashListener mNewSplashListener; struct OwnerListener: ::wl_listener { - MockEffectCompositor *parent; + MockLaunchEffectCompositor *parent; }; OwnerListener mOwnerListener; }; -class MockEffectClient : public MockClient +class MockLaunchEffectClient : public MockClient { public: - MockEffectClient() + MockLaunchEffectClient() : compositor_res(nullptr), tizen_launch_effect(nullptr) {} - MockEffectClient(const struct wl_registry_listener *listener) + MockLaunchEffectClient(const struct wl_registry_listener *listener) : MockClient(listener, this) { ds_inf("%s", __func__); } - ~MockEffectClient() + ~MockLaunchEffectClient() { ds_inf("%s", __func__); } @@ -215,13 +215,13 @@ public: return compositor_res; } - void SetTizenEffect(struct tizen_launch_effect *global_res) + void SetTizenLaunchEffect(struct tizen_launch_effect *global_res) { ds_inf("%s", __func__); tizen_launch_effect = global_res; } - struct tizen_launch_effect *GetTizenEffect() + struct tizen_launch_effect *GetTizenLaunchEffect() { ds_inf("%s", __func__); @@ -241,7 +241,7 @@ client_registry_cb_global(void *data, struct wl_registry *registry, { ds_inf("%s", __func__); - MockEffectClient *client = static_cast(data); + MockLaunchEffectClient *client = static_cast(data); struct wl_compositor *compositor_res; struct tizen_launch_effect *tizen_launch_effect; @@ -260,7 +260,7 @@ client_registry_cb_global(void *data, struct wl_registry *registry, ds_err("wl_registry_bind() failed. tizen_launch_effect resource."); return; } - client->SetTizenEffect(tizen_launch_effect); + client->SetTizenLaunchEffect(tizen_launch_effect); } } @@ -270,9 +270,9 @@ client_registry_cb_global_remove(void *data, struct wl_registry *registry, { ds_inf("%s", __func__); - MockEffectClient *client = static_cast(data); + MockLaunchEffectClient *client = static_cast(data); struct wl_compositor *compositor_res = client->GetWlCompositor(); - struct tizen_launch_effect *effect_res = client->GetTizenEffect(); + struct tizen_launch_effect *effect_res = client->GetTizenLaunchEffect(); tizen_launch_effect_destroy(effect_res); wl_compositor_destroy(compositor_res); @@ -283,33 +283,33 @@ static const struct wl_registry_listener registry_listener = { .global_remove = client_registry_cb_global_remove }; -class EffectTest : public ::testing::Test +class LaunchEffectTest : public ::testing::Test { public: void SetUp(void) override; void TearDown(void) override; - MockEffectCompositor *comp; - MockEffectClient *client; + MockLaunchEffectCompositor *comp; + MockLaunchEffectClient *client; struct wl_compositor *compositor_res; struct tizen_launch_effect *effect_res; }; void -EffectTest::SetUp(void) +LaunchEffectTest::SetUp(void) { ds_inf("%s", __func__); - comp = new MockEffectCompositor(); - client = new MockEffectClient(®istry_listener); + comp = new MockLaunchEffectCompositor(); + client = new MockLaunchEffectClient(®istry_listener); compositor_res = client->GetWlCompositor(); - effect_res = client->GetTizenEffect(); + effect_res = client->GetTizenLaunchEffect(); client->RoundTrip(); } void -EffectTest::TearDown(void) +LaunchEffectTest::TearDown(void) { ds_inf("%s", __func__); @@ -319,12 +319,12 @@ EffectTest::TearDown(void) delete comp; } -TEST_F(EffectTest, Create_P) +TEST_F(LaunchEffectTest, Create_P) { EXPECT_TRUE(true); } -TEST_F(EffectTest, Req_TizenEffectTypeSet) +TEST_F(LaunchEffectTest, Req_TizenLaunchEffectTypeSet) { uint pid = 12345; const char *effect_type; @@ -334,10 +334,10 @@ TEST_F(EffectTest, Req_TizenEffectTypeSet) client->RoundTrip(); EXPECT_TRUE(comp->bTypeSet); EXPECT_TRUE(comp->mPid == pid); - EXPECT_TRUE(comp->mEffectType == DS_TIZEN_EFFECT_TYPE_LAUNCH); + EXPECT_TRUE(comp->mEffectType == DS_TIZEN_LAUNCH_EFFECT_TYPE_LAUNCH); } -TEST_F(EffectTest, Req_TizenEffectTypeUnSet) +TEST_F(LaunchEffectTest, Req_TizenLaunchEffectTypeUnSet) { uint pid = 12345; const char *effect_type; @@ -347,7 +347,7 @@ TEST_F(EffectTest, Req_TizenEffectTypeUnSet) client->RoundTrip(); EXPECT_TRUE(comp->bTypeSet); EXPECT_TRUE(comp->mPid == pid); - EXPECT_TRUE(comp->mEffectType == DS_TIZEN_EFFECT_TYPE_DEPTH_IN); + EXPECT_TRUE(comp->mEffectType == DS_TIZEN_LAUNCH_EFFECT_TYPE_DEPTH_IN); tizen_launch_effect_type_unset(effect_res, pid); client->RoundTrip(); @@ -356,7 +356,7 @@ TEST_F(EffectTest, Req_TizenEffectTypeUnSet) EXPECT_TRUE(comp->mEffectType == -1); } -TEST_F(EffectTest, Req_TizenEffectCreateSplashImg) +TEST_F(LaunchEffectTest, Req_TizenLaunchEffectCreateSplashImg) { struct tizen_launch_splash *splash = NULL; @@ -366,7 +366,7 @@ TEST_F(EffectTest, Req_TizenEffectCreateSplashImg) EXPECT_TRUE(comp->bNewSplash); } -TEST_F(EffectTest, Req_TizenSplashLaunch_EDC) +TEST_F(LaunchEffectTest, Req_TizenLaunchSplashLaunch_EDC) { struct tizen_launch_splash *splash = NULL; struct wl_array options; @@ -383,10 +383,10 @@ TEST_F(EffectTest, Req_TizenSplashLaunch_EDC) client->RoundTrip(); wl_array_release(&options); EXPECT_TRUE(comp->mPid == SPLASH_CLIENT_PID); - EXPECT_TRUE(comp->mEffectType == DS_TIZEN_EFFECT_TYPE_LAUNCH); + EXPECT_TRUE(comp->mEffectType == DS_TIZEN_LAUNCH_EFFECT_TYPE_LAUNCH); } -TEST_F(EffectTest, Req_TizenSplashLaunch_IMG) +TEST_F(LaunchEffectTest, Req_TizenLaunchSplashLaunch_IMG) { struct tizen_launch_splash *splash = NULL; struct wl_array options; @@ -403,10 +403,10 @@ TEST_F(EffectTest, Req_TizenSplashLaunch_IMG) client->RoundTrip(); wl_array_release(&options); EXPECT_TRUE(comp->mPid == SPLASH_CLIENT_PID); - EXPECT_TRUE(comp->mEffectType == DS_TIZEN_EFFECT_TYPE_LAUNCH); + EXPECT_TRUE(comp->mEffectType == DS_TIZEN_LAUNCH_EFFECT_TYPE_LAUNCH); } -TEST_F(EffectTest, Req_TizenSplashSetOwner) +TEST_F(LaunchEffectTest, Req_TizenLaunchSplashSetOwner) { struct tizen_launch_splash *splash = NULL; struct wl_array options; @@ -424,15 +424,15 @@ TEST_F(EffectTest, Req_TizenSplashSetOwner) client->RoundTrip(); wl_array_release(&options); EXPECT_TRUE(comp->mPid == SPLASH_CLIENT_PID); - EXPECT_TRUE(comp->mEffectType == DS_TIZEN_EFFECT_TYPE_DEPTH_IN); + EXPECT_TRUE(comp->mEffectType == DS_TIZEN_LAUNCH_EFFECT_TYPE_DEPTH_IN); tizen_launch_splash_owner(splash, pid); client->RoundTrip(); EXPECT_TRUE(comp->mPid == pid); - EXPECT_TRUE(comp->mEffectType == DS_TIZEN_EFFECT_TYPE_DEPTH_IN); + EXPECT_TRUE(comp->mEffectType == DS_TIZEN_LAUNCH_EFFECT_TYPE_DEPTH_IN); } -TEST_F(EffectTest, Req_TizenSplashLaunch_v2) +TEST_F(LaunchEffectTest, Req_TizenLaunchSplashLaunch_v2) { struct tizen_launch_splash *splash = NULL; @@ -472,5 +472,5 @@ TEST_F(EffectTest, Req_TizenSplashLaunch_v2) wl_array_release(&options); wl_array_release(&extra_config); EXPECT_TRUE(comp->mPid == SPLASH_CLIENT_PID); - EXPECT_TRUE(comp->mEffectType == DS_TIZEN_EFFECT_TYPE_DEPTH_IN); + EXPECT_TRUE(comp->mEffectType == DS_TIZEN_LAUNCH_EFFECT_TYPE_DEPTH_IN); } -- 2.7.4