X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-WebView.cpp;h=8459195b121366821169c7a8c2efaae1f7904e1e;hb=bf58973c37b31d52707463a1e9cdecdbe91099f6;hp=bb9e279535a846302e26f701ffbf6af088e9fbf5;hpb=e5d379064ba0e9a68d1d2680906952dbde263f34;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 index bb9e279..8459195 100644 --- 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) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -75,7 +75,7 @@ static void OnEvaluateJavaScript( const std::string& result ) gEvaluateJavaScriptCallbackCalled++; } -static bool OnTouched( Actor actor, const Dali::TouchData& touch ) +static bool OnTouched( Actor actor, const Dali::TouchEvent& touch ) { gTouched = true; return true; @@ -144,11 +144,11 @@ int UtcDaliWebViewPageNavigation(void) ToolkitTestApplication application; WebView view = WebView::New(); - view.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - view.SetParentOrigin( ParentOrigin::TOP_LEFT ); - view.SetPosition( 0, 0 ); - view.SetSize( 800, 600 ); - Stage::GetCurrent().Add( view ); + view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 )); + view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) ); + application.GetScene().Add( view ); application.SendNotification(); application.Render(); DALI_TEST_CHECK( view ); @@ -178,7 +178,7 @@ int UtcDaliWebViewPageNavigation(void) view.LoadUrl( TEST_URL2 ); view.Suspend(); - view.SetSize( 400, 300 ); + view.SetProperty( Actor::Property::SIZE, Vector2( 400, 300 ) ); application.SendNotification(); application.Render(); Test::EmitGlobalTimerSignal(); @@ -215,12 +215,12 @@ int UtcDaliWebViewTouchAndKeys(void) ToolkitTestApplication application; WebView view = WebView::New(); - view.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - view.SetParentOrigin( ParentOrigin::TOP_LEFT ); - view.SetPosition( 0, 0 ); - view.SetSize( 800, 600 ); + view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + view.SetProperty( Actor::Property::POSITION, Vector2( 0, 0 )); + view.SetProperty( Actor::Property::SIZE, Vector2( 800, 600 ) ); - Stage::GetCurrent().Add( view ); + application.GetScene().Add( view ); application.SendNotification(); application.Render();