X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-WebView.cpp;h=302deb6209c970a507fe1a6a7ea4ec45552dfc56;hp=4fbe8c18c6b26ed02425ae1ef38757fe2c1af334;hb=218c58bb6854ca42475416c106b2edd58e24d6d6;hpb=0e45ebf0c1d7baf6a81c94356aae6d6dbca227b7 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp index 4fbe8c1..302deb6 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp @@ -96,10 +96,10 @@ static int gDownloadStartedCallbackCalled = 0; static int gMimeOverriddenCallbackCalled = 0; static std::vector> gSecurityOriginList; static std::vector> gPasswordDataList; -static int gContextMenuCustomizedCallbackCalled = 0; -static std::shared_ptr gContextMenuInstance = nullptr; -static int gContextMenuItemSelectedCallbackCalled = 0; -static std::shared_ptr gContextMenuItemInstance = nullptr; +static int gContextMenuShownCallbackCalled = 0; +static std::shared_ptr gContextMenuShownInstance = nullptr; +static int gContextMenuHiddenCallbackCalled = 0; +static std::shared_ptr gContextMenuHiddenInstance = nullptr; static int gHitTestCreatedCallbackCalled = 0; static int gCookieManagerChangsWatchCallbackCalled = 0; @@ -293,16 +293,16 @@ static bool OnMimeOverridden(const std::string&, const std::string&, std::string return false; } -static void OnContextMenuCustomized(WebView view, std::shared_ptr menu) +static void OnContextMenuShown(WebView view, std::shared_ptr menu) { - gContextMenuCustomizedCallbackCalled++; - gContextMenuInstance = std::move(menu); + gContextMenuShownCallbackCalled++; + gContextMenuShownInstance = std::move(menu); } -static void OnContextMenuItemSelected(WebView view, std::shared_ptr item) +static void OnContextMenuHidden(WebView view, std::shared_ptr menu) { - gContextMenuItemSelectedCallbackCalled++; - gContextMenuItemInstance = std::move(item); + gContextMenuHiddenCallbackCalled++; + gContextMenuHiddenInstance = std::move(menu); } } // namespace @@ -1072,7 +1072,7 @@ int UtcDaliWebViewPropertyTitleFavicon(void) END_TEST; } -int UtcDaliWebViewContextMenuCustomizedAndItemSelected(void) +int UtcDaliWebViewContextMenuShownAndHidden(void) { ToolkitTestApplication application; @@ -1081,54 +1081,53 @@ int UtcDaliWebViewContextMenuCustomizedAndItemSelected(void) // load url. ConnectionTracker* testTracker = new ConnectionTracker(); - view.ContextMenuCustomizedSignal().Connect( &OnContextMenuCustomized ); - view.ContextMenuItemSelectedSignal().Connect( &OnContextMenuItemSelected ); + view.ContextMenuShownSignal().Connect( &OnContextMenuShown ); + view.ContextMenuHiddenSignal().Connect( &OnContextMenuHidden ); bool signal1 = false; bool signal2 = false; - view.ConnectSignal( testTracker, "contextMenuCustomized", CallbackFunctor(&signal1) ); - view.ConnectSignal( testTracker, "contextMenuItemSelected", CallbackFunctor(&signal2) ); - DALI_TEST_EQUALS( gContextMenuCustomizedCallbackCalled, 0, TEST_LOCATION ); - DALI_TEST_EQUALS( gContextMenuItemSelectedCallbackCalled, 0, TEST_LOCATION ); - DALI_TEST_CHECK(gContextMenuInstance == 0); - DALI_TEST_CHECK(gContextMenuItemInstance == 0); + view.ConnectSignal( testTracker, "contextMenuShown", CallbackFunctor(&signal1) ); + view.ConnectSignal( testTracker, "contextMenuHidden", CallbackFunctor(&signal2) ); + DALI_TEST_EQUALS( gContextMenuShownCallbackCalled, 0, TEST_LOCATION ); + DALI_TEST_EQUALS( gContextMenuHiddenCallbackCalled, 0, TEST_LOCATION ); + DALI_TEST_CHECK(gContextMenuShownInstance == 0); + DALI_TEST_CHECK(gContextMenuHiddenInstance == 0); view.LoadUrl( TEST_URL1 ); Test::EmitGlobalTimerSignal(); - DALI_TEST_EQUALS( gContextMenuCustomizedCallbackCalled, 1, TEST_LOCATION ); - DALI_TEST_EQUALS( gContextMenuItemSelectedCallbackCalled, 1, TEST_LOCATION ); + DALI_TEST_EQUALS( gContextMenuShownCallbackCalled, 1, TEST_LOCATION ); + DALI_TEST_EQUALS( gContextMenuHiddenCallbackCalled, 1, TEST_LOCATION ); DALI_TEST_CHECK( signal1 ); DALI_TEST_CHECK( signal2 ); // check context meun & its items. - DALI_TEST_CHECK(gContextMenuInstance != 0); - std::unique_ptr item = gContextMenuInstance->GetItemAt(0); + DALI_TEST_CHECK(gContextMenuShownInstance != 0); + std::unique_ptr item = gContextMenuShownInstance->GetItemAt(0); DALI_TEST_CHECK(item.get() != 0); - std::vector> itemList = gContextMenuInstance->GetItemList(); + std::vector> itemList = gContextMenuShownInstance->GetItemList(); DALI_TEST_CHECK(itemList.size() == 1); - Dali::Vector2 testPosition = Dali::Vector2(100, 100); - DALI_TEST_EQUALS(gContextMenuInstance->GetPosition(), testPosition, TEST_LOCATION); - DALI_TEST_CHECK(gContextMenuInstance->RemoveItem(*(item.get()))); - DALI_TEST_CHECK(gContextMenuInstance->AppendItemAsAction(WebEngineContextMenuItem::ItemTag::NO_ACTION, "", false)); - DALI_TEST_CHECK(gContextMenuInstance->AppendItem(WebEngineContextMenuItem::ItemTag::NO_ACTION, "", "", false)); - DALI_TEST_CHECK(gContextMenuInstance->SelectItem(*(item.get()))); - DALI_TEST_CHECK(gContextMenuInstance->Hide()); - - DALI_TEST_CHECK(gContextMenuItemInstance != 0); + DALI_TEST_CHECK(gContextMenuShownInstance->RemoveItem(*(item.get()))); + DALI_TEST_CHECK(gContextMenuShownInstance->AppendItemAsAction(WebEngineContextMenuItem::ItemTag::NO_ACTION, "", false)); + DALI_TEST_CHECK(gContextMenuShownInstance->AppendItem(WebEngineContextMenuItem::ItemTag::NO_ACTION, "", "", false)); + DALI_TEST_CHECK(gContextMenuShownInstance->SelectItem(*(item.get()))); + DALI_TEST_CHECK(gContextMenuShownInstance->Hide()); + Dali::WebEngineContextMenuItem::ItemTag testItemTag = Dali::WebEngineContextMenuItem::ItemTag::NO_ACTION; - DALI_TEST_EQUALS(gContextMenuItemInstance->GetTag(), testItemTag, TEST_LOCATION); + DALI_TEST_EQUALS(item->GetTag(), testItemTag, TEST_LOCATION); Dali::WebEngineContextMenuItem::ItemType testItemType = Dali::WebEngineContextMenuItem::ItemType::ACTION; - DALI_TEST_EQUALS(gContextMenuItemInstance->GetType(), testItemType, TEST_LOCATION); - DALI_TEST_CHECK(gContextMenuItemInstance->IsEnabled()); + DALI_TEST_EQUALS(item->GetType(), testItemType, TEST_LOCATION); + DALI_TEST_CHECK(item->IsEnabled()); std::string testLinkUrl("http://test.html"); - DALI_TEST_EQUALS(gContextMenuItemInstance->GetLinkUrl(), testLinkUrl, TEST_LOCATION); + DALI_TEST_EQUALS(item->GetLinkUrl(), testLinkUrl, TEST_LOCATION); std::string testImageUrl("http://test.jpg"); - DALI_TEST_EQUALS(gContextMenuItemInstance->GetImageUrl(), testImageUrl, TEST_LOCATION); + DALI_TEST_EQUALS(item->GetImageUrl(), testImageUrl, TEST_LOCATION); std::string testTitle("title"); - DALI_TEST_EQUALS(gContextMenuItemInstance->GetTitle(), testTitle, TEST_LOCATION); - DALI_TEST_CHECK(gContextMenuItemInstance->GetParentMenu().get() == 0); + DALI_TEST_EQUALS(item->GetTitle(), testTitle, TEST_LOCATION); + DALI_TEST_CHECK(item->GetParentMenu().get() == 0); + + DALI_TEST_CHECK(gContextMenuHiddenInstance != 0); - gContextMenuInstance = nullptr; - gContextMenuItemInstance = nullptr; + gContextMenuShownInstance = nullptr; + gContextMenuHiddenInstance = nullptr; END_TEST; } @@ -1516,6 +1515,7 @@ int UtcDaliWebViewMethodsForCoverage(void) []( const std::string& arg ) { } ); + view.SetTtsFocus(true); DALI_TEST_CHECK( view ); @@ -1585,19 +1585,15 @@ int UtcDaliWebContextGetSetCacheModel(void) std::string kDefaultValue; // Reset something - context->SetProxyUri( kDefaultValue ); - context->SetCertificateFilePath( kDefaultValue ); - context->EnableCache( true ); + context->SetAppId( "id" ); + context->SetApplicationType( Dali::WebEngineContext::ApplicationType::OTHER ); + context->SetTimeOffset( 0 ); + context->SetTimeZoneOffset( 0, 0 ); context->SetDefaultProxyAuth( kDefaultValue, kDefaultValue ); context->DeleteAllWebDatabase(); context->DeleteAllWebStorage(); context->DeleteLocalFileSystem(); context->ClearCache(); - context->SetContextAppId( "id" ); - context->SetContextApplicationType( Dali::WebEngineContext::ApplicationType::OTHER ); - context->SetContextTimeOffset( 0 ); - context->SetContextTimeZoneOffset( 0, 0 ); - context->SetDefaultZoomFactor( 0 ); context->DeleteAllFormPasswordData(); context->DeleteAllFormCandidateData(); @@ -1611,14 +1607,16 @@ int UtcDaliWebContextGetSetCacheModel(void) DALI_TEST_CHECK( value == Dali::WebEngineContext::CacheModel::DOCUMENT_BROWSER ); // Get cache enabled + context->EnableCache( true ); DALI_TEST_CHECK( context->IsCacheEnabled() ); // Get certificate - std::string str = context->GetContextCertificateFile(); + context->SetCertificateFilePath( "test" ); + std::string str = context->GetCertificateFilePath(); DALI_TEST_EQUALS( str, "test", TEST_LOCATION ); // Set version - DALI_TEST_CHECK( context->SetContextAppVersion( "test" ) ); + DALI_TEST_CHECK( context->SetAppVersion( "test" ) ); // Register std::vector temp; @@ -1626,16 +1624,18 @@ int UtcDaliWebContextGetSetCacheModel(void) context->RegisterJsPluginMimeTypes( temp ); context->DeleteFormPasswordDataList( temp ); - // Get zoom - DALI_TEST_EQUALS( context->GetContextDefaultZoomFactor(), float( 0 ), TEST_LOCATION ); + // Get zoom factor + context->SetDefaultZoomFactor( 1.0f ); + DALI_TEST_EQUALS( context->GetDefaultZoomFactor(), float( 1.0f ), TEST_LOCATION ); // Delete cache and database DALI_TEST_CHECK( context->DeleteAllApplicationCache() ); DALI_TEST_CHECK( context->DeleteAllWebIndexedDatabase() ); // Get contextProxy - context->SetContextProxy("", ""); - DALI_TEST_EQUALS( context->GetContextProxy(), "test", TEST_LOCATION ); + context->SetProxyUri( "test" ); + DALI_TEST_EQUALS( context->GetProxyUri(), "test", TEST_LOCATION ); + context->SetProxyBypassRule("", "test"); DALI_TEST_EQUALS( context->GetProxyBypassRule(), "test", TEST_LOCATION ); //Notify low memory