X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-WebView.cpp;h=90d24a5152fa29d45dc342b91c499ce84e1fceb2;hb=c005551b838b8d1deb8b954138664a357a743d9f;hp=442d75d32513c5748e162a305be44ddc1a9eeb99;hpb=a0389a25a5ce0e8b539c75a6f37b75d3286dacef;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp
old mode 100644
new mode 100755
index 442d75d..90d24a5
--- a/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,6 @@
 #include "dali-toolkit-test-utils/toolkit-timer.h"
 
 #include <dali-toolkit/devel-api/controls/web-view/web-back-forward-list.h>
-#include <dali-toolkit/devel-api/controls/web-view/web-context.h>
-#include <dali-toolkit/devel-api/controls/web-view/web-cookie-manager.h>
 #include <dali-toolkit/devel-api/controls/web-view/web-settings.h>
 #include <dali-toolkit/devel-api/controls/web-view/web-view.h>
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
@@ -31,9 +29,10 @@
 #include <dali.h>
 #include <dali/devel-api/adaptor-framework/web-engine/web-engine-certificate.h>
 #include <dali/devel-api/adaptor-framework/web-engine/web-engine-console-message.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context.h>
 #include <dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu-item.h>
 #include <dali/devel-api/adaptor-framework/web-engine/web-engine-context-menu.h>
-#include <dali/devel-api/adaptor-framework/web-engine/web-engine-context.h>
+#include <dali/devel-api/adaptor-framework/web-engine/web-engine-cookie-manager.h>
 #include <dali/devel-api/adaptor-framework/web-engine/web-engine-form-repost-decision.h>
 #include <dali/devel-api/adaptor-framework/web-engine/web-engine-frame.h>
 #include <dali/devel-api/adaptor-framework/web-engine/web-engine-hit-test.h>
@@ -80,6 +79,7 @@ static int                                                                gConso
 static std::unique_ptr<Dali::WebEngineConsoleMessage>                     gConsoleMessageInstance                = nullptr;
 static int                                                                gResponsePolicyDecidedCallbackCalled   = 0;
 static int                                                                gNavigationPolicyDecidedCallbackCalled = 0;
+static int                                                                gNewWindowCreatedCallbackCalled        = 0;
 static std::unique_ptr<Dali::WebEnginePolicyDecision>                     gResponsePolicyDecisionInstance        = nullptr;
 static int                                                                gCertificateConfirmCallbackCalled      = 0;
 static std::unique_ptr<Dali::WebEngineCertificate>                        gCertificateConfirmInstance            = nullptr;
@@ -149,6 +149,13 @@ static void OnNavigationPolicyDecided(std::unique_ptr<Dali::WebEnginePolicyDecis
   gNavigationPolicyDecidedCallbackCalled++;
 }
 
