X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-TextSelectionPopup.cpp;h=4b8aca5af757fc82edd1950c1b4104b37ece5e4e;hb=5aaba5adcf1a717e1ece3ef9c55c8912420993b5;hp=9b7c6fcfef470d03de5502a1ebc5d1f51aed05a0;hpb=cb30ef68af0383b073ba2d425d3d95c1e916cbb4;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp
index 9b7c6fc..4b8aca5 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp
@@ -153,17 +153,17 @@ int UtcDaliToolkitTextSelectionToolBarP(void)
   toolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE, Size( 100.0f, 60.0f) );
 
   Toolkit::PushButton option = Toolkit::PushButton::New();
-  option.SetName( "test-option" );
+  option.SetProperty( Dali::Actor::Property::NAME, "test-option" );
   option.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
   toolbar.AddOption( option );
 
   Toolkit::Control divider = Toolkit::Control::New();
-  divider.SetSize( 2.0f, 0.0f );
+  divider.SetProperty( Actor::Property::SIZE, Vector2( 2.0f, 0.0f ) );
   divider.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT );
   toolbar.AddDivider( divider );
 
   Toolkit::PushButton option2 = Toolkit::PushButton::New();
-  option2.SetName( "test-option-2" );
+  option2.SetProperty( Dali::Actor::Property::NAME, "test-option-2" );
   option2.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
   toolbar.AddOption( option2 );
 
@@ -184,7 +184,7 @@ int UtcDaliToolkitTextSelectionToolBarScrollBarP(void)
   toolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE, Size( 100.0f, 60.0f) );
 
   Toolkit::PushButton option = Toolkit::PushButton::New();
-  option.SetName( "test-option" );
+  option.SetProperty( Dali::Actor::Property::NAME, "test-option" );
   option.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
   toolbar.AddOption( option );
 
@@ -197,3 +197,36 @@ int UtcDaliToolkitTextSelectionToolBarScrollBarP(void)
   DALI_TEST_CHECK( toolbar );
   END_TEST;
 }
+
+int UtcDaliToolkitTextSelectionToolBarScrollView(void)
+{
+  // Configures the ScrollView within the TextSelectionToolbar
+  ToolkitTestApplication application;
+
+  TextSelectionToolbar toolbar = TextSelectionToolbar::New();
+  DALI_TEST_CHECK( toolbar );
+  Stage::GetCurrent().Add( toolbar );
+
+  Property::Map map;
+  map["overshootEffectColor"] = Color::RED;
+  map["overshootSize"] = Vector2(50.0f, 50.f);
+  toolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::SCROLL_VIEW, map );
+
+  application.SendNotification();
+  application.Render();
+
+  Actor actor = toolbar.FindChildByName("TextSelectionScrollView");
+  DALI_TEST_CHECK( actor );
+
+  ScrollView scrollView = ScrollView::DownCast( actor );
+  DALI_TEST_CHECK( scrollView );
+
+  Vector4 color = scrollView.GetProperty<Vector4>( Toolkit::Scrollable::Property::OVERSHOOT_EFFECT_COLOR );
+  DALI_TEST_EQUALS( color, Color::RED, TEST_LOCATION );
+
+  Vector2 size = scrollView.GetProperty<Vector2>( Toolkit::Scrollable::Property::OVERSHOOT_SIZE );
+  DALI_TEST_EQUALS( size, Vector2(50.0f, 50.f), TEST_LOCATION );
+
+  END_TEST;
+}
+