[UTC][chromium-efl][ACR-570][Modify Intercept Request API tests]

The following files were modified to keep up with necessary changes in
Intercept Request API in chromium-efl:
  utc_webkit2_ewk_intercept_request_headers_get_func.c
  utc_webkit2_ewk_intercept_request_http_method_get_func.c
  utc_webkit2_ewk_intercept_request_ignore_func.c
  utc_webkit2_ewk_intercept_request_response_body_set_func.c
  utc_webkit2_ewk_intercept_request_response_header_add_func.c
  utc_webkit2_ewk_intercept_request_response_header_map_add_func.c
  utc_webkit2_ewk_intercept_request_response_set_func.c
  utc_webkit2_ewk_intercept_request_response_status_set_func.c
  utc_webkit2_ewk_intercept_request_response_write_chunk_func.c
  utc_webkit2_ewk_intercept_request_url_get_func.c

One API function was moved to a different owner:
  - utc_webkit2_ewk_view_intercept_request_callback_set_func.c
  + utc_webkit2_ewk_context_intercept_request_callback_set_func.c

Change-Id: I66e0a988cac7a4f7e1343b230fb2266bda31adcc
Signed-off-by: Grzegorz Ludwikowski <g.ludwikowsk@samsung.com>

diff --git a/src/utc/webkit2/CMakeLists.txt b/src/utc/webkit2/CMakeLists.txt
index 8437701..196f44e 100644 (file)
--- a/src/utc/webkit2/CMakeLists.txt
+++ b/src/utc/webkit2/CMakeLists.txt
@@ -34,6 +34,7 @@ SET(TC_SOURCES
     utc_webkit2_ewk_context_form_candidate_data_delete_all_func.c
     utc_webkit2_ewk_context_form_password_data_delete_all_func.c
     utc_webkit2_ewk_context_icon_database_icon_object_add_func.c
+    utc_webkit2_ewk_context_intercept_request_callback_set_func.c
     utc_webkit2_ewk_context_menu_item_append_as_action_func.c
     utc_webkit2_ewk_context_menu_item_append_func.c
     utc_webkit2_ewk_context_menu_item_count_func.c
@@ -110,7 +111,6 @@ SET(TC_SOURCES
     utc_webkit2_ewk_view_forward_possible_func.c
     utc_webkit2_ewk_view_fullscreen_exit_func.c
     utc_webkit2_ewk_view_html_string_load_func.c
-    utc_webkit2_ewk_view_intercept_request_callback_set_func.c
     utc_webkit2_ewk_view_javascript_message_handler_add.c
     utc_webkit2_ewk_view_load_progress_get_func.c
     utc_webkit2_ewk_view_orientation_send_func.c

diff --git a/src/utc/webkit2/public.list b/src/utc/webkit2/public.list
index 014b739..fb24c30 100755 (executable)
--- a/src/utc/webkit2/public.list
+++ b/src/utc/webkit2/public.list
@@ -8,6 +8,7 @@ ewk_settings_autofill_password_form_enabled_set
 ewk_settings_form_candidate_data_enabled_set
 ewk_settings_form_profile_data_enabled_set
 ewk_context_icon_database_icon_object_add
+ewk_context_intercept_request_callback_set
 ewk_context_web_indexed_database_delete_all
 ewk_context_web_storage_delete_all
 ewk_autofill_profile_data_get
@@ -93,7 +94,6 @@ ewk_view_context_get
 ewk_view_forward
 ewk_view_forward_possible
 ewk_view_fullscreen_exit
-ewk_view_intercept_request_callback_set
 ewk_view_load_progress_get
 ewk_view_reload
 ewk_view_resume

diff --git a/src/utc/webkit2/tct-webkit2-core_common_iot.h b/src/utc/webkit2/tct-webkit2-core_common_iot.h
index 994c4f7..a9075c4 100755 (executable)
--- a/src/utc/webkit2/tct-webkit2-core_common_iot.h
+++ b/src/utc/webkit2/tct-webkit2-core_common_iot.h
@@ -89,6 +89,8 @@ extern void utc_webkit2_ewk_context_form_password_data_delete_all_func_startup(v
 extern void utc_webkit2_ewk_context_form_password_data_delete_all_func_cleanup(void);
 extern void utc_webkit2_ewk_context_icon_database_icon_object_add_func_startup(void);
 extern void utc_webkit2_ewk_context_icon_database_icon_object_add_func_cleanup(void);
+extern void utc_webkit2_ewk_context_intercept_request_callback_set_func_startup(void);
+extern void utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup(void);
 extern void utc_webkit2_ewk_context_menu_item_append_as_action_func_startup(void);
 extern void utc_webkit2_ewk_context_menu_item_append_as_action_func_cleanup(void);
 extern void utc_webkit2_ewk_context_menu_item_append_func_startup(void);
@@ -239,8 +241,6 @@ extern void utc_webkit2_ewk_view_fullscreen_exit_func_startup(void);
 extern void utc_webkit2_ewk_view_fullscreen_exit_func_cleanup(void);
 extern void utc_webkit2_ewk_view_html_string_load_func_startup(void);
 extern void utc_webkit2_ewk_view_html_string_load_func_cleanup(void);
-extern void utc_webkit2_ewk_view_intercept_request_callback_set_func_startup(void);
-extern void utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup(void);
 extern void utc_webkit2_ewk_view_javascript_message_handler_add_startup(void);
 extern void utc_webkit2_ewk_view_javascript_message_handler_add_cleanup(void);
 extern void utc_webkit2_ewk_view_load_progress_get_func_startup(void);
@@ -365,6 +365,9 @@ extern int utc_webkit2_ewk_context_form_password_data_delete_all_p(void);
 extern int utc_webkit2_ewk_context_form_password_data_delete_all_n(void);
 extern int utc_webkit2_ewk_context_icon_database_icon_object_add_p(void);
 extern int utc_webkit2_ewk_context_icon_database_icon_object_add_n(void);
+extern int utc_webkit2_ewk_context_intercept_request_callback_set_p(void);
+extern int utc_webkit2_ewk_context_intercept_request_callback_set_p1(void);
+extern int utc_webkit2_ewk_context_intercept_request_callback_set_n(void);
 extern int utc_webkit2_ewk_context_menu_item_append_as_action_n(void);
 extern int utc_webkit2_ewk_context_menu_item_append_n(void);
 extern int utc_webkit2_ewk_context_menu_item_count_n(void);
@@ -518,9 +521,6 @@ extern int utc_webkit2_ewk_view_fullscreen_exit_p(void);
 extern int utc_webkit2_ewk_view_fullscreen_exit_n(void);
 extern int utc_webkit2_ewk_view_html_string_load_p(void);
 extern int utc_webkit2_ewk_view_html_string_load_n(void);
-extern int utc_webkit2_ewk_view_intercept_request_callback_set_p(void);
-extern int utc_webkit2_ewk_view_intercept_request_callback_set_p1(void);
-extern int utc_webkit2_ewk_view_intercept_request_callback_set_n(void);
 extern int utc_webkit2_ewk_view_javascript_message_handler_add_p(void);
 extern int utc_webkit2_ewk_view_javascript_message_handler_add_n(void);
 extern int utc_webkit2_ewk_view_load_progress_get_p(void);
@@ -655,6 +655,9 @@ testcase tc_array[] = {
     {"utc_webkit2_ewk_context_form_password_data_delete_all_n", utc_webkit2_ewk_context_form_password_data_delete_all_n, utc_webkit2_ewk_context_form_password_data_delete_all_func_startup, utc_webkit2_ewk_context_form_password_data_delete_all_func_cleanup},
     {"utc_webkit2_ewk_context_icon_database_icon_object_add_p", utc_webkit2_ewk_context_icon_database_icon_object_add_p, utc_webkit2_ewk_context_icon_database_icon_object_add_func_startup, utc_webkit2_ewk_context_icon_database_icon_object_add_func_cleanup},
     {"utc_webkit2_ewk_context_icon_database_icon_object_add_n", utc_webkit2_ewk_context_icon_database_icon_object_add_n, utc_webkit2_ewk_context_icon_database_icon_object_add_func_startup, utc_webkit2_ewk_context_icon_database_icon_object_add_func_cleanup},
+    {"utc_webkit2_ewk_context_intercept_request_callback_set_p", utc_webkit2_ewk_context_intercept_request_callback_set_p, utc_webkit2_ewk_context_intercept_request_callback_set_func_startup, utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup},
+    {"utc_webkit2_ewk_context_intercept_request_callback_set_p1", utc_webkit2_ewk_context_intercept_request_callback_set_p1, utc_webkit2_ewk_context_intercept_request_callback_set_func_startup, utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup},
+    {"utc_webkit2_ewk_context_intercept_request_callback_set_n", utc_webkit2_ewk_context_intercept_request_callback_set_n, utc_webkit2_ewk_context_intercept_request_callback_set_func_startup, utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup},
     {"utc_webkit2_ewk_context_menu_item_append_as_action_n", utc_webkit2_ewk_context_menu_item_append_as_action_n, utc_webkit2_ewk_context_menu_item_append_as_action_func_startup, utc_webkit2_ewk_context_menu_item_append_as_action_func_cleanup},
     {"utc_webkit2_ewk_context_menu_item_append_n", utc_webkit2_ewk_context_menu_item_append_n, utc_webkit2_ewk_context_menu_item_append_func_startup, utc_webkit2_ewk_context_menu_item_append_func_cleanup},
     {"utc_webkit2_ewk_context_menu_item_count_n", utc_webkit2_ewk_context_menu_item_count_n, utc_webkit2_ewk_context_menu_item_count_func_startup, utc_webkit2_ewk_context_menu_item_count_func_cleanup},
@@ -808,9 +811,6 @@ testcase tc_array[] = {
     {"utc_webkit2_ewk_view_fullscreen_exit_n", utc_webkit2_ewk_view_fullscreen_exit_n, utc_webkit2_ewk_view_fullscreen_exit_func_startup, utc_webkit2_ewk_view_fullscreen_exit_func_cleanup},
     {"utc_webkit2_ewk_view_html_string_load_p", utc_webkit2_ewk_view_html_string_load_p, utc_webkit2_ewk_view_html_string_load_func_startup, utc_webkit2_ewk_view_html_string_load_func_cleanup},
     {"utc_webkit2_ewk_view_html_string_load_n", utc_webkit2_ewk_view_html_string_load_n, utc_webkit2_ewk_view_html_string_load_func_startup, utc_webkit2_ewk_view_html_string_load_func_cleanup},
-    {"utc_webkit2_ewk_view_intercept_request_callback_set_p", utc_webkit2_ewk_view_intercept_request_callback_set_p, utc_webkit2_ewk_view_intercept_request_callback_set_func_startup, utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup},
-    {"utc_webkit2_ewk_view_intercept_request_callback_set_p1", utc_webkit2_ewk_view_intercept_request_callback_set_p1, utc_webkit2_ewk_view_intercept_request_callback_set_func_startup, utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup},
-    {"utc_webkit2_ewk_view_intercept_request_callback_set_n", utc_webkit2_ewk_view_intercept_request_callback_set_n, utc_webkit2_ewk_view_intercept_request_callback_set_func_startup, utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup},
     {"utc_webkit2_ewk_view_javascript_message_handler_add_p", utc_webkit2_ewk_view_javascript_message_handler_add_p, utc_webkit2_ewk_view_javascript_message_handler_add_startup, utc_webkit2_ewk_view_javascript_message_handler_add_cleanup},
     {"utc_webkit2_ewk_view_javascript_message_handler_add_n", utc_webkit2_ewk_view_javascript_message_handler_add_p, utc_webkit2_ewk_view_javascript_message_handler_add_startup, utc_webkit2_ewk_view_javascript_message_handler_add_cleanup},
     {"utc_webkit2_ewk_view_load_progress_get_p", utc_webkit2_ewk_view_load_progress_get_p, utc_webkit2_ewk_view_load_progress_get_func_startup, utc_webkit2_ewk_view_load_progress_get_func_cleanup},

diff --git a/src/utc/webkit2/tct-webkit2-core_mobile.h b/src/utc/webkit2/tct-webkit2-core_mobile.h
index 994c4f7..a9075c4 100644 (file)
--- a/src/utc/webkit2/tct-webkit2-core_mobile.h
+++ b/src/utc/webkit2/tct-webkit2-core_mobile.h
@@ -89,6 +89,8 @@ extern void utc_webkit2_ewk_context_form_password_data_delete_all_func_startup(v
 extern void utc_webkit2_ewk_context_form_password_data_delete_all_func_cleanup(void);
 extern void utc_webkit2_ewk_context_icon_database_icon_object_add_func_startup(void);
 extern void utc_webkit2_ewk_context_icon_database_icon_object_add_func_cleanup(void);
+extern void utc_webkit2_ewk_context_intercept_request_callback_set_func_startup(void);
+extern void utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup(void);
 extern void utc_webkit2_ewk_context_menu_item_append_as_action_func_startup(void);
 extern void utc_webkit2_ewk_context_menu_item_append_as_action_func_cleanup(void);
 extern void utc_webkit2_ewk_context_menu_item_append_func_startup(void);
@@ -239,8 +241,6 @@ extern void utc_webkit2_ewk_view_fullscreen_exit_func_startup(void);
 extern void utc_webkit2_ewk_view_fullscreen_exit_func_cleanup(void);
 extern void utc_webkit2_ewk_view_html_string_load_func_startup(void);
 extern void utc_webkit2_ewk_view_html_string_load_func_cleanup(void);
-extern void utc_webkit2_ewk_view_intercept_request_callback_set_func_startup(void);
-extern void utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup(void);
 extern void utc_webkit2_ewk_view_javascript_message_handler_add_startup(void);
 extern void utc_webkit2_ewk_view_javascript_message_handler_add_cleanup(void);
 extern void utc_webkit2_ewk_view_load_progress_get_func_startup(void);
@@ -365,6 +365,9 @@ extern int utc_webkit2_ewk_context_form_password_data_delete_all_p(void);
 extern int utc_webkit2_ewk_context_form_password_data_delete_all_n(void);
 extern int utc_webkit2_ewk_context_icon_database_icon_object_add_p(void);
 extern int utc_webkit2_ewk_context_icon_database_icon_object_add_n(void);
+extern int utc_webkit2_ewk_context_intercept_request_callback_set_p(void);
+extern int utc_webkit2_ewk_context_intercept_request_callback_set_p1(void);
+extern int utc_webkit2_ewk_context_intercept_request_callback_set_n(void);
 extern int utc_webkit2_ewk_context_menu_item_append_as_action_n(void);
 extern int utc_webkit2_ewk_context_menu_item_append_n(void);
 extern int utc_webkit2_ewk_context_menu_item_count_n(void);
@@ -518,9 +521,6 @@ extern int utc_webkit2_ewk_view_fullscreen_exit_p(void);
 extern int utc_webkit2_ewk_view_fullscreen_exit_n(void);
 extern int utc_webkit2_ewk_view_html_string_load_p(void);
 extern int utc_webkit2_ewk_view_html_string_load_n(void);
-extern int utc_webkit2_ewk_view_intercept_request_callback_set_p(void);
-extern int utc_webkit2_ewk_view_intercept_request_callback_set_p1(void);
-extern int utc_webkit2_ewk_view_intercept_request_callback_set_n(void);
 extern int utc_webkit2_ewk_view_javascript_message_handler_add_p(void);
 extern int utc_webkit2_ewk_view_javascript_message_handler_add_n(void);
 extern int utc_webkit2_ewk_view_load_progress_get_p(void);
@@ -655,6 +655,9 @@ testcase tc_array[] = {
     {"utc_webkit2_ewk_context_form_password_data_delete_all_n", utc_webkit2_ewk_context_form_password_data_delete_all_n, utc_webkit2_ewk_context_form_password_data_delete_all_func_startup, utc_webkit2_ewk_context_form_password_data_delete_all_func_cleanup},
     {"utc_webkit2_ewk_context_icon_database_icon_object_add_p", utc_webkit2_ewk_context_icon_database_icon_object_add_p, utc_webkit2_ewk_context_icon_database_icon_object_add_func_startup, utc_webkit2_ewk_context_icon_database_icon_object_add_func_cleanup},
     {"utc_webkit2_ewk_context_icon_database_icon_object_add_n", utc_webkit2_ewk_context_icon_database_icon_object_add_n, utc_webkit2_ewk_context_icon_database_icon_object_add_func_startup, utc_webkit2_ewk_context_icon_database_icon_object_add_func_cleanup},
+    {"utc_webkit2_ewk_context_intercept_request_callback_set_p", utc_webkit2_ewk_context_intercept_request_callback_set_p, utc_webkit2_ewk_context_intercept_request_callback_set_func_startup, utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup},
+    {"utc_webkit2_ewk_context_intercept_request_callback_set_p1", utc_webkit2_ewk_context_intercept_request_callback_set_p1, utc_webkit2_ewk_context_intercept_request_callback_set_func_startup, utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup},
+    {"utc_webkit2_ewk_context_intercept_request_callback_set_n", utc_webkit2_ewk_context_intercept_request_callback_set_n, utc_webkit2_ewk_context_intercept_request_callback_set_func_startup, utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup},
     {"utc_webkit2_ewk_context_menu_item_append_as_action_n", utc_webkit2_ewk_context_menu_item_append_as_action_n, utc_webkit2_ewk_context_menu_item_append_as_action_func_startup, utc_webkit2_ewk_context_menu_item_append_as_action_func_cleanup},
     {"utc_webkit2_ewk_context_menu_item_append_n", utc_webkit2_ewk_context_menu_item_append_n, utc_webkit2_ewk_context_menu_item_append_func_startup, utc_webkit2_ewk_context_menu_item_append_func_cleanup},
     {"utc_webkit2_ewk_context_menu_item_count_n", utc_webkit2_ewk_context_menu_item_count_n, utc_webkit2_ewk_context_menu_item_count_func_startup, utc_webkit2_ewk_context_menu_item_count_func_cleanup},
@@ -808,9 +811,6 @@ testcase tc_array[] = {
     {"utc_webkit2_ewk_view_fullscreen_exit_n", utc_webkit2_ewk_view_fullscreen_exit_n, utc_webkit2_ewk_view_fullscreen_exit_func_startup, utc_webkit2_ewk_view_fullscreen_exit_func_cleanup},
     {"utc_webkit2_ewk_view_html_string_load_p", utc_webkit2_ewk_view_html_string_load_p, utc_webkit2_ewk_view_html_string_load_func_startup, utc_webkit2_ewk_view_html_string_load_func_cleanup},
     {"utc_webkit2_ewk_view_html_string_load_n", utc_webkit2_ewk_view_html_string_load_n, utc_webkit2_ewk_view_html_string_load_func_startup, utc_webkit2_ewk_view_html_string_load_func_cleanup},
-    {"utc_webkit2_ewk_view_intercept_request_callback_set_p", utc_webkit2_ewk_view_intercept_request_callback_set_p, utc_webkit2_ewk_view_intercept_request_callback_set_func_startup, utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup},
-    {"utc_webkit2_ewk_view_intercept_request_callback_set_p1", utc_webkit2_ewk_view_intercept_request_callback_set_p1, utc_webkit2_ewk_view_intercept_request_callback_set_func_startup, utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup},
-    {"utc_webkit2_ewk_view_intercept_request_callback_set_n", utc_webkit2_ewk_view_intercept_request_callback_set_n, utc_webkit2_ewk_view_intercept_request_callback_set_func_startup, utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup},
     {"utc_webkit2_ewk_view_javascript_message_handler_add_p", utc_webkit2_ewk_view_javascript_message_handler_add_p, utc_webkit2_ewk_view_javascript_message_handler_add_startup, utc_webkit2_ewk_view_javascript_message_handler_add_cleanup},
     {"utc_webkit2_ewk_view_javascript_message_handler_add_n", utc_webkit2_ewk_view_javascript_message_handler_add_p, utc_webkit2_ewk_view_javascript_message_handler_add_startup, utc_webkit2_ewk_view_javascript_message_handler_add_cleanup},
     {"utc_webkit2_ewk_view_load_progress_get_p", utc_webkit2_ewk_view_load_progress_get_p, utc_webkit2_ewk_view_load_progress_get_func_startup, utc_webkit2_ewk_view_load_progress_get_func_cleanup},

diff --git a/src/utc/webkit2/tct-webkit2-core_tv.h b/src/utc/webkit2/tct-webkit2-core_tv.h
index e155f43..511bb82 100644 (file)
--- a/src/utc/webkit2/tct-webkit2-core_tv.h
+++ b/src/utc/webkit2/tct-webkit2-core_tv.h
@@ -60,6 +60,8 @@ extern void utc_webkit2_ewk_context_cache_model_set_func_startup(void);
 extern void utc_webkit2_ewk_context_cache_model_set_func_cleanup(void);
 extern void utc_webkit2_ewk_context_cookie_manager_get_func_startup(void);
 extern void utc_webkit2_ewk_context_cookie_manager_get_func_cleanup(void);
+extern void utc_webkit2_ewk_context_intercept_request_callback_set_func_startup(void);
+extern void utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup(void);
 extern void utc_webkit2_ewk_context_resource_cache_clear_func_startup(void);
 extern void utc_webkit2_ewk_context_resource_cache_clear_func_cleanup(void);
 extern void utc_webkit2_ewk_context_web_indexed_database_delete_all_func_startup(void);
@@ -186,8 +188,6 @@ extern void utc_webkit2_ewk_view_fullscreen_exit_func_startup(void);
 extern void utc_webkit2_ewk_view_fullscreen_exit_func_cleanup(void);
 extern void utc_webkit2_ewk_view_html_string_load_func_startup(void);
 extern void utc_webkit2_ewk_view_html_string_load_func_cleanup(void);
-extern void utc_webkit2_ewk_view_intercept_request_callback_set_func_startup(void);
-extern void utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup(void);
 extern void utc_webkit2_ewk_view_javascript_message_handler_add_startup(void);
 extern void utc_webkit2_ewk_view_javascript_message_handler_add_cleanup(void);
 extern void utc_webkit2_ewk_view_load_progress_get_func_startup(void);
@@ -285,6 +285,9 @@ extern int utc_webkit2_ewk_context_cache_model_set_n1(void);
 extern int utc_webkit2_ewk_context_cache_model_set_n2(void);
 extern int utc_webkit2_ewk_context_cookie_manager_get_p(void);
 extern int utc_webkit2_ewk_context_cookie_manager_get_n(void);
+extern int utc_webkit2_ewk_context_intercept_request_callback_set_p(void);
+extern int utc_webkit2_ewk_context_intercept_request_callback_set_p1(void);
+extern int utc_webkit2_ewk_context_intercept_request_callback_set_n(void);
 extern int utc_webkit2_ewk_context_resource_cache_clear_p(void);
 extern int utc_webkit2_ewk_context_resource_cache_clear_n(void);
 extern int utc_webkit2_ewk_context_web_indexed_database_delete_all_p(void);
@@ -422,9 +425,6 @@ extern int utc_webkit2_ewk_view_fullscreen_exit_p(void);
 extern int utc_webkit2_ewk_view_fullscreen_exit_n(void);
 extern int utc_webkit2_ewk_view_html_string_load_p(void);
 extern int utc_webkit2_ewk_view_html_string_load_n(void);
-extern int utc_webkit2_ewk_view_intercept_request_callback_set_p(void);
-extern int utc_webkit2_ewk_view_intercept_request_callback_set_p1(void);
-extern int utc_webkit2_ewk_view_intercept_request_callback_set_n(void);
 extern int utc_webkit2_ewk_view_javascript_message_handler_add_p(void);
 extern int utc_webkit2_ewk_view_javascript_message_handler_add_n(void);
 extern int utc_webkit2_ewk_view_load_progress_get_p(void);
@@ -532,6 +532,9 @@ testcase tc_array[] = {
     {"utc_webkit2_ewk_context_cache_model_set_n2", utc_webkit2_ewk_context_cache_model_set_n2, utc_webkit2_ewk_context_cache_model_set_func_startup, utc_webkit2_ewk_context_cache_model_set_func_cleanup},
     {"utc_webkit2_ewk_context_cookie_manager_get_p", utc_webkit2_ewk_context_cookie_manager_get_p, utc_webkit2_ewk_context_cookie_manager_get_func_startup, utc_webkit2_ewk_context_cookie_manager_get_func_cleanup},
     {"utc_webkit2_ewk_context_cookie_manager_get_n", utc_webkit2_ewk_context_cookie_manager_get_n, utc_webkit2_ewk_context_cookie_manager_get_func_startup, utc_webkit2_ewk_context_cookie_manager_get_func_cleanup},
+    {"utc_webkit2_ewk_context_intercept_request_callback_set_p", utc_webkit2_ewk_context_intercept_request_callback_set_p, utc_webkit2_ewk_context_intercept_request_callback_set_func_startup, utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup},
+    {"utc_webkit2_ewk_context_intercept_request_callback_set_p1", utc_webkit2_ewk_context_intercept_request_callback_set_p1, utc_webkit2_ewk_context_intercept_request_callback_set_func_startup, utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup},
+    {"utc_webkit2_ewk_context_intercept_request_callback_set_n", utc_webkit2_ewk_context_intercept_request_callback_set_n, utc_webkit2_ewk_context_intercept_request_callback_set_func_startup, utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup},
     {"utc_webkit2_ewk_context_resource_cache_clear_p", utc_webkit2_ewk_context_resource_cache_clear_p, utc_webkit2_ewk_context_resource_cache_clear_func_startup, utc_webkit2_ewk_context_resource_cache_clear_func_cleanup},
     {"utc_webkit2_ewk_context_resource_cache_clear_n", utc_webkit2_ewk_context_resource_cache_clear_n, utc_webkit2_ewk_context_resource_cache_clear_func_startup, utc_webkit2_ewk_context_resource_cache_clear_func_cleanup},
     {"utc_webkit2_ewk_context_web_indexed_database_delete_all_p", utc_webkit2_ewk_context_web_indexed_database_delete_all_p, utc_webkit2_ewk_context_web_indexed_database_delete_all_func_startup, utc_webkit2_ewk_context_web_indexed_database_delete_all_func_cleanup},
@@ -669,9 +672,6 @@ testcase tc_array[] = {
     {"utc_webkit2_ewk_view_fullscreen_exit_n", utc_webkit2_ewk_view_fullscreen_exit_n, utc_webkit2_ewk_view_fullscreen_exit_func_startup, utc_webkit2_ewk_view_fullscreen_exit_func_cleanup},
     {"utc_webkit2_ewk_view_html_string_load_p", utc_webkit2_ewk_view_html_string_load_p, utc_webkit2_ewk_view_html_string_load_func_startup, utc_webkit2_ewk_view_html_string_load_func_cleanup},
     {"utc_webkit2_ewk_view_html_string_load_n", utc_webkit2_ewk_view_html_string_load_n, utc_webkit2_ewk_view_html_string_load_func_startup, utc_webkit2_ewk_view_html_string_load_func_cleanup},
-    {"utc_webkit2_ewk_view_intercept_request_callback_set_p", utc_webkit2_ewk_view_intercept_request_callback_set_p, utc_webkit2_ewk_view_intercept_request_callback_set_func_startup, utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup},
-    {"utc_webkit2_ewk_view_intercept_request_callback_set_p1", utc_webkit2_ewk_view_intercept_request_callback_set_p1, utc_webkit2_ewk_view_intercept_request_callback_set_func_startup, utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup},
-    {"utc_webkit2_ewk_view_intercept_request_callback_set_n", utc_webkit2_ewk_view_intercept_request_callback_set_n, utc_webkit2_ewk_view_intercept_request_callback_set_func_startup, utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup},
     {"utc_webkit2_ewk_view_javascript_message_handler_add_p", utc_webkit2_ewk_view_javascript_message_handler_add_p, utc_webkit2_ewk_view_javascript_message_handler_add_startup, utc_webkit2_ewk_view_javascript_message_handler_add_cleanup},
     {"utc_webkit2_ewk_view_javascript_message_handler_add_n", utc_webkit2_ewk_view_javascript_message_handler_add_p, utc_webkit2_ewk_view_javascript_message_handler_add_startup, utc_webkit2_ewk_view_javascript_message_handler_add_cleanup},
     {"utc_webkit2_ewk_view_load_progress_get_p", utc_webkit2_ewk_view_load_progress_get_p, utc_webkit2_ewk_view_load_progress_get_func_startup, utc_webkit2_ewk_view_load_progress_get_func_cleanup},

diff --git a/src/utc/webkit2/tct-webkit2-core_wearable.h b/src/utc/webkit2/tct-webkit2-core_wearable.h
index 99ea961..acacb45 100644 (file)
--- a/src/utc/webkit2/tct-webkit2-core_wearable.h
+++ b/src/utc/webkit2/tct-webkit2-core_wearable.h
@@ -61,6 +61,8 @@ extern void utc_webkit2_ewk_context_cache_model_set_func_startup(void);
 extern void utc_webkit2_ewk_context_cache_model_set_func_cleanup(void);
 extern void utc_webkit2_ewk_context_cookie_manager_get_func_startup(void);
 extern void utc_webkit2_ewk_context_cookie_manager_get_func_cleanup(void);
+extern void utc_webkit2_ewk_context_intercept_request_callback_set_func_startup(void);
+extern void utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup(void);
 extern void utc_webkit2_ewk_context_resource_cache_clear_func_startup(void);
 extern void utc_webkit2_ewk_context_resource_cache_clear_func_cleanup(void);
 extern void utc_webkit2_ewk_cookie_manager_cookies_clear_func_startup(void);
@@ -163,8 +165,6 @@ extern void utc_webkit2_ewk_view_fullscreen_exit_func_startup(void);
 extern void utc_webkit2_ewk_view_fullscreen_exit_func_cleanup(void);
 extern void utc_webkit2_ewk_view_html_string_load_func_startup(void);
 extern void utc_webkit2_ewk_view_html_string_load_func_cleanup(void);
-extern void utc_webkit2_ewk_view_intercept_request_callback_set_func_startup(void);
-extern void utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup(void);
 extern void utc_webkit2_ewk_view_javascript_message_handler_add_startup(void);
 extern void utc_webkit2_ewk_view_javascript_message_handler_add_cleanup(void);
 extern void utc_webkit2_ewk_view_load_progress_get_func_startup(void);
@@ -254,6 +254,9 @@ extern int utc_webkit2_ewk_context_cache_model_set_n1(void);
 extern int utc_webkit2_ewk_context_cache_model_set_n2(void);
 extern int utc_webkit2_ewk_context_cookie_manager_get_p(void);
 extern int utc_webkit2_ewk_context_cookie_manager_get_n(void);
+extern int utc_webkit2_ewk_context_intercept_request_callback_set_p(void);
+extern int utc_webkit2_ewk_context_intercept_request_callback_set_p1(void);
+extern int utc_webkit2_ewk_context_intercept_request_callback_set_n(void);
 extern int utc_webkit2_ewk_context_resource_cache_clear_p(void);
 extern int utc_webkit2_ewk_context_resource_cache_clear_n(void);
 extern int utc_webkit2_ewk_cookie_manager_cookies_clear_p(void);
@@ -368,9 +371,6 @@ extern int utc_webkit2_ewk_view_fullscreen_exit_p(void);
 extern int utc_webkit2_ewk_view_fullscreen_exit_n(void);
 extern int utc_webkit2_ewk_view_html_string_load_p(void);
 extern int utc_webkit2_ewk_view_html_string_load_n(void);
-extern int utc_webkit2_ewk_view_intercept_request_callback_set_p(void);
-extern int utc_webkit2_ewk_view_intercept_request_callback_set_p1(void);
-extern int utc_webkit2_ewk_view_intercept_request_callback_set_n(void);
 extern int utc_webkit2_ewk_view_javascript_message_handler_add_p(void);
 extern int utc_webkit2_ewk_view_javascript_message_handler_add_n(void);
 extern int utc_webkit2_ewk_view_load_progress_get_p(void);
@@ -470,6 +470,9 @@ testcase tc_array[] = {
     {"utc_webkit2_ewk_context_cache_model_set_n2", utc_webkit2_ewk_context_cache_model_set_n2, utc_webkit2_ewk_context_cache_model_set_func_startup, utc_webkit2_ewk_context_cache_model_set_func_cleanup},
     {"utc_webkit2_ewk_context_cookie_manager_get_p", utc_webkit2_ewk_context_cookie_manager_get_p, utc_webkit2_ewk_context_cookie_manager_get_func_startup, utc_webkit2_ewk_context_cookie_manager_get_func_cleanup},
     {"utc_webkit2_ewk_context_cookie_manager_get_n", utc_webkit2_ewk_context_cookie_manager_get_n, utc_webkit2_ewk_context_cookie_manager_get_func_startup, utc_webkit2_ewk_context_cookie_manager_get_func_cleanup},
+    {"utc_webkit2_ewk_context_intercept_request_callback_set_p", utc_webkit2_ewk_context_intercept_request_callback_set_p, utc_webkit2_ewk_context_intercept_request_callback_set_func_startup, utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup},
+    {"utc_webkit2_ewk_context_intercept_request_callback_set_p1", utc_webkit2_ewk_context_intercept_request_callback_set_p1, utc_webkit2_ewk_context_intercept_request_callback_set_func_startup, utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup},
+    {"utc_webkit2_ewk_context_intercept_request_callback_set_n", utc_webkit2_ewk_context_intercept_request_callback_set_n, utc_webkit2_ewk_context_intercept_request_callback_set_func_startup, utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup},
     {"utc_webkit2_ewk_context_resource_cache_clear_p", utc_webkit2_ewk_context_resource_cache_clear_p, utc_webkit2_ewk_context_resource_cache_clear_func_startup, utc_webkit2_ewk_context_resource_cache_clear_func_cleanup},
     {"utc_webkit2_ewk_context_resource_cache_clear_n", utc_webkit2_ewk_context_resource_cache_clear_n, utc_webkit2_ewk_context_resource_cache_clear_func_startup, utc_webkit2_ewk_context_resource_cache_clear_func_cleanup},
     {"utc_webkit2_ewk_cookie_manager_cookies_clear_p", utc_webkit2_ewk_cookie_manager_cookies_clear_p, utc_webkit2_ewk_cookie_manager_cookies_clear_func_startup, utc_webkit2_ewk_cookie_manager_cookies_clear_func_cleanup},
@@ -584,9 +587,6 @@ testcase tc_array[] = {
     {"utc_webkit2_ewk_view_fullscreen_exit_n", utc_webkit2_ewk_view_fullscreen_exit_n, utc_webkit2_ewk_view_fullscreen_exit_func_startup, utc_webkit2_ewk_view_fullscreen_exit_func_cleanup},
     {"utc_webkit2_ewk_view_html_string_load_p", utc_webkit2_ewk_view_html_string_load_p, utc_webkit2_ewk_view_html_string_load_func_startup, utc_webkit2_ewk_view_html_string_load_func_cleanup},
     {"utc_webkit2_ewk_view_html_string_load_n", utc_webkit2_ewk_view_html_string_load_n, utc_webkit2_ewk_view_html_string_load_func_startup, utc_webkit2_ewk_view_html_string_load_func_cleanup},
-    {"utc_webkit2_ewk_view_intercept_request_callback_set_p", utc_webkit2_ewk_view_intercept_request_callback_set_p, utc_webkit2_ewk_view_intercept_request_callback_set_func_startup, utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup},
-    {"utc_webkit2_ewk_view_intercept_request_callback_set_p1", utc_webkit2_ewk_view_intercept_request_callback_set_p1, utc_webkit2_ewk_view_intercept_request_callback_set_func_startup, utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup},
-    {"utc_webkit2_ewk_view_intercept_request_callback_set_n", utc_webkit2_ewk_view_intercept_request_callback_set_n, utc_webkit2_ewk_view_intercept_request_callback_set_func_startup, utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup},
     {"utc_webkit2_ewk_view_javascript_message_handler_add_p", utc_webkit2_ewk_view_javascript_message_handler_add_p, utc_webkit2_ewk_view_javascript_message_handler_add_startup, utc_webkit2_ewk_view_javascript_message_handler_add_cleanup},
     {"utc_webkit2_ewk_view_javascript_message_handler_add_n", utc_webkit2_ewk_view_javascript_message_handler_add_p, utc_webkit2_ewk_view_javascript_message_handler_add_startup, utc_webkit2_ewk_view_javascript_message_handler_add_cleanup},
     {"utc_webkit2_ewk_view_load_progress_get_p", utc_webkit2_ewk_view_load_progress_get_p, utc_webkit2_ewk_view_load_progress_get_func_startup, utc_webkit2_ewk_view_load_progress_get_func_cleanup},

diff --git a/src/utc/webkit2/utc_webkit2_ewk_view_intercept_request_callback_set_func.c b/src/utc/webkit2/utc_webkit2_ewk_context_intercept_request_callback_set_func.c
similarity index 60%
rename from src/utc/webkit2/utc_webkit2_ewk_view_intercept_request_callback_set_func.c
rename to src/utc/webkit2/utc_webkit2_ewk_context_intercept_request_callback_set_func.c
index 61102b3..a483665 100644 (file)
--- a/src/utc/webkit2/utc_webkit2_ewk_view_intercept_request_callback_set_func.c
+++ b/src/utc/webkit2/utc_webkit2_ewk_context_intercept_request_callback_set_func.c
@@ -20,12 +20,22 @@
 #define NULL    0x0
 #endif
 
+static Ecore_Timer* emergency_exit_timer;
 static const char expected_title[] = "Testing Sample Page";
 
 // results:
+static Eina_Bool timeout;
 static Eina_Bool load_success;
 static Eina_Bool callback_called;
 
+static Eina_Bool emergency_exit_func(void* user_data) {
+  Ecore_Timer** timer = (Ecore_Timer**)user_data;
+  timeout = EINA_TRUE;
+  *timer = NULL;
+  utc_webkit2_main_loop_quit();
+  return ECORE_CALLBACK_CANCEL;
+}
+
 static void load_finished(void* data, Evas_Object* webview, void* event_info) {
   load_success = EINA_TRUE;
   utc_webkit2_main_loop_quit();
@@ -33,17 +43,18 @@ static void load_finished(void* data, Evas_Object* webview, void* event_info) {
 
 static void intercept_request_callback(Evas_Object* o, Ewk_Intercept_Request* intercept_request, void* user_data) {
   callback_called = EINA_TRUE;
-  utc_webkit2_main_loop_quit();
 }
 
 /**
- * @function           utc_webkit2_ewk_view_intercept_request_callback_set_func_startup
+ * @function           utc_webkit2_ewk_context_intercept_request_callback_set_func_startup
  * @description                Called before each test
  * @parameter          NA
  * @return                     NA
  */
-void utc_webkit2_ewk_view_intercept_request_callback_set_func_startup(void)
+void utc_webkit2_ewk_context_intercept_request_callback_set_func_startup(void)
 {
+  emergency_exit_timer = NULL;
+  timeout = EINA_FALSE;
   load_success = EINA_FALSE;
   callback_called = EINA_FALSE;
 
@@ -53,31 +64,38 @@ void utc_webkit2_ewk_view_intercept_request_callback_set_func_startup(void)
 }
 
 /**
- * @function           utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup
+ * @function           utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup
  * @description                Called after each test
  * @parameter          NA
  * @return                     NA
  */
-void utc_webkit2_ewk_view_intercept_request_callback_set_func_cleanup(void)
+void utc_webkit2_ewk_context_intercept_request_callback_set_func_cleanup(void)
 {
+  if (emergency_exit_timer) {
+    ecore_timer_del(emergency_exit_timer);
+    emergency_exit_timer = NULL;
+  }
+
   evas_object_smart_callback_del(test_view.webview, "load,finished", load_finished);
 
   utc_webkit2_ewk_test_end();
 }
 
 /**
- * @testcase           utc_webkit2_ewk_view_intercept_request_callback_set_p
+ * @testcase           utc_webkit2_ewk_context_intercept_request_callback_set_p
  * @since_tizen                3.0
  * @description                Set callback for intercepting requests
  * @scenario           Create Webkit View\n
  *                  Set intercept request callback\n
  *                  Trigger callback
  */
-int utc_webkit2_ewk_view_intercept_request_callback_set_p(void)
+int utc_webkit2_ewk_context_intercept_request_callback_set_p(void)
 {
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback, NULL);
   ewk_view_url_set(test_view.webview, COMMON_SAMPLE_HTML_FILE);
   utc_webkit2_main_loop_begin();
+  assert(timeout);
   assert(!load_success);
   assert(callback_called);
 
@@ -85,7 +103,7 @@ int utc_webkit2_ewk_view_intercept_request_callback_set_p(void)
 }
 
 /**
- * @testcase           utc_webkit2_ewk_view_intercept_request_callback_set_p1
+ * @testcase           utc_webkit2_ewk_context_intercept_request_callback_set_p1
  * @since_tizen                3.0
  * @description                Set callback for intercepting requests
  * @scenario           Create Webkit View\n
@@ -93,13 +111,15 @@ int utc_webkit2_ewk_view_intercept_request_callback_set_p(void)
  *                  Reset intercept request callback\n
  *                  Trigger callback
  */
-int utc_webkit2_ewk_view_intercept_request_callback_set_p1(void)
+int utc_webkit2_ewk_context_intercept_request_callback_set_p1(void)
 {
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback, NULL);
   // resets the callback:
-  ewk_view_intercept_request_callback_set(test_view.webview, NULL, NULL);
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), NULL, NULL);
   ewk_view_url_set(test_view.webview, COMMON_SAMPLE_HTML_FILE);
   utc_webkit2_main_loop_begin();
+  assert(!timeout);
   assert(load_success);
   assert(!callback_called);
   assert(strcmp(ewk_view_title_get(test_view.webview), expected_title) == 0);
@@ -108,16 +128,18 @@ int utc_webkit2_ewk_view_intercept_request_callback_set_p1(void)
 }
 
 /**
- * @testcase           utc_webkit2_ewk_view_intercept_request_callback_set_n
+ * @testcase           utc_webkit2_ewk_context_intercept_request_callback_set_n
  * @since_tizen                3.0
  * @description                Set callback for intercepting requests
  * @scenario           Check operation for entering incorrect parameter
  */
-int utc_webkit2_ewk_view_intercept_request_callback_set_n(void)
+int utc_webkit2_ewk_context_intercept_request_callback_set_n(void)
 {
-  ewk_view_intercept_request_callback_set(NULL, intercept_request_callback, NULL);
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
+  ewk_context_intercept_request_callback_set(NULL, intercept_request_callback, NULL);
   ewk_view_url_set(test_view.webview, COMMON_SAMPLE_HTML_FILE);
   utc_webkit2_main_loop_begin();
+  assert(!timeout);
   assert(load_success);
   assert(!callback_called);
   assert(strcmp(ewk_view_title_get(test_view.webview), expected_title) == 0);

diff --git a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_headers_get_func.c b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_headers_get_func.c
index aada5a1..27ff8de 100644 (file)
--- a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_headers_get_func.c
+++ b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_headers_get_func.c
@@ -64,6 +64,8 @@ void utc_webkit2_ewk_intercept_request_headers_get_func_startup(void)
   null_intercept_request = EINA_FALSE;
 
   utc_webkit2_ewk_test_init();
+
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback, NULL);
 }
 
 /**
@@ -97,7 +99,6 @@ void utc_webkit2_ewk_intercept_request_headers_get_func_cleanup(void)
 int utc_webkit2_ewk_intercept_request_headers_get_p(void)
 {
   emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
   ewk_view_url_set(test_view.webview, COMMON_SAMPLE_HTML_FILE);
   utc_webkit2_main_loop_begin();
   assert(headers);
@@ -119,7 +120,6 @@ int utc_webkit2_ewk_intercept_request_headers_get_n(void)
 {
   null_intercept_request = EINA_TRUE;
   emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
   ewk_view_url_set(test_view.webview, COMMON_SAMPLE_HTML_FILE);
   utc_webkit2_main_loop_begin();
   assert(!headers);

diff --git a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_http_method_get_func.c b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_http_method_get_func.c
index f9c545a..64f9602 100644 (file)
--- a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_http_method_get_func.c
+++ b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_http_method_get_func.c
@@ -53,6 +53,8 @@ void utc_webkit2_ewk_intercept_request_http_method_get_func_startup(void)
   null_intercept_request = EINA_FALSE;
 
   utc_webkit2_ewk_test_init();
+
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback, NULL);
 }
 
 /**
@@ -85,7 +87,6 @@ void utc_webkit2_ewk_intercept_request_http_method_get_func_cleanup(void)
 int utc_webkit2_ewk_intercept_request_http_method_get_p(void)
 {
   emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
   ewk_view_url_set(test_view.webview, COMMON_SAMPLE_HTML_FILE);
   utc_webkit2_main_loop_begin();
   assert(http_method);
@@ -104,7 +105,6 @@ int utc_webkit2_ewk_intercept_request_http_method_get_n(void)
 {
   null_intercept_request = EINA_TRUE;
   emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
   ewk_view_url_set(test_view.webview, COMMON_SAMPLE_HTML_FILE);
   utc_webkit2_main_loop_begin();
   assert(!http_method);

diff --git a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_ignore_func.c b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_ignore_func.c
index b6279af..43f89ee 100644 (file)
--- a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_ignore_func.c
+++ b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_ignore_func.c
@@ -20,14 +20,24 @@
 #define NULL    0x0
 #endif
 
+static Ecore_Timer* emergency_exit_timer;
 static Eina_Bool null_intercept_request;
 static const char expected_title[] = "Testing Sample Page";
 
 // results:
+static Eina_Bool timeout;
 static Eina_Bool load_success;
 static Eina_Bool callback_called;
 static Eina_Bool ignore_intercept_request_result;
 
+static Eina_Bool emergency_exit_func(void* user_data) {
+  timeout = EINA_TRUE;
+  Ecore_Timer** timer = (Ecore_Timer**)user_data;
+  *timer = NULL;
+  utc_webkit2_main_loop_quit();
+  return ECORE_CALLBACK_CANCEL;
+}
+
 static void load_finished(void* data, Evas_Object* webview, void* event_info) {
   load_success = EINA_TRUE;
   utc_webkit2_main_loop_quit();
@@ -36,8 +46,6 @@ static void load_finished(void* data, Evas_Object* webview, void* event_info) {
 static void intercept_request_callback(Evas_Object* o, Ewk_Intercept_Request* intercept_request, void* user_data) {
   callback_called = EINA_TRUE;
   ignore_intercept_request_result = ewk_intercept_request_ignore(null_intercept_request ? NULL : intercept_request);
-  if (!ignore_intercept_request_result)
-    utc_webkit2_main_loop_quit();
 }
 
 /**
@@ -48,6 +56,8 @@ static void intercept_request_callback(Evas_Object* o, Ewk_Intercept_Request* in
  */
 void utc_webkit2_ewk_intercept_request_ignore_func_startup(void)
 {
+  emergency_exit_timer = NULL;
+  timeout = EINA_FALSE;
   load_success = EINA_FALSE;
   callback_called = EINA_FALSE;
   null_intercept_request = EINA_FALSE;
@@ -55,6 +65,7 @@ void utc_webkit2_ewk_intercept_request_ignore_func_startup(void)
 
   utc_webkit2_ewk_test_init();
 
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback, NULL);
   evas_object_smart_callback_add(test_view.webview, "load,finished", load_finished, NULL);
 }
 
@@ -66,6 +77,11 @@ void utc_webkit2_ewk_intercept_request_ignore_func_startup(void)
  */
 void utc_webkit2_ewk_intercept_request_ignore_func_cleanup(void)
 {
+  if (emergency_exit_timer) {
+    ecore_timer_del(emergency_exit_timer);
+    emergency_exit_timer = NULL;
+  }
+
   evas_object_smart_callback_del(test_view.webview, "load,finished", load_finished);
 
   utc_webkit2_ewk_test_end();
@@ -82,9 +98,10 @@ void utc_webkit2_ewk_intercept_request_ignore_func_cleanup(void)
  */
 int utc_webkit2_ewk_intercept_request_ignore_p(void)
 {
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   ewk_view_url_set(test_view.webview, COMMON_SAMPLE_HTML_FILE);
   utc_webkit2_main_loop_begin();
+  assert(!timeout);
   assert(load_success);
   assert(callback_called);
   assert(ignore_intercept_request_result);
@@ -101,10 +118,11 @@ int utc_webkit2_ewk_intercept_request_ignore_p(void)
  */
 int utc_webkit2_ewk_intercept_request_ignore_n(void)
 {
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   null_intercept_request = EINA_TRUE;
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
   ewk_view_url_set(test_view.webview, COMMON_SAMPLE_HTML_FILE);
   utc_webkit2_main_loop_begin();
+  assert(timeout);
   assert(!load_success);
   assert(callback_called);
   assert(!ignore_intercept_request_result);

diff --git a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_body_set_func.c b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_body_set_func.c
index 5522ff9..c6da521 100644 (file)
--- a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_body_set_func.c
+++ b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_body_set_func.c
@@ -22,6 +22,8 @@
 
 #define LENGTH_HEADER_BUFFER_SIZE 20
 
+static Ecore_Timer* emergency_exit_timer;
+
 static const char intercept_url[] = "http://request.intercept.ewk.api.test/";
 static const char body_format[] = "<html><head><title>%s</title></head>"
                                   "<body>Hello, Request Intercept!</body></html>";
@@ -32,9 +34,18 @@ static Eina_Bool null_body;
 static size_t data_to_write;
 
 // results:
+static Eina_Bool timeout = EINA_FALSE;
 static Eina_Bool load_success = EINA_FALSE;
 static Eina_Bool body_set_result = EINA_FALSE;
 
+static Eina_Bool emergency_exit_func(void* user_data) {
+  timeout = EINA_TRUE;
+  Ecore_Timer** timer = (Ecore_Timer**)user_data;
+  *timer = NULL;
+  utc_webkit2_main_loop_quit();
+  return ECORE_CALLBACK_CANCEL;
+}
+
 static void load_finished(void* data, Evas_Object* webview, void* event_info) {
   load_success = EINA_TRUE;
   utc_webkit2_main_loop_quit();
@@ -52,8 +63,6 @@ static void intercept_request_callback(Evas_Object* o, Ewk_Intercept_Request* in
         null_intercept_request ? NULL: intercept_request,
         null_body ? NULL : body_done,
         data_to_write);
-    if (!body_set_result)
-      utc_webkit2_main_loop_quit();
   } else {
     ewk_intercept_request_ignore(intercept_request);
   }
@@ -67,8 +76,10 @@ static void intercept_request_callback(Evas_Object* o, Ewk_Intercept_Request* in
  */
 void utc_webkit2_ewk_intercept_request_response_body_set_func_startup(void)
 {
+  emergency_exit_timer = NULL;
   null_intercept_request = EINA_FALSE;
   null_body = EINA_FALSE;
+  timeout = EINA_FALSE;
   load_success = EINA_FALSE;
   body_set_result = EINA_FALSE;
 
@@ -79,7 +90,7 @@ void utc_webkit2_ewk_intercept_request_response_body_set_func_startup(void)
 
   utc_webkit2_ewk_test_init();
 
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback, NULL);
   evas_object_smart_callback_add(test_view.webview, "load,finished", load_finished, NULL);
 }
 
@@ -93,6 +104,11 @@ void utc_webkit2_ewk_intercept_request_response_body_set_func_cleanup(void)
 {
   free(body_done);
 
+  if (emergency_exit_timer) {
+    ecore_timer_del(emergency_exit_timer);
+    emergency_exit_timer = NULL;
+  }
+
   evas_object_smart_callback_del(test_view.webview, "load,finished", load_finished);
 
   utc_webkit2_ewk_test_end();
@@ -109,8 +125,10 @@ void utc_webkit2_ewk_intercept_request_response_body_set_func_cleanup(void)
  */
 int utc_webkit2_ewk_intercept_request_response_body_set_p(void)
 {
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
+  assert(!timeout);
   assert(load_success);
   assert(body_set_result);
   assert(strcmp(ewk_view_title_get(test_view.webview), title_expected) == 0);
@@ -126,9 +144,11 @@ int utc_webkit2_ewk_intercept_request_response_body_set_p(void)
  */
 int utc_webkit2_ewk_intercept_request_response_body_set_n(void)
 {
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   null_intercept_request = EINA_TRUE;
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
+  assert(timeout);
   assert(!body_set_result);
 
   return 0;
@@ -142,9 +162,11 @@ int utc_webkit2_ewk_intercept_request_response_body_set_n(void)
  */
 int utc_webkit2_ewk_intercept_request_response_body_set_n1(void)
 {
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   null_body = EINA_TRUE;
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
+  assert(timeout);
   assert(!body_set_result);
 
   return 0;

diff --git a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_header_add_func.c b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_header_add_func.c
index 1ee3f76..7b847fe 100644 (file)
--- a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_header_add_func.c
+++ b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_header_add_func.c
@@ -22,6 +22,8 @@
 
 #define LENGTH_HEADER_BUFFER_SIZE 20
 
+static Ecore_Timer* emergency_exit_timer;
+
 static const char intercept_url[] = "http://request.intercept.ewk.api.test/";
 static const char intercept_url_ajax[] = "http://request.intercept.ewk.api.test/ajax/";
 static const char base_title[] = "intercept request";
@@ -51,11 +53,20 @@ static const char expected_title_format[] = "%s: %s, %s: %s";
 static char* expected_title_done;
 
 // results:
+static Eina_Bool timeout;
 static Eina_Bool header_add_1_result;
 static Eina_Bool header_add_2_result;
 static Eina_Bool load_success;
 static int first_title_equal_base_title;
 
+static Eina_Bool emergency_exit_func(void* user_data) {
+  timeout = EINA_TRUE;
+  Ecore_Timer** timer = (Ecore_Timer**)user_data;
+  *timer = NULL;
+  utc_webkit2_main_loop_quit();
+  return ECORE_CALLBACK_CANCEL;
+}
+
 static void load_finished(void* data, Evas_Object* webview, void* event_info) {
   first_title_equal_base_title = strcmp(ewk_view_title_get(test_view.webview), base_title) == 0;
   load_success = EINA_TRUE;
@@ -100,17 +111,14 @@ static void intercept_request_callback(Evas_Object* o, Ewk_Intercept_Request* in
 
 static void intercept_request_callback_neg_1(Evas_Object* o, Ewk_Intercept_Request* intercept_request, void* user_data) {
   header_add_1_result = ewk_intercept_request_response_header_add(NULL, test_header_field_1, test_header_value_1);
-  utc_webkit2_main_loop_quit();
 }
 
 static void intercept_request_callback_neg_2(Evas_Object* o, Ewk_Intercept_Request* intercept_request, void* user_data) {
   header_add_1_result = ewk_intercept_request_response_header_add(intercept_request, NULL, test_header_value_1);
-  utc_webkit2_main_loop_quit();
 }
 
 static void intercept_request_callback_neg_3(Evas_Object* o, Ewk_Intercept_Request* intercept_request, void* user_data) {
   header_add_1_result = ewk_intercept_request_response_header_add(intercept_request, test_header_field_1, NULL);
-  utc_webkit2_main_loop_quit();
 }
 
 /**
@@ -136,6 +144,7 @@ void utc_webkit2_ewk_intercept_request_response_header_add_func_startup(void)
 
   utc_webkit2_ewk_test_init();
 
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback, NULL);
   evas_object_smart_callback_add(test_view.webview, "title,changed", title_changed, NULL);
   evas_object_smart_callback_add(test_view.webview, "load,finished", load_finished, NULL);
   evas_object_smart_callback_add(test_view.webview, "load,error", load_error, NULL);
@@ -168,6 +177,9 @@ void utc_webkit2_ewk_intercept_request_response_header_add_func_cleanup(void)
  */
 void utc_webkit2_ewk_intercept_request_response_header_add_func_neg_startup(void)
 {
+  emergency_exit_timer = NULL;
+  timeout = EINA_FALSE;
+
   utc_webkit2_ewk_test_init();
 }
 
@@ -179,6 +191,11 @@ void utc_webkit2_ewk_intercept_request_response_header_add_func_neg_startup(void
  */
 void utc_webkit2_ewk_intercept_request_response_header_add_func_neg_cleanup(void)
 {
+  if (emergency_exit_timer) {
+    ecore_timer_del(emergency_exit_timer);
+    emergency_exit_timer = NULL;
+  }
+
   utc_webkit2_ewk_test_end();
 }
 
@@ -195,7 +212,6 @@ int utc_webkit2_ewk_intercept_request_response_header_add_p(void)
 {
   header_add_1_result = EINA_FALSE;
   header_add_2_result = EINA_FALSE;
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
 
@@ -217,10 +233,12 @@ int utc_webkit2_ewk_intercept_request_response_header_add_n(void);
  */
 int utc_webkit2_ewk_intercept_request_response_header_add_n(void)
 {
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   header_add_1_result = EINA_TRUE;
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback_neg_1, NULL);
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback_neg_1, NULL);
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
+  assert(timeout);
   assert(!header_add_1_result);
 
   return 0;
@@ -234,10 +252,12 @@ int utc_webkit2_ewk_intercept_request_response_header_add_n(void)
  */
 int utc_webkit2_ewk_intercept_request_response_header_add_n1(void)
 {
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   header_add_1_result = EINA_TRUE;
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback_neg_2, NULL);
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback_neg_2, NULL);
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
+  assert(timeout);
   assert(!header_add_1_result);
 
   return 0;
@@ -251,10 +271,12 @@ int utc_webkit2_ewk_intercept_request_response_header_add_n1(void)
  */
 int utc_webkit2_ewk_intercept_request_response_header_add_n2(void)
 {
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   header_add_1_result = EINA_TRUE;
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback_neg_3, NULL);
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback_neg_3, NULL);
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
+  assert(timeout);
   assert(!header_add_1_result);
 
   return 0;

diff --git a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_header_map_add_func.c b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_header_map_add_func.c
index 6c61c15..8f6b35f 100644 (file)
--- a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_header_map_add_func.c
+++ b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_header_map_add_func.c
@@ -22,6 +22,8 @@
 
 #define LENGTH_HEADER_BUFFER_SIZE 20
 
+static Ecore_Timer* emergency_exit_timer;
+
 static const char intercept_url[] = "http://request.intercept.ewk.api.test/";
 static const char intercept_url_ajax[] = "http://request.intercept.ewk.api.test/ajax/";
 static const char base_title[] = "intercept request";
@@ -52,10 +54,19 @@ static char* expected_title_done;
 Eina_Hash* header_map;
 
 // results:
+static Eina_Bool timeout;
 static Eina_Bool header_map_add_result;
 static Eina_Bool load_success;
 static int first_title_equal_base_title;
 
+static Eina_Bool emergency_exit_func(void* user_data) {
+  timeout = EINA_TRUE;
+  Ecore_Timer** timer = (Ecore_Timer**)user_data;
+  *timer = NULL;
+  utc_webkit2_main_loop_quit();
+  return ECORE_CALLBACK_CANCEL;
+}
+
 static void load_finished(void* data, Evas_Object* webview, void* event_info) {
   first_title_equal_base_title = strcmp(ewk_view_title_get(test_view.webview), base_title) == 0;
   load_success = EINA_TRUE;
@@ -99,12 +110,10 @@ static void intercept_request_callback(Evas_Object* o, Ewk_Intercept_Request* in
 
 static void intercept_request_callback_neg_1(Evas_Object* o, Ewk_Intercept_Request* intercept_request, void* user_data) {
   header_map_add_result = ewk_intercept_request_response_header_map_add(NULL, header_map);
-  utc_webkit2_main_loop_quit();
 }
 
 static void intercept_request_callback_neg_2(Evas_Object* o, Ewk_Intercept_Request* intercept_request, void* user_data) {
   header_map_add_result = ewk_intercept_request_response_header_map_add(intercept_request, NULL);
-  utc_webkit2_main_loop_quit();
 }
 
 /**
@@ -134,6 +143,7 @@ void utc_webkit2_ewk_intercept_request_response_header_map_add_func_startup(void
 
   utc_webkit2_ewk_test_init();
 
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback, NULL);
   evas_object_smart_callback_add(test_view.webview, "title,changed", title_changed, NULL);
   evas_object_smart_callback_add(test_view.webview, "load,finished", load_finished, NULL);
   evas_object_smart_callback_add(test_view.webview, "load,error", load_error, NULL);
@@ -168,6 +178,9 @@ void utc_webkit2_ewk_intercept_request_response_header_map_add_func_cleanup(void
  */
 void utc_webkit2_ewk_intercept_request_response_header_map_add_func_neg_startup(void)
 {
+  emergency_exit_timer = NULL;
+  timeout = EINA_FALSE;
+
   header_map = eina_hash_string_small_new(NULL);
   eina_hash_add(header_map, test_header_field_1, test_header_value_1);
   eina_hash_add(header_map, test_header_field_2, test_header_value_2);
@@ -183,6 +196,11 @@ void utc_webkit2_ewk_intercept_request_response_header_map_add_func_neg_startup(
  */
 void utc_webkit2_ewk_intercept_request_response_header_map_add_func_neg_cleanup(void)
 {
+  if (emergency_exit_timer) {
+    ecore_timer_del(emergency_exit_timer);
+    emergency_exit_timer = NULL;
+  }
+
   eina_hash_free(header_map);
 
   utc_webkit2_ewk_test_end();
@@ -200,7 +218,6 @@ void utc_webkit2_ewk_intercept_request_response_header_map_add_func_neg_cleanup(
 int utc_webkit2_ewk_intercept_request_response_header_map_add_p(void)
 {
   header_map_add_result = EINA_FALSE;
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
 
@@ -221,10 +238,12 @@ int utc_webkit2_ewk_intercept_request_response_header_map_add_n1(void);
  */
 int utc_webkit2_ewk_intercept_request_response_header_map_add_n(void)
 {
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   header_map_add_result = EINA_TRUE;
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback_neg_1, NULL);
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback_neg_1, NULL);
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
+  assert(timeout);
   assert(!header_map_add_result);
 
   return 0;
@@ -238,10 +257,12 @@ int utc_webkit2_ewk_intercept_request_response_header_map_add_n(void)
  */
 int utc_webkit2_ewk_intercept_request_response_header_map_add_n1(void)
 {
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   header_map_add_result = EINA_TRUE;
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback_neg_2, NULL);
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback_neg_2, NULL);
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
+  assert(timeout);
   assert(!header_map_add_result);
 
   return 0;

diff --git a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_set_func.c b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_set_func.c
index 223d23a..cbc7380 100644 (file)
--- a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_set_func.c
+++ b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_set_func.c
@@ -22,6 +22,8 @@
 
 #define LENGTH_HEADER_BUFFER_SIZE 20
 
+static Ecore_Timer* emergency_exit_timer;
+
 static const char intercept_url[] = "http://request.intercept.ewk.api.test/";
 static const char body_format[] = "<html><head><title>%s</title></head>"
                                   "<body>Hello, Request Intercept!</body></html>";
@@ -38,9 +40,18 @@ static Eina_Bool null_headers;
 static size_t data_to_write;
 
 // results:
+static Eina_Bool timeout = EINA_FALSE;
 static Eina_Bool load_success = EINA_FALSE;
 static Eina_Bool response_set_result = EINA_FALSE;
 
+static Eina_Bool emergency_exit_func(void* user_data) {
+  timeout = EINA_TRUE;
+  Ecore_Timer** timer = (Ecore_Timer**)user_data;
+  *timer = NULL;
+  utc_webkit2_main_loop_quit();
+  return ECORE_CALLBACK_CANCEL;
+}
+
 static void load_finished(void* data, Evas_Object* webview, void* event_info) {
   load_success = EINA_TRUE;
   utc_webkit2_main_loop_quit();
@@ -54,8 +65,6 @@ static void intercept_request_callback(Evas_Object* o, Ewk_Intercept_Request* in
         null_headers ? NULL : headers_done,
         null_body ? NULL : body_done,
         data_to_write);
-    if (!response_set_result)
-      utc_webkit2_main_loop_quit();
   } else {
     ewk_intercept_request_ignore(intercept_request);
   }
@@ -69,9 +78,11 @@ static void intercept_request_callback(Evas_Object* o, Ewk_Intercept_Request* in
  */
 void utc_webkit2_ewk_intercept_request_response_set_func_startup(void)
 {
+  emergency_exit_timer = NULL;
   null_intercept_request = EINA_FALSE;
   null_headers = EINA_FALSE;
   null_body = EINA_FALSE;
+  timeout = EINA_FALSE;
   load_success = EINA_FALSE;
   response_set_result = EINA_FALSE;
 
@@ -86,7 +97,7 @@ void utc_webkit2_ewk_intercept_request_response_set_func_startup(void)
 
   utc_webkit2_ewk_test_init();
 
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback, NULL);
   evas_object_smart_callback_add(test_view.webview, "load,finished", load_finished, NULL);
 }
 
@@ -101,6 +112,11 @@ void utc_webkit2_ewk_intercept_request_response_set_func_cleanup(void)
   free(body_done);
   free(headers_done);
 
+  if (emergency_exit_timer) {
+    ecore_timer_del(emergency_exit_timer);
+    emergency_exit_timer = NULL;
+  }
+
   evas_object_smart_callback_del(test_view.webview, "load,finished", load_finished);
 
   utc_webkit2_ewk_test_end();
@@ -117,8 +133,10 @@ void utc_webkit2_ewk_intercept_request_response_set_func_cleanup(void)
  */
 int utc_webkit2_ewk_intercept_request_response_set_p(void)
 {
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
+  assert(!timeout);
   assert(load_success);
   assert(response_set_result);
   assert(strcmp(ewk_view_title_get(test_view.webview), title_expected) == 0);
@@ -134,9 +152,11 @@ int utc_webkit2_ewk_intercept_request_response_set_p(void)
  */
 int utc_webkit2_ewk_intercept_request_response_set_n(void)
 {
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   null_intercept_request = EINA_TRUE;
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
+  assert(timeout);
   assert(!response_set_result);
 
   return 0;
@@ -150,9 +170,11 @@ int utc_webkit2_ewk_intercept_request_response_set_n(void)
  */
 int utc_webkit2_ewk_intercept_request_response_set_n1(void)
 {
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   null_headers = EINA_TRUE;
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
+  assert(timeout);
   assert(!response_set_result);
 
   return 0;
@@ -166,9 +188,11 @@ int utc_webkit2_ewk_intercept_request_response_set_n1(void)
  */
 int utc_webkit2_ewk_intercept_request_response_set_n2(void)
 {
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   null_body = EINA_TRUE;
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
+  assert(timeout);
   assert(!response_set_result);
 
   return 0;

diff --git a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_status_set_func.c b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_status_set_func.c
index 3ab3d2b..25f71a0 100644 (file)
--- a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_status_set_func.c
+++ b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_status_set_func.c
@@ -22,6 +22,8 @@
 
 #define LENGTH_HEADER_BUFFER_SIZE 20
 
+static Ecore_Timer* emergency_exit_timer;
+
 static const char intercept_url[] = "http://request.intercept.ewk.api.test/";
 static const char intercept_url_ajax[] = "http://request.intercept.ewk.api.test/ajax/";
 static const char base_title[] = "intercept request";
@@ -44,10 +46,19 @@ static int status_code;
 static const char* custom_status_text;
 
 // results:
+static Eina_Bool timeout;
 static Eina_Bool load_success;
 static Eina_Bool status_set_result;
 static int first_title_equal_base_title;
 
+static Eina_Bool emergency_exit_func(void* user_data) {
+  timeout = EINA_TRUE;
+  Ecore_Timer** timer = (Ecore_Timer**)user_data;
+  *timer = NULL;
+  utc_webkit2_main_loop_quit();
+  return ECORE_CALLBACK_CANCEL;
+}
+
 static void load_finished(void* data, Evas_Object* webview, void* event_info) {
   first_title_equal_base_title = strcmp(ewk_view_title_get(test_view.webview), base_title);
   load_success = EINA_TRUE;
@@ -90,7 +101,6 @@ static void intercept_request_callback(Evas_Object* o, Ewk_Intercept_Request* in
 
 static void intercept_request_callback_neg(Evas_Object* o, Ewk_Intercept_Request* intercept_request, void* user_data) {
   status_set_result = ewk_intercept_request_response_status_set(NULL, 200, "OK");
-  utc_webkit2_main_loop_quit();
 }
 
 /**
@@ -101,12 +111,16 @@ static void intercept_request_callback_neg(Evas_Object* o, Ewk_Intercept_Request
  */
 void utc_webkit2_ewk_intercept_request_response_status_set_func_startup(void)
 {
+  status_set_result = EINA_FALSE;
+  load_success = EINA_FALSE;
+
   int size = snprintf(NULL, 0, body_format, base_title, body_ajax_test_done, intercept_url_ajax);
   body_done = (char*)malloc((size + 1) * sizeof(char));
   snprintf(body_done, size+1, body_format, base_title, body_ajax_test_done, intercept_url_ajax);
 
   utc_webkit2_ewk_test_init();
 
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback, NULL);
   evas_object_smart_callback_add(test_view.webview, "title,changed", title_changed, NULL);
   evas_object_smart_callback_add(test_view.webview, "load,finished", load_finished, NULL);
   evas_object_smart_callback_add(test_view.webview, "load,error", load_error, NULL);
@@ -137,7 +151,13 @@ void utc_webkit2_ewk_intercept_request_response_status_set_func_cleanup(void)
  */
 void utc_webkit2_ewk_intercept_request_response_status_set_func_neg_startup(void)
 {
+  emergency_exit_timer = NULL;
+  timeout = EINA_FALSE;
+  status_set_result = EINA_TRUE;
+
   utc_webkit2_ewk_test_init();
+
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback_neg, NULL);
 }
 
 /**
@@ -148,6 +168,11 @@ void utc_webkit2_ewk_intercept_request_response_status_set_func_neg_startup(void
  */
 void utc_webkit2_ewk_intercept_request_response_status_set_func_neg_cleanup(void)
 {
+  if (emergency_exit_timer) {
+    ecore_timer_del(emergency_exit_timer);
+    emergency_exit_timer = NULL;
+  }
+
   utc_webkit2_ewk_test_end();
 }
 
@@ -162,10 +187,8 @@ void utc_webkit2_ewk_intercept_request_response_status_set_func_neg_cleanup(void
  */
 int utc_webkit2_ewk_intercept_request_response_status_set_p(void)
 {
-  status_set_result = EINA_FALSE;
   status_code = 200;
   custom_status_text = "COOL";
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
 
@@ -188,10 +211,8 @@ int utc_webkit2_ewk_intercept_request_response_status_set_p(void)
  */
 int utc_webkit2_ewk_intercept_request_response_status_set_p1(void)
 {
-  status_set_result = EINA_FALSE;
   status_code = 200;
   custom_status_text = NULL;
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
 
@@ -211,10 +232,10 @@ int utc_webkit2_ewk_intercept_request_response_status_set_p1(void)
  */
 int utc_webkit2_ewk_intercept_request_response_status_set_n(void)
 {
-  status_set_result = EINA_TRUE;
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback_neg, NULL);
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
+  assert(timeout);
   assert(!status_set_result);
 
   return 0;

diff --git a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_write_chunk_func.c b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_write_chunk_func.c
index 72b88af..ef89c33 100644 (file)
--- a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_write_chunk_func.c
+++ b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_response_write_chunk_func.c
@@ -22,6 +22,8 @@
 
 #define LENGTH_HEADER_BUFFER_SIZE 20
 
+static Ecore_Timer* emergency_exit_timer;
+
 static const char intercept_url[] = "http://request.intercept.ewk.api.test/";
 static const char body_format[] = "<html><head><title>%s</title></head>"
                            "<body>Hello, Request Intercept!</body></html>";
@@ -37,8 +39,17 @@ static size_t data_to_write;
 static const int default_chunk_length = 5;
 
 // results:
+static Eina_Bool timeout;
 static Eina_Bool event_loop_result = EINA_FALSE;
 
+static Eina_Bool emergency_exit_func(void* user_data) {
+  timeout = EINA_TRUE;
+  Ecore_Timer** timer = (Ecore_Timer**)user_data;
+  *timer = NULL;
+  utc_webkit2_main_loop_quit();
+  return ECORE_CALLBACK_CANCEL;
+}
+
 static void load_finished(void* data, Evas_Object* webview, void* event_info) {
   event_loop_result = EINA_TRUE;
   utc_webkit2_main_loop_quit();
@@ -50,7 +61,6 @@ static Eina_Bool chunk_write_callback(void* user_data) {
     const char* chunk = null_chunk ? NULL : (body_done + data_written);
     if (!ewk_intercept_request_response_write_chunk(saved_intercept_request, chunk, to_write)) {
       event_loop_result = EINA_FALSE;
-      utc_webkit2_main_loop_quit();
       chunk_write_timer = NULL;
       return ECORE_CALLBACK_CANCEL;
     }
@@ -89,6 +99,8 @@ static void intercept_request_callback(Evas_Object* o, Ewk_Intercept_Request* in
  */
 void utc_webkit2_ewk_intercept_request_response_write_chunk_func_startup(void)
 {
+  emergency_exit_timer = NULL;
+  timeout = EINA_FALSE;
   saved_intercept_request = NULL;
   null_intercept_request = EINA_FALSE;
   null_chunk = EINA_FALSE;
@@ -102,7 +114,7 @@ void utc_webkit2_ewk_intercept_request_response_write_chunk_func_startup(void)
 
   utc_webkit2_ewk_test_init();
 
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback, NULL);
   evas_object_smart_callback_add(test_view.webview, "load,finished", load_finished, NULL);
 }
 
@@ -116,6 +128,11 @@ void utc_webkit2_ewk_intercept_request_response_write_chunk_func_cleanup(void)
 {
   free(body_done);
 
+  if (emergency_exit_timer) {
+    ecore_timer_del(emergency_exit_timer);
+    emergency_exit_timer = NULL;
+  }
+
   if (chunk_write_timer)
     ecore_timer_del(chunk_write_timer);
 
@@ -135,8 +152,10 @@ void utc_webkit2_ewk_intercept_request_response_write_chunk_func_cleanup(void)
  */
 int utc_webkit2_ewk_intercept_request_response_write_chunk_p(void)
 {
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
+  assert(!timeout);
   assert(event_loop_result);
   assert(strcmp(ewk_view_title_get(test_view.webview), title_expected) == 0);
 
@@ -151,9 +170,11 @@ int utc_webkit2_ewk_intercept_request_response_write_chunk_p(void)
  */
 int utc_webkit2_ewk_intercept_request_response_write_chunk_n(void)
 {
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   null_intercept_request = EINA_TRUE;
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
+  assert(timeout);
   assert(!event_loop_result);
 
   return 0;
@@ -167,9 +188,11 @@ int utc_webkit2_ewk_intercept_request_response_write_chunk_n(void)
  */
 int utc_webkit2_ewk_intercept_request_response_write_chunk_n1(void)
 {
+  emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
   null_chunk = EINA_TRUE;
   ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
+  assert(timeout);
   assert(!event_loop_result);
 
   return 0;

diff --git a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_url_get_func.c b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_url_get_func.c
index c99ce8c..cbbb29e 100644 (file)
--- a/src/utc/webkit2/utc_webkit2_ewk_intercept_request_url_get_func.c
+++ b/src/utc/webkit2/utc_webkit2_ewk_intercept_request_url_get_func.c
@@ -22,7 +22,6 @@
 
 static Ecore_Timer* emergency_exit_timer;
 static Eina_Bool null_intercept_request;
-static const char expected_title[] = "Testing Sample Page";
 
 // results:
 static char* url;
@@ -53,6 +52,8 @@ void utc_webkit2_ewk_intercept_request_url_get_func_startup(void)
   null_intercept_request = EINA_FALSE;
 
   utc_webkit2_ewk_test_init();
+
+  ewk_context_intercept_request_callback_set(ewk_view_context_get(test_view.webview), intercept_request_callback, NULL);
 }
 
 /**
@@ -85,7 +86,6 @@ void utc_webkit2_ewk_intercept_request_url_get_func_cleanup(void)
 int utc_webkit2_ewk_intercept_request_url_get_p(void)
 {
   emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
   ewk_view_url_set(test_view.webview, COMMON_SAMPLE_HTML_FILE);
   utc_webkit2_main_loop_begin();
   assert(url);
@@ -104,7 +104,6 @@ int utc_webkit2_ewk_intercept_request_url_get_n(void)
 {
   null_intercept_request = EINA_TRUE;
   emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
-  ewk_view_intercept_request_callback_set(test_view.webview, intercept_request_callback, NULL);
   ewk_view_url_set(test_view.webview, COMMON_SAMPLE_HTML_FILE);
   utc_webkit2_main_loop_begin();
   assert(!url);