From 1bd2c48e03a0afd8d2dbe9e2d8e85ee61c56a5d8 Mon Sep 17 00:00:00 2001 From: "ayush.k123" Date: Wed, 8 Feb 2023 11:55:57 +0530 Subject: [PATCH] [M108 Migration][Webview] Migrate patches for ewk APIs 1/2. This patch also has the text style related changes, BackgroundColor() api modifications for EFL Reference: https://review.tizen.org/gerrit/279920/ Change-Id: Ibad67e070e4f5b1a5476e4575e8658d37c5bafa9 Signed-off-by: Ayush Kumar --- .../renderer_host/render_widget_host_impl.cc | 13 ++ .../renderer_host/render_widget_host_impl.h | 2 + .../renderer_host/render_widget_host_view_aura.cc | 6 + .../renderer_host/render_widget_host_view_aura.h | 1 + .../renderer_host/render_widget_host_view_base.h | 3 + content/public/browser/web_contents_delegate.h | 1 + packaging/chromium-ewktest.manifest | 2 +- .../public/mojom/widget/platform_widget.mojom | 3 + third_party/blink/public/web/web_view.h | 3 + .../blink/renderer/core/exported/web_view_impl.h | 4 + .../renderer/core/frame/web_frame_widget_impl.cc | 5 + .../renderer/core/frame/web_frame_widget_impl.h | 2 +- .../blink/renderer/platform/widget/widget_base.cc | 4 + .../blink/renderer/platform/widget/widget_base.h | 2 +- .../renderer/platform/widget/widget_base_client.h | 2 +- third_party/libxml/BUILD.gn | 59 +++++++ .../rwhv_aura_offscreen_helper_efl.cc | 5 + .../renderer_host/rwhv_aura_offscreen_helper_efl.h | 1 + .../browser/selection/selection_controller_efl.cc | 12 -- .../browser/selection/selection_controller_efl.h | 4 +- .../public/browser/web_contents_efl_delegate.h | 1 - tizen_src/ewk/efl_integration/BUILD.gn | 2 - .../geolocation_permission_context_efl.cc | 6 +- .../browser/web_view_browser_message_filter.cc | 7 - tizen_src/ewk/efl_integration/command_line_efl.cc | 18 +- tizen_src/ewk/efl_integration/command_line_efl.h | 18 +- .../efl_integration/common/render_messages_ewk.h | 36 +--- tizen_src/ewk/efl_integration/eweb_view.cc | 54 +++--- tizen_src/ewk/efl_integration/eweb_view.h | 34 +++- .../ewk/efl_integration/eweb_view_callbacks.h | 13 -- .../private/ewk_custom_handlers_private.cc | 20 +-- .../private/ewk_custom_handlers_private.h | 7 +- .../private/ewk_geolocation_private.cc | 2 +- .../private/ewk_geolocation_private.h | 2 +- .../private/ewk_notification_private.cc | 58 ++---- .../private/ewk_notification_private.h | 12 +- .../private/ewk_security_origin_private.cc | 10 +- .../private/ewk_suspendable_object.cc | 20 +-- .../private/ewk_suspendable_object.h | 20 +-- .../private/ewk_text_style_private.h | 71 -------- .../ewk/efl_integration/public/ewk_context.cc | 6 +- .../ewk/efl_integration/public/ewk_geolocation.cc | 7 +- .../ewk/efl_integration/public/ewk_notification.cc | 4 +- .../ewk/efl_integration/public/ewk_settings.cc | 26 +-- .../ewk/efl_integration/public/ewk_text_style.cc | 72 ++------ tizen_src/ewk/efl_integration/public/ewk_view.cc | 19 +- .../efl_integration/web_contents_delegate_efl.cc | 36 +--- .../efl_integration/web_contents_delegate_efl.h | 13 +- .../web_contents_efl_delegate_ewk.cc | 4 - .../web_contents_efl_delegate_ewk.h | 2 - tizen_src/ewk/efl_webview_app/app.c | 44 ++--- tizen_src/ewk/efl_webview_app/mini_browser.c | 12 +- tizen_src/ewk/unittest/BUILD.gn | 46 ++--- tizen_src/ewk/unittest/execute_utc_blink.cpp | 17 +- tizen_src/ewk/unittest/resources/common/ul_li.html | 24 --- .../neg_invalid_database_param.bmp | Bin 0 -> 4234 bytes .../neg_invalid_database_param.html | 7 + .../neg_invalid_evas_param.bmp | Bin 0 -> 4234 bytes .../neg_invalid_evas_param.html | 7 + .../ewk_favicon_database_icon_get/neg_no_icon.html | 6 + .../ewk_favicon_database_icon_get/pos.bmp | Bin 0 -> 3126 bytes .../ewk_favicon_database_icon_get/pos.html | 7 + .../protocol_handler/register_burger_handler.html | 24 --- .../register_protocol_handler.html | 14 -- .../unregister_protocol_handler.html | 11 -- .../ewk/unittest/utc_blink_cb_form_submit.cpp | 10 +- .../utc_blink_cb_fullscreen_enterfullscreen.cpp | 9 +- .../utc_blink_cb_fullscreen_exitfullscreen.cpp | 9 +- .../ewk/unittest/utc_blink_cb_icon_received.cpp | 9 +- .../ewk/unittest/utc_blink_cb_load_finished.cpp | 5 +- .../ewk/unittest/utc_blink_cb_load_progress.cpp | 7 +- .../utc_blink_cb_load_progress_finished.cpp | 29 --- .../utc_blink_cb_load_progress_started.cpp | 31 ---- .../ewk/unittest/utc_blink_cb_load_started.cpp | 9 +- .../ewk/unittest/utc_blink_cb_magnifier_hide.cpp | 31 +++- .../ewk/unittest/utc_blink_cb_magnifier_show.cpp | 31 +++- .../ewk/unittest/utc_blink_cb_popup_blocked.cpp | 6 +- .../utc_blink_cb_protocolhandler_isregistered.cpp | 81 --------- ...k_cb_protocolhandler_registration_requested.cpp | 69 -------- ...cb_protocolhandler_unregistration_requested.cpp | 7 +- tizen_src/ewk/unittest/utc_blink_cb_redo_size.cpp | 11 +- .../unittest/utc_blink_cb_textselection_mode.cpp | 75 -------- .../ewk/unittest/utc_blink_cb_title_changed.cpp | 12 +- tizen_src/ewk/unittest/utc_blink_cb_undo_size.cpp | 11 +- .../ewk/unittest/utc_blink_cb_uri_changed.cpp | 24 +-- .../ewk/unittest/utc_blink_cb_url_changed.cpp | 19 +- ...k_ewk_auth_challenge_credential_cancel_func.cpp | 6 +- ...link_ewk_auth_challenge_credential_use_func.cpp | 3 +- ...utc_blink_ewk_auth_challenge_realm_get_func.cpp | 3 +- .../utc_blink_ewk_auth_challenge_suspend_func.cpp | 3 +- ...tc_blink_ewk_autofill_profile_data_get_func.cpp | 3 +- ...tc_blink_ewk_autofill_profile_data_set_func.cpp | 3 +- .../utc_blink_ewk_back_forward_list_count_func.cpp | 4 +- ...ewk_back_forward_list_current_item_get_func.cpp | 4 +- ...wk_back_forward_list_item_at_index_get_func.cpp | 4 +- ...ack_forward_list_item_original_url_get_func.cpp | 4 +- ...c_blink_ewk_back_forward_list_item_ref_func.cpp | 4 +- ...k_ewk_back_forward_list_item_title_get_func.cpp | 4 +- ...blink_ewk_back_forward_list_item_unref_func.cpp | 4 +- ...ink_ewk_back_forward_list_item_url_get_func.cpp | 4 +- ...wk_back_forward_list_n_back_items_copy_func.cpp | 4 +- ...back_forward_list_n_forward_items_copy_func.cpp | 4 +- ...nk_ewk_back_forward_list_next_item_get_func.cpp | 4 +- ...wk_back_forward_list_previous_item_get_func.cpp | 4 +- tizen_src/ewk/unittest/utc_blink_ewk_base.cpp | 43 +++-- tizen_src/ewk/unittest/utc_blink_ewk_base.h | 86 ++++++--- ...ertificate_policy_decision_allowed_set_func.cpp | 13 +- ...te_policy_decision_certificate_pem_get_func.cpp | 14 +- ...wk_certificate_policy_decision_url_get_func.cpp | 15 +- ...tc_blink_ewk_console_message_level_get_func.cpp | 6 +- ...utc_blink_ewk_console_message_line_get_func.cpp | 6 +- ...c_blink_ewk_console_message_source_get_func.cpp | 6 +- ...k_context_application_cache_delete_all_func.cpp | 11 +- ...k_ewk_context_application_cache_delete_func.cpp | 13 +- ..._context_application_cache_origins_get_func.cpp | 13 +- ...ontext_did_start_download_callback_set_func.cpp | 84 ++++----- ...ink_ewk_context_form_autofill_profile_utils.cpp | 11 +- ...blink_ewk_context_form_autofill_profile_utils.h | 9 +- ..._context_icon_database_icon_object_add_func.cpp | 9 +- ...ink_ewk_context_icon_database_path_set_func.cpp | 17 +- ...ink_ewk_context_inspector_server_start_func.cpp | 5 +- ...link_ewk_context_inspector_server_stop_func.cpp | 5 +- ...k_context_local_file_system_all_delete_func.cpp | 19 +- ...k_ewk_context_local_file_system_delete_func.cpp | 194 ++++++++++----------- ...ewk_context_menu_item_append_as_action_func.cpp | 12 +- ...utc_blink_ewk_context_menu_item_append_func.cpp | 14 +- .../utc_blink_ewk_context_menu_item_count_func.cpp | 14 +- ...nk_ewk_context_menu_item_image_url_get_func.cpp | 16 +- ...ink_ewk_context_menu_item_link_url_get_func.cpp | 16 +- ...utc_blink_ewk_context_menu_item_remove_func.cpp | 14 +- ...tc_blink_ewk_context_menu_item_tag_get_func.cpp | 16 +- ...tc_blink_ewk_context_menu_nth_item_get_func.cpp | 14 +- ...k_context_new_with_injected_bundle_path_func.cc | 78 --------- ..._context_new_with_injected_bundle_path_func.cpp | 74 ++++++++ ...nk_ewk_context_preferred_languages_set_func.cpp | 5 +- .../utc_blink_ewk_context_proxy_uri_get_func.cpp | 36 ---- .../utc_blink_ewk_context_proxy_uri_set_func.cpp | 41 ----- ...context_vibration_client_callbacks_set_func.cpp | 6 +- ...nk_ewk_context_web_database_delete_all_func.cpp | 11 +- ..._blink_ewk_context_web_database_delete_func.cpp | 11 +- ...k_ewk_context_web_database_origins_get_func.cpp | 8 +- ...ontext_web_indexed_database_delete_all_func.cpp | 12 +- ...ink_ewk_context_web_storage_delete_all_func.cpp | 17 +- ..._ewk_context_web_storage_origin_delete_func.cpp | 11 +- ...nk_ewk_context_web_storage_origins_get_func.cpp | 8 +- ...blink_ewk_cookie_manager_cookies_clear_func.cpp | 3 +- ..._ewk_custom_handlers_data_base_url_get_func.cpp | 51 ------ ...nk_ewk_custom_handlers_data_result_set_func.cpp | 60 ------- ...nk_ewk_custom_handlers_data_target_get_func.cpp | 62 ------- ...ink_ewk_custom_handlers_data_title_get_func.cpp | 64 ------- ...blink_ewk_custom_handlers_data_url_get_func.cpp | 62 ------- .../unittest/utc_blink_ewk_error_code_get_func.cpp | 48 +++-- .../utc_blink_ewk_error_description_get_func.cpp | 15 +- .../unittest/utc_blink_ewk_error_type_get_func.cpp | 3 +- .../unittest/utc_blink_ewk_error_url_get_func.cpp | 3 +- ...tc_blink_ewk_favicon_database_icon_get_func.cpp | 111 ++++++++++++ ...blink_ewk_geolocation_permission_reply_func.cpp | 17 +- ...location_permission_request_origin_get_func.cpp | 13 +- ...ewk_geolocation_permission_request_set_func.cpp | 19 +- ...geolocation_permission_request_suspend_func.cpp | 8 +- ...blink_ewk_history_back_list_length_get_func.cpp | 4 +- ...c_blink_ewk_history_forward_list_length_get.cpp | 4 +- .../unittest/utc_blink_ewk_history_free_func.cpp | 4 +- .../utc_blink_ewk_history_item_title_get_func.cpp | 4 +- .../utc_blink_ewk_history_item_uri_get_func.cpp | 4 +- .../utc_blink_ewk_history_nth_item_get.cpp | 4 +- .../unittest/utc_blink_ewk_hit_test_free_func.cpp | 6 +- .../utc_blink_ewk_hit_test_node_value_get_func.cpp | 3 +- .../utc_blink_ewk_hit_test_request_base.cpp | 9 + .../unittest/utc_blink_ewk_hit_test_request_base.h | 30 ++-- .../utc_blink_ewk_home_directory_get_func.cpp | 129 -------------- ...link_ewk_notification_permission_reply_func.cpp | 8 +- ...fication_permission_request_origin_get_func.cpp | 28 +-- ...wk_notification_permission_request_set_func.cpp | 60 ------- ...otification_permission_request_suspend_func.cpp | 8 +- ...link_ewk_notification_policies_removed_func.cpp | 13 +- ...k_ewk_notification_security_origin_get_func.cpp | 3 +- .../utc_blink_ewk_notification_showed_func.cpp | 7 +- .../utc_blink_ewk_notification_silent_get_func.cpp | 11 +- .../utc_blink_ewk_notification_test_base.cpp | 44 +++++ .../utc_blink_ewk_notification_test_base.h | 50 +----- .../utc_blink_ewk_notification_title_get_func.cpp | 6 +- ...c_blink_ewk_policy_decision_cookie_get_func.cpp | 13 +- ...tc_blink_ewk_policy_decision_frame_get_func.cpp | 3 +- ...utc_blink_ewk_policy_decision_host_get_func.cpp | 10 +- ...nk_ewk_policy_decision_http_method_get_func.cpp | 7 +- .../utc_blink_ewk_policy_decision_ignore_func.cpp | 13 +- ...wk_policy_decision_navigation_type_get_func.cpp | 13 +- ...blink_ewk_policy_decision_password_get_func.cpp | 9 +- ...k_policy_decision_response_headers_get_func.cpp | 12 +- ..._ewk_policy_decision_response_mime_get_func.cpp | 14 +- ...licy_decision_response_status_code_get_func.cpp | 3 +- ...c_blink_ewk_policy_decision_scheme_get_func.cpp | 10 +- .../utc_blink_ewk_policy_decision_suspend_func.cpp | 4 +- ...utc_blink_ewk_policy_decision_type_get_func.cpp | 13 +- .../utc_blink_ewk_policy_decision_url_get_func.cpp | 13 +- .../utc_blink_ewk_policy_decision_use_func.cpp | 13 +- ...c_blink_ewk_policy_decision_userid_get_func.cpp | 9 +- ...a_permission_request_is_persistent_get_func.cpp | 28 ++- ...ota_permission_request_origin_host_get_func.cpp | 5 +- ...ota_permission_request_origin_port_get_func.cpp | 35 ++-- ...permission_request_origin_protocol_get_func.cpp | 5 +- ...ewk_quota_permission_request_quota_get_func.cpp | 28 ++- ...utc_blink_ewk_security_origin_host_get_func.cpp | 3 +- ...utc_blink_ewk_security_origin_port_get_func.cpp | 3 +- ...blink_ewk_security_origin_protocol_get_func.cpp | 3 +- ...c_blink_ewk_settings_extra_feature_set_func.cpp | 8 +- ...ink_ewk_settings_font_default_size_get_func.cpp | 3 +- ...ink_ewk_settings_font_default_size_set_func.cpp | 2 +- ...settings_form_profile_data_enabled_get_func.cpp | 6 +- ...settings_form_profile_data_enabled_set_func.cpp | 6 +- ...ttings_initial_list_style_position_get_func.cpp | 51 ------ ...ttings_initial_list_style_position_set_func.cpp | 85 --------- ..._settings_scripts_can_open_windows_get_func.cpp | 3 +- ..._settings_scripts_can_open_windows_set_func.cpp | 6 +- ...k_ewk_settings_scripts_window_open_get_func.cpp | 3 +- ...k_ewk_settings_scripts_window_open_set_func.cpp | 6 +- ...k_settings_text_autosizing_enabled_set_func.cpp | 6 +- ..._text_autosizing_font_scale_factor_set_func.cpp | 6 +- ..._blink_ewk_text_style_align_center_get_func.cpp | 94 ---------- ...tc_blink_ewk_text_style_align_full_get_func.cpp | 95 ---------- ...tc_blink_ewk_text_style_align_left_get_func.cpp | 97 ----------- ...c_blink_ewk_text_style_align_right_get_func.cpp | 96 ---------- .../utc_blink_ewk_text_style_bg_color_get_func.cpp | 71 -------- .../utc_blink_ewk_text_style_bold_get_func.cpp | 77 -------- .../utc_blink_ewk_text_style_color_get_func.cpp | 79 --------- ...utc_blink_ewk_text_style_font_size_get_func.cpp | 77 -------- ...ink_ewk_text_style_has_composition_get_func.cpp | 77 -------- .../utc_blink_ewk_text_style_italic_get_func.cpp | 73 -------- ..._blink_ewk_text_style_ordered_list_get_func.cpp | 130 -------------- .../utc_blink_ewk_text_style_position_get_func.cpp | 83 --------- ...utc_blink_ewk_text_style_underline_get_func.cpp | 74 -------- ...link_ewk_text_style_unordered_list_get_func.cpp | 129 -------------- ...c_blink_ewk_view_add_in_incognito_mode_func.cpp | 14 +- ...c_blink_ewk_view_add_with_session_data_func.cpp | 11 +- ...blink_ewk_view_back_forward_list_clear_func.cpp | 4 +- .../ewk/unittest/utc_blink_ewk_view_back_func.cpp | 5 +- .../utc_blink_ewk_view_back_possible_func.cpp | 5 +- .../utc_blink_ewk_view_bg_color_get_func.cpp | 81 +++++++++ .../utc_blink_ewk_view_command_execute_func.cpp | 5 +- ...k_ewk_view_content_security_policy_set_func.cpp | 5 +- .../utc_blink_ewk_view_contents_pdf_get_func.cpp | 11 +- .../utc_blink_ewk_view_contents_size_get_func.cpp | 3 +- .../unittest/utc_blink_ewk_view_forward_func.cpp | 6 +- .../utc_blink_ewk_view_forward_possible_func.cpp | 5 +- ...utc_blink_ewk_view_get_cookies_for_url_func.cpp | 4 +- .../utc_blink_ewk_view_history_get_func.cpp | 4 +- .../utc_blink_ewk_view_hit_test_new_func.cpp | 5 +- .../utc_blink_ewk_view_hit_test_request_func.cpp | 8 +- .../utc_blink_ewk_view_html_string_load_func.cpp | 5 +- ...c_blink_ewk_view_inspector_server_stop_func.cpp | 5 +- ...link_ewk_view_javascript_confirm_reply_func.cpp | 4 +- .../utc_blink_ewk_view_load_progress_get_func.cpp | 8 +- .../utc_blink_ewk_view_mhtml_data_get_func.cpp | 27 ++- ...w_notification_permission_callback_set_func.cpp | 5 +- ...ewk_view_orientation_lock_callback_set_func.cpp | 39 ----- .../utc_blink_ewk_view_orientation_send_func.cpp | 8 +- .../utc_blink_ewk_view_plain_text_get_func.cpp | 5 +- ...k_view_quota_permission_request_cancel_func.cpp | 15 +- ...wk_view_quota_permission_request_reply_func.cpp | 14 +- .../unittest/utc_blink_ewk_view_reload_func.cpp | 5 +- .../unittest/utc_blink_ewk_view_resume_func.cpp | 45 ++--- ...nk_ewk_view_scale_changed_callback_set_func.cpp | 127 ++++++++++++++ .../unittest/utc_blink_ewk_view_scale_get_func.cpp | 19 +- .../unittest/utc_blink_ewk_view_scale_set_func.cpp | 5 +- ...blink_ewk_view_screenshot_contents_get_func.cpp | 7 +- .../utc_blink_ewk_view_script_execute_func.cpp | 5 +- .../utc_blink_ewk_view_scroll_pos_get_func.cpp | 54 +++--- .../utc_blink_ewk_view_scroll_set_func.cpp | 12 +- .../utc_blink_ewk_view_scroll_size_get_func.cpp | 12 +- .../utc_blink_ewk_view_session_data_get_func.cpp | 11 +- .../unittest/utc_blink_ewk_view_suspend_func.cpp | 40 +++-- .../unittest/utc_blink_ewk_view_text_find_func.cpp | 9 +- ...tc_blink_ewk_view_text_selection_clear_func.cpp | 82 --------- ...blink_ewk_view_text_selection_text_get_func.cpp | 102 ----------- .../unittest/utc_blink_ewk_view_title_get_func.cpp | 7 +- .../utc_blink_ewk_view_url_request_set_func.cpp | 6 +- .../utc_blink_ewk_view_user_agent_get_func.cpp | 15 +- .../utc_blink_ewk_view_user_agent_set_func.cpp | 144 +++++++-------- ...k_ewk_view_web_application_capable_get_func.cpp | 21 +-- ..._ewk_view_web_application_icon_url_get_func.cpp | 29 ++- ...ewk_view_web_application_icon_urls_get_func.cpp | 41 ++--- ..._ewk_web_application_icon_data_url_get_func.cpp | 47 +++-- tizen_src/ewk/utc_gtest_run.sh | 4 +- 284 files changed, 1885 insertions(+), 4495 deletions(-) create mode 100644 third_party/libxml/BUILD.gn delete mode 100644 tizen_src/ewk/efl_integration/private/ewk_text_style_private.h mode change 100755 => 100644 tizen_src/ewk/unittest/execute_utc_blink.cpp delete mode 100644 tizen_src/ewk/unittest/resources/common/ul_li.html create mode 100644 tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_invalid_database_param.bmp create mode 100644 tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_invalid_database_param.html create mode 100644 tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_invalid_evas_param.bmp create mode 100644 tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_invalid_evas_param.html create mode 100644 tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_no_icon.html create mode 100644 tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/pos.bmp create mode 100644 tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/pos.html delete mode 100644 tizen_src/ewk/unittest/resources/protocol_handler/register_burger_handler.html delete mode 100644 tizen_src/ewk/unittest/resources/protocol_handler/register_protocol_handler.html delete mode 100644 tizen_src/ewk/unittest/resources/protocol_handler/unregister_protocol_handler.html delete mode 100644 tizen_src/ewk/unittest/utc_blink_cb_load_progress_finished.cpp delete mode 100644 tizen_src/ewk/unittest/utc_blink_cb_load_progress_started.cpp delete mode 100644 tizen_src/ewk/unittest/utc_blink_cb_protocolhandler_isregistered.cpp delete mode 100644 tizen_src/ewk/unittest/utc_blink_cb_protocolhandler_registration_requested.cpp delete mode 100644 tizen_src/ewk/unittest/utc_blink_cb_textselection_mode.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_credential_cancel_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_credential_use_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_realm_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_suspend_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_certificate_policy_decision_allowed_set_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_certificate_policy_decision_certificate_pem_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_certificate_policy_decision_url_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_console_message_level_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_console_message_line_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_console_message_source_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_append_as_action_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_append_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_count_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_image_url_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_link_url_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_remove_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_tag_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_context_menu_nth_item_get_func.cpp delete mode 100644 tizen_src/ewk/unittest/utc_blink_ewk_context_new_with_injected_bundle_path_func.cc create mode 100644 tizen_src/ewk/unittest/utc_blink_ewk_context_new_with_injected_bundle_path_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_context_proxy_uri_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_context_proxy_uri_set_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_context_vibration_client_callbacks_set_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_cookie_manager_cookies_clear_func.cpp delete mode 100644 tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_base_url_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_result_set_func.cpp delete mode 100644 tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_target_get_func.cpp delete mode 100644 tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_title_get_func.cpp delete mode 100644 tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_url_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_error_code_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_error_description_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_error_type_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_error_url_get_func.cpp create mode 100644 tizen_src/ewk/unittest/utc_blink_ewk_favicon_database_icon_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_hit_test_free_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_hit_test_node_value_get_func.cpp create mode 100644 tizen_src/ewk/unittest/utc_blink_ewk_hit_test_request_base.cpp delete mode 100644 tizen_src/ewk/unittest/utc_blink_ewk_home_directory_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_request_origin_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_request_set_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_request_suspend_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_notification_security_origin_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_notification_showed_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_notification_silent_get_func.cpp create mode 100644 tizen_src/ewk/unittest/utc_blink_ewk_notification_test_base.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_notification_title_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_cookie_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_host_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_ignore_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_navigation_type_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_response_mime_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_response_status_code_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_suspend_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_type_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_url_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_use_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_security_origin_host_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_security_origin_port_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_security_origin_protocol_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_settings_font_default_size_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_settings_font_default_size_set_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_settings_initial_list_style_position_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_settings_initial_list_style_position_set_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_text_style_align_center_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_text_style_align_full_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_text_style_align_left_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_text_style_align_right_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_text_style_bg_color_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_text_style_bold_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_text_style_color_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_text_style_font_size_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_text_style_has_composition_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_text_style_italic_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_text_style_ordered_list_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_text_style_position_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_text_style_underline_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_text_style_unordered_list_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_add_with_session_data_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_back_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_back_possible_func.cpp create mode 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_bg_color_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_command_execute_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_content_security_policy_set_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_contents_pdf_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_contents_size_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_forward_possible_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_hit_test_new_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_hit_test_request_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_javascript_confirm_reply_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_mhtml_data_get_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_view_orientation_lock_callback_set_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_orientation_send_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_plain_text_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_reload_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_resume_func.cpp create mode 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_scale_changed_callback_set_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_scale_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_screenshot_contents_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_script_execute_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_session_data_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_suspend_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_text_find_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_view_text_selection_clear_func.cpp delete mode 100755 tizen_src/ewk/unittest/utc_blink_ewk_view_text_selection_text_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_user_agent_get_func.cpp mode change 100755 => 100644 tizen_src/ewk/unittest/utc_blink_ewk_view_user_agent_set_func.cpp diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 4270ae9..775f85b 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -972,6 +972,19 @@ void RenderWidgetHostImpl::RemoveImeInputEventObserver( #endif #if BUILDFLAG(IS_EFL) +void RenderWidgetHostImpl::RequestBackgroundColor(int callback_id) { + blink_widget_->GetBackgroundColor( + base::BindOnce(&RenderWidgetHostImpl::OnGetBackgroundColor, + weak_factory_.GetWeakPtr(), callback_id)); +} + +void RenderWidgetHostImpl::OnGetBackgroundColor(int callback_id, + SkColor bg_color) { + if (!view_) + return; + view_->BackgroundColorReceived(callback_id, bg_color); +} + void RenderWidgetHostImpl::RequestContentSnapshot( const gfx::Rect& snapshot_rect, float page_scale_factor, diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h index 5ac08aa..6182cad 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h @@ -440,6 +440,8 @@ class CONTENT_EXPORT RenderWidgetHostImpl #endif #if BUILDFLAG(IS_EFL) + void RequestBackgroundColor(int callback_id); + void OnGetBackgroundColor(int callback_id, SkColor bg_color); void RequestContentSnapshot(const gfx::Rect& src_subrect, float page_scale_factor, int request_id); diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index 2d73a28..78b93f7 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -558,6 +558,12 @@ bool RenderWidgetHostViewAura::IsSurfaceAvailableForCopy() { } #if BUILDFLAG(IS_EFL) +void RenderWidgetHostViewAura::BackgroundColorReceived(int callback_id, + SkColor bg_color) { + if (offscreen_helper_) + offscreen_helper_->BackgroundColorReceived(callback_id, bg_color); +} + void RenderWidgetHostViewAura::NotifySwap(const uint32_t texture_id) { if (offscreen_helper_) offscreen_helper_->NotifySwap(texture_id); diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h index 566701e..f2c730d 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.h +++ b/content/browser/renderer_host/render_widget_host_view_aura.h @@ -429,6 +429,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura size_t offset, const gfx::Range& range) override; void TextInputStateChanged(const ui::mojom::TextInputState& params) override; + void BackgroundColorReceived(int callback_id, SkColor bg_color) override; void OnGetFocusedNodeBounds(const gfx::RectF& rect) override; #endif diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h index 39a9024..4653432 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.h +++ b/content/browser/renderer_host/render_widget_host_view_base.h @@ -284,6 +284,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView { virtual void DidHandleKeyEvent(blink::WebInputEvent::Type input_event, bool processed) {} virtual void DidGetContentSnapshot(const SkBitmap& bitmap, int request_id) {} + + virtual void BackgroundColorReceived(int callback_id, SkColor bg_color) {} + virtual void OnGetFocusedNodeBounds(const gfx::RectF&) {} #endif diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h index 71eb7b4..acf088d 100644 --- a/content/public/browser/web_contents_delegate.h +++ b/content/public/browser/web_contents_delegate.h @@ -512,6 +512,7 @@ class CONTENT_EXPORT WebContentsDelegate { #if BUILDFLAG(IS_EFL) virtual void DidRenderFrame() {} + virtual void BackgroundColorReceived(int callback_id, SkColor bg_color) {} virtual void OnDidChangeFocusedNodeBounds( const gfx::RectF& focused_node_bounds) {} #endif diff --git a/packaging/chromium-ewktest.manifest b/packaging/chromium-ewktest.manifest index 17d5396..2a0cec5 100644 --- a/packaging/chromium-ewktest.manifest +++ b/packaging/chromium-ewktest.manifest @@ -1,5 +1,5 @@ - + diff --git a/third_party/blink/public/mojom/widget/platform_widget.mojom b/third_party/blink/public/mojom/widget/platform_widget.mojom index 1c524bd..35ed958 100644 --- a/third_party/blink/public/mojom/widget/platform_widget.mojom +++ b/third_party/blink/public/mojom/widget/platform_widget.mojom @@ -9,6 +9,7 @@ import "mojo/public/mojom/base/string16.mojom"; import "mojo/public/mojom/base/text_direction.mojom"; import "mojo/public/mojom/base/time.mojom"; import "services/viz/public/mojom/compositing/compositor_frame_sink.mojom"; +import "skia/public/mojom/skcolor.mojom"; import "ui/base/cursor/mojom/cursor.mojom"; import "ui/gfx/geometry/mojom/geometry.mojom"; import "third_party/blink/public/mojom/input/input_handler.mojom"; @@ -109,6 +110,8 @@ interface Widget { UpdateScreenRects(gfx.mojom.Rect widget_screen_rect, gfx.mojom.Rect window_screen_rect) => (); + [EnableIf=is_efl] + GetBackgroundColor() => (skia.mojom.SkColor bg_color); [EnableIf=is_efl] GetContentSnapshot(gfx.mojom.Rect snapshot_rect, float page_scale_factor) diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h index e07d0eb..ed6c3a0 100644 --- a/third_party/blink/public/web/web_view.h +++ b/third_party/blink/public/web/web_view.h @@ -479,6 +479,9 @@ class BLINK_EXPORT WebView { // onto the specified canvas, when the page is not having any 3D content. virtual bool PaintSoftBitmap(SkCanvas*, const gfx::Rect&) = 0; virtual bool HasAcceleratedCanvasWithinViewport() const = 0; + virtual SkColor BackgroundColor() const { + return 0xFFFFFFFF; /* Sk_ColorWHITE */ + } virtual void SetLongPollingGlobalTimeout(uint64_t timeout) = 0; #endif diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h index 8ec6677..887ef26 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.h +++ b/third_party/blink/renderer/core/exported/web_view_impl.h @@ -332,7 +332,11 @@ class CORE_EXPORT WebViewImpl final : public WebView, void ActivateDevToolsTransform(const DeviceEmulationParams&); void DeactivateDevToolsTransform(); +#if BUILDFLAG(IS_EFL) + SkColor BackgroundColor() const override; +#else SkColor BackgroundColor() const; +#endif Color BaseBackgroundColor() const; Frame* FocusedCoreFrame() const; diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc index a613475..ba0ebb3 100644 --- a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc +++ b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc @@ -4162,6 +4162,11 @@ void WebFrameWidgetImpl::GetContentSnapshot(const gfx::Rect& snapshot_rect, page_scale_factor * snapshot->height()); } +SkColor WebFrameWidgetImpl::GetBackgroundColor() { + SkColor bg_color = View()->BackgroundColor(); + return bg_color; +} + gfx::RectF WebFrameWidgetImpl::UpdateFocusedNodeBounds() { Element* element = FocusedElement(); if (!element) diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.h b/third_party/blink/renderer/core/frame/web_frame_widget_impl.h index be71baa..fa0e445 100644 --- a/third_party/blink/renderer/core/frame/web_frame_widget_impl.h +++ b/third_party/blink/renderer/core/frame/web_frame_widget_impl.h @@ -706,7 +706,7 @@ class CORE_EXPORT WebFrameWidgetImpl void GetContentSnapshot(const gfx::Rect& snapshot_rect, float page_scale_factor, SkBitmap* snapshot) override; - + SkColor GetBackgroundColor() override; gfx::RectF UpdateFocusedNodeBounds() override; void SetLongPollingGlobalTimeout(uint64_t timeout) override; #endif diff --git a/third_party/blink/renderer/platform/widget/widget_base.cc b/third_party/blink/renderer/platform/widget/widget_base.cc index 8eef0d5..c6babf9 100644 --- a/third_party/blink/renderer/platform/widget/widget_base.cc +++ b/third_party/blink/renderer/platform/widget/widget_base.cc @@ -464,6 +464,10 @@ void WidgetBase::GetContentSnapshot(const gfx::Rect& snapshot_rect, std::move(callback).Run(content_snapshot); } +void WidgetBase::GetBackgroundColor(GetBackgroundColorCallback callback) { + std::move(callback).Run(client_->GetBackgroundColor()); +} + void WidgetBase::UpdateFocusedNodeBounds( UpdateFocusedNodeBoundsCallback callback) { std::move(callback).Run(client_->UpdateFocusedNodeBounds()); diff --git a/third_party/blink/renderer/platform/widget/widget_base.h b/third_party/blink/renderer/platform/widget/widget_base.h index 0bee8c23..117004a 100644 --- a/third_party/blink/renderer/platform/widget/widget_base.h +++ b/third_party/blink/renderer/platform/widget/widget_base.h @@ -140,7 +140,7 @@ class PLATFORM_EXPORT WidgetBase : public mojom::blink::Widget, void GetContentSnapshot(const gfx::Rect& snapshot_rect, float page_scale_factor, GetContentSnapshotCallback callback) override; - + void GetBackgroundColor(GetBackgroundColorCallback callback) override; void UpdateFocusedNodeBounds( UpdateFocusedNodeBoundsCallback callback) override; void SetLongPollingGlobalTimeout(uint64_t timeout) override; diff --git a/third_party/blink/renderer/platform/widget/widget_base_client.h b/third_party/blink/renderer/platform/widget/widget_base_client.h index 8e203a2..7065200 100644 --- a/third_party/blink/renderer/platform/widget/widget_base_client.h +++ b/third_party/blink/renderer/platform/widget/widget_base_client.h @@ -173,7 +173,7 @@ class WidgetBaseClient { virtual void GetContentSnapshot(const gfx::Rect& snapshot_rect, float page_scale_factor, SkBitmap* snapshot) {} - + virtual SkColor GetBackgroundColor() {} virtual gfx::RectF UpdateFocusedNodeBounds() { return gfx::RectF(); } virtual void SetLongPollingGlobalTimeout(uint64_t timeout) {} #endif diff --git a/third_party/libxml/BUILD.gn b/third_party/libxml/BUILD.gn new file mode 100644 index 0000000..b9caa10 --- /dev/null +++ b/third_party/libxml/BUILD.gn @@ -0,0 +1,59 @@ +# Copyright 2016 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/linux/pkg_config.gni") + +pkg_config("system_libxml") { + packages = [ "libxml-2.0" ] +} + +source_set("libxml") { + public_configs = [ ":system_libxml" ] +} + +# Please keep in sync with //third_party/libxml/BUILD.gn. +static_library("libxml_utils") { + # Do not expand this visibility list without first consulting with the + # Security Team. + visibility = [ + ":xml_reader", + ":xml_writer", + "//base/test:test_support", + "//services/data_decoder:lib", + "//services/data_decoder:xml_parser_fuzzer_deps", + ] + sources = [ + "chromium/libxml_utils.cc", + "chromium/libxml_utils.h", + ] + public_configs = [ ":system_libxml" ] +} + +# Please keep in sync with //third_party/libxml/BUILD.gn. +static_library("xml_reader") { + # Do not expand this visibility list without first consulting with the + # Security Team. + visibility = [ + "//base/test:test_support", + "//components/policy/core/common:unit_tests", + "//services/data_decoder:*", + "//tools/traffic_annotation/auditor:auditor_sources", + ] + sources = [ + "chromium/xml_reader.cc", + "chromium/xml_reader.h", + ] + deps = [ ":libxml_utils" ] +} + +# Please keep in sync with //third_party/libxml/BUILD.gn. +static_library("xml_writer") { + # The XmlWriter is considered safe to use from any target. + visibility = [ "*" ] + sources = [ + "chromium/xml_writer.cc", + "chromium/xml_writer.h", + ] + deps = [ ":libxml_utils" ] +} diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.cc index 0c15523..8c38cba 100644 --- a/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.cc +++ b/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.cc @@ -1135,4 +1135,9 @@ void RWHVAuraOffscreenHelperEfl::OnGetFocusedNodeBounds( web_contents_->GetDelegate()->OnDidChangeFocusedNodeBounds(rect); } +void RWHVAuraOffscreenHelperEfl::BackgroundColorReceived(int callback_id, + SkColor bg_color) { + web_contents_->GetDelegate()->BackgroundColorReceived(callback_id, bg_color); +} + } // namespace content diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.h index 7ff61e8..be127343 100644 --- a/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.h +++ b/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.h @@ -62,6 +62,7 @@ class CONTENT_EXPORT RWHVAuraOffscreenHelperEfl { void SetAuraParentWindow(gfx::NativeView parent_window); void AuraChildWindowAdded(); void NotifySwap(const uint32_t texture_id); + void BackgroundColorReceived(int callback_id, SkColor bg_color); void Show(); void Hide(); diff --git a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc index 72a366a..b8368ef 100644 --- a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc +++ b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc @@ -305,8 +305,6 @@ void SelectionControllerEfl::ShowHandleAndContextMenuIfRequired( start_handle_->Hide(); end_handle_->Hide(); - QuerySelectionStyle(); - bool show_context_menu = is_any_handle_visible && effective_reason != Reason::ScrollOrZoomGestureEnded && effective_reason != Reason::Tap && @@ -350,16 +348,6 @@ void SelectionControllerEfl::ShowHandleAndContextMenuIfRequired( if (!handle_being_dragged_ && effective_reason != Reason::Irrelevant && is_any_handle_visible) ShowContextMenu(); - - QuerySelectionStyle(); -} - -void SelectionControllerEfl::QuerySelectionStyle() { -#if !defined(USE_AURA) - WebContentsImpl* wci = static_cast(&web_contents_); - WebContentsViewEfl* wcve = static_cast(wci->GetView()); - wcve->QuerySelectionStyle(); -#endif } void SelectionControllerEfl::ShowContextMenu() { diff --git a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.h b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.h index 9176771..bfebbbd 100644 --- a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.h +++ b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.h @@ -1,4 +1,4 @@ -// Copyright 2013 Samsung Electronics. All rights reserved. +// Copyright 2013-2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -150,8 +150,6 @@ class CONTENT_EXPORT SelectionControllerEfl { void Clear(); bool IsSelectionValid(const gfx::Rect& left_rect, const gfx::Rect& right_rect); - void QuerySelectionStyle(); - void ShowContextMenu(); void CancelContextMenu(int request_id); diff --git a/tizen_src/chromium_impl/content/public/browser/web_contents_efl_delegate.h b/tizen_src/chromium_impl/content/public/browser/web_contents_efl_delegate.h index 179a0e8..0b25d66 100644 --- a/tizen_src/chromium_impl/content/public/browser/web_contents_efl_delegate.h +++ b/tizen_src/chromium_impl/content/public/browser/web_contents_efl_delegate.h @@ -63,7 +63,6 @@ class CONTENT_EXPORT WebContentsEflDelegate { virtual void CancelContextMenu(int request_id) = 0; - virtual void QuerySelectionStyle() = 0; virtual void HandleZoomGesture(blink::WebGestureEvent& event) = 0; virtual bool UseKeyPadWithoutUserAction() = 0; diff --git a/tizen_src/ewk/efl_integration/BUILD.gn b/tizen_src/ewk/efl_integration/BUILD.gn index c0a8b8c..c43e886 100755 --- a/tizen_src/ewk/efl_integration/BUILD.gn +++ b/tizen_src/ewk/efl_integration/BUILD.gn @@ -388,8 +388,6 @@ shared_library("chromium-ewk") { "private/ewk_context_private.cc", "private/ewk_context_private.h", "private/ewk_cookie_manager_private.h", - "private/ewk_custom_handlers_private.cc", - "private/ewk_custom_handlers_private.h", "private/ewk_error_private.cc", "private/ewk_error_private.h", "private/ewk_favicon_database_private.h", diff --git a/tizen_src/ewk/efl_integration/browser/geolocation/geolocation_permission_context_efl.cc b/tizen_src/ewk/efl_integration/browser/geolocation/geolocation_permission_context_efl.cc index f33f46e..68db2da 100644 --- a/tizen_src/ewk/efl_integration/browser/geolocation/geolocation_permission_context_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/geolocation/geolocation_permission_context_efl.cc @@ -64,10 +64,12 @@ void GeolocationPermissionContextEfl::RequestPermissionOnUIThread( // if request is suspended, the API takes over the request object lifetime // and request will be deleted after decision is made - if (request->isSuspended()) + if (request->IsSuspended()) std::ignore = request.release(); - else if (!request->isDecided()) // Reject permission if request is not suspended and not decided + else if (!request->IsDecided()) { + // Reject permission if request is not suspended and not decided std::move(callback).Run(PermissionStatus::DENIED); + } } } diff --git a/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc b/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc index f9d2d61..dd8834a 100644 --- a/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc +++ b/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc @@ -106,11 +106,6 @@ class WebViewBrowserMessageFilterPrivate web_view_->InvokeWebAppCapableGetCallback(capable, callback_id); } - void OnSelectionTextStyleState(const SelectionStylePrams& params) { - if (web_view_) - web_view_->OnQuerySelectionStyleReply(params); - } - void OnMHTMLContentGet(const std::string& mhtml_content, int callback_id) { if (web_view_) web_view_->OnMHTMLContentGet(mhtml_content, callback_id); @@ -179,8 +174,6 @@ bool WebViewBrowserMessageFilter::OnMessageReceived( WebViewBrowserMessageFilterPrivate::OnWebAppIconUrlsGet) IPC_MESSAGE_FORWARD(EwkHostMsg_WebAppCapableGet, private_, WebViewBrowserMessageFilterPrivate::OnWebAppCapableGet) - IPC_MESSAGE_FORWARD(EwkViewMsg_SelectionTextStyleState, private_, - WebViewBrowserMessageFilterPrivate::OnSelectionTextStyleState) IPC_MESSAGE_FORWARD(EwkHostMsg_ReadMHTMLData, private_, WebViewBrowserMessageFilterPrivate::OnMHTMLContentGet) #if !defined(EWK_BRINGUP) // FIXME: m67 bringup diff --git a/tizen_src/ewk/efl_integration/command_line_efl.cc b/tizen_src/ewk/efl_integration/command_line_efl.cc index 63b9e7d..3e21479 100644 --- a/tizen_src/ewk/efl_integration/command_line_efl.cc +++ b/tizen_src/ewk/efl_integration/command_line_efl.cc @@ -1,4 +1,4 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. +// Copyright 2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -29,7 +29,7 @@ #include "url/gurl.h" int CommandLineEfl::argc_ = 0; -char** CommandLineEfl::argv_ = NULL; +char** CommandLineEfl::argv_ = nullptr; CommandLineEfl::ArgumentVector CommandLineEfl::original_arguments_; bool CommandLineEfl::is_initialized_ = false; @@ -48,7 +48,7 @@ void CommandLineEfl::Init(int argc, char *argv[]) { // of them. // See: chromium/src/content/common/set_process_title_linux.cc for (int i = 0; i < argc; ++i) - original_arguments_.push_back(std::string(argv[i])); + original_arguments_.push_back(strdup(argv[i])); CommandLineEfl::is_initialized_ = true; } @@ -110,16 +110,20 @@ content::MainFunctionParams CommandLineEfl::GetDefaultPortParams() { return content::MainFunctionParams(p_command_line); } +void CommandLineEfl::Shutdown() { + for (ArgumentVector::iterator it = original_arguments_.begin(); + it != original_arguments_.end(); ++it) { + free(*it); + } + original_arguments_.clear(); +} + void CommandLineEfl::AppendProcessSpecificArgs(base::CommandLine& command_line) { std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); AppendUserArgs(command_line); } -void CommandLineEfl::AppendSwitch(std::string arg) { - original_arguments_.push_back(arg); -} - void CommandLineEfl::AppendUserArgs(base::CommandLine& command_line) { for (ArgumentVector::const_iterator it = original_arguments_.begin(); it != original_arguments_.end(); ++it) { diff --git a/tizen_src/ewk/efl_integration/command_line_efl.h b/tizen_src/ewk/efl_integration/command_line_efl.h index 186eb2b..cb6190f 100644 --- a/tizen_src/ewk/efl_integration/command_line_efl.h +++ b/tizen_src/ewk/efl_integration/command_line_efl.h @@ -1,4 +1,4 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. +// Copyright 2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,7 +12,7 @@ class CommandLineEfl { public: static void Init(int argc, char *argv[]); - static void Shutdown() {}; + static void Shutdown(); // Get default set of arguments for Tizen port of chromium. static content::MainFunctionParams GetDefaultPortParams(); @@ -21,27 +21,25 @@ public: // chromium process type (browser, renderer, zygote, etc). static void AppendProcessSpecificArgs(base::CommandLine& command_line); - static void AppendSwitch(std::string); - static void AppendMemoryOptimizationSwitches(base::CommandLine* command_line); - // Chromium content API expects const char**, but EWK API provides - // us only with char* - static const char** GetArgv() { return (const char **)argv_; }; + // Do not call them apart from ContentMainRunner::Initialize() since they + // will become invalid after that. + static const char** GetArgv() { return const_cast(argv_); }; static int GetArgc() { return argc_; }; private: static void AppendUserArgs(base::CommandLine& command_line); - // Original process argument array provided thorugh EWK API, unfortunately - // chromium has a nasty habit of messig them up. Please do not rely on those + // Original process argument array provided through EWK API, unfortunately + // chromium has a nasty habit of messing them up. Please do not rely on those // values, use original_arguments_ instead. static int argc_; static char** argv_; // Original arguments passed by the user from command line. Added to all // chromium processes. They should remain unchanged until engine shutdown. - typedef std::vector ArgumentVector; + typedef std::vector ArgumentVector; static ArgumentVector original_arguments_; static bool is_initialized_; diff --git a/tizen_src/ewk/efl_integration/common/render_messages_ewk.h b/tizen_src/ewk/efl_integration/common/render_messages_ewk.h index ea7ab84..ffd731a 100644 --- a/tizen_src/ewk/efl_integration/common/render_messages_ewk.h +++ b/tizen_src/ewk/efl_integration/common/render_messages_ewk.h @@ -1,4 +1,4 @@ -// Copyright 2015 Samsung Electronics. All rights reserved. +// Copyright 2015-2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,16 +12,14 @@ #include "common/web_preferences_efl.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_message_macros.h" +#include "ipc_message_start_ewk.h" #include "private/ewk_hit_test_private.h" -#include "private/ewk_text_style_private.h" #include "private/ewk_wrt_private.h" #include "public/ewk_hit_test_internal.h" -#include "public/ewk_view_internal.h" -#include "public/ewk_hit_test_internal.h" #include "public/ewk_view.h" +#include "public/ewk_view_internal.h" #include "third_party/blink/public/web/web_navigation_policy.h" #include "third_party/blink/public/web/web_navigation_type.h" -#include "ipc_message_start_ewk.h" typedef std::map StringMap; typedef std::map ExtensibleApiMap; @@ -83,29 +81,6 @@ IPC_STRUCT_TRAITS_BEGIN(CacheParamsEfl) IPC_STRUCT_TRAITS_MEMBER(cache_max_dead_capacity) IPC_STRUCT_TRAITS_END() -IPC_STRUCT_TRAITS_BEGIN(SelectionStylePrams) - IPC_STRUCT_TRAITS_MEMBER(underline_state) - IPC_STRUCT_TRAITS_MEMBER(italic_state) - IPC_STRUCT_TRAITS_MEMBER(bold_state) - IPC_STRUCT_TRAITS_MEMBER(bg_color) - IPC_STRUCT_TRAITS_MEMBER(color) - IPC_STRUCT_TRAITS_MEMBER(font_size) - IPC_STRUCT_TRAITS_MEMBER(order_list_state) - IPC_STRUCT_TRAITS_MEMBER(un_order_list_state) - IPC_STRUCT_TRAITS_MEMBER(text_align_center_state) - IPC_STRUCT_TRAITS_MEMBER(text_align_left_state) - IPC_STRUCT_TRAITS_MEMBER(text_align_right_state) - IPC_STRUCT_TRAITS_MEMBER(text_align_full_state) - IPC_STRUCT_TRAITS_MEMBER(has_composition) -IPC_STRUCT_TRAITS_END() - -IPC_STRUCT_TRAITS_BEGIN(SelectionColor) - IPC_STRUCT_TRAITS_MEMBER(r) - IPC_STRUCT_TRAITS_MEMBER(g) - IPC_STRUCT_TRAITS_MEMBER(b) - IPC_STRUCT_TRAITS_MEMBER(a) -IPC_STRUCT_TRAITS_END() - IPC_ENUM_TRAITS(blink::WebNavigationPolicy) IPC_ENUM_TRAITS(blink::WebNavigationType) @@ -186,8 +161,6 @@ IPC_MESSAGE_ROUTED0(EwkViewMsg_SetBrowserFont) IPC_MESSAGE_ROUTED0(EwkViewMsg_SuspendScheduledTask) IPC_MESSAGE_ROUTED0(EwkViewMsg_ResumeScheduledTasks) -IPC_MESSAGE_ROUTED0(EwkViewMsg_GetSelectionStyle) - IPC_MESSAGE_ROUTED2(EwkViewMsg_SetScroll, int, /* horizontal position */ int /* vertical position */) @@ -195,9 +168,6 @@ IPC_MESSAGE_ROUTED2(EwkViewMsg_SetScroll, IPC_MESSAGE_ROUTED1(EwkViewMsg_PlainTextGet, int /* callback id */) -IPC_MESSAGE_ROUTED1(EwkViewMsg_SelectionTextStyleState, - SelectionStylePrams /* params */) - IPC_MESSAGE_ROUTED1(EwkSettingsMsg_UpdateWebKitPreferencesEfl, WebPreferencesEfl) IPC_MESSAGE_ROUTED2(EwkHostMsg_HandleTapGestureWithContext, diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc index eb95895..e61ce5c 100644 --- a/tizen_src/ewk/efl_integration/eweb_view.cc +++ b/tizen_src/ewk/efl_integration/eweb_view.cc @@ -60,7 +60,6 @@ #include "private/ewk_policy_decision_private.h" #include "private/ewk_quota_permission_request_private.h" #include "private/ewk_settings_private.h" -#include "private/ewk_text_style_private.h" #include "private/webview_delegate_ewk.h" #include "public/ewk_hit_test_internal.h" #include "services/network/public/cpp/resource_request_body.h" @@ -1345,6 +1344,11 @@ void EWebView::AdjustViewPortHeightToPopupMenu(bool is_popup_menu_visible) { : rect.height() + picker_height)); } +void EWebView::SetScaleChangedCallback(Ewk_View_Scale_Changed_Callback callback, + void* user_data) { + scale_changed_cb_.Set(callback, user_data); +} + bool EWebView::GetScrollPosition(int* x, int* y) const { if (!rwhva()) { LOG(ERROR) << "rwhva() returns nullptr"; @@ -1467,26 +1471,6 @@ void EWebView::MoveCaret(const gfx::Point& point) { #endif } -void EWebView::QuerySelectionStyle() { -#if !defined(EWK_BRINGUP) // FIXME: m94 bringup - if (GetSettings()->textStyleStateState()) { - RenderViewHost* render_view_host = web_contents_->GetRenderViewHost(); - render_view_host->Send( - new EwkViewMsg_GetSelectionStyle(render_view_host->GetRoutingID())); - } -#endif -} - -void EWebView::OnQuerySelectionStyleReply(const SelectionStylePrams& params) { - gfx::Rect left_rect, right_rect; - if (GetSelectionController()) { - GetSelectionController()->GetSelectionBounds(&left_rect, &right_rect); - _Ewk_Text_Style style_data(params, left_rect.origin(), - right_rect.bottom_right()); - SmartCallback().call(&style_data); - } -} - SelectionControllerEfl* EWebView::GetSelectionController() const { RenderViewHost* render_view_host = web_contents_->GetRenderViewHost(); RenderWidgetHostViewAura* view = static_cast( @@ -2102,6 +2086,31 @@ void EWebView::MHTMLGenerated(Ewk_View_Save_Page_Callback callback, user_data); } +bool EWebView::GetBackgroundColor( + Ewk_View_Background_Color_Get_Callback callback, + void* user_data) { + if (!rwhva()) + return false; + BackgroundColorGetCallback* cb = + new BackgroundColorGetCallback(callback, user_data); + int callback_id = background_color_get_callback_map_.Add(cb); + + rwhva()->host()->RequestBackgroundColor(callback_id); + return true; +} + +void EWebView::OnGetBackgroundColor(int callback_id, SkColor bg_color) { + BackgroundColorGetCallback* cb = + background_color_get_callback_map_.Lookup(callback_id); + + if (!cb) + return; + + cb->Run(evas_object(), SkColorGetR(bg_color), SkColorGetG(bg_color), + SkColorGetB(bg_color), SkColorGetA(bg_color)); + background_color_get_callback_map_.Remove(callback_id); +} + bool EWebView::IsFullscreen() { return web_contents_delegate_->IsFullscreenForTabOrPending( web_contents_.get()); @@ -2120,6 +2129,9 @@ void EWebView::DidChangePageScaleFactor(double scale_factor) { page_scale_factor_ = scale_factor; wcva()->wcva_helper()->SetPageScaleFactor(scale_factor); SetScaledContentsSize(); + + // Notify app about the scale change. + scale_changed_cb_.Run(evas_object_, scale_factor); } inline JavaScriptDialogManagerEfl* EWebView::GetJavaScriptDialogManagerEfl() { diff --git a/tizen_src/ewk/efl_integration/eweb_view.h b/tizen_src/ewk/efl_integration/eweb_view.h index c1575df..5f48a75 100644 --- a/tizen_src/ewk/efl_integration/eweb_view.h +++ b/tizen_src/ewk/efl_integration/eweb_view.h @@ -175,6 +175,22 @@ class WebViewExceededQuotaCallback { void* user_data_; }; +class BackgroundColorGetCallback { + public: + BackgroundColorGetCallback(Ewk_View_Background_Color_Get_Callback func, + void* user_data) + : func_(func), user_data_(user_data) {} + + void Run(Evas_Object* webview, int r, int g, int b, int a) { + if (func_) + func_(webview, r, g, b, a, user_data_); + } + + private: + Ewk_View_Background_Color_Get_Callback func_; + void* user_data_; +}; + class WebApplicationIconUrlGetCallback { public: WebApplicationIconUrlGetCallback(Ewk_Web_App_Icon_URL_Get_Callback func, @@ -354,6 +370,9 @@ class EWebView { void ShowContextMenu(const content::ContextMenuParams&); void CancelContextMenu(int request_id); void SetScale(double scale_factor); + void SetScaleChangedCallback(Ewk_View_Scale_Changed_Callback callback, + void* user_data); + bool GetScrollPosition(int* x, int* y) const; void SetScroll(int x, int y); void UrlRequestSet(const char* url, @@ -367,8 +386,6 @@ class EWebView { } ScrollDetector* GetScrollDetector() const { return scroll_detector_.get(); } void MoveCaret(const gfx::Point& point); - void QuerySelectionStyle(); - void OnQuerySelectionStyleReply(const SelectionStylePrams& params); void SelectLinkText(const gfx::Point& touch_point); bool GetSelectionRange(Eina_Rectangle* left_rect, Eina_Rectangle* right_rect); Eina_Bool ClearSelection(); @@ -504,6 +521,10 @@ class EWebView { void set_renderer_crashed(); void GetPageScaleRange(double* min_scale, double* max_scale); void SetDrawsTransparentBackground(bool enabled); + bool GetBackgroundColor(Ewk_View_Background_Color_Get_Callback callback, + void* user_data); + void OnGetBackgroundColor(int callback_id, SkColor bg_color); + void GetSessionData(const char** data, unsigned* length) const; bool RestoreFromSessionData(const char* data, unsigned length); void ShowFileChooser(content::RenderFrameHost* render_frame_host, @@ -693,6 +714,14 @@ class EWebView { MHTMLCallbackDetails; base::IDMap mhtml_callback_map_; + typedef WebViewCallback + MainFrameScrollbarVisibleGetCallback; + base::IDMap + main_frame_scrollbar_visible_callback_map_; + + base::IDMap background_color_get_callback_map_; + gfx::Size contents_size_; double progress_; mutable std::string title_; @@ -722,6 +751,7 @@ class EWebView { quota_request_callback_; WebViewCallback authentication_cb_; + WebViewCallback scale_changed_cb_; std::unique_ptr input_picker_; base::IDMap diff --git a/tizen_src/ewk/efl_integration/eweb_view_callbacks.h b/tizen_src/ewk/efl_integration/eweb_view_callbacks.h index 0a17d74..8be82b0 100644 --- a/tizen_src/ewk/efl_integration/eweb_view_callbacks.h +++ b/tizen_src/ewk/efl_integration/eweb_view_callbacks.h @@ -30,11 +30,9 @@ #include "private/ewk_certificate_private.h" #include "private/ewk_console_message_private.h" #include "private/ewk_context_menu_private.h" -#include "private/ewk_custom_handlers_private.h" #include "private/ewk_error_private.h" #include "private/ewk_geolocation_private.h" #include "private/ewk_policy_decision_private.h" -#include "private/ewk_text_style_private.h" #include "private/ewk_user_media_private.h" typedef struct EwkObject Ewk_Auth_Request; @@ -66,8 +64,6 @@ enum CallbackType { LoadStarted, LoadFinished, LoadProgress, - LoadProgressStarted, - LoadProgressFinished, MenuBarVisible, PopupBlocked, ProvisionalLoadFailed, @@ -90,8 +86,6 @@ enum CallbackType { EnterFullscreen, ExitFullscreen, UserMediaPermission, - RegisterProtocolHandler, - UnregisterProtocolHandler, IMEInputPanelShow, IMEInputPanelHide, IMECandidatePanelShow, @@ -116,7 +110,6 @@ enum CallbackType { OverscrolledRight, OverscrolledTop, OverscrolledBottom, - TextStyleState, TextSelectionMode, SaveSessionData, UndoSize, @@ -204,7 +197,6 @@ DECLARE_EWK_VIEW_CALLBACK(DownloadJobFinished, "download,finished", Ewk_Download DECLARE_EWK_VIEW_CALLBACK(DownloadJobRequested, "download,request", Ewk_Download_Job*); DECLARE_EWK_VIEW_CALLBACK(NewFormSubmissionRequest, "form,submission,request", Ewk_Form_Submission_Request*); DECLARE_EWK_VIEW_CALLBACK(FaviconChanged, "favicon,changed", void); -DECLARE_EWK_VIEW_CALLBACK(LoadError, "load,error", Ewk_Error*); DECLARE_EWK_VIEW_CALLBACK(ProvisionalLoadFailed, "load,provisional,failed", Ewk_Error*); DECLARE_EWK_VIEW_CALLBACK(NavigationPolicyDecision, "policy,decision,navigation", Ewk_Navigation_Policy_Decision*); DECLARE_EWK_VIEW_CALLBACK(TextFound, "text,found", unsigned*); @@ -223,14 +215,10 @@ DECLARE_EWK_VIEW_CALLBACK(TitleChange, "title,changed", const char*); DECLARE_EWK_VIEW_CALLBACK(URLChanged, "url,changed", const char*); DECLARE_EWK_VIEW_CALLBACK(URIChanged, "uri,changed", const char*); DECLARE_EWK_VIEW_CALLBACK(LoadProgress, "load,progress", double*); -DECLARE_EWK_VIEW_CALLBACK(LoadProgressStarted, "load,progress,started", void); -DECLARE_EWK_VIEW_CALLBACK(LoadProgressFinished, "load,progress,finished", void); DECLARE_EWK_VIEW_CALLBACK(TooltipTextSet, "tooltip,text,set", const char*); DECLARE_EWK_VIEW_CALLBACK(EnterFullscreen, "fullscreen,enterfullscreen", void); DECLARE_EWK_VIEW_CALLBACK(ExitFullscreen, "fullscreen,exitfullscreen", void); DECLARE_EWK_VIEW_CALLBACK(UserMediaPermission, "usermedia,permission,request", _Ewk_User_Media_Permission_Request*); -DECLARE_EWK_VIEW_CALLBACK(RegisterProtocolHandler, "protocolhandler,registration,requested", Ewk_Custom_Handlers_Data*); -DECLARE_EWK_VIEW_CALLBACK(UnregisterProtocolHandler, "protocolhandler,unregistration,requested", Ewk_Custom_Handlers_Data*); DECLARE_EWK_VIEW_CALLBACK(IMEInputPanelShow, "editorclient,ime,opened", void); DECLARE_EWK_VIEW_CALLBACK(IMEInputPanelHide, "editorclient,ime,closed", void); DECLARE_EWK_VIEW_CALLBACK(IMECandidatePanelShow, "editorclient,candidate,opened", void); @@ -265,7 +253,6 @@ DECLARE_EWK_VIEW_CALLBACK(OverscrolledLeft, "overscrolled,left", void); DECLARE_EWK_VIEW_CALLBACK(OverscrolledRight, "overscrolled,right", void); DECLARE_EWK_VIEW_CALLBACK(OverscrolledTop, "overscrolled,top", void); DECLARE_EWK_VIEW_CALLBACK(OverscrolledBottom, "overscrolled,bottom", void); -DECLARE_EWK_VIEW_CALLBACK(TextStyleState, "text,style,state", _Ewk_Text_Style*); DECLARE_EWK_VIEW_CALLBACK(SaveSessionData, "save,session,data", void); DECLARE_EWK_VIEW_CALLBACK(UndoSize, "undo,size", size_t*); DECLARE_EWK_VIEW_CALLBACK(RedoSize, "redo,size", size_t*); diff --git a/tizen_src/ewk/efl_integration/private/ewk_custom_handlers_private.cc b/tizen_src/ewk/efl_integration/private/ewk_custom_handlers_private.cc index 210ad58..d7fe116 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_custom_handlers_private.cc +++ b/tizen_src/ewk/efl_integration/private/ewk_custom_handlers_private.cc @@ -8,23 +8,21 @@ Ewk_Custom_Handlers_Data::Ewk_Custom_Handlers_Data() : target(0) , base_url(0) , url(0) - , title(0) , result(EWK_CUSTOM_HANDLERS_NEW) { } -Ewk_Custom_Handlers_Data::Ewk_Custom_Handlers_Data(const char* protocol, const char* baseUrl, const char* full_url, const char* handler_title) - : target(eina_stringshare_add(protocol)) - , base_url(eina_stringshare_add(baseUrl)) - , url(eina_stringshare_add(full_url)) - , title(eina_stringshare_add(handler_title)) - , result(EWK_CUSTOM_HANDLERS_NEW) { -} +Ewk_Custom_Handlers_Data::Ewk_Custom_Handlers_Data(const char* protocol, + const char* baseUrl, + const char* full_url) + : target(eina_stringshare_add(protocol)), + base_url(eina_stringshare_add(baseUrl)), + url(eina_stringshare_add(full_url)), + result(EWK_CUSTOM_HANDLERS_NEW) {} Ewk_Custom_Handlers_Data::~Ewk_Custom_Handlers_Data() { eina_stringshare_del(target); eina_stringshare_del(base_url); eina_stringshare_del(url); - eina_stringshare_del(title); } Eina_Stringshare* Ewk_Custom_Handlers_Data::getTarget() const { @@ -39,10 +37,6 @@ Eina_Stringshare* Ewk_Custom_Handlers_Data::getUrl() const { return url; } -Eina_Stringshare* Ewk_Custom_Handlers_Data::getTitle() const { - return title; -} - Ewk_Custom_Handlers_State Ewk_Custom_Handlers_Data::getResult() const { return result; } diff --git a/tizen_src/ewk/efl_integration/private/ewk_custom_handlers_private.h b/tizen_src/ewk/efl_integration/private/ewk_custom_handlers_private.h index c329d17..5b36798 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_custom_handlers_private.h +++ b/tizen_src/ewk/efl_integration/private/ewk_custom_handlers_private.h @@ -10,14 +10,14 @@ struct Ewk_Custom_Handlers_Data { public: Ewk_Custom_Handlers_Data(); - Ewk_Custom_Handlers_Data(const char* protocol, const char* baseUrl, - const char* full_url, const char* handler_title = NULL); + Ewk_Custom_Handlers_Data(const char* protocol, + const char* baseUrl, + const char* full_url); ~Ewk_Custom_Handlers_Data(); Eina_Stringshare* getTarget() const; Eina_Stringshare* getBaseUrl() const; Eina_Stringshare* getUrl() const; - Eina_Stringshare* getTitle() const; Ewk_Custom_Handlers_State getResult() const; void setResult(Ewk_Custom_Handlers_State result_); @@ -25,7 +25,6 @@ struct Ewk_Custom_Handlers_Data { Eina_Stringshare* target; Eina_Stringshare* base_url; Eina_Stringshare* url; - Eina_Stringshare* title; Ewk_Custom_Handlers_State result; }; diff --git a/tizen_src/ewk/efl_integration/private/ewk_geolocation_private.cc b/tizen_src/ewk/efl_integration/private/ewk_geolocation_private.cc index 4091a6d..c90693c 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_geolocation_private.cc +++ b/tizen_src/ewk/efl_integration/private/ewk_geolocation_private.cc @@ -21,7 +21,7 @@ _Ewk_Geolocation_Permission_Request::~_Ewk_Geolocation_Permission_Request() { delete origin_; } -void _Ewk_Geolocation_Permission_Request::runCallback(bool allowed) { +void _Ewk_Geolocation_Permission_Request::RunCallback(bool allowed) { if (allowed) { device::GeolocationProviderImpl::GetInstance() ->UserDidOptIntoLocationServices(); diff --git a/tizen_src/ewk/efl_integration/private/ewk_geolocation_private.h b/tizen_src/ewk/efl_integration/private/ewk_geolocation_private.h index ab83c11..d0aa8ba 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_geolocation_private.h +++ b/tizen_src/ewk/efl_integration/private/ewk_geolocation_private.h @@ -27,7 +27,7 @@ class _Ewk_Geolocation_Permission_Request : public Ewk_Suspendable_Object{ private: _Ewk_Security_Origin* origin_; - void runCallback(bool allowed) override; + void RunCallback(bool allowed) override; base::OnceCallback callback_; }; diff --git a/tizen_src/ewk/efl_integration/private/ewk_notification_private.cc b/tizen_src/ewk/efl_integration/private/ewk_notification_private.cc index cf3aec0..34861df 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_notification_private.cc +++ b/tizen_src/ewk/efl_integration/private/ewk_notification_private.cc @@ -4,8 +4,10 @@ #include "ewk_notification_private.h" +#include "base/files/file_path.h" +#include "base/files/file_util.h" #include "content/public/browser/browser_thread.h" -#include "third_party/skia/include/core/SkImageEncoder.h" +#include "ui/gfx/codec/png_codec.h" using content::BrowserThread; using namespace blink::mojom; @@ -60,60 +62,28 @@ const _Ewk_Security_Origin* Ewk_Notification::GetSecurityOrigin() const { } bool Ewk_Notification::SaveAsPng(const char* path) const { -#if !defined(EWK_BRINGUP) // FIXME: m67 bringup - return SkImageEncoder::EncodeFile(path, icon_, SkImageEncoder::kPNG_Type, - 100); // use max quality -#else + std::vector png_data; + if (gfx::PNGCodec::EncodeBGRASkBitmap(icon_, false, &png_data)) { + if (base::WriteFile(base::FilePath(path), + reinterpret_cast(png_data.data()), + png_data.size()) != -1) + return true; + } return false; -#endif } Ewk_Notification_Permission_Request::Ewk_Notification_Permission_Request( base::OnceCallback callback, const GURL& source_origin) : origin_(new _Ewk_Security_Origin(source_origin)), - callback_(std::move(callback)), - decided_(false), - suspended_(false) {} + callback_(std::move(callback)) {} const _Ewk_Security_Origin* Ewk_Notification_Permission_Request::GetSecurityOrigin() const { return origin_.get(); } -bool Ewk_Notification_Permission_Request::IsDecided() const { - return decided_; -} - -bool Ewk_Notification_Permission_Request::IsSuspended() const { - return suspended_; -} - -bool Ewk_Notification_Permission_Request::SetSuspend(bool suspend) const { - if (suspend != suspended_) { - suspended_ = suspend; - return true; - } - - return false; -} - -bool Ewk_Notification_Permission_Request::Reply(bool allow) { - if (decided_) - return false; - - decided_ = true; - - std::move(callback_).Run(allow ? PermissionStatus::GRANTED - : PermissionStatus::DENIED); - - if (suspended_) { - // If decision was suspended, then it was not deleted by the creator - // Deletion of this object must be done after decision was made, as - // this object will no longer be valid. But if decision was not suspended - // it will be deleted right after permission callbacks are executed. - BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, this); - } - - return true; +void Ewk_Notification_Permission_Request::RunCallback(bool allowed) { + std::move(callback_).Run(allowed ? PermissionStatus::GRANTED + : PermissionStatus::DENIED); } diff --git a/tizen_src/ewk/efl_integration/private/ewk_notification_private.h b/tizen_src/ewk/efl_integration/private/ewk_notification_private.h index 80bd08a..0de722c 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_notification_private.h +++ b/tizen_src/ewk/efl_integration/private/ewk_notification_private.h @@ -9,6 +9,7 @@ #include #include "base/callback.h" +#include "ewk_suspendable_object.h" #include "private/ewk_security_origin_private.h" #include "third_party/blink/public/mojom/permissions/permission_status.mojom.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -45,7 +46,7 @@ struct Ewk_Notification { std::unique_ptr<_Ewk_Security_Origin> origin_; }; -struct Ewk_Notification_Permission_Request { +struct Ewk_Notification_Permission_Request : public Ewk_Suspendable_Object { public: Ewk_Notification_Permission_Request( base::OnceCallback callback, @@ -58,17 +59,12 @@ struct Ewk_Notification_Permission_Request { const Ewk_Notification_Permission_Request&) = delete; const _Ewk_Security_Origin* GetSecurityOrigin() const; - bool IsDecided() const; - bool IsSuspended() const; - bool SetSuspend(bool suspend) const; - bool Reply(bool allow); private: std::unique_ptr<_Ewk_Security_Origin> origin_; base::OnceCallback callback_; - bool decided_; - mutable bool suspended_; -}; + void RunCallback(bool allowed) override; +}; #endif // ewk_notification_private_h diff --git a/tizen_src/ewk/efl_integration/private/ewk_security_origin_private.cc b/tizen_src/ewk/efl_integration/private/ewk_security_origin_private.cc index e7205fa..2224ab3 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_security_origin_private.cc +++ b/tizen_src/ewk/efl_integration/private/ewk_security_origin_private.cc @@ -7,12 +7,10 @@ #include _Ewk_Security_Origin::_Ewk_Security_Origin(const GURL& url) - : url_(url), - host_(eina_stringshare_add(url.host().c_str())), - protocol_(eina_stringshare_add(url.scheme().c_str())), - port_((url.IntPort() == url::PORT_UNSPECIFIED)? 0: url.IntPort()) -{ -} + : url_(url.DeprecatedGetOriginAsURL()), + host_(eina_stringshare_add(url.host().c_str())), + protocol_(eina_stringshare_add(url.scheme().c_str())), + port_((url.IntPort() == url::PORT_UNSPECIFIED) ? 0 : url.IntPort()) {} _Ewk_Security_Origin::~_Ewk_Security_Origin() { eina_stringshare_del(host_); diff --git a/tizen_src/ewk/efl_integration/private/ewk_suspendable_object.cc b/tizen_src/ewk/efl_integration/private/ewk_suspendable_object.cc index a8aa8fb..8ce4ca5 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_suspendable_object.cc +++ b/tizen_src/ewk/efl_integration/private/ewk_suspendable_object.cc @@ -8,14 +8,14 @@ using content::BrowserThread; -bool Ewk_Suspendable_Object::setDecision(bool allowed) { +bool Ewk_Suspendable_Object::SetDecision(bool allowed) { CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - if (!isDecided_) { - isDecided_ = true; - runCallback(allowed); + if (!decided_) { + decided_ = true; + RunCallback(allowed); - if (isSuspended_) { + if (suspended_) { // If decision was suspended, then it was not deleted by the creator // Deletion of this object must be done after decision was made, as // this object will no longer be valid. But if decision was not suspended @@ -27,15 +27,15 @@ bool Ewk_Suspendable_Object::setDecision(bool allowed) { return false; } -void Ewk_Suspendable_Object::ignore() { - isDecided_ = true; +void Ewk_Suspendable_Object::Ignore() { + decided_ = true; } -bool Ewk_Suspendable_Object::suspend() { +bool Ewk_Suspendable_Object::Suspend() { CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - if (!isDecided_) { - isSuspended_ = true; + if (!decided_) { + suspended_ = true; return true; } return false; diff --git a/tizen_src/ewk/efl_integration/private/ewk_suspendable_object.h b/tizen_src/ewk/efl_integration/private/ewk_suspendable_object.h index e10d5c2..a0e8807 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_suspendable_object.h +++ b/tizen_src/ewk/efl_integration/private/ewk_suspendable_object.h @@ -9,23 +9,21 @@ class Ewk_Suspendable_Object { public: - Ewk_Suspendable_Object() - : isDecided_(false), - isSuspended_(false) {} + Ewk_Suspendable_Object() : decided_(false), suspended_(false) {} virtual ~Ewk_Suspendable_Object() { } - bool setDecision(bool allowed); - void ignore(); - bool suspend(); + bool SetDecision(bool allowed); + void Ignore(); + bool Suspend(); - bool isDecided() const { return isDecided_; } - bool isSuspended() const { return isSuspended_; } + bool IsDecided() const { return decided_; } + bool IsSuspended() const { return suspended_; } private: - virtual void runCallback(bool allowed) {} + virtual void RunCallback(bool allowed) {} - bool isDecided_; - bool isSuspended_; + bool decided_; + bool suspended_; }; #endif /* EWK_SUSPENDABLE_OBJECT_H_ */ diff --git a/tizen_src/ewk/efl_integration/private/ewk_text_style_private.h b/tizen_src/ewk/efl_integration/private/ewk_text_style_private.h deleted file mode 100644 index 069551c..0000000 --- a/tizen_src/ewk/efl_integration/private/ewk_text_style_private.h +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright 2013 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef ewk_text_style_private_h -#define ewk_text_style_private_h - -#include -#include - -#include -#include - -#include - -struct SelectionColor { - int r; - int g; - int b; - int a; -}; - -struct SelectionStylePrams { - int underline_state; - int italic_state; - int bold_state; - SelectionColor bg_color; - SelectionColor color; - std::string font_size; - int order_list_state; - int un_order_list_state; - int text_align_center_state; - int text_align_left_state; - int text_align_right_state; - int text_align_full_state; - int has_composition; -}; - -struct _Ewk_Text_Style { - _Ewk_Text_Style(const SelectionStylePrams& params, const gfx::Point& start_point, const gfx::Point& end_point) { - selectionParams = params; - - position.startPoint.x = start_point.x(); - position.startPoint.y = start_point.y(); - position.endPoint.x = end_point.x(); - position.endPoint.y = end_point.y(); - - bgColor = params.bg_color; - color = params.color; - fontSize = eina_stringshare_add(params.font_size.c_str()); - hasComposition = params.has_composition; - } - - ~_Ewk_Text_Style() { - eina_stringshare_del(fontSize); - } - - SelectionStylePrams selectionParams; - Eina_Stringshare* fontSize; - Eina_Bool hasComposition; - - struct { - Evas_Point startPoint; - Evas_Point endPoint; - } position; - - SelectionColor bgColor; - SelectionColor color; -}; - -#endif diff --git a/tizen_src/ewk/efl_integration/public/ewk_context.cc b/tizen_src/ewk/efl_integration/public/ewk_context.cc index 9288686..016fa3e 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_context.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_context.cc @@ -205,7 +205,8 @@ Eina_Bool ewk_context_local_file_system_delete(Ewk_Context *context, Ewk_Securit EINA_SAFETY_ON_NULL_RETURN_VAL(origin, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(context, EINA_FALSE); std::ostringstream ss; - ss << "://" << ewk_security_origin_host_get(origin); + ss << ewk_security_origin_protocol_get(origin) << "://" + << ewk_security_origin_host_get(origin); context->FileSystemDelete(GURL(ss.str())); return true; } @@ -231,7 +232,8 @@ Eina_Bool ewk_context_web_database_delete(Ewk_Context* context, Ewk_Security_Ori EINA_SAFETY_ON_NULL_RETURN_VAL(origin, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(context, EINA_FALSE); std::ostringstream ss; - ss << "://" << ewk_security_origin_host_get(origin); + ss << ewk_security_origin_protocol_get(origin) << "://" + << ewk_security_origin_host_get(origin); context->WebDBDelete(GURL(ss.str())); return true; } diff --git a/tizen_src/ewk/efl_integration/public/ewk_geolocation.cc b/tizen_src/ewk/efl_integration/public/ewk_geolocation.cc index fae5eed..64114d3 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_geolocation.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_geolocation.cc @@ -38,18 +38,19 @@ const Ewk_Security_Origin* ewk_geolocation_permission_request_origin_get(const E Eina_Bool ewk_geolocation_permission_request_set(Ewk_Geolocation_Permission_Request* permissionRequest, Eina_Bool allow) { EINA_SAFETY_ON_NULL_RETURN_VAL(permissionRequest, EINA_FALSE); - return permissionRequest->setDecision(allow == EINA_TRUE); + return permissionRequest->SetDecision(allow == EINA_TRUE); } Eina_Bool ewk_geolocation_permission_reply(Ewk_Geolocation_Permission_Request* permissionRequest, Eina_Bool allow) { EINA_SAFETY_ON_NULL_RETURN_VAL(permissionRequest, EINA_FALSE); - return permissionRequest->setDecision(allow == EINA_TRUE); // the same as ewk_geolocation_permission_request_set + // The same as ewk_geolocation_permission_request_set + return permissionRequest->SetDecision(allow == EINA_TRUE); } void ewk_geolocation_permission_request_suspend(Ewk_Geolocation_Permission_Request* permissionRequest) { EINA_SAFETY_ON_NULL_RETURN(permissionRequest); - permissionRequest->suspend(); + permissionRequest->Suspend(); } diff --git a/tizen_src/ewk/efl_integration/public/ewk_notification.cc b/tizen_src/ewk/efl_integration/public/ewk_notification.cc index e237480..c2822c7 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_notification.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_notification.cc @@ -145,7 +145,7 @@ Eina_Bool ewk_notification_permission_reply(Ewk_Notification_Permission_Request* ContentBrowserClientEfl* cbce = GetContentBrowserClient(); EINA_SAFETY_ON_NULL_RETURN_VAL(cbce, EINA_FALSE); cbce->GetNotificationController()->SetPermissionForNotification(request, allow); - return request->Reply(allow == EINA_TRUE); + return request->SetDecision(allow == EINA_TRUE); } Eina_Bool ewk_notification_permission_request_set(Ewk_Notification_Permission_Request* request, Eina_Bool allow) @@ -156,7 +156,7 @@ Eina_Bool ewk_notification_permission_request_set(Ewk_Notification_Permission_Re Eina_Bool ewk_notification_permission_request_suspend(Ewk_Notification_Permission_Request* request) { EINA_SAFETY_ON_NULL_RETURN_VAL(request, EINA_FALSE); - return request->SetSuspend(true); + return request->Suspend(); } Eina_Bool ewk_notification_policies_removed(Eina_List* origins) diff --git a/tizen_src/ewk/efl_integration/public/ewk_settings.cc b/tizen_src/ewk/efl_integration/public/ewk_settings.cc index 73141a1..9b918f3 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_settings.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_settings.cc @@ -487,33 +487,15 @@ Eina_Bool ewk_settings_clear_text_selection_automatically_get(const Ewk_Settings Eina_Bool ewk_settings_text_autosizing_enabled_set(Ewk_Settings* settings, Eina_Bool enable) { EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); - if (IsMobileProfile() || IsWearableProfile()) { -#if !defined(EWK_BRINGUP) - settings->getPreferences().text_autosizing_enabled = enable; - ewkUpdateWebkitPreferences(settings->getEvasObject()); - return true; -#else - return false; -#endif - } else { - LOG_EWK_API_MOCKUP("Only for Tizen Mobile Browser"); - return false; - } + settings->getPreferences().text_autosizing_enabled = enable; + ewkUpdateWebkitPreferences(settings->getEvasObject()); + return true; } Eina_Bool ewk_settings_text_autosizing_enabled_get(const Ewk_Settings* settings) { EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); - if (IsMobileProfile() || IsWearableProfile()) { -#if !defined(EWK_BRINGUP) - return settings->getPreferences().text_autosizing_enabled; -#else - return false; -#endif - } else { - LOG_EWK_API_MOCKUP("Only for Tizen Mobile Browser"); - return false; - } + return settings->getPreferences().text_autosizing_enabled; } Eina_Bool ewk_settings_text_autosizing_font_scale_factor_set(Ewk_Settings* settings, double factor) diff --git a/tizen_src/ewk/efl_integration/public/ewk_text_style.cc b/tizen_src/ewk/efl_integration/public/ewk_text_style.cc index 931c540..6a7b6c6 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_text_style.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_text_style.cc @@ -25,116 +25,72 @@ #include "ewk_text_style_internal.h" -#include - -#include "private/ewk_text_style_private.h" - Ewk_Text_Style_State ewk_text_style_underline_get(Ewk_Text_Style* textStyle) { - EINA_SAFETY_ON_NULL_RETURN_VAL(textStyle, EWK_TEXT_STYLE_STATE_FALSE); - return static_cast(textStyle->selectionParams.underline_state); + return EWK_TEXT_STYLE_STATE_FALSE; } Ewk_Text_Style_State ewk_text_style_italic_get(Ewk_Text_Style* textStyle) { - EINA_SAFETY_ON_NULL_RETURN_VAL(textStyle, EWK_TEXT_STYLE_STATE_FALSE); - return static_cast(textStyle->selectionParams.italic_state); + return EWK_TEXT_STYLE_STATE_FALSE; } Ewk_Text_Style_State ewk_text_style_bold_get(Ewk_Text_Style* textStyle) { - EINA_SAFETY_ON_NULL_RETURN_VAL(textStyle, EWK_TEXT_STYLE_STATE_FALSE); - return static_cast(textStyle->selectionParams.bold_state); + return EWK_TEXT_STYLE_STATE_FALSE; } Ewk_Text_Style_State ewk_text_style_ordered_list_get(Ewk_Text_Style* textStyle) { - EINA_SAFETY_ON_NULL_RETURN_VAL(textStyle, EWK_TEXT_STYLE_STATE_FALSE); - return static_cast(textStyle->selectionParams.order_list_state); + return EWK_TEXT_STYLE_STATE_FALSE; } Ewk_Text_Style_State ewk_text_style_unordered_list_get(Ewk_Text_Style* textStyle) { - EINA_SAFETY_ON_NULL_RETURN_VAL(textStyle, EWK_TEXT_STYLE_STATE_FALSE); - return static_cast(textStyle->selectionParams.un_order_list_state); + return EWK_TEXT_STYLE_STATE_FALSE; } Eina_Bool ewk_text_style_position_get(Ewk_Text_Style* textStyle, Evas_Point* startPoint, Evas_Point* endPoint) { - EINA_SAFETY_ON_NULL_RETURN_VAL(textStyle, false); - EINA_SAFETY_ON_NULL_RETURN_VAL(startPoint, false); - EINA_SAFETY_ON_NULL_RETURN_VAL(endPoint, false); - startPoint->x = textStyle->position.startPoint.x; - startPoint->y = textStyle->position.startPoint.y; - - endPoint->x = textStyle->position.endPoint.x; - endPoint->y = textStyle->position.endPoint.y; - - return true; + return EINA_FALSE; } Eina_Bool ewk_text_style_bg_color_get(Ewk_Text_Style* textStyle, int* r, int* g, int* b, int* a) { - EINA_SAFETY_ON_NULL_RETURN_VAL(textStyle, false); - if (r) - *r = textStyle->bgColor.r; - if (g) - *g = textStyle->bgColor.g; - if (b) - *b = textStyle->bgColor.b; - if (a) - *a = textStyle->bgColor.a; - - return true; + return EINA_FALSE; } Eina_Bool ewk_text_style_color_get(Ewk_Text_Style* textStyle, int* r, int* g, int* b, int* a) { - EINA_SAFETY_ON_NULL_RETURN_VAL(textStyle, false); - if (r) - *r = textStyle->color.r; - if (g) - *g = textStyle->color.g; - if (b) - *b = textStyle->color.b; - if (a) - *a = textStyle->color.a; - - return true; + return EINA_FALSE; } Eina_Stringshare* ewk_text_style_font_size_get(Ewk_Text_Style* textStyle) { - EINA_SAFETY_ON_NULL_RETURN_VAL(textStyle, 0); - return textStyle->fontSize; + return nullptr; } Eina_Bool ewk_text_style_has_composition_get(Ewk_Text_Style* textStyle) { - EINA_SAFETY_ON_NULL_RETURN_VAL(textStyle, false); - return textStyle->hasComposition; + return EINA_FALSE; } Ewk_Text_Style_State ewk_text_style_align_center_get(Ewk_Text_Style* textStyle) { - EINA_SAFETY_ON_NULL_RETURN_VAL(textStyle, EWK_TEXT_STYLE_STATE_FALSE); - return static_cast(textStyle->selectionParams.text_align_center_state); + return EWK_TEXT_STYLE_STATE_FALSE; } Ewk_Text_Style_State ewk_text_style_align_left_get(Ewk_Text_Style* textStyle) { - EINA_SAFETY_ON_NULL_RETURN_VAL(textStyle, EWK_TEXT_STYLE_STATE_FALSE); - return static_cast(textStyle->selectionParams.text_align_left_state); + return EWK_TEXT_STYLE_STATE_FALSE; } Ewk_Text_Style_State ewk_text_style_align_right_get(Ewk_Text_Style* textStyle) { - EINA_SAFETY_ON_NULL_RETURN_VAL(textStyle, EWK_TEXT_STYLE_STATE_FALSE); - return static_cast(textStyle->selectionParams.text_align_right_state); + return EWK_TEXT_STYLE_STATE_FALSE; } Ewk_Text_Style_State ewk_text_style_align_full_get(Ewk_Text_Style* textStyle) { - EINA_SAFETY_ON_NULL_RETURN_VAL(textStyle, EWK_TEXT_STYLE_STATE_FALSE); - return static_cast(textStyle->selectionParams.text_align_full_state); + return EWK_TEXT_STYLE_STATE_FALSE; } diff --git a/tizen_src/ewk/efl_integration/public/ewk_view.cc b/tizen_src/ewk/efl_integration/public/ewk_view.cc index e5ffe46..0bf8c29 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_view.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_view.cc @@ -207,6 +207,14 @@ Eina_Bool ewk_view_scale_set(Evas_Object* view, double scale_factor, int x, int return EINA_TRUE; } +void ewk_view_scale_changed_callback_set( + Evas_Object* view, + Ewk_View_Scale_Changed_Callback callback, + void* user_data) { + EWK_VIEW_IMPL_GET_OR_RETURN(view, impl); + impl->SetScaleChangedCallback(callback, user_data); +} + double ewk_view_scale_get(const Evas_Object *view) { EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, -1); @@ -472,8 +480,6 @@ void ewk_view_scroll_by(Evas_Object* ewkView, int deltaX, int deltaY) Eina_Bool ewk_view_scroll_pos_get(Evas_Object* ewkView, int* x, int* y) { EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false); - EINA_SAFETY_ON_NULL_RETURN_VAL(x, EINA_FALSE); - EINA_SAFETY_ON_NULL_RETURN_VAL(y, EINA_FALSE); return impl->GetScrollPosition(x, y); } @@ -1408,6 +1414,15 @@ Eina_Bool ewk_view_key_events_enabled_set(Evas_Object* o, Eina_Bool enabled) { return false; } +Eina_Bool ewk_view_bg_color_get(Evas_Object* view, + Ewk_View_Background_Color_Get_Callback callback, + void* user_data) { + EINA_SAFETY_ON_NULL_RETURN_VAL(callback, EINA_FALSE); + EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, EINA_FALSE); + + return impl->GetBackgroundColor(callback, user_data); +} + void ewk_view_clear_all_tiles_resources(Evas_Object* ewkView) { LOG_EWK_API_MOCKUP(); } diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc index 3cf1919..c46ab42 100644 --- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc @@ -32,7 +32,6 @@ #include "net/http/http_response_headers.h" #include "private/ewk_certificate_private.h" #include "private/ewk_console_message_private.h" -#include "private/ewk_custom_handlers_private.h" #include "private/ewk_error_private.h" #include "private/ewk_policy_decision_private.h" #include "private/ewk_user_media_private.h" @@ -176,14 +175,6 @@ void WebContentsDelegateEfl::NavigationStateChanged( } } -void WebContentsDelegateEfl::LoadingStateChanged(WebContents* source, - bool to_different_document) { - if (source->IsLoading()) - web_view_->SmartCallback().call(); - else - web_view_->SmartCallback().call(); -} - void WebContentsDelegateEfl::AddNewContents( WebContents* source, std::unique_ptr new_contents, @@ -243,28 +234,6 @@ bool WebContentsDelegateEfl::IsFullscreenForTabOrPending( return is_fullscreen_; } -void WebContentsDelegateEfl::RegisterProtocolHandler( - RenderFrameHost* host, - const std::string& protocol, - const GURL& url, - bool user_gesture) { - Ewk_Custom_Handlers_Data protocol_data(protocol.c_str(), url.host().c_str(), - url.spec().c_str()); - web_view_->SmartCallback().call( - &protocol_data); -} - -void WebContentsDelegateEfl::UnregisterProtocolHandler( - RenderFrameHost* host, - const std::string& protocol, - const GURL& url, - bool user_gesture) { - Ewk_Custom_Handlers_Data protocol_data(protocol.c_str(), url.host().c_str(), - url.spec().c_str()); - web_view_->SmartCallback().call( - &protocol_data); -} - #if defined(TIZEN_MULTIMEDIA_SUPPORT) void WebContentsDelegateEfl::RequestMediaAccessAllow( const MediaStreamRequest& request, @@ -606,6 +575,11 @@ bool WebContentsDelegateEfl::PreHandleGestureEvent( return false; } +void WebContentsDelegateEfl::BackgroundColorReceived(int callback_id, + SkColor bg_color) { + web_view_->OnGetBackgroundColor(callback_id, bg_color); +} + void WebContentsDelegateEfl::RequestManifestInfo( Ewk_View_Request_Manifest_Callback callback, void* user_data) { diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h index 1919bfe..3979005 100644 --- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h @@ -31,8 +31,7 @@ class WebContentsDelegateEfl : public WebContentsDelegate { const OpenURLParams& params) override; void NavigationStateChanged(WebContents* source, InvalidateTypes changed_flags) override; - void LoadingStateChanged(WebContents* source, - bool to_different_document) override; + void AddNewContents(WebContents* source, std::unique_ptr new_contents, const GURL& target_url, @@ -58,14 +57,6 @@ class WebContentsDelegateEfl : public WebContentsDelegate { void ExitFullscreenModeForTab(WebContents* web_contents) override; bool IsFullscreenForTabOrPending(const WebContents* web_contents) override; - void RegisterProtocolHandler(RenderFrameHost* host, - const std::string& protocol, - const GURL& url, - bool user_gesture) override; - void UnregisterProtocolHandler(RenderFrameHost* host, - const std::string& protocol, - const GURL& url, - bool user_gesture) override; void FindReply(WebContents* web_contents, int request_id, int number_of_matches, @@ -89,6 +80,8 @@ class WebContentsDelegateEfl : public WebContentsDelegate { void SetContentSecurityPolicy(const std::string& policy, Ewk_CSP_Header_Type header_type); + void BackgroundColorReceived(int callback_id, SkColor bg_color) override; + void DidFirstVisuallyNonEmptyPaint(); void DidStartLoading(); diff --git a/tizen_src/ewk/efl_integration/web_contents_efl_delegate_ewk.cc b/tizen_src/ewk/efl_integration/web_contents_efl_delegate_ewk.cc index f7080df..b6ce1c7 100644 --- a/tizen_src/ewk/efl_integration/web_contents_efl_delegate_ewk.cc +++ b/tizen_src/ewk/efl_integration/web_contents_efl_delegate_ewk.cc @@ -45,10 +45,6 @@ void WebContentsEflDelegateEwk::CancelContextMenu(int request_id) { web_view_->CancelContextMenu(request_id); } -void WebContentsEflDelegateEwk::QuerySelectionStyle() { - web_view_->QuerySelectionStyle(); -} - void WebContentsEflDelegateEwk::HandleZoomGesture( blink::WebGestureEvent& event) { web_view_->HandleZoomGesture(event); diff --git a/tizen_src/ewk/efl_integration/web_contents_efl_delegate_ewk.h b/tizen_src/ewk/efl_integration/web_contents_efl_delegate_ewk.h index 16221fd..0d6117c 100644 --- a/tizen_src/ewk/efl_integration/web_contents_efl_delegate_ewk.h +++ b/tizen_src/ewk/efl_integration/web_contents_efl_delegate_ewk.h @@ -34,8 +34,6 @@ class WebContentsEflDelegateEwk : public content::WebContentsEflDelegate { void CancelContextMenu(int request_id) override; - void QuerySelectionStyle() override; - void HandleZoomGesture(blink::WebGestureEvent& event) override; bool UseKeyPadWithoutUserAction() override; diff --git a/tizen_src/ewk/efl_webview_app/app.c b/tizen_src/ewk/efl_webview_app/app.c index 374e6f7..24f5f49 100644 --- a/tizen_src/ewk/efl_webview_app/app.c +++ b/tizen_src/ewk/efl_webview_app/app.c @@ -1,4 +1,4 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. +// Copyright 2014-2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -76,8 +76,6 @@ static void __load_error_cb(void *data, Evas_Object *obj, void *event_info); static void __uri_changed_cb(void *data, Evas_Object *obj, void *event_info); static void __title_changed_cb(void *data, Evas_Object *obj, void *event_info); static void __load_progress_cb(void *data, Evas_Object *obj, void *event_info); -static void __load_progress_started_cb(void *data, Evas_Object *obj, void *event_info); -static void __load_progress_finished_cb(void *data, Evas_Object *obj, void *event_info); static void __ime_input_panel_show_cb(void* data, Evas_Object *obj, void* event_info); static void __ime_input_panel_hide_cb(void* data, Evas_Object *obj, void* event_info); static void __ime_candidate_panel_show_cb(void* data, Evas_Object *obj, void* event_info); @@ -529,8 +527,6 @@ int main(int argc, char** argv) evas_object_smart_callback_add(view, "usermedia,permission,request", __usermedia_permission_request_cb, NULL); evas_object_smart_callback_add(view, "title,changed", __title_changed_cb,0); evas_object_smart_callback_add(view, "load,progress", __load_progress_cb,0); - evas_object_smart_callback_add(view, "load,progress,started", __load_progress_started_cb,0); - evas_object_smart_callback_add(view, "load,progress,finished", __load_progress_finished_cb,0); evas_object_smart_callback_add(view, "editorclient,ime,opened", __ime_input_panel_show_cb,0); evas_object_smart_callback_add(view, "editorclient,ime,closed", __ime_input_panel_hide_cb,0); evas_object_smart_callback_add(view, "editorclient,candidate,opened", __ime_candidate_panel_show_cb,0); @@ -685,24 +681,6 @@ void __ewk_cookie_manager_async_policy_get_cb(Ewk_Cookie_Accept_Policy policy, } } -void __load_finished_cb(void *data, Evas_Object *obj, void *event_info) -{ - printf ("APP.C callback called __load_finished_cb \n"); - - if(clear_cache) - ewk_context_cache_clear((Ewk_Context*)data); - - if(test_cookie) { - printf("calling get cookie policy async\n"); - Ewk_Context* context = ewk_context_default_get(); - ewk_cookie_manager_accept_policy_async_get( - ewk_context_cookie_manager_get(context), - __ewk_cookie_manager_async_policy_get_cb, - NULL); - } - -} - void __load_error_cb(void *data, Evas_Object *obj, void *event_info) { Ewk_Error* error = (Ewk_Error*)event_info; @@ -725,14 +703,20 @@ void __load_progress_cb(void *data, Evas_Object *obj, void *event_info) printf ("APP.C callback called __load_progress_cb value is = %f \n", *((double *)event_info)); } -void __load_progress_started_cb(void *data, Evas_Object *obj, void *event_info) -{ - printf ("APP.C callback called __load_progress_started_cb \n"); -} +void __load_finished_cb(void* data, Evas_Object* obj, void* event_info) { + printf("APP.C callback called __load_finsihed_cb \n"); + + if (clear_cache) + ewk_context_cache_clear((Ewk_Context*)data); + + if (test_cookie) { + printf("calling get cookie policy async\n"); + Ewk_Context* context = ewk_context_default_get(); + ewk_cookie_manager_accept_policy_async_get( + ewk_context_cookie_manager_get(context), + __ewk_cookie_manager_async_policy_get_cb, NULL); + } -void __load_progress_finished_cb(void *data, Evas_Object *obj, void *event_info) -{ - printf ("APP.C callback called __load_progress_finsihed_cb \n"); ewk_view_custom_header_remove(view, "X-Test-header"); int width, height; diff --git a/tizen_src/ewk/efl_webview_app/mini_browser.c b/tizen_src/ewk/efl_webview_app/mini_browser.c index 15e7863..974f505 100644 --- a/tizen_src/ewk/efl_webview_app/mini_browser.c +++ b/tizen_src/ewk/efl_webview_app/mini_browser.c @@ -152,7 +152,6 @@ static double scale_factor = 1.0; static void __load_started_cb (void *data, Evas_Object *obj, void *event_info); static void __load_finished_cb (void *data, Evas_Object *obj, void *event_info); -static void __load_progress_finished_cb(void *data, Evas_Object *obj, void *event_info); static void __load_error_cb (void *data, Evas_Object *obj, void *event_info); static void __uri_changed_cb (void *data, Evas_Object *obj, void *event_info); static void __title_changed_cb (void *data, Evas_Object *obj, void *event_info); @@ -404,7 +403,6 @@ Evas_Object* _create_view(Evas_Object *parent, app_data *data) evas_object_smart_callback_add(webview, "url,changed" , __uri_changed_cb , data); evas_object_smart_callback_add(webview, "title,changed" , __title_changed_cb , data); evas_object_smart_callback_add(webview, "load,progress" , __load_progress_cb , data); - evas_object_smart_callback_add(webview, "load,progress,finished", __load_progress_finished_cb, data); evas_object_smart_callback_add(webview, "load,started" , __load_started_cb , data); evas_object_smart_callback_add(webview, "policy,newwindow,decide", __policy_newwindow_decide_cb, data); if (IsTvProfile()) { @@ -908,19 +906,13 @@ void _imf_panel_changed_cb(void *data, Evas_Object *obj, Eina_Rectangle *rect) } #endif -void __load_progress_finished_cb(void *data, Evas_Object *obj, void *event_info) -{ - LOGD("Ending Loading \n"); +void __load_finished_cb(void* data, Evas_Object* obj, void* event_info) { + LOGD("Load Done \n"); app_data *ad = (app_data *) data; evas_object_resize(ad->progress_bar, 0, 10); evas_object_hide(ad->progress_bar); } -void __load_finished_cb(void *data, Evas_Object *obj, void *event_info) -{ - LOGD("Load Done \n"); -} - void __load_progress_cb(void *data, Evas_Object *obj, void *event_info) { LOGD("Progress = %f \n", *((double *)event_info)); diff --git a/tizen_src/ewk/unittest/BUILD.gn b/tizen_src/ewk/unittest/BUILD.gn index 29707cb..b6b12ab 100644 --- a/tizen_src/ewk/unittest/BUILD.gn +++ b/tizen_src/ewk/unittest/BUILD.gn @@ -59,17 +59,11 @@ test("ewk_unittests") { "utc_blink_cb_inputmethod_changed.cpp", "utc_blink_cb_load_finished.cpp", "utc_blink_cb_load_progress.cpp", - "utc_blink_cb_load_progress_finished.cpp", - "utc_blink_cb_load_progress_started.cpp", "utc_blink_cb_load_started.cpp", "utc_blink_cb_magnifier_hide.cpp", "utc_blink_cb_magnifier_show.cpp", "utc_blink_cb_popup_blocked.cpp", - "utc_blink_cb_protocolhandler_isregistered.cpp", - "utc_blink_cb_protocolhandler_registration_requested.cpp", - "utc_blink_cb_protocolhandler_unregistration_requested.cpp", "utc_blink_cb_redo_size.cpp", - "utc_blink_cb_textselection_mode.cpp", "utc_blink_cb_title_changed.cpp", "utc_blink_cb_undo_size.cpp", "utc_blink_cb_unfocus_direction.cpp", @@ -136,7 +130,6 @@ test("ewk_unittests") { "utc_blink_ewk_context_inspector_server_start_func.cpp", "utc_blink_ewk_context_inspector_server_stop_func.cpp", "utc_blink_ewk_context_local_file_system_all_delete_func.cpp", - "utc_blink_ewk_context_local_file_system_delete_func.cpp", "utc_blink_ewk_context_menu.h", "utc_blink_ewk_context_menu_item_append_as_action_func.cpp", "utc_blink_ewk_context_menu_item_append_func.cpp", @@ -147,12 +140,10 @@ test("ewk_unittests") { "utc_blink_ewk_context_menu_item_tag_get_func.cpp", "utc_blink_ewk_context_menu_nth_item_get_func.cpp", "utc_blink_ewk_context_new_func.cpp", - "utc_blink_ewk_context_new_with_injected_bundle_path_func.cc", + "utc_blink_ewk_context_new_with_injected_bundle_path_func.cpp", "utc_blink_ewk_context_notify_low_memory_func.cpp", "utc_blink_ewk_context_pixmap_set_func.cpp", "utc_blink_ewk_context_preferred_languages_set_func.cpp", - "utc_blink_ewk_context_proxy_uri_get_func.cpp", - "utc_blink_ewk_context_proxy_uri_set_func.cpp", "utc_blink_ewk_context_vibration_client_callbacks_set_func.cpp", "utc_blink_ewk_context_web_database_delete_all_func.cpp", "utc_blink_ewk_context_web_database_delete_func.cpp", @@ -167,12 +158,12 @@ test("ewk_unittests") { "utc_blink_ewk_custom_handlers_data_base_url_get_func.cpp", "utc_blink_ewk_custom_handlers_data_result_set_func.cpp", "utc_blink_ewk_custom_handlers_data_target_get_func.cpp", - "utc_blink_ewk_custom_handlers_data_title_get_func.cpp", "utc_blink_ewk_custom_handlers_data_url_get_func.cpp", "utc_blink_ewk_error_code_get_func.cpp", "utc_blink_ewk_error_description_get_func.cpp", "utc_blink_ewk_error_type_get_func.cpp", "utc_blink_ewk_error_url_get_func.cpp", + "utc_blink_ewk_favicon_database_icon_get_func.cpp", "utc_blink_ewk_frame_is_main_frame_func.cpp", "utc_blink_ewk_geolocation_permission_reply_func.cpp", "utc_blink_ewk_geolocation_permission_request_origin_get_func.cpp", @@ -193,10 +184,9 @@ test("ewk_unittests") { "utc_blink_ewk_hit_test_link_uri_get_func.cpp", "utc_blink_ewk_hit_test_media_uri_get_func.cpp", "utc_blink_ewk_hit_test_node_value_get_func.cpp", + "utc_blink_ewk_hit_test_request_base.cpp", "utc_blink_ewk_hit_test_result_context_get_func.cpp", "utc_blink_ewk_hit_test_tag_name_get_func.cpp", - "utc_blink_ewk_home_directory_get_func.cpp", - "utc_blink_ewk_home_directory_set_func.cpp", "utc_blink_ewk_notification_body_get_func.cpp", "utc_blink_ewk_notification_callbacks_reset_func.cpp", "utc_blink_ewk_notification_callbacks_set_func.cpp", @@ -207,12 +197,12 @@ test("ewk_unittests") { "utc_blink_ewk_notification_id_get_func.cpp", "utc_blink_ewk_notification_permission_reply_func.cpp", "utc_blink_ewk_notification_permission_request_origin_get_func.cpp", - "utc_blink_ewk_notification_permission_request_set_func.cpp", "utc_blink_ewk_notification_permission_request_suspend_func.cpp", "utc_blink_ewk_notification_policies_removed_func.cpp", "utc_blink_ewk_notification_security_origin_get_func.cpp", "utc_blink_ewk_notification_showed_func.cpp", "utc_blink_ewk_notification_silent_get_func.cpp", + "utc_blink_ewk_notification_test_base.cpp", "utc_blink_ewk_notification_title_get_func.cpp", "utc_blink_ewk_policy_decision_cookie_get_func.cpp", "utc_blink_ewk_policy_decision_frame_get_func.cpp", @@ -257,8 +247,6 @@ test("ewk_unittests") { "utc_blink_ewk_settings_form_candidate_data_enabled_set_func.cpp", "utc_blink_ewk_settings_form_profile_data_enabled_get_func.cpp", "utc_blink_ewk_settings_form_profile_data_enabled_set_func.cpp", - "utc_blink_ewk_settings_initial_list_style_position_get_func.cpp", - "utc_blink_ewk_settings_initial_list_style_position_set_func.cpp", "utc_blink_ewk_settings_is_encoding_valid_func.cpp", "utc_blink_ewk_settings_javascript_can_access_clipboard_get_func.cpp", "utc_blink_ewk_settings_javascript_can_access_clipboard_set_func.cpp", @@ -286,20 +274,8 @@ test("ewk_unittests") { "utc_blink_ewk_settings_text_zoom_enabled_set_func.cpp", "utc_blink_ewk_settings_uses_encoding_detector_set_func.cpp", "utc_blink_ewk_settings_uses_keypad_without_user_action_set_func.cpp", - "utc_blink_ewk_text_style_align_center_get_func.cpp", - "utc_blink_ewk_text_style_align_full_get_func.cpp", - "utc_blink_ewk_text_style_align_left_get_func.cpp", - "utc_blink_ewk_text_style_align_right_get_func.cpp", - "utc_blink_ewk_text_style_bg_color_get_func.cpp", - "utc_blink_ewk_text_style_bold_get_func.cpp", - "utc_blink_ewk_text_style_color_get_func.cpp", - "utc_blink_ewk_text_style_font_size_get_func.cpp", - "utc_blink_ewk_text_style_has_composition_get_func.cpp", - "utc_blink_ewk_text_style_italic_get_func.cpp", - "utc_blink_ewk_text_style_ordered_list_get_func.cpp", - "utc_blink_ewk_text_style_position_get_func.cpp", - "utc_blink_ewk_text_style_underline_get_func.cpp", - "utc_blink_ewk_text_style_unordered_list_get_func.cpp", + "utc_blink_ewk_settings_viewport_meta_tag_get_func.cpp", + "utc_blink_ewk_settings_viewport_meta_tag_set_func.cpp", "utc_blink_ewk_user_media_permission_request_set_func.cpp", "utc_blink_ewk_user_media_permission_request_suspend_func.cpp", "utc_blink_ewk_view_add_func.cpp", @@ -312,6 +288,7 @@ test("ewk_unittests") { "utc_blink_ewk_view_back_forward_list_get_func.cpp", "utc_blink_ewk_view_back_func.cpp", "utc_blink_ewk_view_back_possible_func.cpp", + "utc_blink_ewk_view_bg_color_get_func.cpp", "utc_blink_ewk_view_browser_font_set_func.cpp", "utc_blink_ewk_view_command_execute_func.cpp", "utc_blink_ewk_view_content_security_policy_set_func.cpp", @@ -339,7 +316,6 @@ test("ewk_unittests") { "utc_blink_ewk_view_main_frame_get_func.cpp", "utc_blink_ewk_view_mhtml_data_get_func.cpp", "utc_blink_ewk_view_notification_permission_callback_set_func.cpp", - "utc_blink_ewk_view_orientation_lock_callback_set_func.cpp", "utc_blink_ewk_view_orientation_send_func.cpp", "utc_blink_ewk_view_page_visibility_state_set_func.cpp", "utc_blink_ewk_view_plain_text_get_func.cpp", @@ -348,6 +324,7 @@ test("ewk_unittests") { "utc_blink_ewk_view_quota_permission_request_reply_func.cpp", "utc_blink_ewk_view_reload_func.cpp", "utc_blink_ewk_view_resume_func.cpp", + "utc_blink_ewk_view_scale_changed_callback_set_func.cpp", "utc_blink_ewk_view_scale_get_func.cpp", "utc_blink_ewk_view_scale_range_get_func.cpp", "utc_blink_ewk_view_scale_set_func.cpp", @@ -362,8 +339,6 @@ test("ewk_unittests") { "utc_blink_ewk_view_suspend_func.cpp", "utc_blink_ewk_view_text_find_func.cpp", "utc_blink_ewk_view_text_find_highlight_clear_func.cpp", - "utc_blink_ewk_view_text_selection_clear_func.cpp", - "utc_blink_ewk_view_text_selection_text_get_func.cpp", "utc_blink_ewk_view_text_zoom_get_func.cpp", "utc_blink_ewk_view_text_zoom_set_func.cpp", "utc_blink_ewk_view_title_get_func.cpp", @@ -395,9 +370,10 @@ test("ewk_unittests") { if (ewk_bringup) { defines += [ "EWK_BRINGUP=true" ] sources -= [ - #XXX: enable *local_file_system* once we find a way to set --allow-file-access-from-files flag at runtime - "utc_blink_ewk_context_local_file_system_all_delete_func.cpp", "utc_blink_ewk_context_local_file_system_delete_func.cpp", + + #XXX: removed due to build break + "utc_blink_ewk_home_directory_set_func.cpp", ] } } diff --git a/tizen_src/ewk/unittest/execute_utc_blink.cpp b/tizen_src/ewk/unittest/execute_utc_blink.cpp old mode 100755 new mode 100644 index 359261e..a0d8161 --- a/tizen_src/ewk/unittest/execute_utc_blink.cpp +++ b/tizen_src/ewk/unittest/execute_utc_blink.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. +// Copyright 2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,19 +9,22 @@ #include "ewk_main.h" +int argc_; +char** argv_; + int main(int argc, char* argv[]) { - /* 1. Initialization of the EFL (and other) libraries */ -#if !GLIB_CHECK_VERSION(2, 36, 0) - g_type_init(); -#endif - ewk_set_arguments(argc, argv); - ewk_init(); setenv("ELM_ENGINE", "gl", 1); elm_init(0, NULL); + // Whenever a Google Test flag is seen, it is removed from argv + // and argc is decremented. Remeber argc_ and argv_ after this call + // not to propagate --gtest_filter or --gtest_output to chromium. testing::InitGoogleTest(&argc, argv); + argc_ = argc; + argv_ = argv; + int retval = RUN_ALL_TESTS(); /* 2. Closing whole EWK */ diff --git a/tizen_src/ewk/unittest/resources/common/ul_li.html b/tizen_src/ewk/unittest/resources/common/ul_li.html deleted file mode 100644 index 412c6fa..0000000 --- a/tizen_src/ewk/unittest/resources/common/ul_li.html +++ /dev/null @@ -1,24 +0,0 @@ - - List items - -
    List items -
  • List item 1
    • -
  • List item 2
    • -
  • List item 3
    • -
-
    List items inside -
  • List item 1
    • -
  • List item 2
    • -
  • List item 3
    • -
-
    List items outside -
  • List item 1
    • -
  • List item 2
    • -
  • List item 3
    • -
- - diff --git a/tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_invalid_database_param.bmp b/tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_invalid_database_param.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fdb7ca788e609714ba09e8daa100c45b0b347c81 GIT binary patch literal 4234 zcmd5Uhyy4sDv3DMCAKabXKSq047!L}aX{0hiHTDZ z=NSnqwy~%+P7GSbSSOr82_gc5Je29Zci;WG_qp#rFkM+I{n53$-@Eq=d!PO7v(G;J zoSX308fQt+8hS6K$J_GQP|c3&67leSwi z`WlqnDTSe-7%kQ3(NOgdynISe=`qxm9!ArPLNT0S$OL+^m23;QEu93^OqkrqFI83% zrObW8T2c9rm!Y{5RWa@R@sSv7WJs#9 zFKCLSnrp&|Xed90hKgfCpjk1)$c_;#9-$Hi6-O1^-4$%uKx2uo^=ajk++bAv-52$l zuBhDG4nMKe4>Meaz{-J2w28coFGbv2Sd=+~Cm zZ-s>l9J(lIA_Ezh?NBHJp5^`yjVD4;e>f2J2i#Dz(+<^N+ahO)H{9Dx*tYMGP^Iwv z$N{oYEu*|(BIL^vcy=m={PGAKSBgUOZ(A0TB|7={grLrT(6M1=-o%G5Dv%+aCj zkSD6LyPzSvBWe#i;{nAjj16Kh^4jy>)M)Eg1zui?HRjB+(OTEmps$w~hQ~#VQM}tU zN{9(ZZ1eym42nclSRkG}yNBA$UU;&*J<9fVK-FGbRBrEx!fzzBywcOG&4g|u{MPwv zx>`$>SNZ%oh9?X~Pj@Gb9q}fTVuLYbYN{$`F+XZRe+=y34*|YCv1ivd!F%}qB2=%J zP_)?rC7avf;fD4&|3#$WaegvWoU#>6Exb`EU@1*eq_@Uo`toJ4X>X6vAYY71Oh8=x zP{hYZLg(v>Jv+9DvHa2n1;DqL8zziP5q+#x|LiKRE|zd}l_UPO+6|lD>4Xy*>jj^7 zD8&@dPo1NIY~iF~Qo{@{t1jTH`2qOsZ5MnpF%TcjLW2C@>E?{$ zhxdiPo}RAMc7@SM6KF%b-ye)Uv%Rq}xevNKwWEF6hS|1CxJJsA2KqIW-ND(l5-PS! zc(J}CioWQ8{13Wgf7)=|xqTh)FPx9ye!j4O!xn-5K0?cZ{d-Y(>5^6BmBK4ny*v%c z!@@BpF$TST`(g65d4eyiiNPu>D(2Q$b8&is39%Wtve6U$yo!*yBnCH^wZp*;+Yu6? zPJrVvKlcp0yB#>C^1Gc zl;GkHe@siYRR$26D_%dZe9$)up3u?a$!GryS;Oy`MH@?xq&FL8)Wa{AIp`f@#!Pzrsglrdw z&gj!4M)X%d*VDOSMhWrn-7RW^CBvoLQmp*!jF4+-QsC}k#={bdagI4P{2|l&Gk!(k z4B%V@9%si2{Abx-2sa8UAW-NM7K?KPg`5R|3-B%!KSS%7^qJ-?+=~Kj5=1YK!V2jF~KUzC1nkGnf<@Z$jo7_*&WJl-8o z4@aWz)?WzeCF(7@g%LmV($2$GpRUEP`nux$(w=zusUz-hl<>nQM+%;6h>jbKp%Fb0 ztQ&yn0fC6p^}(#+-Y8t@0sYq&A7t9$L581t4Z8!rCyuh_DF9X?#X5)0t&9TI!m76xHXR+E#dxPT4*2aj3E4<;?y$IPKkH*V`9yqpgIOQ{r zlhzn+8=r0a`EL2!NeUiQY>O?}3U9^bvF!7}Koy_s{HXg-#)?S`uz2!PYmBq}s+Eo6 zKBL;M?JCWFlSQ`?)m3K9nx$a;1j+&Ae-r7|NFA%r;p9mLZf>vRM@1=EIKPte&t?3u zu|M3Mt5AD92(C^wcu@SDwy=6%Vq3NQpEegRTWG;~y`NVraOuk534FtBy~VV}A2mwB znl+mJKyk4m@@F$`26wj>)w%cj8_|22$QLHlv;_Q1N(1>byjoT3SE%);uSC z7p}F=of;M&simiQJY{0((ldP3P literal 0 HcmV?d00001 diff --git a/tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_invalid_database_param.html b/tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_invalid_database_param.html new file mode 100644 index 0000000..40dba83 --- /dev/null +++ b/tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_invalid_database_param.html @@ -0,0 +1,7 @@ + + + + + + + diff --git a/tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_invalid_evas_param.bmp b/tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_invalid_evas_param.bmp new file mode 100644 index 0000000000000000000000000000000000000000..67a722125594d79e78b80c72dddc7f65dcea124b GIT binary patch literal 4234 zcmd5<2~?EV6&^q;7z2n5BBH{8GBDu662&0GpeZ7WMiUR(lctGEV%1n}5_1eaQ2|Y* z(O8$b#Rb=>!S*O>)ifY#6(w;YZh!(J42WSJV7CA3z3-nvFq)H-b9zoMy#MX@yW6|( zjrQf0ZVEvw>6=Q$*IMkTI?+Li|6H!NOAM z0SPcr%S45mqEIEsf;O~E5{>cVHYyg;GVy9Nt#0Rk3tA;3EY!8|xMYT8o$ks_=4t!t z8|qMcqYQ?Y613OmqNV0vXnH`U>ZOlXSw+Yan4M*Ln05lwSN5cUHu5VD_?AkCG^moNxBSTV) zZ9ys$YizB`l2|`7fLX9Mqw?%j zm@kH*`eYQ@8xl0py{r$yjEPfVFOUaU3L<)G{EM)Kj~_&AiE z4gbD<5g#2XcJXPmkv3`=Mnw*X_Qh~S3{m5L^({Qw-yipPIHF=#chqFrL$}ol1sfG; zZ*CyHEQD?%{GZcbp3^;ihtjhLqs3W*bY0$cYHEcjb)RD;14n32n$hRxF!H0 zK>_emx}l`_w&3UE%SrC))A;XzYB)7YmXG!rQeQoy$&>otuPfq+DsBzm|#{ z_;;oPRa+JKag7s-R(D7K2j1AdI372CxPtc=%tP>C6`X%#5A`5F!DY|xEEHV0(82Li z!6htTx)@2Z!!U7N6b7gUWBS{3#C+$N>eyg0@{QW1lw~>K^2z~lus7oLLLUV9>TvFy ztN_=3eoe^FJ>9X#(^Ep!$Xy6f`C)*!5@BQ~?dTVf^im8wUAv>KRJN748#;jH2HjAC zk7OvttwX)hn(YbQJ};zATMRopGg1@hBP~_efyJ_BWRNTtgJ8fs&!0EYd?Q?YIw8p4 z2QNkhWBiy%jE{{(>XOi*J zd#8~yvr^2D99f9|UYSt)e@^Sn@K%0;*)!e{b1p6tRKBl6*}E5(r!N&_@+$zSy}ALV zdwQXAuRE$wO-6nBW=L(-)-?cSLeb{q|D^qcH4^gkWqq=;iqXxn2ua!mT4zK^#8kE* zkr|seOK|K~)3N`DtCwiJ6@^>lac8vxy4{YbI_L)dF%Q%q4I(*W@aW1P(NOUFl0XtRi2d<#aY%@Z#LMGikT`Y(X1@}M+{OMV z``j5fx7ne5Pfr-L-C#WCjR%LqQGfkY+Si1}uHhnhJ^8Vn*NhdJc){NTxv4%VUg3h< zYZbV>&V_>KdqhT$#+a~v2-XZod_xU)AveuohVr{ABy ze`QH*_yvVUcw4K$?N#o$x!DdCyA^2oN`b;{N}T`CKd@=dDtx#!4fEffi>a^9fHpP; z?<5Vt*Pp0y=Cl4NJw205T1l8>Yho?ue{1|vpW~0oRgoFk2bkO)+#O1X^;ptX`N5_IFN7dm@$wNBAW`V=9+TMRQUAS&1hqJ#Q)=F^i z#Tmky2dx5h#!pO?uyUnMeu&)LhjMQl9R^QjJI<^hkFY`CWA4-}gsZR9!D&MyNg(4f zLs>7;r=D$`N9!IEzB{)b>rNf3jpW+POM+hi7(YE-!kjt0z7g-vmar_n9ZMD-5dO%V zPj3oKvv?yiPUo2BK9jAksgW>i7TJGFSM1Jfcx`5;Ja5~l(a5>5m27+Fj2Ya2K=J6{ zU`FBL83bA{t`lBQzZg1Hv+d`a3+pv)ngkui->)L_p@H~YIBw_=@$F$Yl~OFrzb|>f pz>hed_#cpXFVa!tvuohr5JCX*3XSpGoPYbYOO!iB4*kUf{1;YV=Ue~) literal 0 HcmV?d00001 diff --git a/tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_invalid_evas_param.html b/tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_invalid_evas_param.html new file mode 100644 index 0000000..bcd6fa7 --- /dev/null +++ b/tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_invalid_evas_param.html @@ -0,0 +1,7 @@ + + + + + + + diff --git a/tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_no_icon.html b/tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_no_icon.html new file mode 100644 index 0000000..53a7f24 --- /dev/null +++ b/tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/neg_no_icon.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/pos.bmp b/tizen_src/ewk/unittest/resources/ewk_favicon_database_icon_get/pos.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b4e0a75af88c16c6167caab8c6961fdeebc79ffb GIT binary patch literal 3126 zcmcgudr(tX8oxd$pa_VBf`CGZ5(sY+5Xvh79kjGkyLD_kovL;F*sj~H)9McGOl7NB zr`uZEYKtN&@=$@eR->&?5NZ{dEg~wS!SIj-2quBN?(^(-?xidho%WBN{gQj{x#xV} z?|YwfRnH`O5IiNpT?$vo*foXlhY=90hs6k&FhLOL|4Sqb`fP|pBtkTTC;kh>B8QXX zI0PIHgjjgc@MAdSgdc0?C>F2Lh+{Z@dV=UL5CCm9YH#XD>s{wyy>;M+k^4W4=#HCo zwe|K(*+siI41yMFD4NK_$-by4ydC`dn9sLCt z1yPU(F7x$GhSTB9Sy}%vh3W2IoOj3oju1FDnV<@=6vyIKy0@%v{~WT4FqROVTM5mE zfYq`9oB?8HGu}Txaa#EECsp2h62oF0^1P}+uQsPn-@v5g1Dn;g3^TpV;@-yWE| zb7sR}G10!$L%VbOoiAPLcO=3j^c|Efq!GqWcw-oj0t?5|y`^yT6c_jC2=TJTsx)P$ zGBr^q_C2t-1ek$j5#i!s(H~ai!x-ev`j(bWMB7%+e;0|qUNhrVRWZ!t_8m(jBB4Jx zhUQZ}GVtTB_2K_`*5{*@(!b}&tj0$LqF0aBCS0)&wonvml6+(-P(7!HoiZ%q9FU`jn?4H#@t*j_-zI<5#x!QcSsIVX}D{lGXlzHNXFRgtW=Eu`Frii5+e4n))TVg#- z=*p+{?S7)OlxW*L{r367F&=~(8_qS>pB;Z)w|0$096E2VC_yGsr6=Vr$?)@X)oHPV zcnh3BEV9FP#gW>M+BtT$pP|~{xPQ(-InlL+;4C+P%}NS#G(~#MaP#tTiwFyPN*=j1 zQ?WElk(Df)fcoDd!|xQPu9D&JqKw}~4;>F0JvMWwhUl(a2uy%~{@l6MtJlu*m?;Sf zgc-|-#csF5pyO71(dNy{l(^)C1@l9s-yS@HL0PC12Hzm9d{`Jhv;EEM(1ircxv1gq zC3%yZVO1~0BM+$gk~F2ejL+qW-@4a?0+Ri(&d!-L;??G*tqDnjb# zJG*ELP7S|Lqrq#tw3V~_s(kckR+zeXa}GVfgseit(8zAm4QY3Bj-R1T`5wYZ?d@%W zA)YTRQ)H$n;!|_@&|`-as9SK+1|J3g;M+xMLiU95^0GzHaiL z&WebL+wxNM>9=QJ-;>KCGjL=pmAOjAGmA5pHFu?htI=9c!gD&qF%KDTyH>8T*hhl!Rl(WRgM zSyKG@#=?)^dGpUJpLPv&F~@C=k!?K?B9 z#crKtu07@cBh^nDj(8$8`bh3^EckYT_P`Z7J~c@I>=#^Ut;`wNOZ2N<`qiSLQvv$A zFvLE9vx&l+fRzUjfWQ_gF$#aK;ETh@{;xNRiAn@~u)#Lm+EVH^T;olim}fmJ(H~pH za09UY@fr1 zC4*x|3;hN!n8qH$%j54BIEZP^s&9FdJfB2fN=NJ{KALH4>f@z;?}{BqiWSa!QeS<) z@p;6Wa0Dp${Vz1Iuz9l(Ux0(4FtiqqQhfB$(1ZNc@3r*Ne0Y + + + + + + diff --git a/tizen_src/ewk/unittest/resources/protocol_handler/register_burger_handler.html b/tizen_src/ewk/unittest/resources/protocol_handler/register_burger_handler.html deleted file mode 100644 index 3c9cf76..0000000 --- a/tizen_src/ewk/unittest/resources/protocol_handler/register_burger_handler.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/tizen_src/ewk/unittest/resources/protocol_handler/register_protocol_handler.html b/tizen_src/ewk/unittest/resources/protocol_handler/register_protocol_handler.html deleted file mode 100644 index 802dbc8..0000000 --- a/tizen_src/ewk/unittest/resources/protocol_handler/register_protocol_handler.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - -register protocol handler - diff --git a/tizen_src/ewk/unittest/resources/protocol_handler/unregister_protocol_handler.html b/tizen_src/ewk/unittest/resources/protocol_handler/unregister_protocol_handler.html deleted file mode 100644 index cfceab4..0000000 --- a/tizen_src/ewk/unittest/resources/protocol_handler/unregister_protocol_handler.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/tizen_src/ewk/unittest/utc_blink_cb_form_submit.cpp b/tizen_src/ewk/unittest/utc_blink_cb_form_submit.cpp index d8f8e5b..fc5fa1e 100644 --- a/tizen_src/ewk/unittest/utc_blink_cb_form_submit.cpp +++ b/tizen_src/ewk/unittest/utc_blink_cb_form_submit.cpp @@ -7,13 +7,13 @@ class utc_blink_cb_form_submit : public utc_blink_ewk_base { protected: - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "form,submit", (void (*)(void*, Evas_Object*, void*)) form_submit, this); + void PostSetUp() override { + evas_object_smart_callback_add( + GetEwkWebView(), "form,submit", + (void (*)(void*, Evas_Object*, void*))form_submit, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "form,submit", (void (*)(void*, Evas_Object*, void*)) form_submit); } diff --git a/tizen_src/ewk/unittest/utc_blink_cb_fullscreen_enterfullscreen.cpp b/tizen_src/ewk/unittest/utc_blink_cb_fullscreen_enterfullscreen.cpp index c9e9a78..d33481b 100644 --- a/tizen_src/ewk/unittest/utc_blink_cb_fullscreen_enterfullscreen.cpp +++ b/tizen_src/ewk/unittest/utc_blink_cb_fullscreen_enterfullscreen.cpp @@ -7,9 +7,7 @@ class utc_blink_cb_fullscreen_enterfullscreen : public utc_blink_ewk_base { protected: - - void PostSetUp() - { + void PostSetUp() override { Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); ASSERT_TRUE(settings); ewk_settings_fullscreen_enabled_set(settings, EINA_TRUE); @@ -18,13 +16,12 @@ class utc_blink_cb_fullscreen_enterfullscreen : public utc_blink_ewk_base this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "fullscreen,enterfullscreen", ToSmartCallback(fullscreen_enterfullscreen)); } - void LoadFinished(Evas_Object* /*webview*/) { + void LoadFinished(Evas_Object* /*webview*/) override { EventLoopStop(Success); } diff --git a/tizen_src/ewk/unittest/utc_blink_cb_fullscreen_exitfullscreen.cpp b/tizen_src/ewk/unittest/utc_blink_cb_fullscreen_exitfullscreen.cpp index de95b07..07d771a 100644 --- a/tizen_src/ewk/unittest/utc_blink_cb_fullscreen_exitfullscreen.cpp +++ b/tizen_src/ewk/unittest/utc_blink_cb_fullscreen_exitfullscreen.cpp @@ -7,9 +7,7 @@ class utc_blink_cb_fullscreen_exitfullscreen : public utc_blink_ewk_base { protected: - - void PostSetUp() - { + void PostSetUp() override { evas_object_smart_callback_add(GetEwkWebView(), "fullscreen,exitfullscreen", ToSmartCallback(fullscreen_exitfullscreen), this); Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); @@ -17,13 +15,12 @@ class utc_blink_cb_fullscreen_exitfullscreen : public utc_blink_ewk_base ewk_settings_fullscreen_enabled_set(settings,EINA_TRUE); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "fullscreen,exitfullscreen", ToSmartCallback(fullscreen_exitfullscreen)); } - void LoadFinished(Evas_Object*/* webview*/) { + void LoadFinished(Evas_Object* /* webview*/) override { ewk_view_fullscreen_exit(GetEwkWebView()); } diff --git a/tizen_src/ewk/unittest/utc_blink_cb_icon_received.cpp b/tizen_src/ewk/unittest/utc_blink_cb_icon_received.cpp index 81ab88c..8a370d0 100644 --- a/tizen_src/ewk/unittest/utc_blink_cb_icon_received.cpp +++ b/tizen_src/ewk/unittest/utc_blink_cb_icon_received.cpp @@ -7,13 +7,12 @@ class utc_blink_cb_icon_received : public utc_blink_ewk_base { protected: - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "icon,received", cb_icon_received, this); + void PostSetUp() override { + evas_object_smart_callback_add(GetEwkWebView(), "icon,received", + cb_icon_received, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "icon,received", cb_icon_received); } diff --git a/tizen_src/ewk/unittest/utc_blink_cb_load_finished.cpp b/tizen_src/ewk/unittest/utc_blink_cb_load_finished.cpp index 823774d..20a2f0c 100644 --- a/tizen_src/ewk/unittest/utc_blink_cb_load_finished.cpp +++ b/tizen_src/ewk/unittest/utc_blink_cb_load_finished.cpp @@ -10,9 +10,8 @@ class utc_blink_cb_load_finished : public utc_blink_ewk_base { public: /* Callback for "load,finished" */ - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(utc_blink_ewk_base::Success); + void LoadFinished(Evas_Object* webview) override { + EventLoopStop(utc_blink_ewk_base::Success); } }; diff --git a/tizen_src/ewk/unittest/utc_blink_cb_load_progress.cpp b/tizen_src/ewk/unittest/utc_blink_cb_load_progress.cpp index 425c0df..42b288d 100644 --- a/tizen_src/ewk/unittest/utc_blink_cb_load_progress.cpp +++ b/tizen_src/ewk/unittest/utc_blink_cb_load_progress.cpp @@ -13,13 +13,10 @@ class utc_blink_cb_load_progress : public utc_blink_ewk_base { } - ~utc_blink_cb_load_progress() - { - } + ~utc_blink_cb_load_progress() override {} /* Callback for "load,progress" */ - void LoadProgress(Evas_Object* webview, double progress) - { + void LoadProgress(Evas_Object* webview, double progress) override { ewk_view_stop(GetEwkWebView()); EventLoopStop(utc_blink_ewk_base::Success); } diff --git a/tizen_src/ewk/unittest/utc_blink_cb_load_progress_finished.cpp b/tizen_src/ewk/unittest/utc_blink_cb_load_progress_finished.cpp deleted file mode 100644 index 14d992b..0000000 --- a/tizen_src/ewk/unittest/utc_blink_cb_load_progress_finished.cpp +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -#define URL ("http://google.com") - -class utc_blink_cb_load_progress_finished : public utc_blink_ewk_base -{ - public: - void LoadProgressFinished(Evas_Object* webview) - { - EventLoopStop(utc_blink_ewk_base::Success); - } -}; - -/** - * * @brief Tests "load,progress,finished" callback - */ -TEST_F(utc_blink_cb_load_progress_finished, callback) -{ - Eina_Bool result = ewk_view_url_set(GetEwkWebView(), URL); - - if (!result) - utc_fail(); - - utc_check_eq(EventLoopStart(), utc_blink_ewk_base::Success); -} diff --git a/tizen_src/ewk/unittest/utc_blink_cb_load_progress_started.cpp b/tizen_src/ewk/unittest/utc_blink_cb_load_progress_started.cpp deleted file mode 100644 index 44d9c5e..0000000 --- a/tizen_src/ewk/unittest/utc_blink_cb_load_progress_started.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -#define URL ("http://google.com") - -class utc_blink_cb_load_progress_started : public utc_blink_ewk_base -{ - protected: - - void LoadProgressStarted(Evas_Object* webview) - { - EventLoopStop(utc_blink_ewk_base::Success); - } - - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(utc_blink_ewk_base::Failure); - } -}; - -/** - * @brief Tests "load,progress,started" callback - */ -TEST_F(utc_blink_cb_load_progress_started, callback) -{ - ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), URL)); - EXPECT_EQ(utc_blink_ewk_base::Success, EventLoopStart()); -} diff --git a/tizen_src/ewk/unittest/utc_blink_cb_load_started.cpp b/tizen_src/ewk/unittest/utc_blink_cb_load_started.cpp index ad700c9..140c008 100644 --- a/tizen_src/ewk/unittest/utc_blink_cb_load_started.cpp +++ b/tizen_src/ewk/unittest/utc_blink_cb_load_started.cpp @@ -9,14 +9,11 @@ class utc_blink_cb_load_started : public utc_blink_ewk_base { protected: - - void LoadStarted(Evas_Object* webview) - { - EventLoopStop(utc_blink_ewk_base::Success); + void LoadStarted(Evas_Object* webview) override { + EventLoopStop(utc_blink_ewk_base::Success); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Failure); } }; diff --git a/tizen_src/ewk/unittest/utc_blink_cb_magnifier_hide.cpp b/tizen_src/ewk/unittest/utc_blink_cb_magnifier_hide.cpp index 348ccbe..5fae7b8 100644 --- a/tizen_src/ewk/unittest/utc_blink_cb_magnifier_hide.cpp +++ b/tizen_src/ewk/unittest/utc_blink_cb_magnifier_hide.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. +// Copyright 2014-2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,19 +10,19 @@ class utc_blink_cb_magnifier_hide : public utc_blink_ewk_base { public: /* Callback for "load,finished" */ - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(utc_blink_ewk_base::Success); + void LoadFinished(Evas_Object* webview) override { + EventLoopStop(utc_blink_ewk_base::Success); } - void PostSetUp() - { + void PostSetUp() override { evas_object_smart_callback_add(GetEwkWebView(), "magnifier,show", magnifier_show_cb, this); evas_object_smart_callback_add(GetEwkWebView(), "magnifier,hide", magnifier_hide_cb, this); + touch_events_enabled = ewk_view_touch_events_enabled_get(GetEwkWebView()); + ewk_view_touch_events_enabled_set(GetEwkWebView(), EINA_TRUE); } - void PreTearDown() - { + void PreTearDown() override { + ewk_view_touch_events_enabled_set(GetEwkWebView(), touch_events_enabled); evas_object_smart_callback_del(GetEwkWebView(), "magnifier,show", magnifier_show_cb); evas_object_smart_callback_del(GetEwkWebView(), "magnifier,hide", magnifier_hide_cb); } @@ -50,6 +50,19 @@ public: ewk_smart_data->api->text_selection_down(ewk_smart_data, 10, 10); return ECORE_CALLBACK_CANCEL; } + + static void job_do_text_selection_down(utc_blink_ewk_base* data) + { + utc_blink_cb_magnifier_hide* owner = + static_cast(data); + ecore_timer_add(1.0, do_text_selection_down, owner); + } + + protected: + utc_blink_cb_magnifier_hide() + : touch_events_enabled(EINA_FALSE) {} + + Eina_Bool touch_events_enabled; }; /** @@ -61,6 +74,6 @@ TEST_F(utc_blink_cb_magnifier_hide, callback) ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), URL)); ASSERT_EQ(Success, EventLoopStart()); - ecore_timer_add(1.0, do_text_selection_down, this); + SetTestJob(utc_blink_cb_magnifier_hide::job_do_text_selection_down); ASSERT_EQ(Success, EventLoopStart()); } diff --git a/tizen_src/ewk/unittest/utc_blink_cb_magnifier_show.cpp b/tizen_src/ewk/unittest/utc_blink_cb_magnifier_show.cpp index e4625a6..aef8408 100644 --- a/tizen_src/ewk/unittest/utc_blink_cb_magnifier_show.cpp +++ b/tizen_src/ewk/unittest/utc_blink_cb_magnifier_show.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. +// Copyright 2014-2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,18 +10,18 @@ class utc_blink_cb_magnifier_show : public utc_blink_ewk_base { public: /* Callback for "load,finished" */ - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(utc_blink_ewk_base::Success); + void LoadFinished(Evas_Object* webview) override { + EventLoopStop(utc_blink_ewk_base::Success); } - void PostSetUp() - { + void PostSetUp() override { evas_object_smart_callback_add(GetEwkWebView(), "magnifier,show", magnifier_show_cb, this); + touch_events_enabled = ewk_view_touch_events_enabled_get(GetEwkWebView()); + ewk_view_touch_events_enabled_set(GetEwkWebView(), EINA_TRUE); } - void PreTearDown() - { + void PreTearDown() override { + ewk_view_touch_events_enabled_set(GetEwkWebView(), touch_events_enabled); evas_object_smart_callback_del(GetEwkWebView(), "magnifier,show", magnifier_show_cb); } @@ -40,6 +40,19 @@ public: ewk_smart_data->api->text_selection_down(ewk_smart_data, 10, 10); return ECORE_CALLBACK_CANCEL; } + + static void job_do_text_selection_down(utc_blink_ewk_base* data) + { + utc_blink_cb_magnifier_show* owner = + static_cast(data); + ecore_timer_add(1.0, do_text_selection_down, owner); + } + + protected: + utc_blink_cb_magnifier_show() + : touch_events_enabled(EINA_FALSE) {} + + Eina_Bool touch_events_enabled; }; /** @@ -52,6 +65,6 @@ TEST_F(utc_blink_cb_magnifier_show, callback) ASSERT_EQ(Success, EventLoopStart()); - ecore_timer_add(1.0, do_text_selection_down, this); + SetTestJob(utc_blink_cb_magnifier_show::job_do_text_selection_down); ASSERT_EQ(Success, EventLoopStart()); } diff --git a/tizen_src/ewk/unittest/utc_blink_cb_popup_blocked.cpp b/tizen_src/ewk/unittest/utc_blink_cb_popup_blocked.cpp index a08bf65..732c691 100644 --- a/tizen_src/ewk/unittest/utc_blink_cb_popup_blocked.cpp +++ b/tizen_src/ewk/unittest/utc_blink_cb_popup_blocked.cpp @@ -15,16 +15,14 @@ protected: { } - void PostSetUp() - { + void PostSetUp() override { Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); old_can_open_windows_setting_ = ewk_settings_scripts_can_open_windows_get(settings); evas_object_smart_callback_add(GetEwkWebView(), "popup,blocked", ToSmartCallback(popup_blocked_cb), this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "popup,blocked", ToSmartCallback(popup_blocked_cb)); Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); diff --git a/tizen_src/ewk/unittest/utc_blink_cb_protocolhandler_isregistered.cpp b/tizen_src/ewk/unittest/utc_blink_cb_protocolhandler_isregistered.cpp deleted file mode 100644 index 3cdc128..0000000 --- a/tizen_src/ewk/unittest/utc_blink_cb_protocolhandler_isregistered.cpp +++ /dev/null @@ -1,81 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -class utc_blink_cb_protocolhandler_isregistered : public utc_blink_ewk_base -{ -protected: - utc_blink_cb_protocolhandler_isregistered() - : handler_target_(NULL) - , handler_base_url_(NULL) - , handler_url_(NULL) - , handler_title_(NULL) - {} - - ~utc_blink_cb_protocolhandler_isregistered() - { - if (handler_target_) free(handler_target_); - if (handler_base_url_) free(handler_base_url_); - if (handler_url_) free(handler_url_); - if (handler_title_) free(handler_title_); - } - - void LoadFinished(Evas_Object *) - { - EventLoopStop(Failure); - } - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "protocolhandler,isregistered", cb_protocolhandler_isregistered, this); - } - - void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(), "protocolhandler,isregistered", cb_protocolhandler_isregistered); - } - - static void cb_protocolhandler_isregistered(void *data, Evas_Object *, void *info) - { - ASSERT_TRUE(data != NULL); - utc_message("is protocol handler registered"); - utc_blink_cb_protocolhandler_isregistered *owner; - OwnerFromVoid(data, &owner); - EXPECT_TRUE(info); - Ewk_Custom_Handlers_Data *handler_data_ = static_cast(info); - owner->handler_target_ = ewk_custom_handlers_data_target_get(handler_data_) ? strdup(ewk_custom_handlers_data_target_get(handler_data_)) : 0; - owner->handler_base_url_ = ewk_custom_handlers_data_base_url_get(handler_data_) ? strdup(ewk_custom_handlers_data_base_url_get(handler_data_)) : 0; - owner->handler_url_ = ewk_custom_handlers_data_url_get(handler_data_) ? strdup(ewk_custom_handlers_data_url_get(handler_data_)) : 0; - owner->handler_title_ = ewk_custom_handlers_data_title_get(handler_data_) ? strdup(ewk_custom_handlers_data_title_get(handler_data_)) : 0; - owner->EventLoopStop(Success); - } - -protected: - char *handler_target_; - char *handler_base_url_; - char *handler_url_; - char *handler_title_; - - static const char * const TARGET; - static const char * const BASE_URL; - static const char * const URL; -}; - -const char * const utc_blink_cb_protocolhandler_isregistered::TARGET = "mailto"; -const char * const utc_blink_cb_protocolhandler_isregistered::BASE_URL = "file:///"; -const char * const utc_blink_cb_protocolhandler_isregistered::URL = "file:///opt/usr/resources/protocol_handler/handler.html?url=%s"; - -TEST_F(utc_blink_cb_protocolhandler_isregistered, MAILTO_PROTOCOL_UNREGISTRATION) -{ - ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), GetResourceUrl("protocol_handler/is_protocol_handler_registered.html").c_str())); - ASSERT_EQ(Success, EventLoopStart()); - utc_message("target: %s", handler_target_); - utc_message("base url: %s", handler_base_url_); - utc_message("url: %s", handler_url_); - utc_message("title: %s", handler_title_); - ASSERT_STREQ(TARGET, handler_target_); - ASSERT_STREQ(BASE_URL, handler_base_url_); - ASSERT_STREQ(URL, handler_url_); -} diff --git a/tizen_src/ewk/unittest/utc_blink_cb_protocolhandler_registration_requested.cpp b/tizen_src/ewk/unittest/utc_blink_cb_protocolhandler_registration_requested.cpp deleted file mode 100644 index c6c60ee5..0000000 --- a/tizen_src/ewk/unittest/utc_blink_cb_protocolhandler_registration_requested.cpp +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -class utc_blink_cb_protocolhandler_registration_requested : public utc_blink_ewk_base -{ -protected: - utc_blink_cb_protocolhandler_registration_requested() - : handler_target_(NULL) - , handler_base_url_(NULL) - , handler_url_(NULL) - {} - - ~utc_blink_cb_protocolhandler_registration_requested() - { - if (handler_target_) free(handler_target_); - if (handler_base_url_) free(handler_base_url_); - if (handler_url_) free(handler_url_); - } - - void LoadFinished(Evas_Object *) override - { - EventLoopStop(Failure); - } - - void PostSetUp() override - { - evas_object_smart_callback_add(GetEwkWebView(), "protocolhandler,registration,requested", cb_protocolhandler_registration_requested, this); - } - - void PreTearDown() override - { - evas_object_smart_callback_del(GetEwkWebView(), "protocolhandler,registration,requested", cb_protocolhandler_registration_requested); - } - - static void cb_protocolhandler_registration_requested(void *data, Evas_Object *, void *info) - { - ASSERT_TRUE(data != NULL); - utc_message("protocol handler registered"); - utc_blink_cb_protocolhandler_registration_requested *owner; - OwnerFromVoid(data, &owner); - EXPECT_TRUE(info); - Ewk_Custom_Handlers_Data *handler_data_ = static_cast(info); - owner->handler_target_ = ewk_custom_handlers_data_target_get(handler_data_) ? strdup(ewk_custom_handlers_data_target_get(handler_data_)) : 0; - owner->handler_base_url_ = ewk_custom_handlers_data_base_url_get(handler_data_) ? strdup(ewk_custom_handlers_data_base_url_get(handler_data_)) : 0; - owner->handler_url_ = ewk_custom_handlers_data_url_get(handler_data_) ? strdup(ewk_custom_handlers_data_url_get(handler_data_)) : 0; - owner->EventLoopStop(Success); - } - -protected: - char *handler_target_; - char *handler_base_url_; - char *handler_url_; -}; - -TEST_F(utc_blink_cb_protocolhandler_registration_requested, MAILTO_PROTOCOL_REGISTRATION) -{ - std::string url = GetResourceUrl("protocol_handler/register_protocol_handler.html"); - ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), url.c_str())); - ASSERT_EQ(Success, EventLoopStart()); - ASSERT_STREQ("mailto", handler_target_); - ASSERT_STREQ("", handler_base_url_); - ASSERT_STREQ((url + "?url=%s").c_str(), handler_url_); - utc_message("target: %s", handler_target_); - utc_message("base url: %s", handler_base_url_); - utc_message("url: %s", handler_url_); -} diff --git a/tizen_src/ewk/unittest/utc_blink_cb_protocolhandler_unregistration_requested.cpp b/tizen_src/ewk/unittest/utc_blink_cb_protocolhandler_unregistration_requested.cpp index 049740f..c257767 100644 --- a/tizen_src/ewk/unittest/utc_blink_cb_protocolhandler_unregistration_requested.cpp +++ b/tizen_src/ewk/unittest/utc_blink_cb_protocolhandler_unregistration_requested.cpp @@ -11,15 +11,12 @@ protected: : handler_target_(NULL) , handler_base_url_(NULL) , handler_url_(NULL) - , handler_title_(NULL) {} - ~utc_blink_cb_protocolhandler_unregistration_requested() - { + ~utc_blink_cb_protocolhandler_unregistration_requested() override { if (handler_target_) free(handler_target_); if (handler_base_url_) free(handler_base_url_); if (handler_url_) free(handler_url_); - if (handler_title_) free(handler_title_); } void LoadFinished(Evas_Object *) override @@ -48,7 +45,6 @@ protected: owner->handler_target_ = ewk_custom_handlers_data_target_get(handler_data_) ? strdup(ewk_custom_handlers_data_target_get(handler_data_)) : 0; owner->handler_base_url_ = ewk_custom_handlers_data_base_url_get(handler_data_) ? strdup(ewk_custom_handlers_data_base_url_get(handler_data_)) : 0; owner->handler_url_ = ewk_custom_handlers_data_url_get(handler_data_) ? strdup(ewk_custom_handlers_data_url_get(handler_data_)) : 0; - owner->handler_title_ = ewk_custom_handlers_data_title_get(handler_data_) ? strdup(ewk_custom_handlers_data_title_get(handler_data_)) : 0; owner->EventLoopStop(Success); } @@ -56,7 +52,6 @@ protected: char *handler_target_; char *handler_base_url_; char *handler_url_; - char *handler_title_; }; TEST_F(utc_blink_cb_protocolhandler_unregistration_requested, MAILTO_PROTOCOL_UNREGISTRATION) diff --git a/tizen_src/ewk/unittest/utc_blink_cb_redo_size.cpp b/tizen_src/ewk/unittest/utc_blink_cb_redo_size.cpp index da357dee..519a9bb 100644 --- a/tizen_src/ewk/unittest/utc_blink_cb_redo_size.cpp +++ b/tizen_src/ewk/unittest/utc_blink_cb_redo_size.cpp @@ -12,20 +12,15 @@ class utc_blink_cb_redo_size : public utc_blink_ewk_base { } - void PostSetUp() - { + void PostSetUp() override { evas_object_smart_callback_add(GetEwkWebView(), "redo,size", ToSmartCallback(redo_size), this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "redo,size", ToSmartCallback(redo_size)); } - void LoadFinished(Evas_Object*) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } static void undo_size(utc_blink_cb_redo_size* owner, Evas_Object*, const unsigned long*) { diff --git a/tizen_src/ewk/unittest/utc_blink_cb_textselection_mode.cpp b/tizen_src/ewk/unittest/utc_blink_cb_textselection_mode.cpp deleted file mode 100644 index 9fa2aa6..0000000 --- a/tizen_src/ewk/unittest/utc_blink_cb_textselection_mode.cpp +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -#define URL ("http://google.com") - -class utc_blink_cb_textselection_mode : public utc_blink_ewk_base -{ -protected: - utc_blink_cb_textselection_mode() - : state(Unknown) - { - } - - void PostSetUp() - { - ASSERT_EQ(Unknown, state); - evas_object_smart_callback_add(GetEwkWebView(), "textselection,mode", ToSmartCallback(textselection_mode_cb), this); - } - - void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(), "textselection,mode", ToSmartCallback(textselection_mode_cb)); - } - - static void textselection_mode_cb(utc_blink_cb_textselection_mode* owner, Evas_Object* webview, bool* data) - { - ASSERT_TRUE(owner); - - if (data) { - owner->state = (*data ? Selected : Unselected); - owner->EventLoopStop(Success); - } - - EXPECT_TRUE(data); - owner->EventLoopStop(Failure); - } - -protected: - enum SelectionState - { - Unknown, - Selected, - Unselected - }; - - SelectionState state; -}; - -/** - * @brief Tests "load,finished" callback with ewl_view_html_string_load - */ -TEST_F(utc_blink_cb_textselection_mode, selection_textarea) -{ - char htmlBuffer[] = "" - "" - "" - "" - "" - ""; - - ASSERT_EQ(EINA_TRUE, ewk_view_html_string_load(GetEwkWebView(), htmlBuffer, NULL, NULL)); - ASSERT_EQ(Success, EventLoopStart()); - ASSERT_EQ(Selected, state); - ASSERT_EQ(EINA_TRUE, ewk_view_text_selection_clear(GetEwkWebView())); - ASSERT_EQ(Success, EventLoopStart()); - ASSERT_EQ(Unselected, state); -} diff --git a/tizen_src/ewk/unittest/utc_blink_cb_title_changed.cpp b/tizen_src/ewk/unittest/utc_blink_cb_title_changed.cpp index b25c3f3..b8634b1 100644 --- a/tizen_src/ewk/unittest/utc_blink_cb_title_changed.cpp +++ b/tizen_src/ewk/unittest/utc_blink_cb_title_changed.cpp @@ -15,14 +15,12 @@ protected: { } - ~utc_blink_cb_title_changed() - { + ~utc_blink_cb_title_changed() override { free(changed_title); changed_title = NULL; } - void LoadFinished(Evas_Object*) - { + void LoadFinished(Evas_Object*) override { EventLoopStop(utc_blink_ewk_base::Failure); // won't fail the test if EventLoopStop was already called } @@ -43,13 +41,11 @@ protected: owner->EventLoopStop(Success); } - void PostSetUp() - { + void PostSetUp() override { evas_object_smart_callback_add(GetEwkWebView(), "title,changed", title_changed_cb, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "title,changed", title_changed_cb); } diff --git a/tizen_src/ewk/unittest/utc_blink_cb_undo_size.cpp b/tizen_src/ewk/unittest/utc_blink_cb_undo_size.cpp index 240cb3d..a5571f9 100644 --- a/tizen_src/ewk/unittest/utc_blink_cb_undo_size.cpp +++ b/tizen_src/ewk/unittest/utc_blink_cb_undo_size.cpp @@ -12,20 +12,15 @@ class utc_blink_cb_undo_size : public utc_blink_ewk_base { } - void PostSetUp() - { + void PostSetUp() override { evas_object_smart_callback_add(GetEwkWebView(), "undo,size", ToSmartCallback(undo_size), this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "undo,size", ToSmartCallback(undo_size)); } - void LoadFinished(Evas_Object*) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } static void undo_size(utc_blink_cb_undo_size* owner, Evas_Object*, unsigned long* size) { diff --git a/tizen_src/ewk/unittest/utc_blink_cb_uri_changed.cpp b/tizen_src/ewk/unittest/utc_blink_cb_uri_changed.cpp index 6be999b..ba9e957 100644 --- a/tizen_src/ewk/unittest/utc_blink_cb_uri_changed.cpp +++ b/tizen_src/ewk/unittest/utc_blink_cb_uri_changed.cpp @@ -7,13 +7,12 @@ class utc_blink_cb_uri_changed : public utc_blink_ewk_base { protected: - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "uri,changed", uri_changed, this); + void PostSetUp() override { + evas_object_smart_callback_add(GetEwkWebView(), "uri,changed", uri_changed, + this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "uri,changed", uri_changed); } @@ -33,17 +32,20 @@ protected: /** * @brief Tests load page with refresh meta tag. */ -TEST_F(utc_blink_cb_uri_changed, POS_TEST) -{ +TEST_F(utc_blink_cb_uri_changed, REFRESH) { ASSERT_TRUE(ewk_view_url_set(GetEwkWebView(), GetResourceUrl("ewk_view/redirect.html").c_str())); EXPECT_EQ(Success, EventLoopStart()); // Wait for "uri,changed" to .../sample.html } /** - * @brief Tests load page without refresh meta tag. + * @brief Tests load page without refresh meta tag even if previously page with + * refresh meta tag was loaded. */ -TEST_F(utc_blink_cb_uri_changed, NEG_TEST) -{ +TEST_F(utc_blink_cb_uri_changed, NO_REFRESH) { + ASSERT_TRUE(ewk_view_url_set( + GetEwkWebView(), GetResourceUrl("ewk_view/redirect.html").c_str())); + EXPECT_EQ(Success, + EventLoopStart()); // Wait for "uri,changed" to .../sample.html ASSERT_TRUE(ewk_view_url_set(GetEwkWebView(), GetResourceUrl("common/sample_1.html").c_str())); - EXPECT_EQ(Failure, EventLoopStart(5)); // Check for not redirect + EXPECT_EQ(Timeout, EventLoopStart(5)); // Check for not redirect } diff --git a/tizen_src/ewk/unittest/utc_blink_cb_url_changed.cpp b/tizen_src/ewk/unittest/utc_blink_cb_url_changed.cpp index 76cebcf..6a6db95 100644 --- a/tizen_src/ewk/unittest/utc_blink_cb_url_changed.cpp +++ b/tizen_src/ewk/unittest/utc_blink_cb_url_changed.cpp @@ -7,13 +7,12 @@ class utc_blink_cb_url_changed : public utc_blink_ewk_base { protected: - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "url,changed", url_changed, this); + void PostSetUp() override { + evas_object_smart_callback_add(GetEwkWebView(), "url,changed", url_changed, + this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "url,changed", url_changed); } @@ -39,10 +38,16 @@ TEST_F(utc_blink_cb_url_changed, Refresh) } /** - * @brief Tests load page without refresh meta tag. + * @brief Tests load page without refresh meta tag even if previously page with + * refresh meta tag was loaded. */ TEST_F(utc_blink_cb_url_changed, NoRefresh) { + ASSERT_TRUE(ewk_view_url_set( + GetEwkWebView(), GetResourceUrl("ewk_view/redirect.html").c_str())); + EXPECT_EQ(Success, + EventLoopStart()); // Wait for "url,changed" to .../sample.html ASSERT_TRUE(ewk_view_url_set( GetEwkWebView(), GetResourceUrl("common/sample_1.html").c_str())); - EXPECT_EQ(Failure, EventLoopStart(5)); // Check for not redirect to .../sample.html + EXPECT_EQ(Timeout, + EventLoopStart(5)); // Check for not redirect to .../sample.html } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_credential_cancel_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_credential_cancel_func.cpp old mode 100755 new mode 100644 index b577874..36271af --- a/tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_credential_cancel_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_credential_cancel_func.cpp @@ -20,9 +20,9 @@ protected: ewk_view_authentication_callback_set(GetEwkWebView(), nullptr, nullptr); } - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(utc_blink_ewk_base::Failure); // will noop if EventLoopStop was alraedy called + void LoadFinished(Evas_Object* webview) override { + EventLoopStop(utc_blink_ewk_base::Failure); // will noop if EventLoopStop + // was alraedy called } static void AuthenticationChallenge(Evas_Object* o, Ewk_Auth_Challenge* auth_challenge, void* data) diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_credential_use_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_credential_use_func.cpp old mode 100755 new mode 100644 index 8b5467c..fec6ae6 --- a/tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_credential_use_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_credential_use_func.cpp @@ -20,8 +20,7 @@ protected: ewk_view_authentication_callback_set(GetEwkWebView(), nullptr, nullptr); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop( utc_blink_ewk_base::Failure ); // will noop if EventLoopStop was alraedy called } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_realm_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_realm_get_func.cpp old mode 100755 new mode 100644 index 35db7b4..edd5125 --- a/tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_realm_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_realm_get_func.cpp @@ -18,8 +18,7 @@ protected: ewk_view_authentication_callback_set(GetEwkWebView(), nullptr, nullptr); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop( utc_blink_ewk_base::Failure ); // will noop if EventLoopStop was alraedy called } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_suspend_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_suspend_func.cpp old mode 100755 new mode 100644 index b721c5a..59721f2 --- a/tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_suspend_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_auth_challenge_suspend_func.cpp @@ -18,8 +18,7 @@ protected: ewk_view_authentication_callback_set(GetEwkWebView(), nullptr, nullptr); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop( utc_blink_ewk_base::Failure ); // will noop if EventLoopStop was alraedy called } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_autofill_profile_data_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_autofill_profile_data_get_func.cpp index fb9df71..d753192 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_autofill_profile_data_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_autofill_profile_data_get_func.cpp @@ -16,8 +16,7 @@ protected: m_profile = ewk_autofill_profile_new(); } - virtual ~utc_blink_ewk_autofill_profile_data_get() - { + ~utc_blink_ewk_autofill_profile_data_get() override { ewk_autofill_profile_delete(m_profile); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_autofill_profile_data_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_autofill_profile_data_set_func.cpp index 26d1b3c..c6b71e0 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_autofill_profile_data_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_autofill_profile_data_set_func.cpp @@ -16,8 +16,7 @@ protected: m_profile = ewk_autofill_profile_new(); } - virtual ~utc_blink_ewk_autofill_profile_data_set() - { + ~utc_blink_ewk_autofill_profile_data_set() override { ewk_autofill_profile_delete(m_profile); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_count_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_count_func.cpp index b9f2bab..41ecaa3 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_count_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_count_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_back_forward_list_count : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_current_item_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_current_item_get_func.cpp index 64ec4c8..c12ddf3 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_current_item_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_current_item_get_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_back_forward_list_current_item_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_at_index_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_at_index_get_func.cpp index 5b2bc3cf..31afe30 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_at_index_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_at_index_get_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_back_forward_list_item_at_index_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_original_url_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_original_url_get_func.cpp index 7229623..9c2f54da 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_original_url_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_original_url_get_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_back_forward_list_item_original_url_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_ref_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_ref_func.cpp index c6081db..b2393fa 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_ref_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_ref_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_back_forward_list_item_ref : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_title_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_title_get_func.cpp index 57d0b2c..228ff7d 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_title_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_title_get_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_back_forward_list_item_title_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_unref_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_unref_func.cpp index 7992eb8..4ef3a73 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_unref_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_unref_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_back_forward_list_item_unref : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_url_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_url_get_func.cpp index 2b283f1..52c37c6 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_url_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_item_url_get_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_back_forward_list_item_url_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_n_back_items_copy_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_n_back_items_copy_func.cpp index 869807c..3a5360a 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_n_back_items_copy_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_n_back_items_copy_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_back_forward_list_n_back_items_copy : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_n_forward_items_copy_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_n_forward_items_copy_func.cpp index ea9cb04..6bef82e 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_n_forward_items_copy_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_n_forward_items_copy_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_back_forward_list_n_forward_items_copy : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_next_item_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_next_item_get_func.cpp index e3c1a7f..9f9bc69 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_next_item_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_next_item_get_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_back_forward_list_next_item_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_previous_item_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_previous_item_get_func.cpp index 7f01c9e..e9dbaef 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_previous_item_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_back_forward_list_previous_item_get_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_back_forward_list_previous_item_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_base.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_base.cpp index 7922356..cf4e9ca 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_base.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_base.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. +// Copyright 2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -15,6 +15,11 @@ #include "utc_blink_ewk_base.h" +// Do not use them except ctor. You can access argv table from +// utc_blink_ewk_base::argv if needed. +extern int argc_; +extern char** argv_; + utc_blink_ewk_base::utc_blink_ewk_base() : ::testing::Test() , timeout(NULL) @@ -35,6 +40,8 @@ utc_blink_ewk_base::utc_blink_ewk_base() } else { resource_dir = strdup("/opt/usr/resources"); } + for (int i = 0; i < argc_; i++) + argv.push_back(argv_[i]); } utc_blink_ewk_base::~utc_blink_ewk_base() @@ -47,6 +54,11 @@ utc_blink_ewk_base::~utc_blink_ewk_base() free(resource_dir); } +void utc_blink_ewk_base::AllowFileAccessFromFiles() { + static const char* file_access_literal = "--allow-file-access-from-files"; + argv.push_back(const_cast(file_access_literal)); +} + std::string utc_blink_ewk_base::GetResourcePath(const char* resource_path) const { std::string retval = resource_dir; @@ -206,6 +218,15 @@ bool utc_blink_ewk_base::EventLoopStop(utc_blink_ewk_base::MainLoopResult result return false; } +bool utc_blink_ewk_base::TimeOut() { + return false; +} + +bool utc_blink_ewk_base::LoadError(Evas_Object* webview, Ewk_Error* error) { + EventLoopStop(LoadFailure); + return false; +} + void utc_blink_ewk_base::SetUp() { PreSetUp(); @@ -216,8 +237,6 @@ void utc_blink_ewk_base::SetUp() evas_object_smart_callback_add(ewk_webview, "load,finished", load_finished_cb, this); evas_object_smart_callback_add(ewk_webview, "load,error", load_error_cb, this); evas_object_smart_callback_add(ewk_webview, "load,progress", load_progress_cb, this); - evas_object_smart_callback_add(ewk_webview, "load,progress,started", load_progress_started_cb, this); - evas_object_smart_callback_add(ewk_webview, "load,progress,finished", load_progress_finished_cb, this); evas_object_smart_callback_add(ewk_webview, "console,message", ToSmartCallback(console_message_cb), this); PostSetUp(); @@ -231,8 +250,6 @@ void utc_blink_ewk_base::TearDown() evas_object_smart_callback_del(ewk_webview, "load,finished", load_finished_cb); evas_object_smart_callback_del(ewk_webview, "load,error", load_error_cb); evas_object_smart_callback_del(ewk_webview, "load,progress", load_progress_cb); - evas_object_smart_callback_del(ewk_webview, "load,progress,started", load_progress_started_cb); - evas_object_smart_callback_del(ewk_webview, "load,progress,finished", load_progress_finished_cb); evas_object_smart_callback_del(ewk_webview, "console,message", ToSmartCallback(console_message_cb)); EwkDeinit(); @@ -278,20 +295,6 @@ void utc_blink_ewk_base::load_progress_cb(void* data, Evas_Object* webview, void ut->LoadProgress(webview, progress); } -void utc_blink_ewk_base::load_progress_started_cb(void* data, Evas_Object* webview, void* event_info) -{ - utc_debug("[load,progress,started] :: data: %p, webview: %p, event_info: %p", data, webview, event_info); - utc_blink_ewk_base *ut = static_cast(data); - ut->LoadProgressStarted(webview); -} - -void utc_blink_ewk_base::load_progress_finished_cb(void* data, Evas_Object* webview, void* event_info) -{ - utc_debug("[load,progress,finished] :: data: %p, webview: %p, event_info: %p", data, webview, event_info); - utc_blink_ewk_base *ut = static_cast(data); - ut->LoadProgressFinished(webview); -} - void utc_blink_ewk_base::ConsoleMessage(Evas_Object*webview, const Ewk_Console_Message* msg) { EXPECT_EQ(ewk_webview, webview); @@ -332,6 +335,8 @@ void utc_blink_ewk_base::EwkInit() /* 1. Standard TETware test initialization message */ utc_info("[[ TET_MSG ]]:: ============ Startup ============"); + ewk_set_arguments(argv.size(), argv.data()); + ewk_window = elm_win_add(NULL, "TC Launcher", ELM_WIN_BASIC); elm_win_title_set(ewk_window, "TC Launcher"); ewk_evas = evas_object_evas_get(ewk_window); diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_base.h b/tizen_src/ewk/unittest/utc_blink_ewk_base.h index 2b84992..17d7c84 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_base.h +++ b/tizen_src/ewk/unittest/utc_blink_ewk_base.h @@ -1,4 +1,4 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. +// Copyright 2014-2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -131,7 +131,7 @@ protected: }; utc_blink_ewk_base(); - virtual ~utc_blink_ewk_base(); + ~utc_blink_ewk_base() override; void SetLogJavascript(bool enabled) { log_javascript = enabled; } @@ -152,6 +152,10 @@ protected: */ bool CompareEvasImageWithResource(Evas_Object* image_object, const char* resource, int pixel_fuzziness) const; + // Adds allow-file-access-from-files param to Chromium. + // Must be called within PreSetUp to be taken into account. + void AllowFileAccessFromFiles(); + /** * Generates proper path for resource file * @@ -233,7 +237,7 @@ protected: * @retval true if timeout was handled by method, false otherwise. * If method returns false then main application event loop will be stopped with error. */ - virtual bool TimeOut() { return false; } + virtual bool TimeOut(); /** * Override this method if you need to handle "load,finished" ewk callback. @@ -251,7 +255,7 @@ protected: * @retval true if "load,error" was handled by method, false otherwise. * If method returns false then main application event loop will be stopped with error. */ - virtual bool LoadError(Evas_Object* webview, Ewk_Error *error) { EventLoopStop(LoadFailure); return false; } + virtual bool LoadError(Evas_Object* webview, Ewk_Error* error); /** * Override this method if you need to handle "load,progress" ewk callback. @@ -259,16 +263,6 @@ protected: virtual void LoadProgress(Evas_Object* webview, double progress) {} /** - * Override this method if you need to handle "load,progress,started" ewk callback. - */ - virtual void LoadProgressStarted(Evas_Object* webview) {} - - /** - * Override this method if you need to handle "load,progress,finished" ewk callback. - */ - virtual void LoadProgressFinished(Evas_Object* webview) {} - - /** * Override this method if you need to handle "console,message" ewk callback. */ virtual void ConsoleMessage(Evas_Object* webview, const Ewk_Console_Message*); @@ -282,6 +276,52 @@ protected: void SetUp() final; /** + * Sets a (test) job that should be performed during main loop. + * @param [in] job_function name of function (static void method of test + * class) + * that will be called from main loop + * + * @note If exit from main loop depends on code included in body of callback + * that could be called before program enters main loop + * there could be a race codition. + * Example: exit from main loop is a result of call to + * ewk_view_text_selection_clear. + * + * in TEST_F body: + * > ASSERT_EQ(EINA_TRUE, + * ewk_view_text_selection_clear(GetEwkWebView())); + * > ASSERT_EQ(Success, EventLoopStart()); + * + * It would be better to: + * 1. define a additional callback, and move there testing code + * 2. set additional callback with SetTestJob to be called from main + * loop + * 3. result of code called in callback store in auxiliary field of + * class + * and test later + * Example: + * + * in class definition: + * > static void job_selection_clear(utc_blink_ewk_base *data) + * > { + * > utc_blink_cb_textselection_mode *owner = + * > static_cast(data); + * > owner->result_text_selection_clear = + * ewk_view_text_selection_clear(owner->GetEwkWebView()); + * > } + * + * in TEST_F body: + * > + * > SetTestJob(utc_blink_cb_textselection_mode::job_selection_clear); + * > ASSERT_EQ(Success, EventLoopStart()); + * > ASSERT_EQ(EINA_TRUE, result_text_selection_clear); + */ + void SetTestJob(utc_blink_ewk_job_cb_t job_function) + { + test_job_function = job_function; + } + + /** * Performs unit test deinitialization. It calls PreTearDown before default deinitialization * and PostTearDown after default deinitialization. * @@ -335,19 +375,6 @@ private: static void load_progress_cb(void* data, Evas_Object* webview, void* event_info); /** - * Default "load,progress,started" event callback, will call LoadProgressStarted method - * - * @see LoadProgressStarted - */ - static void load_progress_started_cb(void* data, Evas_Object* webview, void* event_info); - /** - * Default load,progress,finished" event callback, will call LoadProgressFinished method - * - * @see LoadProgressFinished - */ - static void load_progress_finished_cb(void* data, Evas_Object* webview, void* event_info); - - /** * Default "console,message" event callback, will call ConsoleMessage method */ static void console_message_cb(utc_blink_ewk_base*, Evas_Object*, Ewk_Console_Message*); @@ -395,6 +422,11 @@ private: Ewk_Context* ewk_context; char *resource_dir; + + Ecore_Job* test_job; + utc_blink_ewk_job_cb_t test_job_function; + + std::vector argv; }; #endif // UTC_BLINK_EWK_BASE_HUTC_BLINK_EWK_BASE_H diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_certificate_policy_decision_allowed_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_certificate_policy_decision_allowed_set_func.cpp old mode 100755 new mode 100644 index 84a5581..0ca5070 --- a/tizen_src/ewk/unittest/utc_blink_ewk_certificate_policy_decision_allowed_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_certificate_policy_decision_allowed_set_func.cpp @@ -11,19 +11,16 @@ class utc_blink_ewk_certificate_policy_decision_allowed_set : public utc_blink_ewk_base { protected: - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "request,certificate,confirm", policy_decision, this); + void PostSetUp() override { + evas_object_smart_callback_add( + GetEwkWebView(), "request,certificate,confirm", policy_decision, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "request,certificate,confirm", policy_decision); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Failure); // will noop if EventLoopStop was alraedy called } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_certificate_policy_decision_certificate_pem_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_certificate_policy_decision_certificate_pem_get_func.cpp old mode 100755 new mode 100644 index 4ff5028..e201200 --- a/tizen_src/ewk/unittest/utc_blink_ewk_certificate_policy_decision_certificate_pem_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_certificate_policy_decision_certificate_pem_get_func.cpp @@ -11,20 +11,18 @@ class utc_blink_ewk_certificate_policy_decision_certificate_pem_get : public utc_blink_ewk_base { protected: - void PostSetUp() - { - pem = NULL; - evas_object_smart_callback_add(GetEwkWebView(), "request,certificate,confirm", policy_decision, this); + void PostSetUp() override { + pem = NULL; + evas_object_smart_callback_add( + GetEwkWebView(), "request,certificate,confirm", policy_decision, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "request,certificate,confirm", policy_decision); eina_stringshare_del(pem); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Failure); // will noop if EventLoopStop was alraedy called } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_certificate_policy_decision_url_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_certificate_policy_decision_url_get_func.cpp old mode 100755 new mode 100644 index 5058e7c..ae25ab3 --- a/tizen_src/ewk/unittest/utc_blink_ewk_certificate_policy_decision_url_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_certificate_policy_decision_url_get_func.cpp @@ -11,22 +11,19 @@ class utc_blink_ewk_certificate_policy_decision_url_get : public utc_blink_ewk_base { protected: - void PostSetUp() - { - url = NULL; - evas_object_smart_callback_add(GetEwkWebView(), - "request,certificate,confirm", policy_decision, this); + void PostSetUp() override { + url = NULL; + evas_object_smart_callback_add( + GetEwkWebView(), "request,certificate,confirm", policy_decision, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "request,certificate,confirm", policy_decision); eina_stringshare_del(url); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Failure); // will noop if EventLoopStop was alraedy called } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_console_message_level_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_console_message_level_get_func.cpp old mode 100755 new mode 100644 index b705cd3..dd69fde --- a/tizen_src/ewk/unittest/utc_blink_ewk_console_message_level_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_console_message_level_get_func.cpp @@ -17,13 +17,11 @@ protected: int gResult; - void PostSetUp() - { + void PostSetUp() override { evas_object_smart_callback_add(GetEwkWebView(),"console,message",console_message_cb, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(),"console,message",console_message_cb); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_console_message_line_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_console_message_line_get_func.cpp old mode 100755 new mode 100644 index 2071797..6c2b273 --- a/tizen_src/ewk/unittest/utc_blink_ewk_console_message_line_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_console_message_line_get_func.cpp @@ -13,13 +13,11 @@ protected: int getResult; - void PostSetUp() - { + void PostSetUp() override { evas_object_smart_callback_add(GetEwkWebView(),"console,message",console_message_cb, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(),"console,message",console_message_cb); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_console_message_source_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_console_message_source_get_func.cpp old mode 100755 new mode 100644 index af5001d..307b154 --- a/tizen_src/ewk/unittest/utc_blink_ewk_console_message_source_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_console_message_source_get_func.cpp @@ -12,13 +12,11 @@ class utc_blink_ewk_console_message_source_get : public utc_blink_ewk_base std::string getSource; - void PostSetUp() - { + void PostSetUp() override { evas_object_smart_callback_add(GetEwkWebView(),"console,message",console_message_cb, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(),"console,message",console_message_cb); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_application_cache_delete_all_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_application_cache_delete_all_func.cpp index aef1f78..e5f3635 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_application_cache_delete_all_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_application_cache_delete_all_func.cpp @@ -14,19 +14,16 @@ protected: { } - ~utc_blink_ewk_context_application_cache_delete_all() - { + ~utc_blink_ewk_context_application_cache_delete_all() override { SetOrigins(NULL); } - void PostSetUp() - { + void PostSetUp() override { utc_message("[postSetUp] :: "); ctx = ewk_view_context_get(GetEwkWebView()); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { utc_message("[loadFinished] :: "); EventLoopStop(Success); } @@ -82,7 +79,7 @@ protected: static const char* const appCacheURLOther; }; -const char* const utc_blink_ewk_context_application_cache_delete_all::appCacheURL = "http://htmlfive.appspot.com/static/stickies.html"; +const char* const utc_blink_ewk_context_application_cache_delete_all::appCacheURL = "http://appcache.offline.technology/demo/"; const char* const utc_blink_ewk_context_application_cache_delete_all::appCacheURLOther = "http://www.w3schools.com/html/tryhtml5_html_manifest.htm"; /** diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_application_cache_delete_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_application_cache_delete_func.cpp index 9ad1782..b33ba87 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_application_cache_delete_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_application_cache_delete_func.cpp @@ -4,7 +4,7 @@ #include "utc_blink_ewk_base.h" -#define SAMPLE_ORIGIN_HOST "htmlfive.appspot.com" +#define SAMPLE_ORIGIN_HOST "appcache.offline.technology" #define SAMPLE_ORIGIN_PROTOCOL "http" // TODO consider using cache status check - possible implementation left for reference class utc_blink_ewk_context_application_cache_delete : public utc_blink_ewk_base { @@ -17,19 +17,16 @@ protected: { } - ~utc_blink_ewk_context_application_cache_delete() - { + ~utc_blink_ewk_context_application_cache_delete() override { SetOrigins(NULL); } - void PostSetUp() - { + void PostSetUp() override { ctx_ = ewk_view_context_get(GetEwkWebView()); ASSERT_TRUE(ctx_); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { utc_message("[LoadFinished]"); EventLoopStop(utc_blink_ewk_base::Success); } @@ -121,7 +118,7 @@ protected: Eina_List* origins_; }; -const char* const utc_blink_ewk_context_application_cache_delete::appCacheURL = SAMPLE_ORIGIN_PROTOCOL "://" SAMPLE_ORIGIN_HOST "/static/stickies.html"; +const char* const utc_blink_ewk_context_application_cache_delete::appCacheURL = SAMPLE_ORIGIN_PROTOCOL "://" SAMPLE_ORIGIN_HOST "/demo/"; const char* const utc_blink_ewk_context_application_cache_delete::appCacheURLOther = "http://www.w3schools.com/html/tryhtml5_html_manifest.htm"; /** diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_application_cache_origins_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_application_cache_origins_get_func.cpp index b4e479a..c8910e3 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_application_cache_origins_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_application_cache_origins_get_func.cpp @@ -14,19 +14,16 @@ protected: { } - ~utc_blink_ewk_context_application_cache_origins_get() - { + ~utc_blink_ewk_context_application_cache_origins_get() override { SetOrigins(NULL); } - void PostSetUp() - { + void PostSetUp() override { ctx = ewk_view_context_get(GetEwkWebView()); ASSERT_TRUE(ctx != NULL); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { utc_message("LoadFinished"); EventLoopStop(Success); } @@ -107,9 +104,9 @@ protected: Eina_List* origins; }; -#define SAMPLE_ORIGIN_HOST "htmlfive.appspot.com" +#define SAMPLE_ORIGIN_HOST "appcache.offline.technology" #define SAMPLE_ORIGIN_PROTOCOL "http" -const char* const utc_blink_ewk_context_application_cache_origins_get::appCacheURL = SAMPLE_ORIGIN_PROTOCOL "://" SAMPLE_ORIGIN_HOST "/static/stickies.html"; +const char* const utc_blink_ewk_context_application_cache_origins_get::appCacheURL = SAMPLE_ORIGIN_PROTOCOL "://" SAMPLE_ORIGIN_HOST "/demo/"; /** * @brief Load page and check if the origins is there diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_did_start_download_callback_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_did_start_download_callback_set_func.cpp index 78934c3..d8efef0 100755 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_did_start_download_callback_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_did_start_download_callback_set_func.cpp @@ -1,75 +1,55 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. +// Copyright 2014-2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "utc_blink_ewk_base.h" -class utc_blink_ewk_context_did_start_download_callback_set : public utc_blink_ewk_base -{ -protected: - void load_finished(Evas_Object* webview) - { - EventLoopStop(Success); - } - - static void policy_navigation_decide(void* data, Evas_Object* webview, void* event_info) - { - utc_message("[policy_navigation_decide] ::"); - - Ewk_Policy_Decision* policy_decision = static_cast(event_info); - - if (!ewk_policy_decision_download(policy_decision) && data) - static_cast(data)->EventLoopStop(Failure); - } - - static void did_start_download_cb(const char* download_url, void* user_data) - { - utc_message("[did_start_download_cb] ::"); - - if(user_data) - static_cast(user_data)->EventLoopStop( download_url?Success:Failure ); - } - - /* Startup function */ - void PostSetUp() - { - evas_object_smart_callback_add( GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide, this); - } - - /* Cleanup function */ - void PreTearDown() - { - evas_object_smart_callback_del( GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide); +class utc_blink_ewk_context_did_start_download_callback_set + : public utc_blink_ewk_base { + protected: + static const char* download_address; + + static void did_start_download_cb(const char* download_url, void* user_data) { + if (user_data) { + auto owner = + static_cast(user_data); + owner->EventLoopStop(download_url ? Success : Failure); + } } }; +const char* utc_blink_ewk_context_did_start_download_callback_set::download_address = + "http://download.thinkbroadband.com/5MB.zip"; + /** * @brief Checking whether callback function for started download is called. */ -TEST_F(utc_blink_ewk_context_did_start_download_callback_set, POS_TEST) -{ - ewk_context_did_start_download_callback_set(ewk_view_context_get(GetEwkWebView()), did_start_download_cb, this); +TEST_F(utc_blink_ewk_context_did_start_download_callback_set, + POS_DOWNLOAD_CALLBACK_CALL) { + ewk_context_did_start_download_callback_set( + ewk_view_context_get(GetEwkWebView()), did_start_download_cb, this); - if (!ewk_view_url_set(GetEwkWebView(), "http://www.google.com")) { - utc_message("[ewk_view_url_set error] :: \n"); - utc_fail(); - } + ASSERT_TRUE(ewk_view_url_set(GetEwkWebView(), download_address)); + ASSERT_EQ(Success, EventLoopStart()); } /** * @brief Checking whether function works properly in case of NULL of a context. */ -TEST_F(utc_blink_ewk_context_did_start_download_callback_set, NEG_TEST1) -{ +TEST_F(utc_blink_ewk_context_did_start_download_callback_set, + NEG_EWK_CONTEXT_NULL) { ewk_context_did_start_download_callback_set(NULL, did_start_download_cb, this); - utc_pass(); } /** - * @brief Checking whether function works properly in case of NULL of a callback for started download. + * @brief Checking whether function works properly in case of NULL of a callback + * for started download. */ -TEST_F(utc_blink_ewk_context_did_start_download_callback_set, NEG_TEST2) -{ - ewk_context_did_start_download_callback_set(ewk_view_context_get(GetEwkWebView()), NULL, this); - utc_pass(); +TEST_F(utc_blink_ewk_context_did_start_download_callback_set, + NEG_DOWNLOAD_CALLBACK_NULL) { + ewk_context_did_start_download_callback_set( + ewk_view_context_get(GetEwkWebView()), NULL, this); + + ASSERT_TRUE(ewk_view_url_set(GetEwkWebView(), download_address)); + ASSERT_EQ(Timeout, EventLoopStart(10)); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_form_autofill_profile_utils.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_form_autofill_profile_utils.cpp index d521171..109fbe2 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_form_autofill_profile_utils.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_form_autofill_profile_utils.cpp @@ -48,7 +48,7 @@ bool checkIfProfileContainsTestData(Ewk_Autofill_Profile* profileToCheck) { return false; } bool dataValid = true; - if (!TEST_AUTOFILL_PROFILE_ID == ewk_autofill_profile_id_get(profileToCheck)) { + if (TEST_AUTOFILL_PROFILE_ID != ewk_autofill_profile_id_get(profileToCheck)) { utc_message("profile ID check failed %i %i", TEST_AUTOFILL_PROFILE_ID, ewk_autofill_profile_id_get(profileToCheck)); dataValid = false; } @@ -64,3 +64,12 @@ bool checkIfProfileContainsTestData(Ewk_Autofill_Profile* profileToCheck) { dataValid = checkOne(profileToCheck, TEST_AUTOFILL_PROFILE_EMAIL, EWK_PROFILE_EMAIL, "email") && dataValid; return dataValid; } + +void utc_blink_ewk_context_form_autofill_profile_base::PostSetUp() { + EventLoopWait(3.0); + RemoveTestProfile(); +} + +void utc_blink_ewk_context_form_autofill_profile_base::PreTearDown() { + RemoveTestProfile(); +} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_form_autofill_profile_utils.h b/tizen_src/ewk/unittest/utc_blink_ewk_context_form_autofill_profile_utils.h index 26dc4ae..2264eb1 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_form_autofill_profile_utils.h +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_form_autofill_profile_utils.h @@ -28,14 +28,9 @@ bool checkIfProfileContainsTestData(Ewk_Autofill_Profile* profileToCheck); class utc_blink_ewk_context_form_autofill_profile_base : public utc_blink_ewk_base { protected: - void PostSetUp() override { - EventLoopWait(3.0); - RemoveTestProfile(); - } + void PostSetUp() override; - void PreTearDown() override { - RemoveTestProfile(); - } + void PreTearDown() override; private: void RemoveTestProfile() { diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_icon_database_icon_object_add_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_icon_database_icon_object_add_func.cpp index 4e36b86..b80f475 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_icon_database_icon_object_add_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_icon_database_icon_object_add_func.cpp @@ -7,13 +7,12 @@ class utc_blink_ewk_context_icon_database_icon_object_add : public utc_blink_ewk_base { protected: - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "icon,received", cb_icon_received, this); + void PostSetUp() override { + evas_object_smart_callback_add(GetEwkWebView(), "icon,received", + cb_icon_received, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "icon,received", cb_icon_received); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_icon_database_path_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_icon_database_path_set_func.cpp index 29437b5..b90b358 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_icon_database_path_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_icon_database_path_set_func.cpp @@ -9,8 +9,21 @@ class utc_blink_ewk_context_icon_database_path_set : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); + void PostSetUp() override + { + evas_object_smart_callback_add(GetEwkWebView(), "icon,received", cb_icon_received, this); + } + + void PreTearDown() override + { + evas_object_smart_callback_del(GetEwkWebView(), "icon,received", cb_icon_received); + } + + static void cb_icon_received(void *data, Evas_Object *, void *) + { + ASSERT_TRUE(data != NULL); + utc_blink_ewk_context_icon_database_path_set *owner = static_cast(data); + owner->EventLoopStop(Success); } static bool exists(const char *path) { diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_inspector_server_start_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_inspector_server_start_func.cpp index 5a5e2bc..a7b7751 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_inspector_server_start_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_inspector_server_start_func.cpp @@ -6,10 +6,7 @@ class utc_blink_ewk_context_inspector_server_start : public utc_blink_ewk_base { - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } }; /* @brief Negative test case of ewk_context_inspector_server_start */ diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_inspector_server_stop_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_inspector_server_stop_func.cpp index 58925e1..29bdc15 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_inspector_server_stop_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_inspector_server_stop_func.cpp @@ -7,10 +7,7 @@ class utc_blink_ewk_context_inspector_server_stop : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } }; /* @brief Try stop inspector with NULL as context */ diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_local_file_system_all_delete_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_local_file_system_all_delete_func.cpp index 55b1fe7..bba221e 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_local_file_system_all_delete_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_local_file_system_all_delete_func.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. +// Copyright 2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,26 +14,19 @@ protected: { } - ~utc_blink_ewk_context_local_file_system_all_delete() - { + ~utc_blink_ewk_context_local_file_system_all_delete() override { SetOrigins(NULL); } - void PreSetUp() - { - static char* args[]={"--allow-file-access-from-files"}; - ewk_set_arguments(1,args); - } + void PreSetUp() override { AllowFileAccessFromFiles(); } - void PostSetUp() - { + void PostSetUp() override { utc_message("[PostSetUp] :: "); ctx = ewk_view_context_get(GetEwkWebView()); evas_object_smart_callback_add(GetEwkWebView(), "title,changed", title_changed_cb, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "title,changed", title_changed_cb); } @@ -96,8 +89,8 @@ protected: static const char* const URL; protected: - Eina_List* origins; Ewk_Context* ctx; + Eina_List* origins; }; const char* const utc_blink_ewk_context_local_file_system_all_delete::URL = "ewk_context_local_file_system/sample_context_local_file_system_write.html"; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_local_file_system_delete_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_local_file_system_delete_func.cpp index af1a787..0513a1a 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_local_file_system_delete_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_local_file_system_delete_func.cpp @@ -1,42 +1,34 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. +// Copyright 2014-2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "utc_blink_ewk_base.h" +#include -class utc_blink_ewk_context_local_file_system_delete : public utc_blink_ewk_base -{ -protected: +class utc_blink_ewk_context_local_file_system_delete + : public utc_blink_ewk_base { + protected: utc_blink_ewk_context_local_file_system_delete() - : utc_blink_ewk_base() - , ctx(NULL) - , origins(NULL) - , origin_to_delete(NULL) - { - } + : utc_blink_ewk_base(), + ctx(nullptr), + origins(nullptr), + origin_to_delete(nullptr) {} - ~utc_blink_ewk_context_local_file_system_delete() - { - origin_to_delete = NULL; - SetOrigins(NULL); + ~utc_blink_ewk_context_local_file_system_delete() override { + SetOrigins(nullptr); } - void PreSetUp() - { - static char* args[]={"--allow-file-access-from-files"}; - ewk_set_arguments(1,args); - } + void PreSetUp() override { AllowFileAccessFromFiles(); } - void PostSetUp() - { - utc_message("[PostSetUp] :: "); + void PostSetUp() override { ctx = ewk_view_context_get(GetEwkWebView()); - evas_object_smart_callback_add(GetEwkWebView(), "title,changed", title_changed_cb, this); + evas_object_smart_callback_add(GetEwkWebView(), "title,changed", + title_changed_cb, this); } - void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(), "title,changed", title_changed_cb); + void PreTearDown() override { + evas_object_smart_callback_del(GetEwkWebView(), "title,changed", + title_changed_cb); } static void origins_get_cb(Eina_List* origins, void* user_data) @@ -48,23 +40,7 @@ protected: owner->EventLoopStop(Success); } - static void title_changed_cb(void* user_data, Evas_Object* webView, void* event_info) - { - utc_message("[title_changed_cb] :: \n"); - - ASSERT_TRUE(user_data); - utc_blink_ewk_context_local_file_system_delete* owner = static_cast(user_data); - - if (!strcmp("SUCCESS", (char*)event_info)) { - owner->EventLoopStop(Success); - } - else if (!strcmp("FAILURE", (char*)event_info)) { - owner->EventLoopStop(Failure); - } - } - - void SetOrigins(Eina_List* new_origins) - { + void SetOrigins(Eina_List* new_origins) { utc_message("[SetOrigins] :: "); if (new_origins != origins) { if (origins) { @@ -74,99 +50,117 @@ protected: } } - Eina_Bool HasOrigin(const char* protocol, const char* host, uint16_t port) - { - Eina_List* list = NULL; - void* list_data = NULL; + Eina_Bool FindOriginToDelete(const char* expected_protocol, + const char* expected_host, + uint16_t expected_port) { + Eina_List* list = nullptr; + void* list_data = nullptr; EINA_LIST_FOREACH(origins, list, list_data) { Ewk_Security_Origin* origin = (Ewk_Security_Origin*)(list_data); - const char* protocol_ = ewk_security_origin_protocol_get(origin); - const char* host_ = ewk_security_origin_host_get(origin); - uint16_t port_ = ewk_security_origin_port_get(origin); - if (!strcmp(protocol_, protocol) && !strcmp(host_, host) && (port_ == port)) { + const char* protocol = ewk_security_origin_protocol_get(origin); + const char* host = ewk_security_origin_host_get(origin); + uint16_t port = ewk_security_origin_port_get(origin); + utc_message( + "[FindOriginToDelete] :: " + "protocol: %s :: host: %s :: port: %" PRIu16, + protocol, host, port); + if (!strcmp(protocol, expected_protocol) && + !strcmp(host, expected_host) && (port == expected_port)) { origin_to_delete = origin; - return EINA_TRUE; + return true; } } - return EINA_FALSE; + return false; } - void GetOrigins(int expected_count) - { + void GetOrigins(int expected_count) { utc_message("[GetOrigins] :: %d", eina_list_count(origins)); // web database operations are async, we must wait for changes to propagate - for (int i = 0; i < 3; ++i) { - if (EINA_TRUE != ewk_context_local_file_system_origins_get(ctx, origins_get_cb, this)) - break; - - if (Success != EventLoopStart()) - break; - - if (expected_count == eina_list_count(origins)) - break; + ASSERT_EQ(EINA_TRUE, ewk_context_local_file_system_origins_get( + ctx, origins_get_cb, this)); + ASSERT_EQ(Success, EventLoopStart()); + ASSERT_EQ(expected_count, eina_list_count(origins)); + } - if (!EventLoopWait(3.0)) - break; + static void origins_get_cb(Eina_List* origins, void* data) { + utc_message("[origins_get_cb] :: origins: %p, data: %p", origins, data); + if (data) { + auto owner = + static_cast(data); + owner->SetOrigins(origins); + owner->EventLoopStop(Success); } } -protected: - static const char* const URL; - static const char* const expected_protocol; - static const char* const expected_host; - static const uint16_t expected_port; + static void title_changed_cb(void* data, + Evas_Object* webView, + void* event_info) { + utc_message("[title_changed_cb] :: data: %p", data); + if (data) { + auto owner = + static_cast(data); + if (!strcmp("SUCCESS", static_cast(event_info))) { + owner->EventLoopStop(Success); + } else if (!strcmp("FAILURE", static_cast(event_info))) { + owner->EventLoopStop(Failure); + } + } + } -protected: + Ewk_Context* ctx; Eina_List* origins; Ewk_Security_Origin* origin_to_delete; - Ewk_Context* ctx; }; -const char* const utc_blink_ewk_context_local_file_system_delete::URL = "ewk_context_local_file_system/sample_context_local_file_system_write.html"; -const char* const utc_blink_ewk_context_local_file_system_delete::expected_protocol = "file"; -const char* const utc_blink_ewk_context_local_file_system_delete::expected_host = ""; -const uint16_t utc_blink_ewk_context_local_file_system_delete::expected_port = 65535; - /** -* @brief Tests if there is possibility to get local file system origins -*/ -TEST_F(utc_blink_ewk_context_local_file_system_delete, POS_TEST) -{ + * @brief Tests if there is possibility to get local file system origins +**/ +TEST_F(utc_blink_ewk_context_local_file_system_delete, POS) { + std::string url = GetResourceUrl( + "ewk_context_local_file_system/" + "sample_context_local_file_system_write.html"); + const char* const expected_protocol = "file"; + const char* const expected_host = ""; + const uint16_t expected_port = 0; // Delete the local file system and check if there are no origins left ASSERT_EQ(EINA_TRUE, ewk_context_local_file_system_all_delete(ctx)); GetOrigins(0); - ASSERT_EQ(0, eina_list_count(origins)); - ASSERT_TRUE(origins == NULL); // Create a local file system - ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), GetResourceUrl(URL).c_str())); + ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), url.c_str())); ASSERT_EQ(Success, EventLoopStart()); + EventLoopWait(2); // Check if origin is loaded GetOrigins(1); - ASSERT_EQ(EINA_TRUE, HasOrigin(expected_protocol, expected_host, expected_port)); + ASSERT_TRUE( + FindOriginToDelete(expected_protocol, expected_host, expected_port)); + ASSERT_TRUE(origin_to_delete); // Delete selected origin - ASSERT_TRUE(origin_to_delete); - ASSERT_EQ(EINA_TRUE, ewk_context_local_file_system_delete(ctx, origin_to_delete)); + ASSERT_EQ(EINA_TRUE, + ewk_context_local_file_system_delete(ctx, origin_to_delete)); + EventLoopWait(2); // Check if there is no expected origin GetOrigins(0); - ASSERT_EQ(EINA_FALSE, HasOrigin(expected_protocol, expected_host, expected_port)); + ASSERT_FALSE( + FindOriginToDelete(expected_protocol, expected_host, expected_port)); } /** -* @brief Tests if cannot delete local file systems when origin is null -*/ -TEST_F(utc_blink_ewk_context_local_file_system_delete, NEG_TEST1) -{ - ASSERT_EQ(EINA_FALSE, ewk_context_local_file_system_delete(ctx, NULL)); + * @brief Negative test for ewk_context_local_file_system_delete(). Checking + * whether function works properly with null origin value. +**/ +TEST_F(utc_blink_ewk_context_local_file_system_delete, NEG_ORIGIN_NULL) { + ASSERT_EQ(EINA_FALSE, ewk_context_local_file_system_delete(ctx, nullptr)); } /** -* @brief Tests if cannot delete local file systems when context is null -*/ -TEST_F(utc_blink_ewk_context_local_file_system_delete, NEG_TEST2) -{ - ASSERT_EQ(EINA_FALSE, ewk_context_local_file_system_delete(NULL, NULL)); -} \ No newline at end of file + * @brief Negative test for ewk_context_local_file_system_delete(). Checking + * whether function works properly with null context and origin value. +**/ +TEST_F(utc_blink_ewk_context_local_file_system_delete, + NEG_ORIGIN_AND_CONTEXT_NULL) { + ASSERT_EQ(EINA_FALSE, ewk_context_local_file_system_delete(nullptr, nullptr)); +} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_append_as_action_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_append_as_action_func.cpp old mode 100755 new mode 100644 index a3f6562..4c7a23d --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_append_as_action_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_append_as_action_func.cpp @@ -14,20 +14,17 @@ protected: { } - virtual void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { feed_mouse_click(3, 100, 100, GetEwkEvas()); } - virtual bool LoadError(Evas_Object* webview, Ewk_Error *error) - { + bool LoadError(Evas_Object* webview, Ewk_Error* error) override { is_failed = EINA_TRUE; EventLoopStop(utc_blink_ewk_base::Success); return false; } - virtual void PostSetUp() - { + void PostSetUp() override { /* Enable mouse events to feed events directly. */ ewk_view_mouse_events_enabled_set(GetEwkWebView(), EINA_TRUE); @@ -38,8 +35,7 @@ protected: evas_object_smart_callback_add(GetEwkWebView(), "contextmenu,customize", contextmenu_customize_callback, this); } - virtual void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "contextmenu,customize", contextmenu_customize_callback); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_append_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_append_func.cpp old mode 100755 new mode 100644 index 618b900..71e1f68 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_append_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_append_func.cpp @@ -15,20 +15,17 @@ public: } protected: - virtual void LoadFinished(Evas_Object* webview) - { - feed_mouse_click(3, 100, 100, GetEwkEvas()); + void LoadFinished(Evas_Object* webview) override { + feed_mouse_click(3, 100, 100, GetEwkEvas()); } - virtual bool LoadError(Evas_Object* webview, Ewk_Error *error) - { + bool LoadError(Evas_Object* webview, Ewk_Error* error) override { is_failed = EINA_TRUE; EventLoopStop(utc_blink_ewk_base::Success); return false; } - virtual void PostSetUp() - { + void PostSetUp() override { /* Enable mouse events to feed events directly. */ ewk_view_mouse_events_enabled_set(GetEwkWebView(), EINA_TRUE); @@ -39,8 +36,7 @@ protected: evas_object_smart_callback_add(GetEwkWebView(), "contextmenu,customize", contextmenu_customize_callback, this); } - virtual void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "contextmenu,customize", contextmenu_customize_callback); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_count_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_count_func.cpp old mode 100755 new mode 100644 index 582338e1..592a08b --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_count_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_count_func.cpp @@ -15,20 +15,17 @@ public: } protected: - virtual void LoadFinished(Evas_Object* webview) - { - feed_mouse_click(3, 100, 100, GetEwkEvas()); + void LoadFinished(Evas_Object* webview) override { + feed_mouse_click(3, 100, 100, GetEwkEvas()); } - virtual bool LoadError(Evas_Object* webview, Ewk_Error *error) - { + bool LoadError(Evas_Object* webview, Ewk_Error* error) override { is_failed = EINA_TRUE; EventLoopStop(utc_blink_ewk_base::Success); return false; } - virtual void PostSetUp() - { + void PostSetUp() override { /* Enable mouse events to feed events directly. */ ewk_view_mouse_events_enabled_set(GetEwkWebView(), EINA_TRUE); @@ -39,8 +36,7 @@ protected: evas_object_smart_callback_add(GetEwkWebView(), "contextmenu,customize", contextmenu_customize_callback, this); } - virtual void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "contextmenu,customize", contextmenu_customize_callback); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_image_url_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_image_url_get_func.cpp old mode 100755 new mode 100644 index a41e60b..166ce62 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_image_url_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_image_url_get_func.cpp @@ -16,20 +16,17 @@ public: } protected: - virtual void LoadFinished(Evas_Object* webview) - { - feed_mouse_click(3, 100, 300, GetEwkEvas()); + void LoadFinished(Evas_Object* webview) override { + feed_mouse_click(3, 100, 100, GetEwkEvas()); } - virtual bool LoadError(Evas_Object* webview, Ewk_Error *error) - { + bool LoadError(Evas_Object* webview, Ewk_Error* error) override { is_failed = EINA_TRUE; EventLoopStop(utc_blink_ewk_base::Success); return false; } - virtual void PostSetUp() - { + void PostSetUp() override { /* Enable mouse events to feed events directly. */ ewk_view_mouse_events_enabled_set(GetEwkWebView(), EINA_TRUE); @@ -42,8 +39,7 @@ protected: image_path = GetResourceUrl("/ewk_context_menu/webkit.png"); } - virtual void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "contextmenu,customize", contextmenu_customize_callback); evas_object_smart_callback_del(GetEwkWebView(), "contextmenu,selected", contextmenu_selected_callback); if (url) { @@ -95,7 +91,7 @@ protected: utc_message("[select_timer_callback] :: \n"); if (data) { utc_blink_ewk_context_menu_item_image_url_get *owner = static_cast(data); - feed_mouse_click(1, 50, 400, owner->GetEwkEvas()); + feed_mouse_click(1, 250, 500, owner->GetEwkEvas()); owner->select_timer = 0; } return ECORE_CALLBACK_CANCEL; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_link_url_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_link_url_get_func.cpp old mode 100755 new mode 100644 index 7b1516a..71f4843 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_link_url_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_link_url_get_func.cpp @@ -16,20 +16,17 @@ public: } protected: - virtual void LoadFinished(Evas_Object* webview) - { - feed_mouse_click(3, 100, 300, GetEwkEvas()); + void LoadFinished(Evas_Object* webview) override { + feed_mouse_click(3, 100, 100, GetEwkEvas()); } - virtual bool LoadError(Evas_Object* webview, Ewk_Error *error) - { + bool LoadError(Evas_Object* webview, Ewk_Error* error) override { is_failed = EINA_TRUE; EventLoopStop(utc_blink_ewk_base::Success); return false; } - virtual void PostSetUp() - { + void PostSetUp() override { /* Enable mouse events to feed events directly. */ ewk_view_mouse_events_enabled_set(GetEwkWebView(), EINA_TRUE); @@ -41,8 +38,7 @@ protected: evas_object_smart_callback_add(GetEwkWebView(), "contextmenu,selected", contextmenu_selected_callback, this); } - virtual void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "contextmenu,customize", contextmenu_customize_callback); evas_object_smart_callback_del(GetEwkWebView(), "contextmenu,selected", contextmenu_selected_callback); if (url) { @@ -92,7 +88,7 @@ protected: utc_message("[select_timer_callback] :: \n"); if (data) { utc_blink_ewk_context_menu_item_link_url_get *owner = static_cast(data); - feed_mouse_click(1, 50, 450, owner->GetEwkEvas()); + feed_mouse_click(1, 250, 500, owner->GetEwkEvas()); owner->select_timer = 0; } return ECORE_CALLBACK_CANCEL; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_remove_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_remove_func.cpp old mode 100755 new mode 100644 index f961df3..aa406ff --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_remove_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_remove_func.cpp @@ -17,20 +17,17 @@ public: } protected: - virtual void LoadFinished(Evas_Object* webview) - { - feed_mouse_click(3, 100, 100, GetEwkEvas()); + void LoadFinished(Evas_Object* webview) override { + feed_mouse_click(3, 100, 100, GetEwkEvas()); } - virtual bool LoadError(Evas_Object* webview, Ewk_Error *error) - { + bool LoadError(Evas_Object* webview, Ewk_Error* error) override { is_failed = EINA_TRUE; EventLoopStop(utc_blink_ewk_base::Success); return false; } - virtual void PostSetUp() - { + void PostSetUp() override { /* Enable mouse events to feed events directly. */ ewk_view_mouse_events_enabled_set(GetEwkWebView(), EINA_TRUE); @@ -41,8 +38,7 @@ protected: evas_object_smart_callback_add(GetEwkWebView(), "contextmenu,customize", contextmenu_customize_callback, this); } - virtual void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "contextmenu,customize", contextmenu_customize_callback); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_tag_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_tag_get_func.cpp old mode 100755 new mode 100644 index ce067ce..0143b33 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_tag_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_item_tag_get_func.cpp @@ -17,20 +17,17 @@ public: } protected: - virtual void LoadFinished(Evas_Object* webview) - { - feed_mouse_click(3, 100, 100, GetEwkEvas()); + void LoadFinished(Evas_Object* webview) override { + feed_mouse_click(3, 100, 100, GetEwkEvas()); } - virtual bool LoadError(Evas_Object* webview, Ewk_Error *error) - { + bool LoadError(Evas_Object* webview, Ewk_Error* error) override { is_failed = EINA_TRUE; EventLoopStop(utc_blink_ewk_base::Success); return false; } - virtual void PostSetUp() - { + void PostSetUp() override { /* Enable mouse events to feed events directly. */ ewk_view_mouse_events_enabled_set(GetEwkWebView(), EINA_TRUE); @@ -42,8 +39,7 @@ protected: evas_object_smart_callback_add(GetEwkWebView(), "contextmenu,selected", contextmenu_selected_callback, this); } - virtual void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "contextmenu,customize", contextmenu_customize_callback); evas_object_smart_callback_del(GetEwkWebView(), "contextmenu,selected", contextmenu_selected_callback); if (select_timer) { @@ -90,7 +86,7 @@ protected: utc_message("[select_timer_callback] :: \n"); if (data) { utc_blink_ewk_context_menu_item_tag_get *owner = static_cast(data); - feed_mouse_click(1, 50, 250, owner->GetEwkEvas()); + feed_mouse_click(1, 250, 400, owner->GetEwkEvas()); owner->select_timer = 0; } return ECORE_CALLBACK_CANCEL; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_nth_item_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_nth_item_get_func.cpp old mode 100755 new mode 100644 index 8d450dc..9f1b0fc --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_nth_item_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_menu_nth_item_get_func.cpp @@ -15,20 +15,17 @@ public: } protected: - virtual void LoadFinished(Evas_Object* webview) - { - feed_mouse_click(3, 100, 100, GetEwkEvas()); + void LoadFinished(Evas_Object* webview) override { + feed_mouse_click(3, 100, 100, GetEwkEvas()); } - virtual bool LoadError(Evas_Object* webview, Ewk_Error *error) - { + bool LoadError(Evas_Object* webview, Ewk_Error* error) override { is_failed = EINA_TRUE; EventLoopStop(utc_blink_ewk_base::Success); return false; } - virtual void PostSetUp() - { + void PostSetUp() override { /* Enable mouse events to feed events directly. */ ewk_view_mouse_events_enabled_set(GetEwkWebView(), EINA_TRUE); @@ -39,8 +36,7 @@ protected: evas_object_smart_callback_add(GetEwkWebView(), "contextmenu,customize", contextmenu_customize_callback, this); } - virtual void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "contextmenu,customize", contextmenu_customize_callback); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_new_with_injected_bundle_path_func.cc b/tizen_src/ewk/unittest/utc_blink_ewk_context_new_with_injected_bundle_path_func.cc deleted file mode 100644 index b712306..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_new_with_injected_bundle_path_func.cc +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright 2015 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// See README.md how to run this test in DESKTOP mode. - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_context_new_with_injected_bundle_path_func : public utc_blink_ewk_base -{ -protected: - utc_blink_ewk_context_new_with_injected_bundle_path_func() - : timer(NULL), - webview(NULL) { - } - - Ecore_Timer* timer; - Evas_Object* webview; - static const std::string injectedBundlePath; - - static void getPlainText(Evas_Object* webview, const char* plainText, void* data) - { - ASSERT_TRUE(data); - utc_blink_ewk_context_new_with_injected_bundle_path_func* owner = - static_cast(data); - owner->EventLoopStop(Success); - if (!plainText) - utc_fail(); - - if (strcmp(plainText, "DynamicPluginStartSession")) - utc_fail(); - } - static Eina_Bool timerCallback(void* data) - { - utc_blink_ewk_context_new_with_injected_bundle_path_func* owner = - static_cast(data); - ewk_view_plain_text_get(owner->webview, getPlainText, owner); - } - void runWithTimer() - { - timer = ecore_timer_add(1, timerCallback, this); - } - - Evas_Object* CreateWindow() - { - Evas_Object* window = elm_win_add(NULL, "TC Launcher", ELM_WIN_BASIC); - return ewk_view_add_with_context(evas_object_evas_get(window), - ewk_context_new_with_injected_bundle_path(GetResourcePath(injectedBundlePath.c_str()).c_str())); - } -}; - -const std::string utc_blink_ewk_context_new_with_injected_bundle_path_func::injectedBundlePath = - "ewk_context/injected_bundle/chromium/libbundle_sample.so"; - -/** - * @brief Checking whether context with injected bundle path is returned - */ -TEST_F(utc_blink_ewk_context_new_with_injected_bundle_path_func, POS_TEST) -{ - ASSERT_TRUE(ewk_context_new_with_injected_bundle_path( - GetResourcePath(injectedBundlePath.c_str()).c_str())); -} - -TEST_F(utc_blink_ewk_context_new_with_injected_bundle_path_func, POS_TEST1) -{ - webview = CreateWindow(); - const char simpleHTML[] = ""; - ewk_context_tizen_app_id_set(ewk_view_context_get(webview), "1"); - ASSERT_TRUE(ewk_view_html_string_load(webview, simpleHTML, NULL, NULL)); - runWithTimer(); - ASSERT_EQ(Success, EventLoopStart()); -} - -TEST_F(utc_blink_ewk_context_new_with_injected_bundle_path_func, NEG_TEST) -{ - Ewk_Context* context = ewk_context_new_with_injected_bundle_path(0); - ASSERT_TRUE(!context); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_new_with_injected_bundle_path_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_new_with_injected_bundle_path_func.cpp new file mode 100644 index 0000000..2ae7d18 --- /dev/null +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_new_with_injected_bundle_path_func.cpp @@ -0,0 +1,74 @@ +// Copyright 2015 Samsung Electronics. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// See README.md how to run this test in DESKTOP mode. + +#include "utc_blink_ewk_base.h" + +class utc_blink_ewk_context_new_with_injected_bundle_path_func + : public utc_blink_ewk_base { + protected: + utc_blink_ewk_context_new_with_injected_bundle_path_func() + : timer(NULL), webview(NULL) {} + + Ecore_Timer* timer; + Evas_Object* webview; + static const std::string injectedBundlePath; + + static void getPlainText(Evas_Object* webview, + const char* plainText, + void* data) { + ASSERT_TRUE(data); + utc_blink_ewk_context_new_with_injected_bundle_path_func* owner = + static_cast( + data); + owner->EventLoopStop(Success); + ASSERT_TRUE(plainText); + + ASSERT_STREQ("DynamicPluginStartSession", plainText); + } + static Eina_Bool timerCallback(void* data) { + utc_blink_ewk_context_new_with_injected_bundle_path_func* owner = + static_cast( + data); + ewk_view_plain_text_get(owner->webview, getPlainText, owner); + return ECORE_CALLBACK_CANCEL; + } + void runWithTimer() { timer = ecore_timer_add(1, timerCallback, this); } + + Evas_Object* CreateWindow() { + Evas_Object* window = elm_win_add(NULL, "TC Launcher", ELM_WIN_BASIC); + return ewk_view_add_with_context( + evas_object_evas_get(window), + ewk_context_new_with_injected_bundle_path( + GetResourcePath(injectedBundlePath.c_str()).c_str())); + } +}; + +const std::string utc_blink_ewk_context_new_with_injected_bundle_path_func:: + injectedBundlePath = + "ewk_context/injected_bundle/chromium/libbundle_sample.so"; + +/** + * @brief Checking whether context with injected bundle path is returned + */ +TEST_F(utc_blink_ewk_context_new_with_injected_bundle_path_func, POS_TEST) { + ASSERT_TRUE(ewk_context_new_with_injected_bundle_path( + GetResourcePath(injectedBundlePath.c_str()).c_str())); +} + +TEST_F(utc_blink_ewk_context_new_with_injected_bundle_path_func, POS_TEST1) { + webview = CreateWindow(); + const char simpleHTML[] = + ""; + ewk_context_tizen_app_id_set(ewk_view_context_get(webview), "1"); + ASSERT_TRUE(ewk_view_html_string_load(webview, simpleHTML, NULL, NULL)); + runWithTimer(); + ASSERT_EQ(Success, EventLoopStart()); +} + +TEST_F(utc_blink_ewk_context_new_with_injected_bundle_path_func, NEG_TEST) { + Ewk_Context* context = ewk_context_new_with_injected_bundle_path(0); + ASSERT_TRUE(!context); +} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_preferred_languages_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_preferred_languages_set_func.cpp index bdd22be..ea91835 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_preferred_languages_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_preferred_languages_set_func.cpp @@ -14,9 +14,8 @@ protected: { } - void LoadFinished(Evas_Object* webview) - { - ewk_view_plain_text_get(webview, _get_plain_text_cb, this); + void LoadFinished(Evas_Object* webview) override { + ewk_view_plain_text_get(webview, _get_plain_text_cb, this); } static void _get_plain_text_cb(Evas_Object* obj, const char* result, void* data) diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_proxy_uri_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_proxy_uri_get_func.cpp deleted file mode 100755 index 6f91751..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_proxy_uri_get_func.cpp +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -#define URL "http://proxy.tc.url" - -class utc_blink_ewk_context_proxy_uri_get : public utc_blink_ewk_base -{ -public: - Ewk_Context* defaultContext; -protected: - void PostSetUp() - { - defaultContext = ewk_view_context_get(GetEwkWebView()); - ASSERT_TRUE(defaultContext); - ewk_context_proxy_uri_set(defaultContext, URL); - } -}; - -/** - * @brief Positive TC for ewk_context_proxy_uri_get() - */ -TEST_F(utc_blink_ewk_context_proxy_uri_get, POS_TEST) -{ - EXPECT_STREQ(ewk_context_proxy_uri_get(defaultContext), URL); -} - -/** - * @brief Negative TC for ewk_context_proxy_uri_get() - */ -TEST_F(utc_blink_ewk_context_proxy_uri_get, NEG_TEST) -{ - EXPECT_STRNE(ewk_context_proxy_uri_get(0), URL); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_proxy_uri_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_proxy_uri_set_func.cpp deleted file mode 100755 index 722453a..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_proxy_uri_set_func.cpp +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_context_proxy_uri_set : public utc_blink_ewk_base -{ -protected: - static const char*const url; -}; - -const char*const utc_blink_ewk_context_proxy_uri_set::url="http://proxy.tc.url"; - -/** - * @brief Positive TC for ewk_context_proxy_uri_set() - */ -TEST_F(utc_blink_ewk_context_proxy_uri_set, POS_TEST) -{ - /* TODO: this code should use ewk_context_proxy_uri_set and check its behaviour. - Results should be reported using one of utc_ macros */ - Ewk_Context* defaultContext = ewk_context_default_get(); - if (!defaultContext) - utc_fail(); - ewk_context_proxy_uri_set(defaultContext, url); - utc_check_str_eq(ewk_context_proxy_uri_get(defaultContext), url); -} - -/** - * @brief Negative TC for ewk_context_proxy_uri_set() - */ -TEST_F(utc_blink_ewk_context_proxy_uri_set, NEG_TEST) -{ - /* TODO: this code should use ewk_context_proxy_uri_set and check its behaviour. - Results should be reported using one of utc_ macros */ - Ewk_Context* defaultContext = ewk_context_default_get(); - if (!defaultContext) - utc_fail(); - ewk_context_proxy_uri_set(NULL, NULL); - utc_pass(); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_vibration_client_callbacks_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_vibration_client_callbacks_set_func.cpp old mode 100755 new mode 100644 index 1cb956a..bc5232d --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_vibration_client_callbacks_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_vibration_client_callbacks_set_func.cpp @@ -29,16 +29,14 @@ protected: } /* Startup function */ - void PostSetUp() - { + void PostSetUp() override { vibrateCalled = EINA_FALSE; cancelCalled = EINA_FALSE; evas_object_smart_callback_add(GetEwkWebView(), "title,changed", title_changed, this); } /* Cleanup function */ - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "title,changed", title_changed); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_web_database_delete_all_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_web_database_delete_all_func.cpp index bfad729..dfa5b25b 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_web_database_delete_all_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_web_database_delete_all_func.cpp @@ -14,19 +14,16 @@ protected: { } - ~utc_blink_ewk_context_web_database_delete_all() - { + ~utc_blink_ewk_context_web_database_delete_all() override { SetOrigins(NULL); } - void PostSetUp() - { + void PostSetUp() override { utc_message("[postSetUp] :: "); ctx = ewk_view_context_get(GetEwkWebView()); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { utc_message("[loadFinished] :: "); EventLoopStop(Success); } @@ -112,4 +109,4 @@ TEST_F(utc_blink_ewk_context_web_database_delete_all, POS_TEST) TEST_F(utc_blink_ewk_context_web_database_delete_all, NEG_TEST) { ASSERT_EQ(EINA_FALSE, ewk_context_web_database_delete_all(0)); -} \ No newline at end of file +} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_web_database_delete_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_web_database_delete_func.cpp index 385e1b0..5351fd6 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_web_database_delete_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_web_database_delete_func.cpp @@ -12,19 +12,14 @@ protected: { } - ~utc_blink_ewk_context_web_database_delete() - { - SetOrigins(NULL); - } + ~utc_blink_ewk_context_web_database_delete() override { SetOrigins(NULL); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { utc_message("[loadFinished] :: "); EventLoopStop(Success); } - void PostSetUp() - { + void PostSetUp() override { utc_message("[postSetUp] :: "); ctx = ewk_view_context_get(GetEwkWebView()); ASSERT_TRUE(ctx != NULL); diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_web_database_origins_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_web_database_origins_get_func.cpp index 96b0351..3bde06b 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_web_database_origins_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_web_database_origins_get_func.cpp @@ -11,14 +11,12 @@ protected: { } - void PostSetUp() - { + void PostSetUp() override { utc_message("[postSetUp] :: "); ctx = ewk_view_context_get(GetEwkWebView()); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { utc_message("[loadFinished] :: "); EventLoopStop(Success); } @@ -68,4 +66,4 @@ TEST_F(utc_blink_ewk_context_web_database_origins_get, NEG_TEST1) TEST_F(utc_blink_ewk_context_web_database_origins_get, NEG_TEST2) { ASSERT_EQ(EINA_FALSE, ewk_context_web_database_origins_get(ctx, 0, 0)); -} \ No newline at end of file +} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_web_indexed_database_delete_all_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_web_indexed_database_delete_all_func.cpp index 7eb0e70..a219580 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_web_indexed_database_delete_all_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_web_indexed_database_delete_all_func.cpp @@ -17,19 +17,17 @@ protected: static_cast(data)->EventLoopStop(Success); } - virtual void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { evas_object_smart_callback_add(GetEwkWebView(), "title,changed", title_changed, this); } - virtual void PostSetUp() - { + void PostSetUp() override { ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), GetResourceUrl("/ewk_context_web_indexed_database/CreateDB.html").c_str())); } - virtual void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(), "title,changed", title_changed); + void PreTearDown() override { + evas_object_smart_callback_del(GetEwkWebView(), "title,changed", + title_changed); } protected: diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_web_storage_delete_all_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_web_storage_delete_all_func.cpp index bdb5b12..7065926 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_web_storage_delete_all_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_web_storage_delete_all_func.cpp @@ -9,14 +9,12 @@ class utc_blink_ewk_context_web_storage_delete_all : public utc_blink_ewk_base { protected: - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "title,changed", title_changed, this); + void PostSetUp() override { + evas_object_smart_callback_add(GetEwkWebView(), "title,changed", + title_changed, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "title,changed", title_changed); } @@ -47,7 +45,12 @@ TEST_F(utc_blink_ewk_context_web_storage_delete_all, POS_TEST) storageItemValue = ewk_view_title_get(GetEwkWebView()); ASSERT_EQ("STORAGE_TEST_VALUE", storageItemValue); - EventLoopWait(3.0); + // Local storage item may be set in renderer cache but setting it in physical + // memory may be delayed. ewk_context_web_storage_delete_all removes all data + // of origins present in physical memory. In case of no line below, item may + // not be saved in physical memory before ewk_context_web_storage_delete_all + // is called. + EventLoopWait(6.0); // Delete all web storage Ewk_Context* context = ewk_view_context_get(GetEwkWebView()); diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_web_storage_origin_delete_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_web_storage_origin_delete_func.cpp index ff631e6..bedaa27 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_web_storage_origin_delete_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_web_storage_origin_delete_func.cpp @@ -15,13 +15,11 @@ protected: { } - ~utc_blink_ewk_context_web_storage_origin_delete() - { + ~utc_blink_ewk_context_web_storage_origin_delete() override { SetOrigins(NULL); } - void PostSetUp() - { + void PostSetUp() override { ctx = ewk_view_context_get(GetEwkWebView()); ASSERT_TRUE(ctx != NULL); @@ -32,10 +30,7 @@ protected: ASSERT_TRUE(origins == NULL); } - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } static void origins_get_cb(Eina_List* origins, void* user_data) { diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_context_web_storage_origins_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_context_web_storage_origins_get_func.cpp index a3cd730..e68f559 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_context_web_storage_origins_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_context_web_storage_origins_get_func.cpp @@ -12,13 +12,9 @@ protected: { } - void LoadFinished(Evas_Object*) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } - void PostSetUp() - { + void PostSetUp() override { ctx = ewk_view_context_get(GetEwkWebView()); ASSERT_TRUE(ctx); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_cookie_manager_cookies_clear_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_cookie_manager_cookies_clear_func.cpp old mode 100755 new mode 100644 index c3c554d..479a7db --- a/tizen_src/ewk/unittest/utc_blink_ewk_cookie_manager_cookies_clear_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_cookie_manager_cookies_clear_func.cpp @@ -17,8 +17,7 @@ protected: owner->EventLoopStop(utc_blink_ewk_base::Success); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Success); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_base_url_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_base_url_get_func.cpp deleted file mode 100644 index b0eb5c5..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_base_url_get_func.cpp +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_custom_handlers_data_base_url_get: public utc_blink_ewk_base { -protected: - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"protocolhandler,registration,requested", (void(*)(void*, Evas_Object*, void*))custom_handler, this); - } - - void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"protocolhandler,registration,requested", (void(*)(void*, Evas_Object*, void*))custom_handler); - } - - void LoadFinished(Evas_Object* webview) - { - utc_message("[loadFinished] :: "); - EventLoopStop(Failure); - } - - static void custom_handler(utc_blink_ewk_custom_handlers_data_base_url_get* owner, Evas_Object* /*webview*/, Ewk_Custom_Handlers_Data* custom_handler_data) - { - utc_message("[custom handler] :: \n"); - ASSERT_TRUE(NULL != owner); - ASSERT_TRUE(NULL != custom_handler_data); - - ASSERT_STREQ("codebits.glennjones.net", ewk_custom_handlers_data_base_url_get(custom_handler_data)); - owner->EventLoopStop(Success); - } -}; - -/** - * @brief Checking if base_url is returned properly. -*/ -TEST_F(utc_blink_ewk_custom_handlers_data_base_url_get, POS_TEST) -{ - ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), "http://codebits.glennjones.net/registerprotocol/register.html")); - ASSERT_EQ(Success, EventLoopStart()); -} - -/** - * @brief Checking if NULL is returned when custom_handler_data is NULL. -*/ -TEST_F(utc_blink_ewk_custom_handlers_data_base_url_get, NEG_TEST) -{ - ASSERT_EQ(NULL, ewk_custom_handlers_data_base_url_get(NULL)); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_result_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_result_set_func.cpp deleted file mode 100755 index ab8fa79..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_result_set_func.cpp +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_custom_handlers_data_result_set : public utc_blink_ewk_base { -protected: - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"protocolhandler,registration,requested", custom_handler, this); - } - - void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"protocolhandler,registration,requested", custom_handler); - } - - void LoadFinished(Evas_Object* webview) - { - utc_message("[loadFinished] :: "); - EventLoopStop(Failure); - } - - static void custom_handler(void* data, Evas_Object* /*webview*/, void* event_info) - { - utc_message("[custom handler] :: \n"); - - ASSERT_TRUE(data != NULL); - ASSERT_TRUE(event_info != NULL); - - utc_blink_ewk_custom_handlers_data_result_set* owner = static_cast(data); - Ewk_Custom_Handlers_Data* custom_handler_data = static_cast(event_info); - - ewk_custom_handlers_data_result_set(custom_handler_data, EWK_CUSTOM_HANDLERS_DECLINED); - owner->EventLoopStop(Success); - } - -protected: - static const char* const URL; -}; - -const char* const utc_blink_ewk_custom_handlers_data_result_set::URL = "http://codebits.glennjones.net/registerprotocol/register.html"; - -/** - * @brief Checking whether sending cancellation notification for authentication challenge works properly. -*/ -TEST_F(utc_blink_ewk_custom_handlers_data_result_set, POS_TEST) -{ - ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), URL)); - ASSERT_EQ(Success, EventLoopStart()); -} - -/** - * @brief Checking whether function works properly in case of NULL of a custom_handler_data. -*/ -TEST_F(utc_blink_ewk_custom_handlers_data_result_set, NEG_TEST) -{ - ewk_custom_handlers_data_result_set(NULL, EWK_CUSTOM_HANDLERS_DECLINED); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_target_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_target_get_func.cpp deleted file mode 100644 index 834ad0b..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_target_get_func.cpp +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_custom_handlers_data_target_get: public utc_blink_ewk_base { -protected: - utc_blink_ewk_custom_handlers_data_target_get() : target_(NULL) {} - ~utc_blink_ewk_custom_handlers_data_target_get() { free(target_); } - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"protocolhandler,registration,requested", (void(*)(void*, Evas_Object*, void*))custom_handler, this); - } - - void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"protocolhandler,registration,requested", (void(*)(void*, Evas_Object*, void*))custom_handler); - } - - void LoadFinished(Evas_Object* webview) - { - utc_message("[loadFinished] :: "); - EventLoopStop(Failure); - } - - static void custom_handler(utc_blink_ewk_custom_handlers_data_target_get* owner, Evas_Object* /*webview*/, Ewk_Custom_Handlers_Data* custom_handler_data) - { - utc_message("[custom handler] :: \n"); - ASSERT_TRUE(NULL != owner); - ASSERT_TRUE(NULL != custom_handler_data); - - const char* target = ewk_custom_handlers_data_target_get(custom_handler_data); - owner->target_ = (target ? strdup(target) : NULL); - owner->EventLoopStop(Success); - } - -protected: - char* target_; - static const char* const expected_target_; -}; - -const char* const utc_blink_ewk_custom_handlers_data_target_get::expected_target_ = "web+burger"; - -/** - * @brief Checking if base_url is returned properly. -*/ -TEST_F(utc_blink_ewk_custom_handlers_data_target_get, POS_TEST) -{ - ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), "http://jmajnert.github.io/tests/customProtocols/")); - ASSERT_EQ(Success, EventLoopStart()); - ASSERT_STREQ(expected_target_, target_); -} - -/** - * @brief Checking if NULL is returned when custom_handler_data is NULL. -*/ -TEST_F(utc_blink_ewk_custom_handlers_data_target_get, NEG_TEST) -{ - ASSERT_EQ(NULL, ewk_custom_handlers_data_target_get(NULL)); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_title_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_title_get_func.cpp deleted file mode 100644 index 49dcddc..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_title_get_func.cpp +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_custom_handlers_data_title_get: public utc_blink_ewk_base { -protected: - utc_blink_ewk_custom_handlers_data_title_get() : title_(NULL) {} - ~utc_blink_ewk_custom_handlers_data_title_get() { - free(title_); - } - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"protocolhandler,registration,requested", (void(*)(void*, Evas_Object*, void*))custom_handler, this); - } - - void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"protocolhandler,registration,requested", (void(*)(void*, Evas_Object*, void*))custom_handler); - } - - void LoadFinished(Evas_Object* webview) - { - utc_message("[loadFinished] :: "); - EventLoopStop(Failure); - } - - static void custom_handler(utc_blink_ewk_custom_handlers_data_title_get* owner, Evas_Object* /*webview*/, Ewk_Custom_Handlers_Data* custom_handler_data) - { - utc_message("[custom handler] :: \n"); - ASSERT_TRUE(NULL != owner); - ASSERT_TRUE(NULL != custom_handler_data); - - const char *title = ewk_custom_handlers_data_title_get(custom_handler_data); - owner->title_ = (title ? strdup(title) : NULL); - owner->EventLoopStop(Success); - } - -protected: - char* title_; - static const char* const expected_title_; -}; - -const char* const utc_blink_ewk_custom_handlers_data_title_get::expected_title_ = "Burger handler"; - -/** - * @brief Checking if base_url is returned properly. -*/ -TEST_F(utc_blink_ewk_custom_handlers_data_title_get, POS_TEST) -{ - ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), "http://jmajnert.github.io/tests/customProtocols/")); - ASSERT_EQ(Success, EventLoopStart()) << "\"protocolhandler,registration,requested\" was not fired."; - ASSERT_STREQ(expected_title_, title_); -} - -/** - * @brief Checking if NULL is returned when custom_handler_data is NULL. -*/ -TEST_F(utc_blink_ewk_custom_handlers_data_title_get, NEG_TEST) -{ - ASSERT_EQ(NULL, ewk_custom_handlers_data_title_get(NULL)); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_url_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_url_get_func.cpp deleted file mode 100644 index c955db7..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_custom_handlers_data_url_get_func.cpp +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_custom_handlers_data_url_get: public utc_blink_ewk_base { -protected: - utc_blink_ewk_custom_handlers_data_url_get() : url_(NULL) {} - ~utc_blink_ewk_custom_handlers_data_url_get() { free(url_); } - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"protocolhandler,registration,requested", (void(*)(void*, Evas_Object*, void*))custom_handler, this); - } - - void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"protocolhandler,registration,requested", (void(*)(void*, Evas_Object*, void*))custom_handler); - } - - void LoadFinished(Evas_Object* webview) - { - utc_message("[loadFinished] :: "); - EventLoopStop(Failure); - } - - static void custom_handler(utc_blink_ewk_custom_handlers_data_url_get* owner, Evas_Object* /*webview*/, Ewk_Custom_Handlers_Data* custom_handler_data) - { - utc_message("[custom handler] :: \n"); - ASSERT_TRUE(NULL != owner); - ASSERT_TRUE(NULL != custom_handler_data); - - const char* url = ewk_custom_handlers_data_url_get(custom_handler_data); - owner->url_ = (url ? strdup(url) : NULL); - owner->EventLoopStop(Success); - } - -protected: - char* url_; - static const char* const expected_url_; -}; - -const char* const utc_blink_ewk_custom_handlers_data_url_get::expected_url_ = "http://jmajnert.github.io/tests/customProtocols/?uri=%s"; - -/** - * @brief Checking if base_url is returned properly. -*/ -TEST_F(utc_blink_ewk_custom_handlers_data_url_get, POS_TEST) -{ - ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), "http://jmajnert.github.io/tests/customProtocols/")); - ASSERT_EQ(Success, EventLoopStart()); - ASSERT_STREQ(expected_url_, url_); -} - -/** - * @brief Checking if NULL is returned when custom_handler_data is NULL. -*/ -TEST_F(utc_blink_ewk_custom_handlers_data_url_get, NEG_TEST) -{ - ASSERT_EQ(NULL, ewk_custom_handlers_data_url_get(NULL)); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_error_code_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_error_code_get_func.cpp old mode 100755 new mode 100644 index 1d93543..1422170 --- a/tizen_src/ewk/unittest/utc_blink_ewk_error_code_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_error_code_get_func.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. +// Copyright 2014-2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,45 +7,37 @@ class utc_blink_ewk_error_code_get : public utc_blink_ewk_base { protected: /* Callback for load error */ - bool LoadError(Evas_Object* webview, Ewk_Error* error) - { - utc_message("LoadError"); - int err = ewk_error_code_get(error); - - if (err != 0) { - EventLoopStop(utc_blink_ewk_base::Success); - return true; - } - - // returning false will cause default behaviour - exiting main loop with Failure - return false; + bool LoadError(Evas_Object* webview, Ewk_Error* error) override { + utc_message("LoadError :: error: %p", error); + if (EWK_ERROR_CODE_CANT_LOOKUP_HOST == ewk_error_code_get(error)) { + EventLoopStop(Success); + return true; + } + + // returning false will cause default behaviour - exiting main loop with + // Failure + return false; } protected: static const char* const test_url; }; -const char* const utc_blink_ewk_error_code_get::test_url = "http://page_that_does_not_exist"; +const char* const utc_blink_ewk_error_code_get::test_url = + "http://page_that_does_not_exist"; /** - * @brief Positive test case of ewk_error_code_get(). Page is loaded and stopped in between to generate loadError + * @brief Positive test case of ewk_error_code_get(). Page is loaded and stopped + * in between to generate loadError */ -TEST_F(utc_blink_ewk_error_code_get, POS_TEST) -{ - Eina_Bool result = ewk_view_url_set(GetEwkWebView(), test_url); - - if (!result) { - utc_fail(); - } - - utc_blink_ewk_base::MainLoopResult loop_result = EventLoopStart(); - utc_check_eq(loop_result, utc_blink_ewk_base::Success); +TEST_F(utc_blink_ewk_error_code_get, POS) { + ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), test_url)); + ASSERT_EQ(Success, EventLoopStart()); } /** * @brief Checking whether function works properly in case of NULL argument. */ -TEST_F(utc_blink_ewk_error_code_get, NEG_TEST) -{ - utc_check_eq(ewk_error_code_get(NULL), 0); +TEST_F(utc_blink_ewk_error_code_get, NEG) { + ASSERT_EQ(0, ewk_error_code_get(NULL)); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_error_description_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_error_description_get_func.cpp old mode 100755 new mode 100644 index 94eea08..f691378 --- a/tizen_src/ewk/unittest/utc_blink_ewk_error_description_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_error_description_get_func.cpp @@ -7,16 +7,15 @@ class utc_blink_ewk_error_description_get : public utc_blink_ewk_base { protected: /* Callback for load error */ - bool LoadError(Evas_Object* webview, Ewk_Error* error) - { - utc_message("[load_error] :: "); + bool LoadError(Evas_Object* webview, Ewk_Error* error) override { + utc_message("[load_error] :: "); - if (ewk_error_description_get(error)) { - EventLoopStop(utc_blink_ewk_base::Success); - return true; // handled load error, supress default behaviour - } + if (ewk_error_description_get(error)) { + EventLoopStop(utc_blink_ewk_base::Success); + return true; // handled load error, supress default behaviour + } - return false; // fallback default behaviour + return false; // fallback default behaviour } protected: diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_error_type_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_error_type_get_func.cpp old mode 100755 new mode 100644 index 275a072..f607816 --- a/tizen_src/ewk/unittest/utc_blink_ewk_error_type_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_error_type_get_func.cpp @@ -12,8 +12,7 @@ class utc_blink_ewk_error_type_get : public utc_blink_ewk_base { } /* Callback for load error */ - bool LoadError(Evas_Object* webview, Ewk_Error* error) - { + bool LoadError(Evas_Object* webview, Ewk_Error* error) override { utc_message("[load_error] :: "); error_type = ewk_error_type_get(error); EventLoopStop(utc_blink_ewk_base::Success); diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_error_url_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_error_url_get_func.cpp old mode 100755 new mode 100644 index 924ee5b..bdb3e53 --- a/tizen_src/ewk/unittest/utc_blink_ewk_error_url_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_error_url_get_func.cpp @@ -7,8 +7,7 @@ class utc_blink_ewk_error_url_get : public utc_blink_ewk_base { protected: /* Callback for load error */ - bool LoadError(Evas_Object* webview, Ewk_Error* error) - { + bool LoadError(Evas_Object* webview, Ewk_Error* error) override { utc_message("[load_error] :: "); if (ewk_error_url_get(error)) { diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_favicon_database_icon_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_favicon_database_icon_get_func.cpp new file mode 100644 index 0000000..dc55e27 --- /dev/null +++ b/tizen_src/ewk/unittest/utc_blink_ewk_favicon_database_icon_get_func.cpp @@ -0,0 +1,111 @@ +// Copyright 2016 Samsung Electronics. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "utc_blink_ewk_base.h" + +#include +#include + +class utc_blink_ewk_favicon_database_icon_get : public utc_blink_ewk_base { + protected: + void PostSetUp() override { + evas_object_smart_callback_add(GetEwkWebView(), "icon,received", + cb_icon_received, this); + } + + void PreTearDown() override { + evas_object_smart_callback_del(GetEwkWebView(), "icon,received", + cb_icon_received); + } + + static void cb_icon_received(void* data, Evas_Object*, void*) { + ASSERT_TRUE(data); + auto owner = static_cast(data); + owner->EventLoopStop(Success); + } +}; + +TEST_F(utc_blink_ewk_favicon_database_icon_get, POS) { + std::string page_path = + GetResourceUrl("ewk_favicon_database_icon_get/pos.html"); + std::string icon_path = + GetResourcePath("ewk_favicon_database_icon_get/pos.bmp"); + + ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), page_path.c_str())); + ASSERT_EQ(Success, EventLoopStart()); + Ewk_Favicon_Database* favicon_db = + ewk_context_favicon_database_get(ewk_context_default_get()); + ASSERT_TRUE(favicon_db); + Evas_Object* favicon_received = ewk_favicon_database_icon_get( + favicon_db, page_path.c_str(), GetEwkEvas()); + ASSERT_TRUE(favicon_received); + int w_received, h_received; + evas_object_image_size_get(favicon_received, &w_received, &h_received); + + Evas_Object* favicon_expected = evas_object_image_filled_add(GetEwkEvas()); + ASSERT_TRUE(favicon_expected); + evas_object_image_file_set(favicon_expected, icon_path.c_str(), NULL); + int w_expected, h_expected; + evas_object_image_size_get(favicon_expected, &w_expected, &h_expected); + + ASSERT_EQ(w_expected, w_received); + ASSERT_EQ(h_expected, h_received); + + auto favicon_expected_image_data = + evas_object_image_data_get(favicon_expected, EINA_FALSE); + ASSERT_TRUE(favicon_expected_image_data); + auto favicon_received_image_data = + evas_object_image_data_get(favicon_received, EINA_FALSE); + ASSERT_TRUE(favicon_received_image_data); + + const int pixel_size = 4; + ASSERT_EQ(0, memcmp(favicon_expected_image_data, favicon_received_image_data, + w_expected * h_expected * pixel_size)); +} + +TEST_F(utc_blink_ewk_favicon_database_icon_get, NEG_NO_ICON) { + std::string page_path = + GetResourceUrl("ewk_favicon_database_icon_get/neg_no_icon.html"); + + Ewk_Favicon_Database* favicon_db = + ewk_context_favicon_database_get(ewk_context_default_get()); + ASSERT_TRUE(favicon_db); + Evas_Object* favicon = ewk_favicon_database_icon_get( + favicon_db, page_path.c_str(), GetEwkEvas()); + ASSERT_FALSE(favicon); +} + +TEST_F(utc_blink_ewk_favicon_database_icon_get, NEG_INVALID_DATABASE_PARAM) { + std::string page_path = GetResourceUrl( + "ewk_favicon_database_icon_get/neg_invalid_database_param.html"); + + ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), page_path.c_str())); + ASSERT_EQ(Success, EventLoopStart()); + Evas_Object* favicon = + ewk_favicon_database_icon_get(NULL, page_path.c_str(), GetEwkEvas()); + ASSERT_FALSE(favicon); +} + +TEST_F(utc_blink_ewk_favicon_database_icon_get, NEG_INVALID_PAGE_URL_PARAM) { + Ewk_Favicon_Database* favicon_db = + ewk_context_favicon_database_get(ewk_context_default_get()); + ASSERT_TRUE(favicon_db); + Evas_Object* favicon = + ewk_favicon_database_icon_get(favicon_db, NULL, GetEwkEvas()); + ASSERT_FALSE(favicon); +} + +TEST_F(utc_blink_ewk_favicon_database_icon_get, NEG_INVALID_EVAS_PARAM) { + std::string page_path = GetResourceUrl( + "ewk_favicon_database_icon_get/neg_invalid_evas_param.html"); + + ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), page_path.c_str())); + ASSERT_EQ(Success, EventLoopStart()); + Ewk_Favicon_Database* favicon_db = + ewk_context_favicon_database_get(ewk_context_default_get()); + ASSERT_TRUE(favicon_db); + Evas_Object* favicon = + ewk_favicon_database_icon_get(favicon_db, page_path.c_str(), NULL); + ASSERT_FALSE(favicon); +} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_geolocation_permission_reply_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_geolocation_permission_reply_func.cpp index ab22603..8f8d6e8 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_geolocation_permission_reply_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_geolocation_permission_reply_func.cpp @@ -9,21 +9,20 @@ class utc_blink_ewk_geolocation_permission_reply : public utc_blink_ewk_base { protected: - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "geolocation,permission,request", - ToSmartCallback(request_geolocation_permisson), this); + void PostSetUp() override { + ewk_view_geolocation_permission_callback_set(GetEwkWebView(), nullptr, + nullptr); + evas_object_smart_callback_add( + GetEwkWebView(), "geolocation,permission,request", + ToSmartCallback(request_geolocation_permisson), this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "geolocation,permission,request", ToSmartCallback(request_geolocation_permisson)); } - void ConsoleMessage(Evas_Object*, const Ewk_Console_Message* msg) - { + void ConsoleMessage(Evas_Object*, const Ewk_Console_Message* msg) override { utc_message("JavaScript::console:\t\"%s\"", ewk_console_message_text_get(msg)); EventLoopStop(Success); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_geolocation_permission_request_origin_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_geolocation_permission_request_origin_get_func.cpp index 592c9f2..a1e12dcd 100755 --- a/tizen_src/ewk/unittest/utc_blink_ewk_geolocation_permission_request_origin_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_geolocation_permission_request_origin_get_func.cpp @@ -9,14 +9,15 @@ class utc_blink_ewk_geolocation_permission_request_origin_get : public utc_blink_ewk_base { protected: - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"geolocation,permission,request", request_geolocation_permisson, this); + void PostSetUp() override { + ewk_view_geolocation_permission_callback_set(GetEwkWebView(), nullptr, + nullptr); + evas_object_smart_callback_add(GetEwkWebView(), + "geolocation,permission,request", + request_geolocation_permisson, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(),"geolocation,permission,request", request_geolocation_permisson); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_geolocation_permission_request_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_geolocation_permission_request_set_func.cpp index 483607d..12a7ca3 100755 --- a/tizen_src/ewk/unittest/utc_blink_ewk_geolocation_permission_request_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_geolocation_permission_request_set_func.cpp @@ -9,20 +9,21 @@ class utc_blink_ewk_geolocation_permission_request_set : public utc_blink_ewk_base { protected: - - virtual void PostSetUp() override - { - permissionDecision = false; - evas_object_smart_callback_add(GetEwkWebView(),"geolocation,permission,request", request_geolocation_permisson, this); + void PostSetUp() override { + ewk_view_geolocation_permission_callback_set(GetEwkWebView(), nullptr, + nullptr); + permissionDecision = false; + evas_object_smart_callback_add(GetEwkWebView(), + "geolocation,permission,request", + request_geolocation_permisson, this); } - virtual void PreTearDown() override - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(),"geolocation,permission,request", request_geolocation_permisson); } - virtual void ConsoleMessage(Evas_Object* webview, const Ewk_Console_Message* msg) override - { + void ConsoleMessage(Evas_Object* webview, + const Ewk_Console_Message* msg) override { utc_blink_ewk_base::ConsoleMessage(webview, msg); const char* message = ewk_console_message_text_get(msg); diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_geolocation_permission_request_suspend_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_geolocation_permission_request_suspend_func.cpp index 83ea116..d62e270 100755 --- a/tizen_src/ewk/unittest/utc_blink_ewk_geolocation_permission_request_suspend_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_geolocation_permission_request_suspend_func.cpp @@ -18,14 +18,14 @@ protected: Eina_Bool call_request_suspend; - void PostSetUp() - { + void PostSetUp() override { + ewk_view_geolocation_permission_callback_set(GetEwkWebView(), nullptr, + nullptr); evas_object_smart_callback_add(GetEwkWebView(),"geolocation,permission,request", request_geolocation_permisson, this); evas_object_smart_callback_add(GetEwkWebView(), "title,changed", onTitleChanged, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(),"geolocation,permission,request", request_geolocation_permisson); evas_object_smart_callback_del(GetEwkWebView(), "title,changed", onTitleChanged); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_history_back_list_length_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_history_back_list_length_get_func.cpp index 6f90193..126ed32 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_history_back_list_length_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_history_back_list_length_get_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_history_back_list_length_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_history_forward_list_length_get.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_history_forward_list_length_get.cpp index 13d2c96..fc9aa56 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_history_forward_list_length_get.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_history_forward_list_length_get.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_history_forward_list_length_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_history_free_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_history_free_func.cpp index 23f6bda..1ebe1d2 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_history_free_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_history_free_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_history_free : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_history_item_title_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_history_item_title_get_func.cpp index 5904259..da61681 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_history_item_title_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_history_item_title_get_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_history_item_title_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_history_item_uri_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_history_item_uri_get_func.cpp index ea5ceeb..8d3b03e 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_history_item_uri_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_history_item_uri_get_func.cpp @@ -6,9 +6,7 @@ class utc_blink_ewk_history_item_uri_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_history_nth_item_get.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_history_nth_item_get.cpp index 6147244..6fe4223 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_history_nth_item_get.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_history_nth_item_get.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_history_nth_item_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_hit_test_free_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_hit_test_free_func.cpp old mode 100755 new mode 100644 index ca7db81..e653c92 --- a/tizen_src/ewk/unittest/utc_blink_ewk_hit_test_free_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_hit_test_free_func.cpp @@ -6,10 +6,8 @@ class utc_blink_ewk_hit_test_free : public utc_blink_ewk_base { protected: - - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(utc_blink_ewk_base::Success); + void LoadFinished(Evas_Object* webview) override { + EventLoopStop(utc_blink_ewk_base::Success); } static const char* const test_url; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_hit_test_node_value_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_hit_test_node_value_get_func.cpp old mode 100755 new mode 100644 index 2a938c0..58e5415 --- a/tizen_src/ewk/unittest/utc_blink_ewk_hit_test_node_value_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_hit_test_node_value_get_func.cpp @@ -10,8 +10,7 @@ protected: ASSERT_TRUE(ewk_hit_test_node_value_get(hit_test)); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Success); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_hit_test_request_base.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_hit_test_request_base.cpp new file mode 100644 index 0000000..dc3cf689 --- /dev/null +++ b/tizen_src/ewk/unittest/utc_blink_ewk_hit_test_request_base.cpp @@ -0,0 +1,9 @@ +// Copyright 2016 Samsung Electronics. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "ewk/unittest/utc_blink_ewk_hit_test_request_base.h" + +void utc_blink_ewk_hit_test_request_base::LoadFinished(Evas_Object* webview) { + EventLoopStop(utc_blink_ewk_base::Success); +} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_hit_test_request_base.h b/tizen_src/ewk/unittest/utc_blink_ewk_hit_test_request_base.h index 519d2cd..b1e9cf7 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_hit_test_request_base.h +++ b/tizen_src/ewk/unittest/utc_blink_ewk_hit_test_request_base.h @@ -9,20 +9,22 @@ class utc_blink_ewk_hit_test_request_base : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(utc_blink_ewk_base::Success); - } - - virtual void CheckHitTest(Ewk_Hit_Test* hit_test) {} - - static void hit_test_result(Evas_Object* o, int x, int y, int mode, Ewk_Hit_Test* hit_test, void* user_data) - { - utc_blink_ewk_hit_test_request_base* owner = static_cast(user_data); - ASSERT_TRUE(owner); - - owner->EventLoopStop(Success); - owner->CheckHitTest(hit_test); + void LoadFinished(Evas_Object* webview) override; + + virtual void CheckHitTest(Ewk_Hit_Test* hit_test) {} + + static void hit_test_result(Evas_Object* o, + int x, + int y, + int mode, + Ewk_Hit_Test* hit_test, + void* user_data) { + utc_blink_ewk_hit_test_request_base* owner = + static_cast(user_data); + ASSERT_TRUE(owner); + + owner->EventLoopStop(Success); + owner->CheckHitTest(hit_test); } }; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_home_directory_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_home_directory_get_func.cpp deleted file mode 100644 index dbcea99..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_home_directory_get_func.cpp +++ /dev/null @@ -1,129 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" -#include "../private/ewk_main_private.h" - -class utc_blink_ewk_home_directory_get : public utc_blink_ewk_base -{ -}; - -/** - * @brief Test if home directory is correctly returned when m_homeDirectory is set. - */ -TEST_F(utc_blink_ewk_home_directory_get, m_homeDirectory_is_set) -{ - ewk_home_directory_set("/someNewDir"); - const char* dir = ewk_home_directory_get(); - utc_message("Home dir == %s", dir); - ASSERT_STREQ("/someNewDir", dir); - ewk_home_directory_set(NULL); -} - -/** - * @brief Test if home directory is correctly returned when there is no m_homeDirectory and $HOME is set. - */ -TEST_F(utc_blink_ewk_home_directory_get, m_homeDirectory_not_set) -{ - ewk_home_directory_set(NULL); - - // If there is no $HOME set it - const char* home = getenv("HOME"); - bool home_set = false; - if (!home) { - setenv("HOME", "/newHomeDir", 1); - home = getenv("HOME"); - home_set = true; - } - - // Get home directory - const char* dir = ewk_home_directory_get(); - utc_message("Home dir == %s", dir); - ASSERT_STREQ(home, dir); - - // Unset $HOME if it was previously set - if (home_set) { - unsetenv("HOME"); - ASSERT_EQ(NULL, getenv("HOME")); - } -} - -/** - * @brief Test if home directory is correctly returned when $HOME is not set. - */ -TEST_F(utc_blink_ewk_home_directory_get, env_HOME_not_set) -{ - ewk_home_directory_set(NULL); - // Save original $HOME - const char* orig_home = getenv("HOME"); - if (orig_home) { - unsetenv("HOME"); - ASSERT_EQ(NULL, getenv("HOME")); - } - - // If there is no $TMPDIR set it - const char* tmpdir = getenv("TMPDIR"); - bool tmpdir_set = false; - if (!tmpdir) { - setenv("TMPDIR", "/newtmpdir", 1); - tmpdir = getenv("TMPDIR"); - tmpdir_set = true; - } - - // Get home directory - const char* dir = ewk_home_directory_get(); - utc_message("Home dir == %s", dir); - ASSERT_STREQ(tmpdir, dir); - - // Restore original $HOME - if (orig_home) { - setenv("HOME", orig_home, 1); - ASSERT_STREQ(orig_home, getenv("HOME")); - } - - // Unset $TMPDIR if it was previously set - if (tmpdir_set) { - unsetenv("TMPDIR"); - ASSERT_EQ(NULL, getenv("TMPDIR")); - } -} - -/** - * @brief Test if home directory is correctly returned when $TMPDIR is not set. - */ -TEST_F(utc_blink_ewk_home_directory_get, env_TMPDIR_not_set) -{ - ewk_home_directory_set(NULL); - // Save $HOME - const char* home = getenv("HOME"); - if (home) { - unsetenv("HOME"); - ASSERT_EQ(NULL, getenv("HOME")); - } - - // Save $TMPDIR - const char* tmpdir = getenv("TMPDIR"); - if (tmpdir) { - unsetenv("TMPDIR"); - ASSERT_EQ(NULL, getenv("TMPDIR")); - } - - // Get home directory - const char* dir = ewk_home_directory_get(); - utc_message("Home dir == %s", dir); - ASSERT_STREQ("/tmp", dir); - - // Restore $HOME - if (home) { - setenv("HOME", home, 1); - ASSERT_STREQ(home, getenv("HOME")); - } - - // Restore $TMPDIR - if (tmpdir) { - setenv("TMPDIR", tmpdir, 1); - ASSERT_STREQ(tmpdir, getenv("TMPDIR")); - } -} - diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_reply_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_reply_func.cpp index 11cdc07..ede7976 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_reply_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_reply_func.cpp @@ -10,15 +10,15 @@ class utc_blink_ewk_notification_permission_reply : public utc_blink_ewk_notific : notification_permission_request_cnt(0) {} - virtual Eina_Bool NotificationPermissionRequest(Evas_Object* webview, Ewk_Notification_Permission_Request* request) override - { + Eina_Bool NotificationPermissionRequest( + Evas_Object* webview, + Ewk_Notification_Permission_Request* request) override { EXPECT_EQ(EINA_TRUE, ewk_notification_permission_reply(request, EINA_TRUE)); ++notification_permission_request_cnt; return EINA_TRUE; } - virtual void NotificationShow(Ewk_Notification* notification) - { + void NotificationShow(Ewk_Notification* notification) override { EventLoopStop(Success); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_request_origin_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_request_origin_get_func.cpp old mode 100755 new mode 100644 index 67b8524..af3c86b --- a/tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_request_origin_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_request_origin_get_func.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. +// Copyright 2014-2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,29 +7,29 @@ class utc_blink_ewk_notification_permission_request_origin_get : public utc_blink_ewk_notification_test_base { protected: utc_blink_ewk_notification_permission_request_origin_get() - : expected_origin_protocol("") - , expected_origin_host("") - , expected_origin_port(65535) - , received_origin_protocol(NULL) - , received_origin_host(NULL) - , received_origin_port(0) - {} + : expected_origin_protocol(""), + expected_origin_host(""), + expected_origin_port(0), + received_origin_protocol(NULL), + received_origin_host(NULL), + received_origin_port(1) {} - ~utc_blink_ewk_notification_permission_request_origin_get() - { + ~utc_blink_ewk_notification_permission_request_origin_get() override { eina_stringshare_del(received_origin_protocol); eina_stringshare_del(received_origin_host); } /* Callback for "notification,permission,request" */ - virtual Eina_Bool NotificationPermissionRequest(Evas_Object* webview, Ewk_Notification_Permission_Request* request) - { + Eina_Bool NotificationPermissionRequest( + Evas_Object* webview, + Ewk_Notification_Permission_Request* request) override { const Ewk_Security_Origin* origin = ewk_notification_permission_request_origin_get(request); EXPECT_FALSE(received_origin_protocol); EXPECT_FALSE(received_origin_host); - EXPECT_FALSE(received_origin_port); - if (received_origin_protocol || received_origin_host || received_origin_port) { + EXPECT_NE(0, received_origin_port); + if (received_origin_protocol || received_origin_host || + 0 == received_origin_port) { EventLoopStop(Failure); return EINA_FALSE; } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_request_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_request_set_func.cpp deleted file mode 100755 index 213aa81..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_request_set_func.cpp +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_notification_test_base.h" - -class utc_blink_ewk_notification_permission_request_set : public utc_blink_ewk_notification_test_base { - protected: - utc_blink_ewk_notification_permission_request_set() - : notification_permission_request_cnt(0) - {} - - virtual Eina_Bool NotificationPermissionRequest(Evas_Object* webview, Ewk_Notification_Permission_Request* request) override - { - ewk_notification_permission_request_set(request, EINA_TRUE); - ++notification_permission_request_cnt; - return EINA_TRUE; - } - - virtual void NotificationShow(Ewk_Notification* notification) - { - EventLoopStop(Success); - } - - protected: - int notification_permission_request_cnt; -}; - -/** - * @brief Positive test case for ewk_notification_permission_request_set function - */ -TEST_F(utc_blink_ewk_notification_permission_request_set, POS_TEST) -{ - ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), notification_sample_1.c_str())); - ASSERT_EQ(Success, EventLoopStart()); - ASSERT_EQ(1, notification_permission_request_cnt); - - ASSERT_EQ(EINA_TRUE, ewk_view_script_execute(GetEwkWebView(), "new Notification('Notification title');", NULL, NULL)); - ASSERT_EQ(Success, EventLoopStart()); - // once granted it should not request permission anymore - ASSERT_EQ(1, notification_permission_request_cnt); - - ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), notification_sample_1.c_str())); - ASSERT_EQ(Success, EventLoopStart()); - // once granted it should not request permission anymore - ASSERT_EQ(1, notification_permission_request_cnt); -} - -/** - * @brief Tests whether function works properly in case of nullptr value pass. - */ -TEST_F(utc_blink_ewk_notification_permission_request_set, NEG_TEST) -{ - /* TODO: this code should use ewk_notification_cached_permissions_set and check its behaviour. - Results should be reported using one of utc_ macros */ - ewk_notification_permission_request_set(nullptr, EINA_TRUE); - - // If nullptr argument passing wont give segmentation fault negative test case will pass - SUCCEED(); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_request_suspend_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_request_suspend_func.cpp old mode 100755 new mode 100644 index 612fc78..18a2828 --- a/tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_request_suspend_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_notification_permission_request_suspend_func.cpp @@ -11,16 +11,16 @@ class utc_blink_ewk_notification_permission_request_suspend : public utc_blink_e {} /* Callback for notification permission request */ - virtual Eina_Bool NotificationPermissionRequest(Evas_Object* webview, Ewk_Notification_Permission_Request* request) override - { + Eina_Bool NotificationPermissionRequest( + Evas_Object* webview, + Ewk_Notification_Permission_Request* request) override { EXPECT_EQ(EINA_TRUE, ewk_notification_permission_request_suspend(request)); permission_request = request; EventLoopStop(Success); return EINA_TRUE; } - virtual void NotificationShow(Ewk_Notification* notification) - { + void NotificationShow(Ewk_Notification* notification) override { EventLoopStop(Success); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_notification_policies_removed_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_notification_policies_removed_func.cpp index 4518311..96da633 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_notification_policies_removed_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_notification_policies_removed_func.cpp @@ -14,15 +14,15 @@ class utc_blink_ewk_notification_policies_removed : public utc_blink_ewk_notific , expected_host_("") {} - ~utc_blink_ewk_notification_policies_removed() - { + ~utc_blink_ewk_notification_policies_removed() override { eina_stringshare_del(proto_); eina_stringshare_del(host_); } /* Callback for notification permission request */ - virtual Eina_Bool NotificationPermissionRequest(Evas_Object* obj, Ewk_Notification_Permission_Request* request) override - { + Eina_Bool NotificationPermissionRequest( + Evas_Object* obj, + Ewk_Notification_Permission_Request* request) override { const Ewk_Security_Origin* origin = ewk_notification_permission_request_origin_get(request); if (!origin) { @@ -38,10 +38,7 @@ class utc_blink_ewk_notification_policies_removed : public utc_blink_ewk_notific return EINA_TRUE; } - virtual void NotificationShow(Ewk_Notification*) override - { - EventLoopStop(Success); - } + void NotificationShow(Ewk_Notification*) override { EventLoopStop(Success); } protected: int permission_request_call_cnt; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_notification_security_origin_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_notification_security_origin_get_func.cpp old mode 100755 new mode 100644 index feeab38..a063858 --- a/tizen_src/ewk/unittest/utc_blink_ewk_notification_security_origin_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_notification_security_origin_get_func.cpp @@ -13,8 +13,7 @@ class utc_blink_ewk_notification_security_origin_get : public utc_blink_ewk_noti , origin_port(1) {} - virtual void NotificationShow(Ewk_Notification* notification) override - { + void NotificationShow(Ewk_Notification* notification) override { //call ewk_notification API const Ewk_Security_Origin* origin = ewk_notification_security_origin_get(notification); diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_notification_showed_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_notification_showed_func.cpp old mode 100755 new mode 100644 index bf5063f..e6455e4 --- a/tizen_src/ewk/unittest/utc_blink_ewk_notification_showed_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_notification_showed_func.cpp @@ -10,14 +10,13 @@ class utc_blink_ewk_notification_showed : public utc_blink_ewk_notification_test : notification_id(0) {} - virtual void NotificationShow(Ewk_Notification* notification) override - { + void NotificationShow(Ewk_Notification* notification) override { notification_id = ewk_notification_id_get(notification); EventLoopStop(Success);; } - virtual void ConsoleMessage(Evas_Object* webview, const Ewk_Console_Message* message) override - { + void ConsoleMessage(Evas_Object* webview, + const Ewk_Console_Message* message) override { if (message) { const char* message_text = ewk_console_message_text_get(message); if (message_text) { diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_notification_silent_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_notification_silent_get_func.cpp old mode 100755 new mode 100644 index 3a48e30..51d72e0 --- a/tizen_src/ewk/unittest/utc_blink_ewk_notification_silent_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_notification_silent_get_func.cpp @@ -8,16 +8,11 @@ class utc_blink_ewk_notification_silent_get : public utc_blink_ewk_notification_test_base { protected: utc_blink_ewk_notification_silent_get() - : silent(NULL) - , notification_silent_ref(true) - {} + : silent(false), notification_silent_ref(true) {} - ~utc_blink_ewk_notification_silent_get() - { - } + ~utc_blink_ewk_notification_silent_get() override {} - virtual void NotificationShow(Ewk_Notification* notification) override - { + void NotificationShow(Ewk_Notification* notification) override { silent = ewk_notification_silent_get(notification); EventLoopStop(Success); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_notification_test_base.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_notification_test_base.cpp new file mode 100644 index 0000000..921b115 --- /dev/null +++ b/tizen_src/ewk/unittest/utc_blink_ewk_notification_test_base.cpp @@ -0,0 +1,44 @@ +// Copyright 2015 Samsung Electronics. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "utc_blink_ewk_notification_test_base.h" + +void utc_blink_ewk_notification_test_base::PostSetUp() { + ewk_view_notification_permission_callback_set( + GetEwkWebView(), + reinterpret_cast( + notification_permission_request_callback), + this); + ewk_notification_callbacks_set( + reinterpret_cast( + notification_show_callback), + reinterpret_cast( + notification_cancel_callback), + this); +} + +void utc_blink_ewk_notification_test_base::PreTearDown() { + ewk_view_notification_permission_callback_set(GetEwkWebView(), NULL, NULL); + ewk_notification_callbacks_reset(); + + if (security_origins) { + // if it fails, than other TCs can produce false negatives/positives + EXPECT_EQ(EINA_TRUE, ewk_notification_policies_removed(security_origins)); + + void* data = NULL; + + EINA_LIST_FREE(security_origins, data) { + Ewk_Security_Origin* origin = static_cast(data); + ewk_security_origin_free(origin); + } + } +} + +Eina_Bool utc_blink_ewk_notification_test_base::NotificationPermissionRequest( + Evas_Object* webview, + Ewk_Notification_Permission_Request* request) { + // allow the notification by default + EXPECT_EQ(EINA_TRUE, ewk_notification_permission_reply(request, EINA_TRUE)); + return EINA_TRUE; +} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_notification_test_base.h b/tizen_src/ewk/unittest/utc_blink_ewk_notification_test_base.h index cdda6ee9..8f3791a 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_notification_test_base.h +++ b/tizen_src/ewk/unittest/utc_blink_ewk_notification_test_base.h @@ -13,56 +13,22 @@ class utc_blink_ewk_notification_test_base : public utc_blink_ewk_base {} /* Common setup */ - void PostSetUp() override - { - ewk_view_notification_permission_callback_set(GetEwkWebView(), - reinterpret_cast( - notification_permission_request_callback), - this); - ewk_notification_callbacks_set( - reinterpret_cast(notification_show_callback), - reinterpret_cast(notification_cancel_callback), - this); - } + void PostSetUp() override; + void PreTearDown() override; - void PreTearDown() override - { - ewk_view_notification_permission_callback_set(GetEwkWebView(), NULL, NULL); - ewk_notification_callbacks_reset(); + void NotificationShow(Ewk_Notification* notification) override {} - if (security_origins) { - // if it fails, than other TCs can produce false negatives/positives - EXPECT_EQ(EINA_TRUE, ewk_notification_policies_removed(security_origins)); + void NotificationCancel(uint64_t notificationId) override {} - void* data = NULL; - - EINA_LIST_FREE(security_origins, data) { - Ewk_Security_Origin* origin = static_cast(data); - ewk_security_origin_free(origin); - } - } - } - - virtual void NotificationShow(Ewk_Notification* notification) - { - } - - virtual void NotificationCancel(uint64_t notificationId) - { - } - - virtual Eina_Bool NotificationPermissionRequest(Evas_Object* webview, Ewk_Notification_Permission_Request* request) - { - //allow the notification by default - EXPECT_EQ(EINA_TRUE, ewk_notification_permission_reply(request, EINA_TRUE)); - return EINA_TRUE; - } + Eina_Bool NotificationPermissionRequest( + Evas_Object* webview, + Ewk_Notification_Permission_Request* request) override; static Eina_Bool notification_permission_request_callback(Evas_Object* webview, Ewk_Notification_Permission_Request* request, utc_blink_ewk_notification_test_base* owner) { utc_message("[notification_permission_request_callback] :: "); if (!owner) { - EINA_FALSE; + return EINA_FALSE; } if (!request) { diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_notification_title_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_notification_title_get_func.cpp old mode 100755 new mode 100644 index 1e9bde1..a58b61c --- a/tizen_src/ewk/unittest/utc_blink_ewk_notification_title_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_notification_title_get_func.cpp @@ -12,13 +12,11 @@ class utc_blink_ewk_notification_title_get : public utc_blink_ewk_notification_t , notification_title_ref("Notification Title") {} - ~utc_blink_ewk_notification_title_get() - { + ~utc_blink_ewk_notification_title_get() override { eina_stringshare_del(title); } - virtual void NotificationShow(Ewk_Notification* notification) override - { + void NotificationShow(Ewk_Notification* notification) override { title = eina_stringshare_add(ewk_notification_title_get(notification)); EventLoopStop(Success); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_cookie_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_cookie_get_func.cpp old mode 100755 new mode 100644 index e939f1f..f803cdf --- a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_cookie_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_cookie_get_func.cpp @@ -7,19 +7,16 @@ class utc_blink_ewk_policy_decision_cookie_get : public utc_blink_ewk_base { protected: - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "policy,response,decide", policy_navigation_decide, this); + void PostSetUp() override { + evas_object_smart_callback_add(GetEwkWebView(), "policy,response,decide", + policy_navigation_decide, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "policy,response,decide", policy_navigation_decide); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Failure); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_frame_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_frame_get_func.cpp index d75edb3..5e589c1 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_frame_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_frame_get_func.cpp @@ -14,8 +14,7 @@ protected: ewk_settings_scripts_can_open_windows_set(settings, true); } - void PreTearDown() - { + void PreTearDown() override { Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); ewk_settings_scripts_can_open_windows_set(settings, old_can_open_windows_setting_); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_host_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_host_get_func.cpp old mode 100755 new mode 100644 index e1ab145..804fcaa --- a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_host_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_host_get_func.cpp @@ -7,19 +7,15 @@ class utc_blink_ewk_policy_decision_host_get : public utc_blink_ewk_base { protected: - - void PostSetUp() - { + void PostSetUp() override { evas_object_smart_callback_add(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Failure); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_http_method_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_http_method_get_func.cpp index 6e20a22..9956a95 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_http_method_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_http_method_get_func.cpp @@ -9,14 +9,11 @@ class utc_blink_ewk_policy_decision_http_method_get : public utc_blink_ewk_base { protected: - - void PostSetUp() - { + void PostSetUp() override { evas_object_smart_callback_add(GetEwkWebView(), "policy,navigation,decide", ToSmartCallback(policy_navigation_decide), this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "policy,navigation,decide", ToSmartCallback(policy_navigation_decide)); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_ignore_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_ignore_func.cpp old mode 100755 new mode 100644 index 7838029..3968c9d --- a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_ignore_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_ignore_func.cpp @@ -7,19 +7,16 @@ class utc_blink_ewk_policy_decision_ignore : public utc_blink_ewk_base { protected: - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide, this); + void PostSetUp() override { + evas_object_smart_callback_add(GetEwkWebView(), "policy,navigation,decide", + policy_navigation_decide, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide); } - void LoadFinished(Evas_Object* webview) { - + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Failure); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_navigation_type_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_navigation_type_get_func.cpp old mode 100755 new mode 100644 index e19836e..ac7a19e --- a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_navigation_type_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_navigation_type_get_func.cpp @@ -6,19 +6,16 @@ class utc_blink_ewk_policy_decision_navigation_type_get : public utc_blink_ewk_base { protected: - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide, this); + void PostSetUp() override { + evas_object_smart_callback_add(GetEwkWebView(), "policy,navigation,decide", + policy_navigation_decide, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide); } - void LoadFinished(Evas_Object* webview) { - + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Failure); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_password_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_password_get_func.cpp index 99c77d8..edb0550 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_password_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_password_get_func.cpp @@ -18,19 +18,16 @@ protected: { } - void PostSetUp() - { + void PostSetUp() override { evas_object_smart_callback_add(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide); eina_stringshare_del(password); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Failure); // will noop if EventLoopStop was alraedy called } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_response_headers_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_response_headers_get_func.cpp index 392aad7..ce256b6 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_response_headers_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_response_headers_get_func.cpp @@ -7,18 +7,16 @@ class utc_blink_ewk_policy_decision_response_headers_get : public utc_blink_ewk_base { protected: - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "policy,response,decide", policy_response_decide, this); + void PostSetUp() override { + evas_object_smart_callback_add(GetEwkWebView(), "policy,response,decide", + policy_response_decide, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "policy,response,decide", policy_response_decide); } - void LoadFinished(Evas_Object* webview) { + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Failure); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_response_mime_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_response_mime_get_func.cpp old mode 100755 new mode 100644 index 090e7bb..f8d63fe --- a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_response_mime_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_response_mime_get_func.cpp @@ -6,19 +6,17 @@ class utc_blink_ewk_policy_decision_response_mime_get : public utc_blink_ewk_base { protected: - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "policy,response,decide", (void(*)(void*, Evas_Object*, void*))policy_response_decide, this); + void PostSetUp() override { + evas_object_smart_callback_add( + GetEwkWebView(), "policy,response,decide", + (void (*)(void*, Evas_Object*, void*))policy_response_decide, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "policy,response,decide", (void(*)(void*, Evas_Object*, void*))policy_response_decide); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Failure); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_response_status_code_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_response_status_code_get_func.cpp old mode 100755 new mode 100644 index 1863a67..402b23c --- a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_response_status_code_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_response_status_code_get_func.cpp @@ -11,8 +11,7 @@ protected: { } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Failure); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_scheme_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_scheme_get_func.cpp index fb48564..794fe62 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_scheme_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_scheme_get_func.cpp @@ -7,10 +7,14 @@ class utc_blink_ewk_policy_decision_scheme_get : public utc_blink_ewk_base { protected: + void PostSetUp() override { + evas_object_smart_callback_add(GetEwkWebView(), "policy,navigation,decide", + policy_navigation_decide, this); + } - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide, this); + void PreTearDown() override { + evas_object_smart_callback_del(GetEwkWebView(), "policy,navigation,decide", + policy_navigation_decide); } utc_blink_ewk_policy_decision_scheme_get() : received_scheme_(nullptr) {} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_suspend_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_suspend_func.cpp old mode 100755 new mode 100644 index 84edac3..4742624 --- a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_suspend_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_suspend_func.cpp @@ -11,9 +11,7 @@ protected: { } - - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Failure); // will noop if EventLoopStop was already called } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_type_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_type_get_func.cpp old mode 100755 new mode 100644 index 119f3f8..3fa05fd --- a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_type_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_type_get_func.cpp @@ -6,19 +6,16 @@ class utc_blink_ewk_policy_decision_type_get : public utc_blink_ewk_base { protected: - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide, this); + void PostSetUp() override { + evas_object_smart_callback_add(GetEwkWebView(), "policy,navigation,decide", + policy_navigation_decide, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide); } - void LoadFinished(Evas_Object* webview) { - + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Failure); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_url_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_url_get_func.cpp old mode 100755 new mode 100644 index 881d568..f29b5eb --- a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_url_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_url_get_func.cpp @@ -6,19 +6,16 @@ class utc_blink_ewk_policy_decision_url_get : public utc_blink_ewk_base { protected: - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide, this); + void PostSetUp() override { + evas_object_smart_callback_add(GetEwkWebView(), "policy,navigation,decide", + policy_navigation_decide, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide); } - void LoadFinished(Evas_Object* webview) { - + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Failure); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_use_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_use_func.cpp old mode 100755 new mode 100644 index caf63c4..5ae6c5a --- a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_use_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_use_func.cpp @@ -7,19 +7,16 @@ class utc_blink_ewk_policy_decision_use : public utc_blink_ewk_base { protected: - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide, this); + void PostSetUp() override { + evas_object_smart_callback_add(GetEwkWebView(), "policy,navigation,decide", + policy_navigation_decide, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide); } - void LoadFinished(Evas_Object* webview) { - + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Success); // will noop if EventLoopStop was alraedy called } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_userid_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_userid_get_func.cpp index 6388323..f2f167b 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_userid_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_policy_decision_userid_get_func.cpp @@ -20,19 +20,16 @@ protected: { } - void PostSetUp() - { + void PostSetUp() override { evas_object_smart_callback_add(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "policy,navigation,decide", policy_navigation_decide); eina_stringshare_del(user_name); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Failure); // will noop if EventLoopStop was alraedy called } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_is_persistent_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_is_persistent_get_func.cpp index 4295ef7..2613287 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_is_persistent_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_is_persistent_get_func.cpp @@ -10,22 +10,18 @@ class utc_blink_ewk_quota_permission_request_is_persistent_get : public utc_blink_ewk_base { protected: - - void PreSetUp() - { - persistent = EINA_FALSE; - } - - static void quotaPermission(Evas_Object*, - const Ewk_Quota_Permission_Request* request, - utc_blink_ewk_quota_permission_request_is_persistent_get* owner) - { - utc_message("[ %s ]", __PRETTY_FUNCTION__); - ASSERT_TRUE(owner); - EXPECT_TRUE(request); - owner->persistent = ewk_quota_permission_request_is_persistent_get(request); - ewk_view_quota_permission_request_cancel(request); - owner->EventLoopStop(Success); + void PreSetUp() override { persistent = EINA_FALSE; } + + static void quotaPermission( + Evas_Object*, + const Ewk_Quota_Permission_Request* request, + utc_blink_ewk_quota_permission_request_is_persistent_get* owner) { + utc_message("[ %s ]", __PRETTY_FUNCTION__); + ASSERT_TRUE(owner); + EXPECT_TRUE(request); + owner->persistent = ewk_quota_permission_request_is_persistent_get(request); + ewk_view_quota_permission_request_cancel(request); + owner->EventLoopStop(Success); } protected: diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_origin_host_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_origin_host_get_func.cpp index cafe98a..c7c6e80 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_origin_host_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_origin_host_get_func.cpp @@ -15,10 +15,7 @@ protected: { } - void PreTearDown() - { - eina_stringshare_del(host); - } + void PreTearDown() override { eina_stringshare_del(host); } static void quotaPermission(Evas_Object*, const Ewk_Quota_Permission_Request* request, diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_origin_port_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_origin_port_get_func.cpp index 3c5f121..2f0e58c 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_origin_port_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_origin_port_get_func.cpp @@ -10,26 +10,21 @@ class utc_blink_ewk_quota_permission_request_origin_port_get : public utc_blink_ewk_base { protected: - - void PreSetUp() - { - port = 0; - } - - static void quotaPermission(Evas_Object*, - const Ewk_Quota_Permission_Request* request, - utc_blink_ewk_quota_permission_request_origin_port_get* owner) - { - utc_message("[ %s ]", __PRETTY_FUNCTION__); - ASSERT_TRUE(owner); - if (!request) - { - owner->EventLoopStop(Failure); - return; - } - owner->port = ewk_quota_permission_request_origin_port_get(request); - ewk_view_quota_permission_request_cancel(request); - owner->EventLoopStop(Success); + void PreSetUp() override { port = 0; } + + static void quotaPermission( + Evas_Object*, + const Ewk_Quota_Permission_Request* request, + utc_blink_ewk_quota_permission_request_origin_port_get* owner) { + utc_message("[ %s ]", __PRETTY_FUNCTION__); + ASSERT_TRUE(owner); + if (!request) { + owner->EventLoopStop(Failure); + return; + } + owner->port = ewk_quota_permission_request_origin_port_get(request); + ewk_view_quota_permission_request_cancel(request); + owner->EventLoopStop(Success); } protected: diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_origin_protocol_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_origin_protocol_get_func.cpp index 0d4d6d3..c2c385b 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_origin_protocol_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_origin_protocol_get_func.cpp @@ -15,10 +15,7 @@ protected: { } - void PreTearDown() - { - eina_stringshare_del(protocol); - } + void PreTearDown() override { eina_stringshare_del(protocol); } static void quotaPermission(Evas_Object*, const Ewk_Quota_Permission_Request* request, diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_quota_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_quota_get_func.cpp index 1431aa7..a2cad31 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_quota_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_quota_permission_request_quota_get_func.cpp @@ -10,22 +10,18 @@ class utc_blink_ewk_quota_permission_request_quota_get : public utc_blink_ewk_base { protected: - - void PreSetUp() - { - quota = 0; - } - - static void quotaPermission(Evas_Object*, - const Ewk_Quota_Permission_Request* request, - utc_blink_ewk_quota_permission_request_quota_get* owner) - { - utc_message("[ %s ]", __PRETTY_FUNCTION__); - ASSERT_TRUE(owner); - EXPECT_TRUE(request); - owner->quota = ewk_quota_permission_request_quota_get(request); - ewk_view_quota_permission_request_cancel(request); - owner->EventLoopStop(Success); + void PreSetUp() override { quota = 0; } + + static void quotaPermission( + Evas_Object*, + const Ewk_Quota_Permission_Request* request, + utc_blink_ewk_quota_permission_request_quota_get* owner) { + utc_message("[ %s ]", __PRETTY_FUNCTION__); + ASSERT_TRUE(owner); + EXPECT_TRUE(request); + owner->quota = ewk_quota_permission_request_quota_get(request); + ewk_view_quota_permission_request_cancel(request); + owner->EventLoopStop(Success); } protected: diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_security_origin_host_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_security_origin_host_get_func.cpp old mode 100755 new mode 100644 index bb9370b..60a3e5a --- a/tizen_src/ewk/unittest/utc_blink_ewk_security_origin_host_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_security_origin_host_get_func.cpp @@ -7,8 +7,7 @@ class utc_blink_ewk_security_origin_host_get : public utc_blink_ewk_notification_test_base { protected: - virtual void NotificationShow(Ewk_Notification* notification) override - { + void NotificationShow(Ewk_Notification* notification) override { const Ewk_Security_Origin* org = ewk_notification_security_origin_get(notification); MainLoopResult result = Failure; if (org) { diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_security_origin_port_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_security_origin_port_get_func.cpp old mode 100755 new mode 100644 index 1e5df84..0bca667 --- a/tizen_src/ewk/unittest/utc_blink_ewk_security_origin_port_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_security_origin_port_get_func.cpp @@ -7,8 +7,7 @@ class utc_blink_ewk_security_origin_port_get : public utc_blink_ewk_notification_test_base { protected: - virtual void NotificationShow(Ewk_Notification* notification) override - { + void NotificationShow(Ewk_Notification* notification) override { MainLoopResult result = Failure; const Ewk_Security_Origin* org = ewk_notification_security_origin_get((const Ewk_Notification*)notification); diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_security_origin_protocol_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_security_origin_protocol_get_func.cpp old mode 100755 new mode 100644 index b773f30..2a00502 --- a/tizen_src/ewk/unittest/utc_blink_ewk_security_origin_protocol_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_security_origin_protocol_get_func.cpp @@ -7,8 +7,7 @@ class utc_blink_ewk_security_origin_protocol_get : public utc_blink_ewk_notification_test_base { protected: - virtual void NotificationShow(Ewk_Notification* notification) override - { + void NotificationShow(Ewk_Notification* notification) override { MainLoopResult result = Failure; const Ewk_Security_Origin* org = ewk_notification_security_origin_get((const Ewk_Notification*)notification); diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_settings_extra_feature_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_settings_extra_feature_set_func.cpp index 2fe685b..9e34e69 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_settings_extra_feature_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_settings_extra_feature_set_func.cpp @@ -11,13 +11,9 @@ protected: { } - void LoadFinished(Evas_Object*) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } - void PostSetUp() - { + void PostSetUp() override { // load file just to initialize everything ewk_view_url_set(GetEwkWebView(), GetResourceUrl("/common/sample.html").c_str()); ASSERT_EQ(Success, EventLoopStart()); diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_settings_font_default_size_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_settings_font_default_size_get_func.cpp old mode 100755 new mode 100644 index 7e29faa..1328fa3 --- a/tizen_src/ewk/unittest/utc_blink_ewk_settings_font_default_size_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_settings_font_default_size_get_func.cpp @@ -6,8 +6,7 @@ class utc_blink_ewk_settings_font_default_size_get : public utc_blink_ewk_base { - void PostSetUp() - { + void PostSetUp() override { settings = ewk_view_settings_get(GetEwkWebView()); ASSERT_TRUE(settings) << "ewk_view_settings_get(GetEwkWebView())"; } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_settings_font_default_size_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_settings_font_default_size_set_func.cpp old mode 100755 new mode 100644 index 636c293..72a3e0a --- a/tizen_src/ewk/unittest/utc_blink_ewk_settings_font_default_size_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_settings_font_default_size_set_func.cpp @@ -10,7 +10,7 @@ protected: utc_blink_ewk_settings_font_default_size_set_func() : settings(NULL){ } - void PostSetUp(){ + void PostSetUp() override { settings = ewk_view_settings_get(GetEwkWebView()); ASSERT_TRUE(settings != NULL); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_settings_form_profile_data_enabled_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_settings_form_profile_data_enabled_get_func.cpp index 8ba7ee4..3061662 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_settings_form_profile_data_enabled_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_settings_form_profile_data_enabled_get_func.cpp @@ -10,9 +10,9 @@ public: Ewk_Settings* settings; protected: - void PostSetUp() { - settings = ewk_view_settings_get(GetEwkWebView()); - EXPECT_TRUE(settings); + void PostSetUp() override { + settings = ewk_view_settings_get(GetEwkWebView()); + EXPECT_TRUE(settings); } }; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_settings_form_profile_data_enabled_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_settings_form_profile_data_enabled_set_func.cpp index 9a12a74..e65b86e 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_settings_form_profile_data_enabled_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_settings_form_profile_data_enabled_set_func.cpp @@ -9,9 +9,9 @@ public: Ewk_Settings* settings; protected: - void PostSetUp() { - settings = ewk_view_settings_get(GetEwkWebView()); - EXPECT_TRUE(settings); + void PostSetUp() override { + settings = ewk_view_settings_get(GetEwkWebView()); + EXPECT_TRUE(settings); } }; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_settings_initial_list_style_position_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_settings_initial_list_style_position_get_func.cpp deleted file mode 100755 index dfffcc7..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_settings_initial_list_style_position_get_func.cpp +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_settings_initial_list_style_position_get : public utc_blink_ewk_base -{ -protected: - void PostSetUp() - { - settings = ewk_view_settings_get(GetEwkWebView()); - } - -protected: - Ewk_Settings *settings; -}; - -/** -* @brief checking if returns EWK_LIST_STYLE_POSITION_OUTSIDE when initiated with NULL webview. -*/ -TEST_F(utc_blink_ewk_settings_initial_list_style_position_get, NullArg) -{ - EXPECT_EQ(EWK_LIST_STYLE_POSITION_OUTSIDE, - ewk_settings_initial_list_style_position_get(NULL)); -} - -/** -* @brief checking if returns EWK_LIST_STYLE_POSITION_INSIDE when initiated with a correct webview -* and initial list style position set to EWK_LIST_STYLE_POSITION_INSIDE. -*/ -TEST_F(utc_blink_ewk_settings_initial_list_style_position_get, INSIDE) -{ - ASSERT_TRUE(settings); - EXPECT_EQ(EINA_TRUE, - ewk_settings_initial_list_style_position_set(settings, EWK_LIST_STYLE_POSITION_INSIDE)); - EXPECT_EQ(EWK_LIST_STYLE_POSITION_INSIDE, ewk_settings_initial_list_style_position_get(settings)); -} - -/** -* @brief checking if returns EWK_LIST_STYLE_POSITION_OUTSIDE when initiated with a correct webview -* and initial list style position set to EWK_LIST_STYLE_POSITION_OUTSIDE. -*/ -TEST_F(utc_blink_ewk_settings_initial_list_style_position_get, OUTSIDE) -{ - ASSERT_TRUE(settings); - EXPECT_EQ(EINA_TRUE, - ewk_settings_initial_list_style_position_set(settings, EWK_LIST_STYLE_POSITION_OUTSIDE)); - EXPECT_EQ(EWK_LIST_STYLE_POSITION_OUTSIDE, - ewk_settings_initial_list_style_position_get(settings)); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_settings_initial_list_style_position_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_settings_initial_list_style_position_set_func.cpp deleted file mode 100755 index 5d7cd5d..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_settings_initial_list_style_position_set_func.cpp +++ /dev/null @@ -1,85 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_settings_initial_list_style_position_set : public utc_blink_ewk_base -{ - protected: - utc_blink_ewk_settings_initial_list_style_position_set() - : settings(NULL) - , list_style_position(NULL) - { - } - - ~utc_blink_ewk_settings_initial_list_style_position_set() - { - eina_stringshare_del(list_style_position); - } - - void PostSetUp() - { - settings = ewk_view_settings_get(GetEwkWebView()); - ASSERT_TRUE(settings); - } - - virtual void ConsoleMessage(Evas_Object* webview, const Ewk_Console_Message* msg) - { - utc_blink_ewk_base::ConsoleMessage(webview, msg); - - if (!list_style_position) { - list_style_position = eina_stringshare_add(ewk_console_message_text_get(msg)); - } - - EventLoopStop(Success); - } - - protected: - Ewk_Settings *settings; - Eina_Stringshare *list_style_position; -}; - - -/** -* @brief checking if returns FALSE when initiated with NULL webview. -*/ -TEST_F(utc_blink_ewk_settings_initial_list_style_position_set, NullArg) -{ - EXPECT_EQ(EINA_FALSE, - ewk_settings_initial_list_style_position_set(NULL, EWK_LIST_STYLE_POSITION_INSIDE)); -} - -/** -* @brief checking if returns EWK_LIST_STYLE_POSITION_INSIDE when initiated with a correct webview -* and initial list style position set to EWK_LIST_STYLE_POSITION_INSIDE. -*/ -TEST_F(utc_blink_ewk_settings_initial_list_style_position_set, inside) -{ - EXPECT_EQ(EINA_TRUE, - ewk_settings_initial_list_style_position_set(settings, EWK_LIST_STYLE_POSITION_INSIDE)); - - ASSERT_EQ(EINA_TRUE, - ewk_view_url_set(GetEwkWebView(), GetResourceUrl("common/ul_li.html").c_str())); - ASSERT_EQ(Success, EventLoopStart()); - - ASSERT_TRUE(list_style_position); - ASSERT_STREQ("inside", list_style_position); -} - -/** -* @brief checking if returns EWK_LIST_STYLE_POSITION_INSIDE when initiated with a correct webview -* and initial list style position set to EWK_LIST_STYLE_POSITION_OUTSIDE. -*/ -TEST_F(utc_blink_ewk_settings_initial_list_style_position_set, outside) -{ - EXPECT_EQ(EINA_TRUE, - ewk_settings_initial_list_style_position_set(settings, EWK_LIST_STYLE_POSITION_OUTSIDE)); - - ASSERT_EQ(EINA_TRUE, - ewk_view_url_set(GetEwkWebView(), GetResourceUrl("common/ul_li.html").c_str())); - ASSERT_EQ(Success, EventLoopStart()); - - ASSERT_TRUE(list_style_position); - ASSERT_STREQ("outside", list_style_position); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_settings_scripts_can_open_windows_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_settings_scripts_can_open_windows_get_func.cpp index e8448a2..cbab9db 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_settings_scripts_can_open_windows_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_settings_scripts_can_open_windows_get_func.cpp @@ -11,8 +11,7 @@ protected: { } - void PostSetUp() - { + void PostSetUp() override { settings = ewk_view_settings_get(GetEwkWebView()); ASSERT_TRUE(settings); // make sure default value is proper diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_settings_scripts_can_open_windows_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_settings_scripts_can_open_windows_set_func.cpp index e62b934..adaa2b5 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_settings_scripts_can_open_windows_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_settings_scripts_can_open_windows_set_func.cpp @@ -11,8 +11,7 @@ protected: { } - void PostSetUp() - { + void PostSetUp() override { settings = ewk_view_settings_get(GetEwkWebView()); ASSERT_TRUE(settings); // make sure default value is proper @@ -22,8 +21,7 @@ protected: evas_object_smart_callback_add(GetEwkWebView(), "create,window", ToSmartCallback(create_window_cb), this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "popup,blocked", ToSmartCallback(popup_blocked_cb)); evas_object_smart_callback_del(GetEwkWebView(), "create,window", ToSmartCallback(create_window_cb)); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_settings_scripts_window_open_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_settings_scripts_window_open_get_func.cpp index 8881d6b..52e21c8 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_settings_scripts_window_open_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_settings_scripts_window_open_get_func.cpp @@ -11,8 +11,7 @@ protected: { } - void PostSetUp() - { + void PostSetUp() override { settings = ewk_view_settings_get(GetEwkWebView()); ASSERT_TRUE(settings); // make sure default value is proper diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_settings_scripts_window_open_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_settings_scripts_window_open_set_func.cpp index a26bc60..bed7d1f 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_settings_scripts_window_open_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_settings_scripts_window_open_set_func.cpp @@ -11,8 +11,7 @@ protected: { } - void PostSetUp() - { + void PostSetUp() override { settings = ewk_view_settings_get(GetEwkWebView()); ASSERT_TRUE(settings); // make sure default value is proper @@ -22,8 +21,7 @@ protected: evas_object_smart_callback_add(GetEwkWebView(), "create,window", ToSmartCallback(create_window_cb), this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "popup,blocked", ToSmartCallback(popup_blocked_cb)); evas_object_smart_callback_del(GetEwkWebView(), "create,window", ToSmartCallback(create_window_cb)); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_settings_text_autosizing_enabled_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_settings_text_autosizing_enabled_set_func.cpp index b22e790..a9a7999 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_settings_text_autosizing_enabled_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_settings_text_autosizing_enabled_set_func.cpp @@ -7,9 +7,9 @@ class utc_blink_ewk_settings_text_autosizing_enabled_set_func : public utc_blink_ewk_base { protected: - void PostSetUp(){ - settings = ewk_view_settings_get(GetEwkWebView()); - ASSERT_TRUE(settings != NULL); + void PostSetUp() override { + settings = ewk_view_settings_get(GetEwkWebView()); + ASSERT_TRUE(settings != NULL); } utc_blink_ewk_settings_text_autosizing_enabled_set_func() : settings(NULL){ diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_settings_text_autosizing_font_scale_factor_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_settings_text_autosizing_font_scale_factor_set_func.cpp index dde6838..3f037bb 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_settings_text_autosizing_font_scale_factor_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_settings_text_autosizing_font_scale_factor_set_func.cpp @@ -7,9 +7,9 @@ class utc_blink_ewk_settings_text_autosizing_font_scale_factor_set_func : public utc_blink_ewk_base { protected: - void PostSetUp(){ - settings = ewk_view_settings_get(GetEwkWebView()); - ASSERT_TRUE(settings != NULL); + void PostSetUp() override { + settings = ewk_view_settings_get(GetEwkWebView()); + ASSERT_TRUE(settings != NULL); } utc_blink_ewk_settings_text_autosizing_font_scale_factor_set_func() : settings(NULL){ diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_align_center_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_text_style_align_center_get_func.cpp deleted file mode 100755 index 5dbe074..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_align_center_get_func.cpp +++ /dev/null @@ -1,94 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/* Define those macros _before_ you include the utc_blink_ewk.h header file. */ - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_text_style_align_center_get : public utc_blink_ewk_base { -protected: - static void get_text_style(void* data, Evas_Object* webview, void* event_info) - { - utc_message("[get_text_style callback] :: \n"); - utc_blink_ewk_text_style_align_center_get* owner = NULL; - - if (!data) { - utc_fail(); - } - - owner = static_cast(data); - Ewk_Text_Style* style = (Ewk_Text_Style*)event_info; - owner->state = ewk_text_style_align_center_get(style); - owner->EventLoopStop(utc_blink_ewk_base::Success); - } - - virtual void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"text,style,state", get_text_style, this); - - Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); - ewk_settings_text_style_state_enabled_set(settings, EINA_TRUE); - } - - virtual void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"text,style,state", get_text_style); - } - -protected: - Ewk_Text_Style_State state; -}; - -/** - * @brief Positive test case of ewk_text_style_bg_color_get(),testing results to get background Color. - */ -TEST_F(utc_blink_ewk_text_style_align_center_get, POS_TEST1) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - // Wait until get_text callback or timeout. - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(state, EWK_TEXT_STYLE_STATE_TRUE); -} - -TEST_F(utc_blink_ewk_text_style_align_center_get, POS_TEST2) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - // Wait until get_text callback or timeout. - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(state, EWK_TEXT_STYLE_STATE_FALSE); -} - -/** - * @brief checking whether function is working when providing NULL value. - */ -TEST_F(utc_blink_ewk_text_style_align_center_get, NEG_TEST) -{ - utc_check_eq(EWK_TEXT_STYLE_STATE_FALSE, ewk_text_style_align_center_get(NULL)); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_align_full_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_text_style_align_full_get_func.cpp deleted file mode 100755 index cfb0e89..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_align_full_get_func.cpp +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/* Define those macros _before_ you include the utc_blink_ewk.h header file. */ - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_text_style_align_full_get : public utc_blink_ewk_base { -protected: - static void get_text_style(void* data, Evas_Object* webview, void* event_info) - { - utc_message("[get_text_style callback] :: "); - utc_blink_ewk_text_style_align_full_get* owner = NULL; - - if (!data) { - utc_fail(); - } - - owner = static_cast(data); - - Ewk_Text_Style* style = (Ewk_Text_Style*)event_info; - owner->state = ewk_text_style_align_full_get(style); - owner->EventLoopStop(utc_blink_ewk_base::Success); - } - - virtual void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"text,style,state", get_text_style, this); - - Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); - ewk_settings_text_style_state_enabled_set(settings, EINA_TRUE); - } - - virtual void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"text,style,state", get_text_style); - } - -protected: - Ewk_Text_Style_State state; -}; - -/** - * @brief Positive test case of ewk_text_style_bg_color_get(),testing results to get background Color. - */ -TEST_F(utc_blink_ewk_text_style_align_full_get, POS_TEST1) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - // Wait until get text callback or timeout. - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(state, EWK_TEXT_STYLE_STATE_TRUE); -} - -TEST_F(utc_blink_ewk_text_style_align_full_get, POS_TEST2) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - // Wait until get text callback or timeout. - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(state, EWK_TEXT_STYLE_STATE_FALSE); -} - -/** - * @brief checking whether function is working when providing NULL value. - */ -TEST_F(utc_blink_ewk_text_style_align_full_get, NEG_TEST) -{ - utc_check_eq(EWK_TEXT_STYLE_STATE_FALSE, ewk_text_style_align_full_get(NULL)); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_align_left_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_text_style_align_left_get_func.cpp deleted file mode 100755 index 9cee05c..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_align_left_get_func.cpp +++ /dev/null @@ -1,97 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/* Define those macros _before_ you include the utc_blink_ewk.h header file. */ - -#include "utc_blink_ewk_base.h" - - -class utc_blink_ewk_text_style_align_left_get : public utc_blink_ewk_base { -protected: - static void get_text_style(void* data, Evas_Object* webview, void* event_info) - { - utc_message("[get_text_style callback] :: "); - - utc_blink_ewk_text_style_align_left_get* owner = NULL; - if (!data) { - utc_fail(); - } - - owner = static_cast(data); - - Ewk_Text_Style* style = (Ewk_Text_Style*)event_info; - owner->state = ewk_text_style_align_left_get(style); - owner->EventLoopStop(utc_blink_ewk_base::Success); - } - - virtual void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"text,style,state", get_text_style, this); - - Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); - ewk_settings_text_style_state_enabled_set(settings, EINA_TRUE); - } - - virtual void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"text,style,state", get_text_style); - } - -protected: - Ewk_Text_Style_State state; -}; - -/** - * @brief Positive test case of ewk_text_style_bg_color_get(),testing results to get background Color. - */ -TEST_F(utc_blink_ewk_text_style_align_left_get, POS_TEST1) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - // Wait until get_text callback or timeout. - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(state, EWK_TEXT_STYLE_STATE_TRUE); -} - -TEST_F(utc_blink_ewk_text_style_align_left_get, POS_TEST2) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - // Wait until get_text callback or timeout. - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(state, EWK_TEXT_STYLE_STATE_FALSE); -} - -/** - * @brief checking whether function is working when providing NULL value. - */ -TEST_F(utc_blink_ewk_text_style_align_left_get, NEG_TEST) -{ - utc_check_eq(EWK_TEXT_STYLE_STATE_FALSE, ewk_text_style_align_left_get(NULL)); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_align_right_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_text_style_align_right_get_func.cpp deleted file mode 100755 index 6dca5ea..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_align_right_get_func.cpp +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/* Define those macros _before_ you include the utc_blink_ewk.h header file. */ - -#include "utc_blink_ewk_base.h" - - -class utc_blink_ewk_text_style_align_right_get : public utc_blink_ewk_base { -protected: - static void get_text_style(void* data, Evas_Object* webview, void* event_info) - { - utc_blink_ewk_text_style_align_right_get* owner = NULL; - if (!data) { - utc_fail(); - } - - owner = static_cast(data); - - utc_message("[get_text_style callback] :: "); - Ewk_Text_Style* style = (Ewk_Text_Style*)event_info; - owner->state = ewk_text_style_align_right_get(style); - printf("State = %d\n", owner->state); - owner->EventLoopStop(utc_blink_ewk_base::Success); - } - - virtual void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"text,style,state", get_text_style, this); - - Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); - ewk_settings_text_style_state_enabled_set(settings, EINA_TRUE); - } - - virtual void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"text,style,state", get_text_style); - } - -protected: - Ewk_Text_Style_State state; -}; - -/** - * @brief Positive test case of ewk_text_style_bg_color_get(),testing results to get background Color. - */ -TEST_F(utc_blink_ewk_text_style_align_right_get, POS_TEST1) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - // wait until get_text callback or timeout - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(state, EWK_TEXT_STYLE_STATE_TRUE); -} - -TEST_F(utc_blink_ewk_text_style_align_right_get, POS_TEST2) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - // wait until get_text callback or timeout - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(state, EWK_TEXT_STYLE_STATE_FALSE); -} - -/** - * @brief checking whether function is working when providing NULL value. - */ -TEST_F(utc_blink_ewk_text_style_align_right_get, NEG_TEST) -{ - utc_check_eq(EWK_TEXT_STYLE_STATE_FALSE, ewk_text_style_align_right_get(NULL)); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_bg_color_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_text_style_bg_color_get_func.cpp deleted file mode 100755 index ae219bf..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_bg_color_get_func.cpp +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/* Define those macros _before_ you include the utc_blink_ewk.h header file. */ - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_text_style_bg_color_get : public utc_blink_ewk_base { -protected: - static void get_text_style(void* data, Evas_Object* webview, void* event_info) - { - utc_blink_ewk_text_style_bg_color_get* owner = NULL; - if(!data) { - utc_fail(); - } - - owner = static_cast(data); - - utc_message("[get_text_style callback] :: "); - Ewk_Text_Style* style = (Ewk_Text_Style*)event_info; - int r, g, b, a; - ewk_text_style_bg_color_get(style, &r, &g, &b, &a); - utc_blink_ewk_base::MainLoopResult result = utc_blink_ewk_base::Failure; - if (r == 0 && g == 255 && b == 0) - result = utc_blink_ewk_base::Success; - - owner->EventLoopStop(result); - } - - virtual void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "text,style,state", get_text_style, this); - } - - virtual void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(), "text,style,state", get_text_style); - } -}; - -/** - * @brief Positive test case of ewk_text_style_bg_color_get(),testing results to get background Color. - */ -TEST_F(utc_blink_ewk_text_style_bg_color_get, POS_TEST) -{ - Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); - ewk_settings_text_style_state_enabled_set(settings, EINA_TRUE); - - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - // Wait until load finished. - utc_check_eq(EventLoopStart(), utc_blink_ewk_base::Success); -} - -/** - * @brief checking whether function is working when providing NULL value. - */ -TEST_F(utc_blink_ewk_text_style_bg_color_get, NEG_TEST) -{ - int r, g, b, a; - utc_check_eq(ewk_text_style_bg_color_get(NULL, &a, &r, &g, &b), EINA_FALSE); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_bold_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_text_style_bold_get_func.cpp deleted file mode 100755 index ecf2230..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_bold_get_func.cpp +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/* Define those macros _before_ you include the utc_blink_ewk.h header file. */ - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_text_style_bold_get : public utc_blink_ewk_base { -protected: - static void get_text_style(void* data, Evas_Object* webview, void* event_info) - { - utc_message("[get_text_style callback] :: "); - - utc_blink_ewk_text_style_bold_get* owner = NULL; - if (!data) { - utc_fail(); - } - - owner = static_cast(data); - - Ewk_Text_Style* style = (Ewk_Text_Style*)event_info; - owner->state = ewk_text_style_bold_get(style); - owner->EventLoopStop(utc_blink_ewk_base::Success); - } - - virtual void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"text,style,state", get_text_style, this); - - Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); - ewk_settings_text_style_state_enabled_set(settings, EINA_TRUE); - } - - virtual void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"text,style,state", get_text_style); - } - -protected: - Ewk_Text_Style_State state; -}; - -/** - * @brief Positive test case of ewk_text_style_bold_get(),testing results to get font storke. - */ -TEST_F(utc_blink_ewk_text_style_bold_get, POS_TEST) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - // wait until get_text callback or timeout - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(state, EWK_TEXT_STYLE_STATE_TRUE); -} - -/** - * @brief checking whether function is working when providing NULL value. - */ -TEST_F(utc_blink_ewk_text_style_bold_get, NEG_TEST) -{ - utc_check_eq(ewk_text_style_bold_get(NULL), EWK_TEXT_STYLE_STATE_FALSE); -} - - - diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_color_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_text_style_color_get_func.cpp deleted file mode 100755 index 2bc744a..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_color_get_func.cpp +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/* Define those macros _before_ you include the utc_blink_ewk.h header file. */ - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_text_style_color_get : public utc_blink_ewk_base { - protected: - static void get_text_style(void* data, Evas_Object* webview, void* event_info) - { - utc_message("[get_text_style callback] :: "); - - utc_blink_ewk_text_style_color_get* owner = NULL; - if (!data) { - utc_fail(); - } - - owner = static_cast(data); - - Ewk_Text_Style* style = (Ewk_Text_Style*)event_info; - - Eina_Bool get_result = ewk_text_style_color_get(style, &owner->r, &owner->g, &owner->b, &owner->a); - - if (get_result != EINA_TRUE) { - utc_fail(); - } - - owner->EventLoopStop(utc_blink_ewk_base::Success); - } - - virtual void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"text,style,state", get_text_style, this); - - Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); - ewk_settings_text_style_state_enabled_set(settings, EINA_TRUE); - } - - virtual void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"text,style,state", get_text_style); - } - -protected: - int a, r, g, b; -}; - - -/** - * @brief Positive test case of ewk_text_style_color_get(),testing results to get Color. - */ -TEST_F(utc_blink_ewk_text_style_color_get, POS_TEST) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - - EventLoopStart(10.0); - - utc_check_eq(r, 255); - utc_check_eq(g, 0); - utc_check_eq(b, 0); -} - -/** - * @brief checking whether function is working when providing NULL value. - */ -TEST_F(utc_blink_ewk_text_style_color_get, NEG_TEST) -{ - utc_check_eq(ewk_text_style_color_get(NULL, &a, &r, &g, &b), EINA_FALSE); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_font_size_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_text_style_font_size_get_func.cpp deleted file mode 100755 index 5974b43..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_font_size_get_func.cpp +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/* Define those macros _before_ you include the utc_blink_ewk.h header file. */ - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_text_style_font_size_get : public utc_blink_ewk_base { - protected: - static void get_text_style(void* data, Evas_Object* webview, void* event_info) - { - utc_message("[get_text_style callback] :: "); - utc_blink_ewk_text_style_font_size_get* owner = NULL; - if (!data) { - utc_fail(); - } - - owner = static_cast(data); - - Ewk_Text_Style* style = (Ewk_Text_Style*)event_info; - - owner->font_size = ewk_text_style_font_size_get(style); - owner->EventLoopStop(utc_blink_ewk_base::Success); - } - - virtual void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"text,style,state", get_text_style, this); - - Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); - ewk_settings_text_style_state_enabled_set(settings, EINA_TRUE); - } - - virtual void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(), "text,style,state", get_text_style); - } - -protected: - std::string font_size; -}; - -/** -* @brief Positive test case of ewk_text_style_font_size_get(). To get the Font size. -*/ -TEST_F(utc_blink_ewk_text_style_font_size_get, POS_TEST) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - // Wait until load finished. - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(std::string("5"), font_size); -} - -/** -* @brief Checking whether function works properly in case of NULL of command. -*/ -TEST_F(utc_blink_ewk_text_style_font_size_get, NEG_TEST) -{ - utc_check_eq(0, ewk_text_style_font_size_get(NULL)); -} - - - diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_has_composition_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_text_style_has_composition_get_func.cpp deleted file mode 100755 index 3b4043a..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_has_composition_get_func.cpp +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/* Define those macros _before_ you include the utc_blink_ewk.h header file. */ - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_text_style_has_composition_get : public utc_blink_ewk_base { -protected: - static void get_text_style(void* data, Evas_Object* webview, void* event_info) - { - utc_message("[get_text_style callback] :: \n"); - utc_blink_ewk_text_style_has_composition_get* owner = NULL; - - if (!data) { - utc_fail(); - } - - owner = static_cast(data); - Ewk_Text_Style* style = (Ewk_Text_Style*)event_info; - - owner->state = ewk_text_style_has_composition_get(style); - owner->EventLoopStop(utc_blink_ewk_base::Success); - } - - virtual void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"text,style,state", get_text_style, this); - - Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); - ewk_settings_text_style_state_enabled_set(settings, EINA_TRUE); - } - - virtual void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"text,style,state", get_text_style); - } - -protected: - Eina_Bool state; -}; - -/** - * @brief Positive test case of ewk_text_style_has_composition_get(),testing results to get composition state. - */ -TEST_F(utc_blink_ewk_text_style_has_composition_get, POS_TEST) -{ - Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); - ewk_settings_text_style_state_enabled_set(settings, EINA_TRUE); - - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - // Wait until load finished. - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(state, EWK_TEXT_STYLE_STATE_FALSE); -} - -/** - * @brief checking whether function is working when providing NULL value. - */ -TEST_F(utc_blink_ewk_text_style_has_composition_get, NEG_TEST) -{ - utc_check_eq(ewk_text_style_has_composition_get(NULL), EINA_FALSE); -} \ No newline at end of file diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_italic_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_text_style_italic_get_func.cpp deleted file mode 100755 index 14f77e9..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_italic_get_func.cpp +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/* Define those macros _before_ you include the utc_blink_ewk.h header file. */ - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_text_style_italic_get : public utc_blink_ewk_base { -protected: - static void get_text_style(void* data, Evas_Object* webview, void* event_info) - { - utc_message("[get_text_style callback] :: "); - - utc_blink_ewk_text_style_italic_get* owner = NULL; - if (!data) { - utc_fail(); - } - - owner = static_cast(data); - - Ewk_Text_Style* style = (Ewk_Text_Style*)event_info; - owner->state = ewk_text_style_italic_get(style); - owner->EventLoopStop(utc_blink_ewk_base::Success); - } - - virtual void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"text,style,state", get_text_style, this); - - Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); - ewk_settings_text_style_state_enabled_set(settings, EINA_TRUE); - } - - virtual void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"text,style,state", get_text_style); - } - -protected: - Ewk_Text_Style_State state; -}; - -/** - * @brief Positive test case of ewk_text_style_italic_get(),testing results to get font Style. - */ -TEST_F(utc_blink_ewk_text_style_italic_get, POS_TEST) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(state, EWK_TEXT_STYLE_STATE_TRUE); -} - -/** - * @brief checking whether function is working when providing NULL value. - */ -TEST_F(utc_blink_ewk_text_style_italic_get, NEG_TEST) -{ - utc_check_eq(ewk_text_style_italic_get(NULL), EWK_TEXT_STYLE_STATE_FALSE); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_ordered_list_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_text_style_ordered_list_get_func.cpp deleted file mode 100755 index b71506e..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_ordered_list_get_func.cpp +++ /dev/null @@ -1,130 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/* Define those macros _before_ you include the utc_blink_ewk.h header file. */ - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_text_style_ordered_list_get : public utc_blink_ewk_base { -protected: - static void get_text_style(void* data, Evas_Object* webview, void* event_info) - { - utc_message("[get_text_style callback] :: "); - utc_blink_ewk_text_style_ordered_list_get* owner = NULL; - if (!data) { - utc_fail(); - } - - owner = static_cast(data); - - Ewk_Text_Style* style = (Ewk_Text_Style*)event_info; - owner->state = ewk_text_style_ordered_list_get(style); - owner->EventLoopStop(utc_blink_ewk_base::Success); - } - - virtual void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"text,style,state", get_text_style, this); - - Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); - ewk_settings_text_style_state_enabled_set(settings, EINA_TRUE); - } - - virtual void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"text,style,state", get_text_style); - } - -protected: - Ewk_Text_Style_State state; -}; - -/** - * @brief Positive test case of ewk_text_style_bg_color_get(),testing results to get background Color. - */ -TEST_F(utc_blink_ewk_text_style_ordered_list_get, POS_TEST1) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - "" - "
" - "
    " - "
  1. Coffee
    2. " - "
  2. Tea
    3. " - "
  3. Coca Cola
    4. " - "
" - "
" - "" - ""; - - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(state, EWK_TEXT_STYLE_STATE_TRUE); -} - -TEST_F(utc_blink_ewk_text_style_ordered_list_get, POS_TEST2) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - - - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(state, EWK_TEXT_STYLE_STATE_FALSE); -} - -/** - * @brief checking whether function is working when providing NULL value. - */ -TEST_F(utc_blink_ewk_text_style_ordered_list_get, NEG_TEST) -{ - utc_check_eq(EWK_TEXT_STYLE_STATE_FALSE, ewk_text_style_ordered_list_get(NULL)); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_position_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_text_style_position_get_func.cpp deleted file mode 100755 index c4746df..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_position_get_func.cpp +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/* Define those macros _before_ you include the utc_blink_ewk.h header file. */ - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_text_style_position_get : public utc_blink_ewk_base { - protected: - static void get_text_style(void* data, Evas_Object* webview, void* event_info) - { - utc_message("[get_text_style callback] :: "); - - utc_blink_ewk_text_style_position_get* owner = NULL; - - if (!data) { - utc_fail(); - } - - owner = static_cast(data); - - if (!event_info) { - utc_fail(); - } - - Ewk_Text_Style* gStyle = (Ewk_Text_Style*)event_info; - - ewk_text_style_position_get(gStyle, &owner->leftpoint, &owner->rightpoint); - owner->EventLoopStop(utc_blink_ewk_base::Success); - } - - virtual void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"text,style,state", get_text_style, this); - - Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); - ewk_settings_text_style_state_enabled_set(settings, EINA_TRUE); - } - - virtual void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"text,style,state", get_text_style); - } - -protected: - Evas_Point leftpoint, rightpoint; -}; - - -/** - * @brief Positive test case of ewk_text_style_position_get(),testing results to get position. - */ -TEST_F(utc_blink_ewk_text_style_position_get, POS_TEST) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_ne(leftpoint.x, rightpoint.x); - utc_check_ne(leftpoint.y, rightpoint.y); -} - -/** - * @brief checking whether function is working when providing NULL value. - */ -TEST_F(utc_blink_ewk_text_style_position_get, NEG_TEST) -{ - utc_check_eq( ewk_text_style_position_get(NULL, &leftpoint, &rightpoint), EINA_FALSE); -} - diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_underline_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_text_style_underline_get_func.cpp deleted file mode 100755 index abff428..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_underline_get_func.cpp +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/* Define those macros _before_ you include the utc_blink_ewk.h header file. */ - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_text_style_underline_get : public utc_blink_ewk_base { -protected: - static void get_text_style(void* data, Evas_Object* webview, void* event_info) - { - utc_message("[get_text_style callback] :: "); - - utc_blink_ewk_text_style_underline_get* owner = NULL; - if (!data) { - utc_fail(); - } - - owner = static_cast(data); - - Ewk_Text_Style* style = (Ewk_Text_Style*)event_info; - owner->state = ewk_text_style_underline_get(style); - owner->EventLoopStop(utc_blink_ewk_base::Success); - } - - virtual void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"text,style,state", get_text_style, this); - - Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); - ewk_settings_text_style_state_enabled_set(settings, EINA_TRUE); - } - - virtual void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"text,style,state", get_text_style); - } - -protected: - Ewk_Text_Style_State state; -}; - -/** - * @brief Positive test case of ewk_text_style_underline_get(),testing results to get Underline property. - */ -TEST_F(utc_blink_ewk_text_style_underline_get, POS_TEST) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(state, EWK_TEXT_STYLE_STATE_TRUE); -} - -/** - * @brief checking whether function is working when providing NULL value. - */ -TEST_F(utc_blink_ewk_text_style_underline_get, NEG_TEST) -{ - utc_check_eq(ewk_text_style_underline_get(NULL), EWK_TEXT_STYLE_STATE_FALSE); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_unordered_list_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_text_style_unordered_list_get_func.cpp deleted file mode 100755 index f5f932e..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_text_style_unordered_list_get_func.cpp +++ /dev/null @@ -1,129 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -/* Define those macros _before_ you include the utc_blink_ewk.h header file. */ - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_text_style_unordered_list_get : public utc_blink_ewk_base { -protected: - static void get_text_style(void* data, Evas_Object* webview, void* event_info) - { - utc_message("[get_text_style callback] :: "); - - utc_blink_ewk_text_style_unordered_list_get* owner = NULL; - if (!data) { - utc_fail(); - } - - owner = static_cast(data); - - Ewk_Text_Style* style = (Ewk_Text_Style*)event_info; - owner->state = ewk_text_style_unordered_list_get(style); - owner->EventLoopStop(utc_blink_ewk_base::Success); - } - - virtual void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(),"text,style,state", get_text_style, this); - - Ewk_Settings* settings = ewk_view_settings_get(GetEwkWebView()); - ewk_settings_text_style_state_enabled_set(settings, EINA_TRUE); - } - - virtual void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(),"text,style,state", get_text_style); - } - -protected: - Ewk_Text_Style_State state; -}; - -/** - * @brief Positive test case of ewk_text_style_bg_color_get(),testing results to get background Color. - */ -TEST_F(utc_blink_ewk_text_style_unordered_list_get, POS_TEST1) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - "" - "
" - "
    " - "
  • Coffee
    • " - "
  • Tea
    • " - "
  • Coca Cola
    • " - "
" - "
" - "" -""; - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(state, EWK_TEXT_STYLE_STATE_TRUE); -} - -TEST_F(utc_blink_ewk_text_style_unordered_list_get, POS_TEST2) -{ - const char textStyleHTML[] = - "" - "" - "" - "" - "" - ""; - ewk_view_html_string_load(GetEwkWebView(), textStyleHTML, 0, 0); - - utc_blink_ewk_base::MainLoopResult result = EventLoopStart(10.0); - - if (result != utc_blink_ewk_base::Success) { - utc_fail(); - } - - utc_check_eq(state, EWK_TEXT_STYLE_STATE_FALSE); -} - -/** - * @brief checking whether function is working when providing NULL value. - */ -TEST_F(utc_blink_ewk_text_style_unordered_list_get, NEG_TEST) -{ - utc_check_eq(EWK_TEXT_STYLE_STATE_FALSE, ewk_text_style_unordered_list_get(NULL)); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_add_in_incognito_mode_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_add_in_incognito_mode_func.cpp index 4050cf1..d91c85e 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_add_in_incognito_mode_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_add_in_incognito_mode_func.cpp @@ -12,13 +12,11 @@ protected: { } - ~utc_blink_ewk_view_add_in_incognito_mode() - { + ~utc_blink_ewk_view_add_in_incognito_mode() override { SetAppCacheOrigins(NULL); } - void PostSetUp() - { + void PostSetUp() override { // TODO: appcache is initialized asynchronously, loading pages helps with TC pass rate ASSERT_TRUE(ewk_view_url_set(GetEwkWebView(), "about:blank")); ASSERT_EQ(utc_blink_ewk_base::Success, EventLoopStart()); @@ -32,8 +30,7 @@ protected: ASSERT_EQ(0, eina_list_count(appcache_origins)); } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { utc_message("LoadFinished"); EventLoopStop(Success); } @@ -148,9 +145,10 @@ protected: Eina_List* appcache_origins; }; -#define SAMPLE_ORIGIN_HOST "htmlfive.appspot.com" +#define SAMPLE_ORIGIN_HOST "appcache.offline.technology" #define SAMPLE_ORIGIN_PROTOCOL "http" -const char* const utc_blink_ewk_view_add_in_incognito_mode::appCacheURL = SAMPLE_ORIGIN_PROTOCOL "://" SAMPLE_ORIGIN_HOST "/static/stickies.html"; +const char* const utc_blink_ewk_view_add_in_incognito_mode::appCacheURL = + SAMPLE_ORIGIN_PROTOCOL "://" SAMPLE_ORIGIN_HOST "/demo/"; /** * @brief Load page and check if the appcache_origins is there diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_add_with_session_data_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_add_with_session_data_func.cpp old mode 100755 new mode 100644 index dc86d06..5e904f8 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_add_with_session_data_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_add_with_session_data_func.cpp @@ -14,8 +14,7 @@ protected: const char *sessionData; Evas_Object *otherWebview; - void PreSetUp() - { + void PreSetUp() override { firstPage = GetResourceUrl("common/sample.html"); testUrl = GetResourceUrl("common/sample_1.html"); lastPage = GetResourceUrl("common/sample_2.html"); @@ -24,13 +23,9 @@ protected: sessionData = NULL; } - void LoadFinished(Evas_Object*) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } - void PostTearDown() - { + void PostTearDown() override { if (otherWebview) evas_object_del(otherWebview); if (sessionData) diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_back_forward_list_clear_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_back_forward_list_clear_func.cpp index 92766154..be24874 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_back_forward_list_clear_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_back_forward_list_clear_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_view_back_forward_list_clear : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_back_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_back_func.cpp old mode 100755 new mode 100644 index 37ff3bf..3f189c8 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_back_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_back_func.cpp @@ -8,10 +8,7 @@ class utc_blink_ewk_view_back : public utc_blink_ewk_base { protected: /* Callback for load finished */ - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } }; /** diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_back_possible_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_back_possible_func.cpp old mode 100755 new mode 100644 index ca4a173..e8e49d0 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_back_possible_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_back_possible_func.cpp @@ -8,10 +8,7 @@ class utc_blink_ewk_view_back_possible : public utc_blink_ewk_base { protected: /* Callback for load finished */ - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } }; /** diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_bg_color_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_bg_color_get_func.cpp new file mode 100644 index 0000000..4a72f94 --- /dev/null +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_bg_color_get_func.cpp @@ -0,0 +1,81 @@ +// Copyright 2016 Samsung Electronics. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "utc_blink_ewk_base.h" + +class utc_blink_ewk_view_bg_color_get : public utc_blink_ewk_base { + public: + utc_blink_ewk_view_bg_color_get() + : utc_blink_ewk_base(), + bgcolor_r_value_(23), + bgcolor_g_value_(30), + bgcolor_b_value_(55), + bgcolor_a_value_(2) {} + + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } + + static void BackgroundColorGetCallback(Evas_Object* o, + int r, + int g, + int b, + int a, + void* user_data) { + ASSERT_TRUE(user_data != NULL); + + utc_blink_ewk_view_bg_color_get* const owner = + static_cast(user_data); + + owner->EventLoopStop( + owner->bgcolor_r_value_ == r && owner->bgcolor_g_value_ == g && + owner->bgcolor_b_value_ == b && owner->bgcolor_a_value_ == a + ? Success + : Failure); + } + + static Eina_Bool GetBackgroundColorOnTimer(void* user_data) { + if (user_data) { + utc_blink_ewk_view_bg_color_get* const owner = + static_cast(user_data); + + if (!ewk_view_bg_color_get(owner->GetEwkWebView(), + BackgroundColorGetCallback, owner)) { + owner->EventLoopStop(Failure); + } + } + return ECORE_CALLBACK_CANCEL; + } + + protected: + unsigned int bgcolor_r_value_; + unsigned int bgcolor_g_value_; + unsigned int bgcolor_b_value_; + unsigned int bgcolor_a_value_; +}; + +/** +* @brief Tests if setting and getting the background color is fetched +* from webkit properly. +*/ +TEST_F(utc_blink_ewk_view_bg_color_get, POS_TEST) { + ASSERT_TRUE(ewk_view_url_set(GetEwkWebView(), + GetResourceUrl("/common/sample.html").c_str())); + + ASSERT_EQ(EventLoopStart(), Success); + + ewk_view_bg_color_set(GetEwkWebView(), bgcolor_r_value_, bgcolor_g_value_, + bgcolor_b_value_, bgcolor_a_value_); + + ASSERT_TRUE(ecore_timer_add(1, GetBackgroundColorOnTimer, this) != NULL); + + ASSERT_EQ(EventLoopStart(), Success); +} + +/** +* @brief Tests if getter returns false when callback function is NULL +* or view is NULL +*/ +TEST_F(utc_blink_ewk_view_bg_color_get, NEG_TEST) { + EXPECT_FALSE(ewk_view_bg_color_get(NULL, BackgroundColorGetCallback, this)); + EXPECT_FALSE(ewk_view_bg_color_get(GetEwkWebView(), NULL, this)); +} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_command_execute_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_command_execute_func.cpp old mode 100755 new mode 100644 index 471e794..c6b47d8 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_command_execute_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_command_execute_func.cpp @@ -8,10 +8,7 @@ class utc_blink_ewk_view_command_execute : public utc_blink_ewk_base { protected: /* Callback for load finished */ - void LoadFinished(Evas_Object* webview) - { - EventLoopStop( Success ); - } + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } }; /** diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_content_security_policy_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_content_security_policy_set_func.cpp old mode 100755 new mode 100644 index d24ce50..2d1ea87 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_content_security_policy_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_content_security_policy_set_func.cpp @@ -12,9 +12,8 @@ class utc_blink_ewk_view_content_security_policy_set : public utc_blink_ewk_base protected: std::string title; - void LoadFinished(Evas_Object* webview) { - - ecore_timer_add(2, getTitle, this); + void LoadFinished(Evas_Object* webview) override { + ecore_timer_add(2, getTitle, this); } static Eina_Bool getTitle(void *data) diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_contents_pdf_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_contents_pdf_get_func.cpp old mode 100755 new mode 100644 index e7fe159..5385aae --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_contents_pdf_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_contents_pdf_get_func.cpp @@ -8,22 +8,17 @@ class utc_blink_ewk_view_contents_pdf_get : public utc_blink_ewk_base { protected: bool file_exists; - void PreSetUp() - { + void PreSetUp() override { file_exists=false; evas_object_smart_callback_add(GetEwkWebView(), "frame,rendered", FrameRendered, this); } - void PostTearDown() - { + void PostTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "frame,rendered", FrameRendered); } /* Callback for load finished */ - void LoadFinished(Evas_Object* webview) - { - EventLoopStop( Success ); - } + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } static void FrameRendered(void* data, Evas_Object* obj, void* event_info) { diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_contents_size_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_contents_size_get_func.cpp old mode 100755 new mode 100644 index c284010..7824d34 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_contents_size_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_contents_size_get_func.cpp @@ -7,8 +7,7 @@ class utc_blink_ewk_view_contents_size_get : public utc_blink_ewk_base { /* Callback for load finished */ - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { utc_message("[loadFinished] :: \n"); EventLoopStop( Success ); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_forward_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_forward_func.cpp index 228a53a..0c16fb4 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_forward_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_forward_func.cpp @@ -7,10 +7,8 @@ class utc_blink_ewk_view_forward : public utc_blink_ewk_base { protected: - - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(utc_blink_ewk_base::Success); + void LoadFinished(Evas_Object* webview) override { + EventLoopStop(utc_blink_ewk_base::Success); } protected: diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_forward_possible_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_forward_possible_func.cpp old mode 100755 new mode 100644 index 7bcac8a..0f1b50d --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_forward_possible_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_forward_possible_func.cpp @@ -8,10 +8,7 @@ class utc_blink_ewk_view_forward_possible_func : public utc_blink_ewk_base { protected: /* Callback for load finished */ - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } }; /** diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_get_cookies_for_url_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_get_cookies_for_url_func.cpp index c90600b..5fa6ca6 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_get_cookies_for_url_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_get_cookies_for_url_func.cpp @@ -8,9 +8,7 @@ class utc_blink_ewk_view_get_cookies_for_url : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object* webview) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } }; /** diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_history_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_history_get_func.cpp index 64bc495..445e4c0 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_history_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_history_get_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_view_history_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } protected: static const char* const TEST_URL1; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_hit_test_new_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_hit_test_new_func.cpp old mode 100755 new mode 100644 index a2e0656..7e566e2 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_hit_test_new_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_hit_test_new_func.cpp @@ -7,9 +7,8 @@ class utc_blink_ewk_view_hit_test_new: public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(utc_blink_ewk_base::Success); + void LoadFinished(Evas_Object* webview) override { + EventLoopStop(utc_blink_ewk_base::Success); } protected: diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_hit_test_request_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_hit_test_request_func.cpp old mode 100755 new mode 100644 index 7f09cbc..c98c465 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_hit_test_request_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_hit_test_request_func.cpp @@ -14,9 +14,8 @@ protected: { } - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(utc_blink_ewk_base::Success); + void LoadFinished(Evas_Object* webview) override { + EventLoopStop(utc_blink_ewk_base::Success); } static void hit_test_result(Evas_Object* o, int x, int y, int mode, Ewk_Hit_Test* hit_test, void* user_data) @@ -33,8 +32,7 @@ protected: owner->EventLoopStop(Success); } - void PostSetUp() - { + void PostSetUp() override { ASSERT_EQ(EINA_TRUE, ewk_view_url_set(GetEwkWebView(), url)); ASSERT_EQ(Success, EventLoopStart()); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_html_string_load_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_html_string_load_func.cpp index e0f966d..d3749ef 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_html_string_load_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_html_string_load_func.cpp @@ -6,10 +6,7 @@ class utc_blink_ewk_view_html_string_load : public utc_blink_ewk_base { - void LoadFinished(Evas_Object*) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } }; /** diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_inspector_server_stop_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_inspector_server_stop_func.cpp index 3405977..08d3588 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_inspector_server_stop_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_inspector_server_stop_func.cpp @@ -6,10 +6,7 @@ class utc_blink_ewk_view_inspector_server_stop : public utc_blink_ewk_base { - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } }; /* @brief Positive test case of ewk_view_inspector_server_stop */ diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_javascript_confirm_reply_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_javascript_confirm_reply_func.cpp old mode 100755 new mode 100644 index 34821df..fbf76f3 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_javascript_confirm_reply_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_javascript_confirm_reply_func.cpp @@ -7,9 +7,7 @@ class utc_blink_ewk_view_javascript_confirm_reply : public utc_blink_ewk_base { protected: - - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Success); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_load_progress_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_load_progress_get_func.cpp index 542539d..5dce733 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_load_progress_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_load_progress_get_func.cpp @@ -8,10 +8,8 @@ class utc_blink_ewk_view_load_progress_get : public utc_blink_ewk_base { protected: - - void LoadProgress(Evas_Object* webview, double progress) - { - EventLoopStop(utc_blink_ewk_base::Success); + void LoadProgress(Evas_Object* webview, double progress) override { + EventLoopStop(utc_blink_ewk_base::Success); } protected: @@ -74,4 +72,4 @@ TEST_F(utc_blink_ewk_view_load_progress_get, NEG_TEST) evas_object_show(GetEwkWebView()); evas_object_show(GetEwkWebView()); EXPECT_EQ(result, EINA_TRUE); -} \ No newline at end of file +} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_mhtml_data_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_mhtml_data_get_func.cpp old mode 100755 new mode 100644 index 4c65422..d6adf59 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_mhtml_data_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_mhtml_data_get_func.cpp @@ -9,20 +9,19 @@ class utc_blink_ewk_view_mhtml_data_get : public utc_blink_ewk_base protected: /* Callback for load finished */ - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(Success); - } - - static void mhtmlDataGetCallback(Evas_Object *o, const char *data, void *user_data) - { - ASSERT_TRUE(user_data != NULL); - ASSERT_TRUE(data != NULL); - utc_blink_ewk_view_mhtml_data_get*const owner = static_cast(user_data); - bool const notEmpty = strlen(data); - owner->EventLoopStop(notEmpty ? Success : Failure); - if (notEmpty) - utc_message("MHTML:\t\"%s\"", data); + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } + + static void mhtmlDataGetCallback(Evas_Object* o, + const char* data, + void* user_data) { + ASSERT_TRUE(user_data != NULL); + ASSERT_TRUE(data != NULL); + utc_blink_ewk_view_mhtml_data_get* const owner = + static_cast(user_data); + bool const notEmpty = strlen(data); + owner->EventLoopStop(notEmpty ? Success : Failure); + if (notEmpty) + utc_message("MHTML:\t\"%s\"", data); } }; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_notification_permission_callback_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_notification_permission_callback_set_func.cpp index 0fd271e..6890287 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_notification_permission_callback_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_notification_permission_callback_set_func.cpp @@ -7,8 +7,9 @@ class utc_blink_ewk_view_notification_permission_callback_set : public utc_blink_ewk_notification_test_base { protected: - virtual Eina_Bool NotificationPermissionRequest(Evas_Object* webview, Ewk_Notification_Permission_Request* request) override - { + Eina_Bool NotificationPermissionRequest( + Evas_Object* webview, + Ewk_Notification_Permission_Request* request) override { EventLoopStop(Success); return EINA_TRUE; } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_orientation_lock_callback_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_orientation_lock_callback_set_func.cpp deleted file mode 100755 index 0e8910e..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_orientation_lock_callback_set_func.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_view_orientation_lock_callback_set : public utc_blink_ewk_base -{ -protected: - //This function will be invoked when orientation has to be locked or unlocked - //The API for orientation lock and unlock has not been implemented yet. - static Eina_Bool lockCallback(Evas_Object* o, Eina_Bool need_lock, int orientation, void* user_data) - { - } -}; - -/** -* @brief Tests if EINA_SAFETY check fails if view object is NULL -*/ -TEST_F(utc_blink_ewk_view_orientation_lock_callback_set, NEG_TEST1) -{ - ewk_view_orientation_lock_callback_set(NULL, lockCallback, this); -} - -/** -* @brief Tests if EINA_SAFETY check fails if callback is NULL -*/ -TEST_F(utc_blink_ewk_view_orientation_lock_callback_set, NEG_TEST2) -{ - ewk_view_orientation_lock_callback_set(GetEwkWebView(), NULL, this); -} - -/** -* @brief Tests if ewk_view_orientation_lock_callback_set is called without any error -*/ -TEST_F(utc_blink_ewk_view_orientation_lock_callback_set, POS_TEST) -{ - ewk_view_orientation_lock_callback_set(GetEwkWebView(), lockCallback, this); -} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_orientation_send_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_orientation_send_func.cpp old mode 100755 new mode 100644 index d50863f..a309a50 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_orientation_send_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_orientation_send_func.cpp @@ -15,15 +15,13 @@ protected: { } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { g_orientation = atol(ewk_view_title_get(GetEwkWebView())); EventLoopStop(utc_blink_ewk_base::Success); } - - void ConsoleMessage(Evas_Object* webview, const Ewk_Console_Message* msg) - { + void ConsoleMessage(Evas_Object* webview, + const Ewk_Console_Message* msg) override { utc_blink_ewk_base::ConsoleMessage(webview, msg); const char* message_text = ewk_console_message_text_get(msg); diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_plain_text_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_plain_text_get_func.cpp old mode 100755 new mode 100644 index 6d5afe3..dcd87fb --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_plain_text_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_plain_text_get_func.cpp @@ -8,10 +8,7 @@ class utc_blink_ewk_view_plain_text_get : public utc_blink_ewk_base { protected: /* Callback for load finished */ - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } /* Ewk_View_Plain_Text_Get_Callback to get the text */ static void getPlainTextFinished(Evas_Object* webview, const char* plain_text, void* data) diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_quota_permission_request_cancel_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_quota_permission_request_cancel_func.cpp index 1fed873..e6444b1 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_quota_permission_request_cancel_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_quota_permission_request_cancel_func.cpp @@ -10,17 +10,14 @@ class utc_blink_ewk_view_quota_permission_request_cancel : public utc_blink_ewk_base { protected: - - void PostSetUp() - { - isTitleNull = true; - title = ""; - evas_object_smart_callback_add(GetEwkWebView(), "title,changed", - ToSmartCallback(title_changed), this); + void PostSetUp() override { + isTitleNull = true; + title = ""; + evas_object_smart_callback_add(GetEwkWebView(), "title,changed", + ToSmartCallback(title_changed), this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "title,changed", ToSmartCallback(title_changed)); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_quota_permission_request_reply_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_quota_permission_request_reply_func.cpp index d04b92e..3766a76 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_quota_permission_request_reply_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_quota_permission_request_reply_func.cpp @@ -10,20 +10,16 @@ class utc_blink_ewk_view_quota_permission_request_reply : public utc_blink_ewk_base { protected: - - void PreSetUp() - { - isTitleNull = true; - title = ""; + void PreSetUp() override { + isTitleNull = true; + title = ""; } - void PostSetUp() - { + void PostSetUp() override { evas_object_smart_callback_add(GetEwkWebView(), "title,changed", ToSmartCallback(title_changed), this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "title,changed", ToSmartCallback(title_changed)); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_reload_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_reload_func.cpp old mode 100755 new mode 100644 index 0691960..f1a9add --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_reload_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_reload_func.cpp @@ -7,10 +7,7 @@ class utc_blink_ewk_view_reload : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } protected: static const char*const sample; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_resume_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_resume_func.cpp old mode 100755 new mode 100644 index 6e1d36d..9ac82a9 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_resume_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_resume_func.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. +// Copyright 2014-2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,23 +14,19 @@ protected: }; protected: - utc_blink_ewk_view_resume() - : phase(PageLoadStart) - { + utc_blink_ewk_view_resume() + : phase(PageLoadStart), result_url_set(EINA_FALSE) {} + + /* Callback for quitting main loop */ + void LoadProgress(Evas_Object* webview, double pr) override { + // Page started to load, after that we want to suspend right after + if (phase == PageLoadStart) { + phase = PageSuspended; + EventLoopStop(Success); + } } - /* Callback for quitting main loop */ - void LoadProgress(Evas_Object* webview, double pr) - { - // Page started to load, after that we want to suspend right after - if (phase == PageLoadStart) { - phase = PageSuspended; - EventLoopStop(Success); - } - } - - bool TimeOut() - { + bool TimeOut() override { if (phase == PageSuspended) { phase = PageResumed; EventLoopStop(Success); @@ -40,8 +36,7 @@ protected: return false; } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { if (phase == PageResumed) { EventLoopStop(Success); } else { @@ -49,8 +44,15 @@ protected: } } -protected: + static void job_url_set(utc_blink_ewk_base* data) { + utc_blink_ewk_view_resume* owner = + static_cast(data); + owner->result_url_set = + ewk_view_url_set(owner->GetEwkWebView(), "http://www.google.pl"); + } + RunPhase phase; + Eina_Bool result_url_set; }; /** @@ -58,12 +60,13 @@ protected: */ TEST_F(utc_blink_ewk_view_resume, POS_TEST) { - if (!ewk_view_url_set(GetEwkWebView(), "http://www.google.pl")) - FAIL(); + SetTestJob(utc_blink_ewk_view_resume::job_url_set); if (Success != EventLoopStart()) FAIL(); + ASSERT_EQ(EINA_TRUE, result_url_set); + utc_message("Suspend"); ewk_view_suspend(GetEwkWebView()); diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_scale_changed_callback_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_scale_changed_callback_set_func.cpp new file mode 100644 index 0000000..05b3c5b --- /dev/null +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_scale_changed_callback_set_func.cpp @@ -0,0 +1,127 @@ +// Copyright 2016 Samsung Electronics. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "utc_blink_ewk_base.h" + +#include + +class utc_blink_ewk_view_scale_changed_callback_set : public utc_blink_ewk_base +{ + protected: + + void LoadFinished(Evas_Object* webview) override + { + EventLoopStop(Success); + } + + static Eina_Bool mainLoopQuit(void* data) + { + if (data) + static_cast(data)->EventLoopStop(Success); + return ECORE_CALLBACK_DONE; + } + + static void scaleChanged(Evas_Object* webview, double scale, void* user_data) + { + ASSERT_LT(std::abs(expected_scale - scale), precision); + wasCallbackCalled = true; + } + + static const char*const sample; + static double precision; + static bool wasCallbackCalled; + static double expected_scale; +}; + +const char*const utc_blink_ewk_view_scale_changed_callback_set::sample = + "/common/sample.html"; +bool utc_blink_ewk_view_scale_changed_callback_set::wasCallbackCalled = + 1.0; +double utc_blink_ewk_view_scale_changed_callback_set::expected_scale = + false; +double utc_blink_ewk_view_scale_changed_callback_set::precision = + std::numeric_limits::epsilon(); + +TEST_F(utc_blink_ewk_view_scale_changed_callback_set, POS_TEST) +{ + ASSERT_TRUE(ewk_view_url_set(GetEwkWebView(), + GetResourceUrl(sample).c_str())); + ASSERT_EQ(Success, EventLoopStart()); + + double min_scale = 0, max_scale = 0; + ewk_view_scale_range_get(GetEwkWebView(), &min_scale, &max_scale); + double scale_factor = (max_scale + min_scale) / 2; + + // Set the scale within the allowed range and expect this value while + // calling the callback. + expected_scale = scale_factor; + ewk_view_scale_changed_callback_set(GetEwkWebView(), + utc_blink_ewk_view_scale_changed_callback_set::scaleChanged, + nullptr /* user_data */); + + ASSERT_TRUE(ewk_view_scale_set(GetEwkWebView(), scale_factor, 0, 0)); + ecore_timer_add(0.5f, mainLoopQuit, this); + ASSERT_EQ(Success, EventLoopStart()); + ASSERT_TRUE(wasCallbackCalled); + + // Set the scale grather than the maximum allowed value and expect the + // scale change callback with the value clamped to maxium allowed scale. + wasCallbackCalled = false; + scale_factor = max_scale * 2; + expected_scale = max_scale; + + ASSERT_TRUE(ewk_view_scale_set(GetEwkWebView(), scale_factor, 0, 0)); + ecore_timer_add(0.5f, mainLoopQuit, this); + ASSERT_EQ(Success, EventLoopStart()); + ASSERT_TRUE(wasCallbackCalled); + + // Set the scale lower than the minimum allowed value and expect the + // scale change callback with the value clamped to minimum allowed scale. + wasCallbackCalled = false; + scale_factor = min_scale / 2; + expected_scale = min_scale; + + ASSERT_TRUE(ewk_view_scale_set(GetEwkWebView(), scale_factor, 0, 0)); + ecore_timer_add(0.5f, mainLoopQuit, this); + ASSERT_EQ(Success, EventLoopStart()); + ASSERT_TRUE(wasCallbackCalled); +} + +TEST_F(utc_blink_ewk_view_scale_changed_callback_set, NEG_TEST) +{ + ASSERT_TRUE(ewk_view_url_set(GetEwkWebView(), + GetResourceUrl(sample).c_str())); + ASSERT_EQ(Success, EventLoopStart()); + + double min_scale = 0, max_scale = 0; + ewk_view_scale_range_get(GetEwkWebView(), &min_scale, &max_scale); + + // Set the scale within the allowed range and expect this value to be set + // but does not specify the callback for scale changes. The code must not crash. + double scale_factor = (max_scale + min_scale) / 2; + wasCallbackCalled = false; + ewk_view_scale_changed_callback_set(GetEwkWebView(), + nullptr /* scaleChanged callback */, + nullptr /* user_data */); + + ASSERT_TRUE(ewk_view_scale_set(GetEwkWebView(), scale_factor, 0, 0)); + ecore_timer_add(0.5f, mainLoopQuit, this); + ASSERT_EQ(Success, EventLoopStart()); + ASSERT_FALSE(wasCallbackCalled); + ASSERT_LT(std::abs(scale_factor - ewk_view_scale_get(GetEwkWebView())), + precision); + + // Set the current scale again. The callback responsible for scale change + // should not be called. + wasCallbackCalled = false; + ewk_view_scale_changed_callback_set(GetEwkWebView(), + utc_blink_ewk_view_scale_changed_callback_set::scaleChanged, + nullptr /* user_data */); + + ASSERT_TRUE(ewk_view_scale_set(GetEwkWebView(), + ewk_view_scale_get(GetEwkWebView()), 0, 0)); + ecore_timer_add(0.5f, mainLoopQuit, this); + ASSERT_EQ(Success, EventLoopStart()); + ASSERT_FALSE(wasCallbackCalled); +} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_scale_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_scale_get_func.cpp old mode 100755 new mode 100644 index 5f1a3ef..6f1f4d4 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_scale_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_scale_get_func.cpp @@ -3,6 +3,8 @@ // found in the LICENSE file. #include "utc_blink_ewk_base.h" + +#include #include class utc_blink_ewk_view_scale_get : public utc_blink_ewk_base @@ -11,10 +13,7 @@ class utc_blink_ewk_view_scale_get : public utc_blink_ewk_base utc_blink_ewk_view_scale_get() : precision(std::numeric_limits::epsilon()) { } /* Callback for load finished */ - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } /* Function called when timer expires */ static Eina_Bool mainLoopQuit(void* data) @@ -41,7 +40,7 @@ TEST_F(utc_blink_ewk_view_scale_get, POS_TEST) double minScale = 0, maxScale = 0; ewk_view_scale_range_get(GetEwkWebView(), &minScale, &maxScale); - ASSERT_GT(abs(maxScale - minScale), precision); + ASSERT_GT(std::abs(maxScale - minScale), precision); const double scaleFactor = minScale + (maxScale - minScale)/2; const Evas_Coord centerX = 5; @@ -51,26 +50,26 @@ TEST_F(utc_blink_ewk_view_scale_get, POS_TEST) ecore_timer_add(0.5f, mainLoopQuit, this); ASSERT_EQ(Success, EventLoopStart()); double currentScale = ewk_view_scale_get(GetEwkWebView()); - ASSERT_LT(abs(scaleFactor - currentScale), precision); + ASSERT_LT(std::abs(scaleFactor - currentScale), precision); ASSERT_TRUE(ewk_view_scale_set(GetEwkWebView(), maxScale + 1, centerX, centerY)); ecore_timer_add(0.5f, mainLoopQuit, this); ASSERT_EQ(Success, EventLoopStart()); currentScale = ewk_view_scale_get(GetEwkWebView()); - ASSERT_LT(abs(maxScale - currentScale), precision); + ASSERT_LT(std::abs(maxScale - currentScale), precision); // Now scale is set to max. Set overscale once again to make sure getter return correct value ASSERT_TRUE(ewk_view_scale_set(GetEwkWebView(), maxScale + 1, centerX, centerY)); ecore_timer_add(0.5f, mainLoopQuit, this); ASSERT_EQ(Success, EventLoopStart()); currentScale = ewk_view_scale_get(GetEwkWebView()); - ASSERT_LT(abs(maxScale - currentScale), precision); + ASSERT_LT(std::abs(maxScale - currentScale), precision); ASSERT_TRUE(ewk_view_scale_set(GetEwkWebView(), minScale - 1, centerX, centerY)); ecore_timer_add(0.5f, mainLoopQuit, this); ASSERT_EQ(Success, EventLoopStart()); currentScale = ewk_view_scale_get(GetEwkWebView()); - ASSERT_LT(abs(minScale - currentScale), precision); + ASSERT_LT(std::abs(minScale - currentScale), precision); } /** @@ -79,5 +78,5 @@ TEST_F(utc_blink_ewk_view_scale_get, POS_TEST) TEST_F(utc_blink_ewk_view_scale_get, NEG_TEST) { const double getScaleFactor = ewk_view_scale_get(NULL); - ASSERT_LT(abs(getScaleFactor + 1), precision); + ASSERT_LT(std::abs(getScaleFactor + 1), precision); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_scale_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_scale_set_func.cpp index d071b5d..b7c11a1 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_scale_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_scale_set_func.cpp @@ -8,10 +8,7 @@ class utc_blink_ewk_view_scale_set : public utc_blink_ewk_base { protected: /* Callback for load finished */ - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } /* Function called when timer expires */ static Eina_Bool mainLoopQuit(void* data) diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_screenshot_contents_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_screenshot_contents_get_func.cpp old mode 100755 new mode 100644 index 2dc9c68..59576fc --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_screenshot_contents_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_screenshot_contents_get_func.cpp @@ -8,12 +8,9 @@ class utc_blink_ewk_view_screenshot_contents_get : public utc_blink_ewk_base { protected: /* Callback for load finished */ - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } -protected: + protected: static const char*const url; }; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_script_execute_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_script_execute_func.cpp old mode 100755 new mode 100644 index fb2f3e2..fb06ead --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_script_execute_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_script_execute_func.cpp @@ -9,10 +9,7 @@ class utc_blink_ewk_view_script_execute : public utc_blink_ewk_base protected: /* Callback for load finished */ - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object* webview) override { EventLoopStop(Success); } /* Callback for script execution */ static void scriptExecutionFinished(Evas_Object* webview, const char* result_value, void* data) diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_scroll_pos_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_scroll_pos_get_func.cpp index f56263b..7941ed4 100755 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_scroll_pos_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_scroll_pos_get_func.cpp @@ -7,19 +7,22 @@ class utc_blink_ewk_view_scroll_pos_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object*) + void PostSetUp() override { - evas_object_focus_set(GetEwkWebView(), EINA_TRUE); - EventLoopStop(Success); + evas_object_smart_callback_add(GetEwkWebView(), "contents,size,changed", contentsSizeChanged, this); } - static Eina_Bool quitMainLoop(void* data) + void PreTearDown() override { - if (data) - static_cast(data)->EventLoopStop(Success); - return EINA_FALSE; + evas_object_smart_callback_del(GetEwkWebView(), "contents,size,changed", contentsSizeChanged); } + static void contentsSizeChanged(void* data, Evas_Object* eObject, void* dataFinished) + { + utc_message("[contentsSizeChanged] :: \n"); + if(data) + static_cast(data)->EventLoopStop(Success); + } protected: static const char* resource; }; @@ -31,21 +34,16 @@ const char* utc_blink_ewk_view_scroll_pos_get::resource="/ewk_view/index_big_red */ TEST_F(utc_blink_ewk_view_scroll_pos_get, POS_TEST1) { - if(!ewk_view_url_set(GetEwkWebView(),GetResourceUrl(resource).c_str())) - utc_fail(); - if(Success!=EventLoopStart()) - utc_fail(); + ASSERT_TRUE(ewk_view_url_set(GetEwkWebView(),GetResourceUrl(resource).c_str())); + ASSERT_EQ(Success, EventLoopStart()); + int x = 0, y = 0; const int valScrollSet = 2; - ewk_view_scroll_set(GetEwkWebView(), valScrollSet, valScrollSet); - - ewk_view_scroll_pos_get(GetEwkWebView(), &x, &y); + ASSERT_TRUE(ewk_view_scroll_set(GetEwkWebView(), valScrollSet, valScrollSet)); + ASSERT_TRUE(ewk_view_scroll_pos_get(GetEwkWebView(), &x, &y)); - Eina_Bool result = EINA_FALSE; - if (x == valScrollSet && y == valScrollSet) - result = EINA_TRUE; - ASSERT_TRUE(result); + ASSERT_TRUE(x == valScrollSet && y == valScrollSet); } /** @@ -56,15 +54,10 @@ TEST_F(utc_blink_ewk_view_scroll_pos_get, POS_TEST2) int x = 0, y = 0; const int valScrollSet = -12 ; - ewk_view_scroll_set(GetEwkWebView(), valScrollSet, valScrollSet); - - ewk_view_scroll_pos_get(GetEwkWebView(), &x, &y); - - Eina_Bool result = EINA_FALSE; - if (x == 0 && y == 0) - result = EINA_TRUE; + ASSERT_TRUE(ewk_view_scroll_set(GetEwkWebView(), valScrollSet, valScrollSet)); + ASSERT_TRUE(ewk_view_scroll_pos_get(GetEwkWebView(), &x, &y)); - utc_check_eq(result, EINA_TRUE); + ASSERT_TRUE(x == 0 && y == 0); } /** @@ -107,8 +100,7 @@ TEST_F(utc_blink_ewk_view_scroll_pos_get, POS_TEST4) ASSERT_EQ(scrollSizeX, x); ASSERT_EQ(10, y); - ecore_timer_add(5.0f, quitMainLoop, this); - ASSERT_EQ(Success, EventLoopStart()); + ASSERT_TRUE(EventLoopWait(1)); ASSERT_TRUE(ewk_view_scroll_pos_get(GetEwkWebView(), &x, &y)); ASSERT_NE(scrollSizeX, x); @@ -116,8 +108,7 @@ TEST_F(utc_blink_ewk_view_scroll_pos_get, POS_TEST4) // Now at the end of the page ASSERT_TRUE(ewk_view_scroll_set(GetEwkWebView(), oversizeX, 10)); - ecore_timer_add(5.0f, quitMainLoop, this); - ASSERT_EQ(Success, EventLoopStart()); + ASSERT_TRUE(EventLoopWait(1)); ASSERT_TRUE(ewk_view_scroll_pos_get(GetEwkWebView(), &x, &y)); ASSERT_EQ(scrollSizeX, x); } @@ -137,8 +128,7 @@ TEST_F(utc_blink_ewk_view_scroll_pos_get, POS_TEST5) ASSERT_EQ(0, x); ASSERT_EQ(10, y); - ecore_timer_add(5.0f, quitMainLoop, this); - ASSERT_EQ(Success, EventLoopStart()); + ASSERT_TRUE(EventLoopWait(1)); ASSERT_TRUE(ewk_view_scroll_pos_get(GetEwkWebView(), &x, &y)); ASSERT_EQ(0, x); diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_scroll_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_scroll_set_func.cpp index 686efff..8f90e07 100755 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_scroll_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_scroll_set_func.cpp @@ -7,23 +7,23 @@ class utc_blink_ewk_view_scroll_set : public utc_blink_ewk_base { protected: - static void frameRendered(void* data, Evas_Object* eObject, void* dataFinished) + static void contentsSizeChanged(void* data, Evas_Object* eObject, void* dataFinished) { - utc_message("[frameRendered] :: \n"); + utc_message("[contentsSizeChanged] :: \n"); if(data) static_cast(data)->EventLoopStop(Success); } /* Startup function */ - void PostSetUp() + void PostSetUp() override { - evas_object_smart_callback_add(GetEwkWebView(), "frame,rendered", frameRendered, this); + evas_object_smart_callback_add(GetEwkWebView(), "contents,size,changed", contentsSizeChanged, this); } /* Cleanup function */ - void PreTearDown() + void PreTearDown() override { - evas_object_smart_callback_del(GetEwkWebView(), "frame,rendered", frameRendered); + evas_object_smart_callback_del(GetEwkWebView(), "contents,size,changed", contentsSizeChanged); } protected: diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_scroll_size_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_scroll_size_get_func.cpp index 4a8bf5e..04bf99e 100755 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_scroll_size_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_scroll_size_get_func.cpp @@ -7,19 +7,19 @@ class utc_blink_ewk_view_scroll_size_get : public utc_blink_ewk_base { protected: - void PostSetUp() + void PostSetUp() override { - evas_object_smart_callback_add(GetEwkWebView(), "frame,rendered", frameRendered, this); + evas_object_smart_callback_add(GetEwkWebView(), "contents,size,changed", contentsSizeChanged, this); } - void PreTearDown() + void PreTearDown() override { - evas_object_smart_callback_del(GetEwkWebView(), "frame,rendered", frameRendered); + evas_object_smart_callback_del(GetEwkWebView(), "contents,size,changed", contentsSizeChanged); } - static void frameRendered(void* data, Evas_Object* eObject, void* dataFinished) + static void contentsSizeChanged(void* data, Evas_Object* eObject, void* dataFinished) { - utc_message("[frameRendered] :: \n"); + utc_message("[contentsSizeChanged] :: \n"); if(data) static_cast(data)->EventLoopStop(Success); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_session_data_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_session_data_get_func.cpp old mode 100755 new mode 100644 index 6372368..1566599 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_session_data_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_session_data_get_func.cpp @@ -10,19 +10,14 @@ protected: std::string firstPage; const char *sessionData; - void PreSetUp() - { + void PreSetUp() override { firstPage = GetResourceUrl("common/sample.html"); sessionData = NULL; } - void LoadFinished(Evas_Object*) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } - void PostTearDown() - { + void PostTearDown() override { if (sessionData) free(const_cast(sessionData)); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_suspend_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_suspend_func.cpp old mode 100755 new mode 100644 index 1d1dce8..512bd3f --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_suspend_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_suspend_func.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. +// Copyright 2014-2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,35 +7,38 @@ class utc_blink_ewk_view_suspend : public utc_blink_ewk_base { protected: - utc_blink_ewk_view_suspend(): after_progress(false) - { - } + utc_blink_ewk_view_suspend() + : after_progress(false), result_url_set(EINA_FALSE) {} - void LoadProgress(Evas_Object* webview, double progress) - { - if (!after_progress) { - // Page started to load, after that we want to suspend it - after_progress = true; - EventLoopStop(utc_blink_ewk_base::Success); - } + void LoadProgress(Evas_Object* webview, double progress) override { + if (!after_progress) { + // Page started to load, after that we want to suspend it + after_progress = true; + EventLoopStop(utc_blink_ewk_base::Success); + } } - bool TimeOut() - { + bool TimeOut() override { // If we reached timeout then load,finished (and load,error) was not called // we expect that - this indicates that suspend did work EventLoopStop(utc_blink_ewk_base::Success); return true; } - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { // Load finished should never be called after suspend EventLoopStop(utc_blink_ewk_base::Failure); } -protected: + static void job_url_set(utc_blink_ewk_base* data) { + utc_blink_ewk_view_suspend* owner = + static_cast(data); + owner->result_url_set = + ewk_view_url_set(owner->GetEwkWebView(), "http://www.google.pl"); + } + bool after_progress; + Eina_Bool result_url_set; }; /** @@ -43,13 +46,14 @@ protected: */ TEST_F(utc_blink_ewk_view_suspend, POS_TEST) { - if(!ewk_view_url_set(GetEwkWebView(), "http://www.google.pl")) - FAIL(); + SetTestJob(utc_blink_ewk_view_suspend::job_url_set); utc_blink_ewk_base::MainLoopResult main_result = EventLoopStart(); if (main_result != utc_blink_ewk_base::Success) FAIL(); + ASSERT_EQ(EINA_TRUE, result_url_set); + ewk_view_suspend(GetEwkWebView()); main_result = EventLoopStart(5.0); diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_text_find_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_text_find_func.cpp old mode 100755 new mode 100644 index 48f2619..030662d --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_text_find_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_text_find_func.cpp @@ -25,18 +25,15 @@ protected: } /* Callback for load finished */ - void LoadFinished(Evas_Object* webview) - { + void LoadFinished(Evas_Object* webview) override { EventLoopStop(utc_blink_ewk_base::Success); // will noop if EventLoopStop was alraedy called } - virtual void PostSetUp() - { + virtual void PostSetUp() override { evas_object_smart_callback_add(GetEwkWebView(), "text,found", findStringCallback, this); } - virtual void PreTearDown() - { + virtual void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "text,found", findStringCallback); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_text_selection_clear_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_text_selection_clear_func.cpp deleted file mode 100755 index 4856d99..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_text_selection_clear_func.cpp +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_view_text_selection_clear : public utc_blink_ewk_base { -protected: - void LoadFinished(Evas_Object* /*webview*/) - { - EventLoopStop(Success); - } - - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "textselection,mode", ToSmartCallback(textselection_mode_cb), this); - } - - void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(), "textselection,mode", ToSmartCallback(textselection_mode_cb)); - } - - static void textselection_mode_cb(utc_blink_ewk_view_text_selection_clear* owner, Evas_Object* webview, bool* data) - { - ASSERT_TRUE(owner); - owner->EventLoopStop(Success); - } -}; - -/** - * @brief Positive test case of ewk_view_text_selection_range_clear(),testing results whether range is cleared or not. - */ -TEST_F(utc_blink_ewk_view_text_selection_clear, POS_TEST) -{ - // In case of no error and no selection, ewk_view_text_selection_text_get should return EMPTY string, not NULL ptr - const char* selected_text = ewk_view_text_selection_text_get(GetEwkWebView()); - ASSERT_TRUE(selected_text); - ASSERT_STREQ("", selected_text); - - char htmlBuffer[] = "" - "" - "" - "Some text" - ""; - - ASSERT_EQ(EINA_TRUE, ewk_view_html_string_load(GetEwkWebView(), htmlBuffer, NULL, NULL)); - ASSERT_EQ(Success, EventLoopStart()); - - selected_text = ewk_view_text_selection_text_get(GetEwkWebView()); - ASSERT_TRUE(selected_text); - ASSERT_STREQ("", selected_text); - - ASSERT_EQ(EINA_TRUE, ewk_view_command_execute(GetEwkWebView(), "SelectAll", NULL)); - ASSERT_EQ(Success, EventLoopStart()); - - selected_text = ewk_view_text_selection_text_get(GetEwkWebView()); - ASSERT_TRUE(selected_text); - ASSERT_STREQ("Some text", selected_text); - - ASSERT_EQ(EINA_TRUE, ewk_view_text_selection_clear(GetEwkWebView())); - ASSERT_EQ(Success, EventLoopStart()); - - selected_text = ewk_view_text_selection_text_get(GetEwkWebView()); - ASSERT_TRUE(selected_text); - ASSERT_STREQ("", selected_text); -} - -/** - * @brief checking whether function is working when providing NULL value. - */ -TEST_F(utc_blink_ewk_view_text_selection_clear, NEG_TEST) -{ - // In case of no error and no selection, ewk_view_text_selection_text_get should return EMPTY string, not NULL ptr - const char* selected_text = ewk_view_text_selection_text_get(GetEwkWebView()); - ASSERT_TRUE(selected_text); - ASSERT_STREQ("", selected_text); - - ASSERT_EQ(EINA_FALSE, ewk_view_text_selection_clear(NULL)); -} - - diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_text_selection_text_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_text_selection_text_get_func.cpp deleted file mode 100755 index 2284775..0000000 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_text_selection_text_get_func.cpp +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "utc_blink_ewk_base.h" - -class utc_blink_ewk_view_text_selection_text_get : public utc_blink_ewk_base { -protected: - void PostSetUp() - { - evas_object_smart_callback_add(GetEwkWebView(), "textselection,mode", ToSmartCallback(textselection_mode_cb), this); - } - - void PreTearDown() - { - evas_object_smart_callback_del(GetEwkWebView(), "textselection,mode", ToSmartCallback(textselection_mode_cb)); - } - - static void textselection_mode_cb(utc_blink_ewk_view_text_selection_text_get* owner, Evas_Object* webview, bool* data) - { - ASSERT_TRUE(owner); - owner->EventLoopStop(Success); - } - - static void load_finished_cb(utc_blink_ewk_view_text_selection_text_get* owner, Evas_Object* webview, bool* data) - { - ASSERT_TRUE(owner); - owner->EventLoopStop(Success); - } -}; - -/** - * @brief Checks if API returns proper value if selection event occured from JavaScript - */ -TEST_F(utc_blink_ewk_view_text_selection_text_get, textarea_js_select) -{ - // In case of no error and no selection, ewk_view_text_selection_text_get should return EMPTY string, not NULL ptr - const char* selected_text = ewk_view_text_selection_text_get(GetEwkWebView()); - ASSERT_TRUE(selected_text); - ASSERT_STREQ("", selected_text); - - char htmlBuffer[] = "" - "" - "" - "" - "" - ""; - - ASSERT_EQ(EINA_TRUE, ewk_view_html_string_load(GetEwkWebView(), htmlBuffer, NULL, NULL)); - ASSERT_EQ(Success, EventLoopStart()); - - selected_text = ewk_view_text_selection_text_get(GetEwkWebView()); - ASSERT_TRUE(selected_text); - ASSERT_STREQ("select text", selected_text); - fprintf(stderr,"[text_selection_text_get]=%s\n",selected_text); -} - -/** - * @brief Checks if API returns proper value if selection event occured by executing edit command "SelectAll" - */ -TEST_F(utc_blink_ewk_view_text_selection_text_get, execute_select_all) -{ - evas_object_smart_callback_auto autocb(GetEwkWebView(), "load,finished", ToSmartCallback(load_finished_cb), this); - - // In case of no error and no selection, ewk_view_text_selection_text_get should return EMPTY string, not NULL ptr - const char* selected_text = ewk_view_text_selection_text_get(GetEwkWebView()); - ASSERT_TRUE(selected_text); - ASSERT_STREQ("", selected_text); - - char htmlBuffer[] = "" - "" - "" - "Some text" - ""; - - ASSERT_EQ(EINA_TRUE, ewk_view_html_string_load(GetEwkWebView(), htmlBuffer, NULL, NULL)); - ASSERT_EQ(Success, EventLoopStart()); - - selected_text = ewk_view_text_selection_text_get(GetEwkWebView()); - ASSERT_TRUE(selected_text); - ASSERT_STREQ("", selected_text); - - ASSERT_EQ(EINA_TRUE, ewk_view_command_execute(GetEwkWebView(), "SelectAll", NULL)); - ASSERT_EQ(Success, EventLoopStart()); - - selected_text = ewk_view_text_selection_text_get(GetEwkWebView()); - ASSERT_TRUE(selected_text); - ASSERT_STREQ("Some text", selected_text); - fprintf(stderr,"[text_selection_text_get]=%s\n",selected_text); -} - -/** - * @brief checking whether function is working when providing NULL value. - */ -TEST_F(utc_blink_ewk_view_text_selection_text_get, invalid_args) -{ - EXPECT_EQ(0, ewk_view_text_selection_text_get(NULL)); -} - diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_title_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_title_get_func.cpp index 3056700..9b07e06 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_title_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_title_get_func.cpp @@ -10,9 +10,10 @@ class utc_blink_ewk_view_title_get_func : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object*) - { - EventLoopStop(utc_blink_ewk_base::Success); // won't fail the test if EventLoopStop was already called + void LoadFinished(Evas_Object*) override { + EventLoopStop(utc_blink_ewk_base::Success); // won't fail the test if + // EventLoopStop was already + // called } }; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_url_request_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_url_request_set_func.cpp index 35cc061..2188a20 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_url_request_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_url_request_set_func.cpp @@ -16,11 +16,9 @@ protected: eina_hash_add(header, "Referer", "http://samsung.com"); } - ~utc_blink_ewk_view_url_request_set() { - eina_hash_free(header); - } + ~utc_blink_ewk_view_url_request_set() override { eina_hash_free(header); } -protected: + protected: Eina_Hash *const header; }; diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_user_agent_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_user_agent_get_func.cpp old mode 100755 new mode 100644 index 2519d79..b412057 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_user_agent_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_user_agent_get_func.cpp @@ -7,18 +7,17 @@ class utc_blink_ewk_view_user_agent_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object* webview) - { - EventLoopStop(utc_blink_ewk_base::Failure); // won't fail the test if EventLoopStop was already called + void LoadFinished(Evas_Object* webview) override { + EventLoopStop(utc_blink_ewk_base::Failure); // won't fail the test if + // EventLoopStop was already + // called } - void PostSetUp() - { + void PostSetUp() override { evas_object_smart_callback_add(GetEwkWebView(), "title,changed", title_changed, this); } - void PreTearDown() - { + void PreTearDown() override { evas_object_smart_callback_del(GetEwkWebView(), "title,changed", title_changed); } @@ -77,4 +76,4 @@ TEST_F(utc_blink_ewk_view_user_agent_get, NEG_TEST) const char* userAgent = ewk_view_user_agent_get(NULL); if (NULL != userAgent) FAIL(); -} \ No newline at end of file +} diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_user_agent_set_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_user_agent_set_func.cpp old mode 100755 new mode 100644 index 4530034..5d955ee --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_user_agent_set_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_user_agent_set_func.cpp @@ -1,121 +1,125 @@ -// Copyright 2014 Samsung Electronics. All rights reserved. +// Copyright 2014-2016 Samsung Electronics. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -/* Define this macro _before_ you include the utc_blink_ewk_base.h header file. */ -#define USER_AGENT_STRING "TEST_USER_AGENT" - #include "utc_blink_ewk_base.h" -class utc_blink_ewk_view_user_agent_set : public utc_blink_ewk_base -{ -protected: +class utc_blink_ewk_view_user_agent_set : public utc_blink_ewk_base { + protected: + static const char* kUserAgentString; + static const char* kAboutBlankURL; + void PostSetUp() override { - default_ua_ = eina_stringshare_add(ewk_view_user_agent_get(GetEwkWebView())); - ASSERT_TRUE(default_ua_); - ASSERT_STRNE(default_ua_, USER_AGENT_STRING); + default_user_agent_ = + eina_stringshare_add(ewk_view_user_agent_get(GetEwkWebView())); + current_user_agent_ = nullptr; + ASSERT_TRUE(default_user_agent_); + ASSERT_STRNE(default_user_agent_, kUserAgentString); } void PreTearDown() override { // reset user agent to default value ewk_view_user_agent_set(GetEwkWebView(), ""); - if (default_ua_) { - eina_stringshare_del(default_ua_); - default_ua_ = NULL; + if (default_user_agent_) { + eina_stringshare_del(default_user_agent_); + default_user_agent_ = nullptr; } - if (current_ua_) { - eina_stringshare_del(current_ua_); - current_ua_ = NULL; + if (current_user_agent_) { + eina_stringshare_del(current_user_agent_); + current_user_agent_ = nullptr; } } - void LoadFinished(Evas_Object* webview) override - { - if (!ewk_view_script_execute(GetEwkWebView(), "navigator.userAgent", scriptExecutionFinished, this)) { - FAIL(); + void LoadFinished(Evas_Object* webview) override { + if (!ewk_view_script_execute(GetEwkWebView(), "navigator.userAgent", + scriptExecutionFinished, this)) { + EventLoopStop(Failure); } } /* Callback for script execution */ - static void scriptExecutionFinished(Evas_Object* webview, const char* result_value, void* data) { - if (data) { - static_cast(data)->current_ua_ = eina_stringshare_add(result_value); - static_cast(data)->EventLoopStop(Success); - } + static void scriptExecutionFinished(Evas_Object* webview, + const char* result_value, + void* data) { + auto owner = static_cast(data); + owner->current_user_agent_ = eina_stringshare_add(result_value); + owner->EventLoopStop(Success); } - Eina_Stringshare* current_ua_; - Eina_Stringshare* default_ua_; + Eina_Stringshare* current_user_agent_; + Eina_Stringshare* default_user_agent_; }; +const char* utc_blink_ewk_view_user_agent_set::kUserAgentString = + "TEST_USER_AGENT"; +const char* utc_blink_ewk_view_user_agent_set::kAboutBlankURL = "about:blank"; /** * @brief Positive test case of ewk_view_user_agent_set() */ -TEST_F(utc_blink_ewk_view_user_agent_set, POS_TEST) -{ - EXPECT_TRUE(ewk_view_user_agent_set(GetEwkWebView(), USER_AGENT_STRING)); - Eina_Stringshare* ua = eina_stringshare_add(ewk_view_user_agent_get(GetEwkWebView())); - ASSERT_TRUE(ua); - EXPECT_STREQ(USER_AGENT_STRING, ua); - - ewk_view_url_set(GetEwkWebView(), "about:blank"); +TEST_F(utc_blink_ewk_view_user_agent_set, POS_SET_USER_AGENT) { + ASSERT_TRUE(ewk_view_user_agent_set(GetEwkWebView(), kUserAgentString)); + Eina_Stringshare* user_agent = + eina_stringshare_add(ewk_view_user_agent_get(GetEwkWebView())); + ASSERT_TRUE(user_agent); + ASSERT_STREQ(kUserAgentString, user_agent); + + ewk_view_url_set(GetEwkWebView(), kAboutBlankURL); ASSERT_EQ(Success, EventLoopStart()); - ASSERT_STREQ(USER_AGENT_STRING, current_ua_); - eina_stringshare_del(ua); + ASSERT_STREQ(kUserAgentString, current_user_agent_); + eina_stringshare_del(user_agent); } /** * @brief Positive test case of ewk_view_user_agent_set() with empty string */ -TEST_F(utc_blink_ewk_view_user_agent_set, EmptyString) -{ - EXPECT_TRUE(ewk_view_user_agent_set(GetEwkWebView(), USER_AGENT_STRING)); - Eina_Stringshare* ua = eina_stringshare_add(ewk_view_user_agent_get(GetEwkWebView())); - ASSERT_TRUE(ua); - EXPECT_STREQ(USER_AGENT_STRING, ua); - ewk_view_url_set(GetEwkWebView(), "about:blank"); +TEST_F(utc_blink_ewk_view_user_agent_set, POS_EMPTY_STRING) { + ASSERT_TRUE(ewk_view_user_agent_set(GetEwkWebView(), kUserAgentString)); + Eina_Stringshare* user_agent = + eina_stringshare_add(ewk_view_user_agent_get(GetEwkWebView())); + ASSERT_TRUE(user_agent); + ASSERT_STREQ(kUserAgentString, user_agent); + ewk_view_url_set(GetEwkWebView(), kAboutBlankURL); ASSERT_EQ(Success, EventLoopStart()); - ASSERT_STREQ(USER_AGENT_STRING, current_ua_); - eina_stringshare_del(ua); + ASSERT_STREQ(kUserAgentString, current_user_agent_); + eina_stringshare_del(user_agent); - EXPECT_TRUE(ewk_view_user_agent_set(GetEwkWebView(), "")); + ASSERT_TRUE(ewk_view_user_agent_set(GetEwkWebView(), "")); - ua = eina_stringshare_add(ewk_view_user_agent_get(GetEwkWebView())); - ASSERT_TRUE(ua); - EXPECT_STREQ(default_ua_, ua); - ewk_view_url_set(GetEwkWebView(), "about:blank"); + user_agent = eina_stringshare_add(ewk_view_user_agent_get(GetEwkWebView())); + ASSERT_TRUE(user_agent); + ASSERT_STREQ(default_user_agent_, user_agent); + ewk_view_url_set(GetEwkWebView(), kAboutBlankURL); ASSERT_EQ(Success, EventLoopStart()); - ASSERT_STREQ(default_ua_, current_ua_); - eina_stringshare_del(ua); + ASSERT_STREQ(default_user_agent_, current_user_agent_); + eina_stringshare_del(user_agent); } /** * @brief Positive test case of ewk_view_user_agent_set() with Null string */ -TEST_F(utc_blink_ewk_view_user_agent_set, NullString) -{ - EXPECT_TRUE(ewk_view_user_agent_set(GetEwkWebView(), USER_AGENT_STRING)); - Eina_Stringshare* ua = eina_stringshare_add(ewk_view_user_agent_get(GetEwkWebView())); - ASSERT_TRUE(ua); - EXPECT_STREQ(USER_AGENT_STRING, ua); - ewk_view_url_set(GetEwkWebView(), "about:blank"); +TEST_F(utc_blink_ewk_view_user_agent_set, POS_NULL_STRING) { + ASSERT_TRUE(ewk_view_user_agent_set(GetEwkWebView(), kUserAgentString)); + Eina_Stringshare* user_agent = + eina_stringshare_add(ewk_view_user_agent_get(GetEwkWebView())); + ASSERT_TRUE(user_agent); + ASSERT_STREQ(kUserAgentString, user_agent); + ewk_view_url_set(GetEwkWebView(), kAboutBlankURL); ASSERT_EQ(Success, EventLoopStart()); - ASSERT_STREQ(USER_AGENT_STRING, current_ua_); - eina_stringshare_del(ua); + ASSERT_STREQ(kUserAgentString, current_user_agent_); + eina_stringshare_del(user_agent); - EXPECT_TRUE(ewk_view_user_agent_set(GetEwkWebView(), NULL)); + ASSERT_TRUE(ewk_view_user_agent_set(GetEwkWebView(), NULL)); - ua = eina_stringshare_add(ewk_view_user_agent_get(GetEwkWebView())); - ASSERT_TRUE(ua); - EXPECT_STREQ(default_ua_, ua); - eina_stringshare_del(ua); + user_agent = eina_stringshare_add(ewk_view_user_agent_get(GetEwkWebView())); + ASSERT_TRUE(user_agent); + ASSERT_STREQ(default_user_agent_, user_agent); + eina_stringshare_del(user_agent); } /** * @brief Negative test case of ewk_view_user_agent_set() */ -TEST_F(utc_blink_ewk_view_user_agent_set, NEG_TEST) -{ - EXPECT_FALSE(ewk_view_user_agent_set(NULL, "")); +TEST_F(utc_blink_ewk_view_user_agent_set, NEG_EWK_VIEW_NULL) { + ASSERT_FALSE(ewk_view_user_agent_set(nullptr, "")); } diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_web_application_capable_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_web_application_capable_get_func.cpp index b7b5256..511a19c 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_web_application_capable_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_web_application_capable_get_func.cpp @@ -7,19 +7,16 @@ class utc_blink_ewk_view_web_application_capable_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } - static void webAppCapableGetCallback(Eina_Bool capable, void *data) - { - ASSERT_TRUE(data != NULL); - utc_blink_ewk_view_web_application_capable_get *owner = 0; - OwnerFromVoid(data, &owner); - fprintf(stderr, "[webAppCapableGetCallback] :: capable = %s\n", capable == EINA_TRUE ? "EINA_TRUE" : "EINA_FALSE"); - ASSERT_EQ(owner->expectedCapable, capable); - owner->EventLoopStop(Success); + static void webAppCapableGetCallback(Eina_Bool capable, void* data) { + ASSERT_TRUE(data != NULL); + utc_blink_ewk_view_web_application_capable_get* owner = 0; + OwnerFromVoid(data, &owner); + fprintf(stderr, "[webAppCapableGetCallback] :: capable = %s\n", + capable == EINA_TRUE ? "EINA_TRUE" : "EINA_FALSE"); + ASSERT_EQ(owner->expectedCapable, capable); + owner->EventLoopStop(Success); } protected: diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_web_application_icon_url_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_web_application_icon_url_get_func.cpp index 09c03f9..2e43a0e 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_web_application_icon_url_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_web_application_icon_url_get_func.cpp @@ -7,22 +7,21 @@ class utc_blink_ewk_view_web_application_icon_url_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } - static void webAppUrlGetCallback(const char *url, utc_blink_ewk_view_web_application_icon_url_get *owner) - { - ASSERT_TRUE(NULL != owner); - ASSERT_TRUE(NULL != url); - utc_message("[webAppUrlGetCallback] :: url = %s", url); - if(!*url) { - owner->EventLoopStop(Failure); - } else { - ASSERT_STREQ(owner->GetResourceUrl(owner->expectedUrl.c_str()).c_str(), url); - owner->EventLoopStop(Success); - } + static void webAppUrlGetCallback( + const char* url, + utc_blink_ewk_view_web_application_icon_url_get* owner) { + ASSERT_TRUE(NULL != owner); + ASSERT_TRUE(NULL != url); + utc_message("[webAppUrlGetCallback] :: url = %s", url); + if (!*url) { + owner->EventLoopStop(Failure); + } else { + ASSERT_STREQ(owner->GetResourceUrl(owner->expectedUrl.c_str()).c_str(), + url); + owner->EventLoopStop(Success); + } } protected: diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_view_web_application_icon_urls_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_view_web_application_icon_urls_get_func.cpp index 615359c..b199f99 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_view_web_application_icon_urls_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_view_web_application_icon_urls_get_func.cpp @@ -8,27 +8,28 @@ class utc_blink_ewk_view_web_application_icon_urls_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) - { - EventLoopStop(Success); - } + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } - static void webAppUrlsGetCallback(Eina_List *urls, utc_blink_ewk_view_web_application_icon_urls_get *owner) - { - ASSERT_TRUE(NULL != owner); - utc_message("[webAppUrlsGetCallback] :: "); - ASSERT_EQ(owner->expectedUrls.size(), eina_list_count(urls)); - Eina_List *l = 0; - void *d = 0; - EINA_LIST_FOREACH(urls, l, d) { - const char* size = ewk_web_application_icon_data_size_get(static_cast(d)); - ASSERT_TRUE(NULL != size); - const char* url = ewk_web_application_icon_data_url_get(static_cast(d)); - ASSERT_TRUE(NULL != url); - utc_message("[URLS]: %s ; %s", size, url); - ASSERT_STREQ(owner->GetResourceUrl(owner->expectedUrls[size].c_str()).c_str(), url); - } - owner->EventLoopStop(Success); + static void webAppUrlsGetCallback( + Eina_List* urls, + utc_blink_ewk_view_web_application_icon_urls_get* owner) { + ASSERT_TRUE(NULL != owner); + utc_message("[webAppUrlsGetCallback] :: "); + ASSERT_EQ(owner->expectedUrls.size(), eina_list_count(urls)); + Eina_List* l = 0; + void* d = 0; + EINA_LIST_FOREACH(urls, l, d) { + const char* size = ewk_web_application_icon_data_size_get( + static_cast(d)); + ASSERT_TRUE(NULL != size); + const char* url = ewk_web_application_icon_data_url_get( + static_cast(d)); + ASSERT_TRUE(NULL != url); + utc_message("[URLS]: %s ; %s", size, url); + ASSERT_STREQ( + owner->GetResourceUrl(owner->expectedUrls[size].c_str()).c_str(), url); + } + owner->EventLoopStop(Success); } protected: diff --git a/tizen_src/ewk/unittest/utc_blink_ewk_web_application_icon_data_url_get_func.cpp b/tizen_src/ewk/unittest/utc_blink_ewk_web_application_icon_data_url_get_func.cpp index 2ffa422..e96dd22 100644 --- a/tizen_src/ewk/unittest/utc_blink_ewk_web_application_icon_data_url_get_func.cpp +++ b/tizen_src/ewk/unittest/utc_blink_ewk_web_application_icon_data_url_get_func.cpp @@ -14,30 +14,29 @@ class utc_blink_ewk_web_application_icon_data_url_get : public utc_blink_ewk_base { protected: - void LoadFinished(Evas_Object *) - { - EventLoopStop(Success); - } - - static void webAppUrlsGetCallback(Eina_List *urls, utc_blink_ewk_web_application_icon_data_url_get *owner) - { - ASSERT_TRUE(NULL != owner); - ASSERT_TRUE(NULL != urls); - utc_message("[webAppUrlsGetCallback] :: "); - ASSERT_EQ(owner->expectedUrls.size(), eina_list_count(urls)); - Eina_List *l = 0; - void *d = 0; - EINA_LIST_FOREACH(urls, l, d) { - Ewk_Web_App_Icon_Data *data = static_cast(d); - ASSERT_TRUE(NULL != data); - const char* size = ewk_web_application_icon_data_size_get(data); - ASSERT_TRUE(NULL != size); - const char* url = ewk_web_application_icon_data_url_get(data); - ASSERT_TRUE(NULL != url); - utc_message("[URLS]: %s ; %s", size, url); - ASSERT_STREQ(owner->GetResourceUrl(owner->expectedUrls[size].c_str()).c_str(), url); - } - owner->EventLoopStop(Success); + void LoadFinished(Evas_Object*) override { EventLoopStop(Success); } + + static void webAppUrlsGetCallback( + Eina_List* urls, + utc_blink_ewk_web_application_icon_data_url_get* owner) { + ASSERT_TRUE(NULL != owner); + ASSERT_TRUE(NULL != urls); + utc_message("[webAppUrlsGetCallback] :: "); + ASSERT_EQ(owner->expectedUrls.size(), eina_list_count(urls)); + Eina_List* l = 0; + void* d = 0; + EINA_LIST_FOREACH(urls, l, d) { + Ewk_Web_App_Icon_Data* data = static_cast(d); + ASSERT_TRUE(NULL != data); + const char* size = ewk_web_application_icon_data_size_get(data); + ASSERT_TRUE(NULL != size); + const char* url = ewk_web_application_icon_data_url_get(data); + ASSERT_TRUE(NULL != url); + utc_message("[URLS]: %s ; %s", size, url); + ASSERT_STREQ( + owner->GetResourceUrl(owner->expectedUrls[size].c_str()).c_str(), url); + } + owner->EventLoopStop(Success); } std::map expectedUrls; diff --git a/tizen_src/ewk/utc_gtest_run.sh b/tizen_src/ewk/utc_gtest_run.sh index b008def..0ad52bb 100755 --- a/tizen_src/ewk/utc_gtest_run.sh +++ b/tizen_src/ewk/utc_gtest_run.sh @@ -40,7 +40,7 @@ EOF function getHostArch() { echo $(uname -m | sed -e \ - 's/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/') + 's/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/;s/aarch64/arm64/') } # Set target environment depending on the host architecture @@ -93,7 +93,7 @@ function init { EXEC="$EXEC --disable-gpu-driver-bug-workarounds" ;; - arm) + arm | arm64) UTC_EXEC=ewk_unittests EXEC="/opt/usr/utc_exec/$UTC_EXEC" chmod +x $EXEC -- 2.7.4