X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ScrollViewEffect.cpp;h=911e5374e87be5eca7227a6e8d5d1a29532fc722;hb=65fe4d97a7a58199b2f5ad2d84e26acbb2b6ae39;hp=438a496939e18970afb309bfef6b9c1d88bf0e3a;hpb=e57ac623d829edc5470e4ede8beff556a13035e1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp
index 438a496..911e537 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -25,7 +25,6 @@
 #include <dali.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/integration-api/events/touch-event-integ.h>
-#include <dali/integration-api/events/pan-gesture-event.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -138,9 +137,9 @@ ScrollView SetupTestScrollView(int rows, int columns, Vector2 size)
   Constraint constraint;
 
   ScrollView scrollView = ScrollView::New();
-  scrollView.SetSize(size);
-  scrollView.SetAnchorPoint(AnchorPoint::CENTER);
-  scrollView.SetParentOrigin(ParentOrigin::CENTER);
+  scrollView.SetProperty( Actor::Property::SIZE, size);
+  scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER);
+  scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
 
   constraint = Constraint::New<Dali::Vector3>( scrollView, Dali::Actor::Property::SIZE, Dali::EqualToConstraint() );
   constraint.AddSource( Dali::ParentSource( Dali::Actor::Property::SIZE ) );
@@ -175,9 +174,9 @@ ScrollView SetupTestScrollView(int rows, int columns, Vector2 size)
   Stage::GetCurrent().Add( scrollView );
 
   Actor container = Actor::New();
-  container.SetParentOrigin(ParentOrigin::CENTER);
-  container.SetAnchorPoint(AnchorPoint::CENTER);
-  container.SetSize( size );
+  container.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER);
+  container.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER);
+  container.SetProperty( Actor::Property::SIZE, size );
   scrollView.Add( container );
 
   constraint = Constraint::New<Vector3>( container, Actor::Property::SIZE, EqualToConstraint() );
@@ -194,9 +193,9 @@ ScrollView SetupTestScrollView(int rows, int columns, Vector2 size)
       constraint = Constraint::New<Vector3>( page, Actor::Property::SIZE, EqualToConstraint() );
       constraint.AddSource( Dali::ParentSource( Dali::Actor::Property::SIZE ) );
       constraint.Apply();
-      page.SetParentOrigin( ParentOrigin::CENTER );
-      page.SetAnchorPoint( AnchorPoint::CENTER );
-      page.SetPosition( column * size.x, row * size.y );
+      page.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+      page.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+      page.SetProperty( Actor::Property::POSITION, Vector2( column * size.x, row * size.y ));
       container.Add(page);
 
       gPages.push_back(page);
@@ -290,7 +289,7 @@ int UtcDaliScrollViewPagePathEffectTest(void)
   }
 
   // test that the test page has reached centre of screen
-  Vector3 pagePos = testPage.GetCurrentPosition();
+  Vector3 pagePos = testPage.GetCurrentProperty< Vector3 >( Actor::Property::POSITION );
   DALI_TEST_EQUALS(pagePos, Vector3::ZERO, Math::MACHINE_EPSILON_0, TEST_LOCATION);
 
   CleanupTest();