+static void OnNewWindowCreated(Dali::WebEnginePlugin*& outPlugin)
+{
+  gNewWindowCreatedCallbackCalled++;
+  WebView newView = WebView::New();
+  outPlugin = newView.GetPlugin();
+}
+
 static void OnUrlChanged(const std::string& url)
 {
   gUrlChangedCallbackCalled++;
@@ -890,11 +897,8 @@ int UtcDaliWebViewGetWebContext(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK(view);
-
-  Dali::Toolkit::WebContext* context = view.GetContext();
-  DALI_TEST_CHECK(context != 0);
+  Dali::WebEngineContext* context = WebView::GetContext();
+  DALI_TEST_CHECK(context != nullptr);
 
   END_TEST;
 }
@@ -903,10 +907,7 @@ int UtcDaliWebViewGetWebCookieManager(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK(view);
-
-  Dali::Toolkit::WebCookieManager* cookieManager = view.GetCookieManager();
+  Dali::WebEngineCookieManager* cookieManager = WebView::GetCookieManager();
   DALI_TEST_CHECK(cookieManager != 0);
 
   END_TEST;
@@ -1300,6 +1301,24 @@ int UtcDaliWebViewNavigationPolicyDecisionRequest(void)
   END_TEST;
 }
 
+int UtcDaliWebViewNewWindowCreated(void)
+{
+  ToolkitTestApplication application;
+
+  WebView view = WebView::New();
+  DALI_TEST_CHECK(view);
+
+  // load url.
+  view.RegisterNewWindowCreatedCallback(&OnNewWindowCreated);
+  DALI_TEST_EQUALS(gNewWindowCreatedCallbackCalled, 0, TEST_LOCATION);
+
+  view.LoadUrl(TEST_URL1);
+  Test::EmitGlobalTimerSignal();
+  DALI_TEST_EQUALS(gNewWindowCreatedCallbackCalled, 1, TEST_LOCATION);
+
+  END_TEST;
+}
+
 int UtcDaliWebViewHitTest(void)
 {
   ToolkitTestApplication application;
@@ -1404,7 +1423,7 @@ int UtcDaliWebViewLoadHtmlStringOverrideCurrentEntryAndContents(void)
   application.Render();
   Test::EmitGlobalTimerSignal();
 
-  result = view.LoadContents(html, html.length(), "html/text", "utf-8", basicUri);
+  result = view.LoadContents((const int8_t*)html.c_str(), html.length(), "html/text", "utf-8", basicUri);
   DALI_TEST_CHECK(result);
 
   END_TEST;
@@ -1519,14 +1538,11 @@ int UtcDaliWebBackForwardListCheckItem(void)
 
 // test cases for web context.
 
-int UtcDaliWebContextGetSetCacheModel(void)
+int UtcDaliWebContextGetSetCacheModelEtc(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK(view);
-
-  Dali::Toolkit::WebContext* context = view.GetContext();
+  Dali::WebEngineContext* context = WebView::GetContext();
   DALI_TEST_CHECK(context != 0)
 
   std::string kDefaultValue;
@@ -1595,10 +1611,7 @@ int UtcDaliWebContextGetWebDatabaseStorageOrigins(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK(view);
-
-  Dali::Toolkit::WebContext* context = view.GetContext();
+  Dali::WebEngineContext* context = WebView::GetContext();
   DALI_TEST_CHECK(context != 0)
 
   std::string kDefaultValue;
@@ -1665,11 +1678,14 @@ int UtcDaliWebContextHttpRequestInterceptor(void)
 {
   ToolkitTestApplication application;
 
+  Dali::WebEngineContext* context = WebView::GetContext();
+  DALI_TEST_CHECK(context != 0)
+
   WebView view = WebView::New();
   DALI_TEST_CHECK(view);
 
-  Dali::Toolkit::WebContext* context = view.GetContext();
-  DALI_TEST_CHECK(context != 0)
+  // Check if web view is found or not when plugin is null.
+  DALI_TEST_CHECK(!WebView::FindWebView(nullptr));
 
   // load url.
   context->RegisterRequestInterceptedCallback(&OnRequestIntercepted);
@@ -1690,6 +1706,11 @@ int UtcDaliWebContextHttpRequestInterceptor(void)
   DALI_TEST_CHECK(gRequestInterceptorInstance->AddResponseBody((const int8_t*)"test", 4));
   DALI_TEST_CHECK(gRequestInterceptorInstance->AddResponse("key:value", (const int8_t*)"test", 4));
   DALI_TEST_CHECK(gRequestInterceptorInstance->WriteResponseChunk((const int8_t*)"test", 4));
+
+  DALI_TEST_CHECK(gRequestInterceptorInstance->GetWebEngine());
+  // Check if web view is found or not when plugin is not null.
+  DALI_TEST_CHECK(WebView::FindWebView(gRequestInterceptorInstance->GetWebEngine()));
+
   std::string testUrl("http://test.html");
   DALI_TEST_EQUALS(gRequestInterceptorInstance->GetUrl(), testUrl, TEST_LOCATION);
   std::string testMethod("GET");
@@ -1697,6 +1718,8 @@ int UtcDaliWebContextHttpRequestInterceptor(void)
   Dali::Property::Map resultHeaders = gRequestInterceptorInstance->GetHeaders();
   DALI_TEST_EQUALS(resultHeaders.Count(), 2, TEST_LOCATION);
 
+  // Destroy web view.
+  view.Reset();
   gRequestInterceptorInstance = nullptr;
 
   END_TEST;
@@ -1708,10 +1731,7 @@ int UtcDaliWebCookieManagerGetSetCookieAcceptPolicy(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK(view);
-
-  Dali::Toolkit::WebCookieManager* cookieManager = view.GetCookieManager();
+  Dali::WebEngineCookieManager* cookieManager = WebView::GetCookieManager();
   DALI_TEST_CHECK(cookieManager != 0)
 
   const std::string kDefaultValue;
@@ -1736,10 +1756,7 @@ int UtcDaliWebCookieManagerChangesWatch(void)
 {
   ToolkitTestApplication application;
 
-  WebView view = WebView::New();
-  DALI_TEST_CHECK(view);
-
-  Dali::Toolkit::WebCookieManager* cookieManager = view.GetCookieManager();
+  Dali::WebEngineCookieManager* cookieManager = WebView::GetCookieManager();
   DALI_TEST_CHECK(cookieManager != 0)
 
   cookieManager->ChangesWatch(&OnChangesWatch);