[UTC/ITC][webkit2][Non-ACR][Change test URL for ewk_intercept_request_headers_get] 85/212485/2
authoryh106.jung <yh106.jung@samsung.com>
Thu, 22 Aug 2019 03:30:57 +0000 (12:30 +0900)
committeryh106.jung <yh106.jung@samsung.com>
Thu, 22 Aug 2019 03:34:42 +0000 (12:34 +0900)
TCs for ewk_intercept_request_headers_get used file scheme URL, but the
latest chromium never set User-Agent into header of file request. So we
should change the test URL to http scheme URL.

Change-Id: I1b0264c39515bd3db53d2795a25a65354ea66e2d
Signed-off-by: yh106.jung <yh106.jung@samsung.com>
src/itc/webkit2/ITs-webkit2-intercept-request.c
src/utc/webkit2/utc_webkit2_ewk_intercept_request_headers_get_func.c

index ab23d8764e2be2b9938c9fc3416ab7af73236f0f..80968dee8a5b92948d0b6c422a42907c5df1dc47 100755 (executable)
@@ -533,21 +533,12 @@ int ITc_ewk_intercept_request_header_get_p(void)
 {
        START_TEST;
 
-       char pPath[PATH_LEN] = {0,};
-
        if ( Webkit_EFLCreateWebKitView() == false)
        {
                FPRINTF("[Line : %d][%s] Unable to create EFL webkit view\\n", __LINE__, API_NAMESPACE);
                return 1;
        }
 
-       if ( false == Webkit_EFLAppendToDataPathWithFileFormat(SAMPLE_HTML_FILE, pPath) )
-       {
-               FPRINTF("[Line : %d][%s] Unable to get the app data path\\n", __LINE__, API_NAMESPACE);
-               Webkit_EFLDestroyWebKitView();
-               return 1;
-       }
-
        evas_object_smart_callback_add(objWebkit_EFL_view.webview, "load,finished", webkit_EFL_LoadFinished, NULL);
        evas_object_smart_callback_add(objWebkit_EFL_view.webview, "load,error", webkit_EFL_LoadError, NULL);
 
@@ -555,7 +546,7 @@ int ITc_ewk_intercept_request_header_get_p(void)
        emergency_exit_timer = ecore_timer_add(5, webkit_emergency_exit_func, &emergency_exit_timer);
        ewk_context_intercept_request_callback_set(ewk_view_context_get(objWebkit_EFL_view.webview), webkit_intercept_request_header_get_callback , NULL);
 
-       if ( ewk_view_url_set(objWebkit_EFL_view.webview, pPath) != EINA_TRUE)
+       if ( ewk_view_url_set(objWebkit_EFL_view.webview, g_InterceptUrl) != EINA_TRUE)
        {
                FPRINTF("[Line : %d][%s] ewk_view_url_set returned error on API call\\n", __LINE__, API_NAMESPACE);
                evas_object_smart_callback_del(objWebkit_EFL_view.webview, "load,finished", webkit_EFL_LoadFinished);
@@ -638,21 +629,12 @@ int ITc_ewk_intercept_request_ignore_p(void)
 {
        START_TEST;
 
-       char pPath[PATH_LEN] = {0,};
-
        if ( Webkit_EFLCreateWebKitView() == false)
        {
                FPRINTF("[Line : %d][%s] Unable to create EFL webkit view\\n", __LINE__, API_NAMESPACE);
                return 1;
        }
 
-       if ( false == Webkit_EFLAppendToDataPathWithFileFormat(SAMPLE_HTML_FILE, pPath) )
-       {
-               FPRINTF("[Line : %d][%s] Unable to get the app data path\\n", __LINE__, API_NAMESPACE);
-               Webkit_EFLDestroyWebKitView();
-               return 1;
-       }
-
        evas_object_smart_callback_add(objWebkit_EFL_view.webview, "load,finished", webkit_EFL_LoadFinished, NULL);
        evas_object_smart_callback_add(objWebkit_EFL_view.webview, "load,error", webkit_EFL_LoadError, NULL);
 
@@ -660,7 +642,7 @@ int ITc_ewk_intercept_request_ignore_p(void)
        emergency_exit_timer = ecore_timer_add(5, webkit_emergency_exit_func, &emergency_exit_timer);
        ewk_context_intercept_request_callback_set(ewk_view_context_get(objWebkit_EFL_view.webview), webkit_intercept_request_ignore_callback , NULL);
 
-       if ( ewk_view_url_set(objWebkit_EFL_view.webview, pPath) != EINA_TRUE)
+       if ( ewk_view_url_set(objWebkit_EFL_view.webview, g_InterceptUrl) != EINA_TRUE)
        {
                FPRINTF("[Line : %d][%s] ewk_view_url_set returned error on API call\\n", __LINE__, API_NAMESPACE);
                evas_object_smart_callback_del(objWebkit_EFL_view.webview, "load,finished", webkit_EFL_LoadFinished);
index 27ff8de3397667082289395046d23c405bb2abc1..4e4ee06292b56740ccfa2b3eac8721c0571d3143 100755 (executable)
@@ -22,6 +22,7 @@
 
 static Ecore_Timer* emergency_exit_timer;
 static Eina_Bool null_intercept_request;
+static const char intercept_url[] = "http://request.intercept.ewk.api.test/";
 
 // results:
 static const Eina_Hash* headers;
@@ -99,7 +100,7 @@ void utc_webkit2_ewk_intercept_request_headers_get_func_cleanup(void)
 int utc_webkit2_ewk_intercept_request_headers_get_p(void)
 {
   emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
-  ewk_view_url_set(test_view.webview, COMMON_SAMPLE_HTML_FILE);
+  ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
   assert(headers);
   assert(accept_header);
@@ -120,7 +121,7 @@ int utc_webkit2_ewk_intercept_request_headers_get_n(void)
 {
   null_intercept_request = EINA_TRUE;
   emergency_exit_timer = ecore_timer_add(5, emergency_exit_func, &emergency_exit_timer);
-  ewk_view_url_set(test_view.webview, COMMON_SAMPLE_HTML_FILE);
+  ewk_view_url_set(test_view.webview, intercept_url);
   utc_webkit2_main_loop_begin();
   assert(!headers);