Changes after TouchData renamed to TouchEvent

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / utc-Dali-WebView.cpp

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-WebView.cpp
index f12353a..8459195 100644 (file)
--- 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;
@@ -146,9 +146,9 @@ int UtcDaliWebViewPageNavigation(void)
   WebView view = WebView::New();
   view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
   view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetPosition( 0, 0 );
-  view.SetSize( 800, 600 );
-  Stage::GetCurrent().Add( view );
+  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();
@@ -217,10 +217,10 @@ int UtcDaliWebViewTouchAndKeys(void)
   WebView view = WebView::New();
   view.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
   view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
-  view.SetPosition( 0, 0 );
-  view.SetSize( 800, 600 );
+  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();