X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-Accessibility-Value.cpp;h=af4739ba342f6f968d3a3eea54554d50f35c882b;hb=7956f5a39044145c9f6af24fa6d291a9943800cf;hp=0b26c3f49a8beefe53029018cdc241956d31a2af;hpb=cb36eef8199cd838f5123efc500106c52bbc4d98;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp
index 0b26c3f..af4739b 100644
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Value.cpp
@@ -28,11 +28,14 @@
 
 #include <dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h>
 
+#include <automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dbus-wrapper.h>
+
 using namespace Dali::Accessibility;
 
 void utc_dali_toolkit_accessibility_value_startup(void)
 {
   test_return_value = TET_UNDEF;
+  DBusWrapper::Install(std::unique_ptr<DBusWrapper>(new TestDBusWrapper));
 }
 
 void utc_dali_toolkit_accessibility_value_cleanup(void)
@@ -74,7 +77,7 @@ int utcDaliAccessibilityProgressBarGetMinimumIncrement(void)
   auto q = Dali::Accessibility::Accessible::Get(progress_bar);
   auto x = dynamic_cast< Dali::Accessibility::Value* >( q );
   DALI_TEST_CHECK( x );
-  DALI_TEST_EQUALS( x->GetMinimumIncrement(), 0.001, TEST_LOCATION );
+  DALI_TEST_EQUALS( x->GetMinimumIncrement(), 0.0, TEST_LOCATION );
 
   END_TEST;
 }
@@ -225,7 +228,7 @@ int utcDaliAccessibilitySliderGetMinimumIncrement(void)
   auto q = Dali::Accessibility::Accessible::Get(slider);
   auto x = dynamic_cast< Dali::Accessibility::Value* >( q );
   DALI_TEST_CHECK( x );
-  DALI_TEST_EQUALS<float>( x->GetMinimumIncrement(), 0.05, TEST_LOCATION );
+  DALI_TEST_EQUALS<float>( x->GetMinimumIncrement(), 0.0, TEST_LOCATION );
 
   END_TEST;
 }
@@ -243,5 +246,23 @@ int utcDaliAccessibilitySliderGetSetCurrent(void)
   DALI_TEST_EQUALS( x->SetCurrent( 0.25 ), true, TEST_LOCATION );
   DALI_TEST_EQUALS( x->GetCurrent(), 0.25, TEST_LOCATION );
 
+  const float MIN_BOUND = 0.0f;
+  const float MAX_BOUND = 1.0f;
+  const int NUM_MARKS = 5;
+  Property::Array marks;
+  for( int i = 0; i < NUM_MARKS; ++i )
+  {
+    marks.PushBack( MIN_BOUND + ( static_cast<float>(i) / ( NUM_MARKS - 1) ) * ( MAX_BOUND - MIN_BOUND ) );
+  }
+  slider.SetProperty( Toolkit::Slider::Property::MARKS, marks );
+  // when current value is not a mark, set new value to the closest mark
+  DALI_TEST_CHECK( x->SetCurrent( 0.1f ) );
+  slider.SetProperty( Toolkit::Slider::Property::SNAP_TO_MARKS, true );
+  DALI_TEST_CHECK( x->SetCurrent( 0.7f ) );
+  DALI_TEST_EQUALS( static_cast<float>( x->GetCurrent() ), marks[3].Get<float>(), TEST_LOCATION );
+  // when current value is a mark at index i set new value to the mark at index i +/- 1
+  // depending if the new value is greater/less than current value
+  DALI_TEST_CHECK( x->SetCurrent( 0.2f ) );
+  DALI_TEST_EQUALS( static_cast<float>( x->GetCurrent() ),  marks[2].Get<float>(), TEST_LOCATION );
   END_TEST;
 }