[ITC/UTC][dali-toolkit][Non-ACR][Fix tc fails]

Change-Id: If6c83f9d81a3672f31bdcc699de5bd010e68ef0a

diff --git a/src/itc/dali-toolkit/scroll-view/ITs-scroll-view-impl.h b/src/itc/dali-toolkit/scroll-view/ITs-scroll-view-impl.h
index b5838b25bdc1e728a85123db5f6e0b9f549ddb56..112b0b6a608c0b81710bad141d5eaf294d59c5cc 100755 (executable)
--- a/src/itc/dali-toolkit/scroll-view/ITs-scroll-view-impl.h
+++ b/src/itc/dali-toolkit/scroll-view/ITs-scroll-view-impl.h
@@ -922,19 +922,21 @@ void ScrollViewActorAutoSnap()
        g_ScrollView.Add(actor);
        actor.SetPosition(SCROLL_VIEW_TEST_ACTOR_POSITION);
 
-       //ScrollTo [400.0f 400.0f]
-       g_ScrollView.ScrollTo(Vector2( SCROLL_TARGET_Y, SCROLL_TARGET_Y ), SCROLL_DURATION);
+       //ScrollTo [150.0f 150.0f]
+       g_ScrollView.ScrollTo(SCROLL_TARGET_2, SCROLL_DURATION);
 }
 void VTScrollViewActorAutoSnap001()
 {
-       DALI_CHECK_FAIL(g_ScrollView.GetCurrentScrollPosition() != Vector2( SCROLL_TARGET_Y, SCROLL_TARGET_Y ) , " ScrollTo is failed");
+       DALI_CHECK_FAIL(g_ScrollView.GetCurrentScrollPosition() != SCROLL_TARGET_2, " ScrollTo is failed");
+
+       g_ScrollView.SetScrollSnapDuration(0.1f);
 
        //Try to snap without enabling true
        g_ScrollView.ScrollToSnapPoint();
 }
 void VTScrollViewActorAutoSnap002()
 {
-       DALI_CHECK_FAIL(g_ScrollView.GetCurrentScrollPosition() != Vector2( SCROLL_TARGET_Y, SCROLL_TARGET_Y ) , 
+       DALI_CHECK_FAIL(g_ScrollView.GetCurrentScrollPosition() != SCROLL_TARGET_2, 
                                                                        "Should not execute snap without enabling true.");
 
        //Try to snap with enabling true

diff --git a/src/utc/dali-toolkit/scroll-view/utc-dali-scroll-view.cpp b/src/utc/dali-toolkit/scroll-view/utc-dali-scroll-view.cpp
index 34f9337e49a92d0adfa7951cbad5beb99568a330..edeab7a5cd30c593063ad99a2f2b0a89f9958665 100755 (executable)
--- a/src/utc/dali-toolkit/scroll-view/utc-dali-scroll-view.cpp
+++ b/src/utc/dali-toolkit/scroll-view/utc-dali-scroll-view.cpp
@@ -1104,22 +1104,24 @@ void ScrollViewSetActorAutoSnapP()
   gScrollView.Add(actor);
   actor.SetPosition(SCROLL_VIEW_TEST_ACTOR_POSITION);
 
-  //ScrollTo [400.0f 400.0f]
-  gScrollView.ScrollTo(Vector2( SCROLL_TARGET_Y, SCROLL_TARGET_Y ), SCROLL_DURATION);
+  //ScrollTo [150.0f 150.0f]
+  gScrollView.ScrollTo(SCROLL_TARGET_2, SCROLL_DURATION);
 }
 
 // * ############################## Verdict test for ScrollViewActorAutoSnap
 
 void VTScrollViewActorAutoSnap001()
 {
-  DALI_CHECK_FAIL(gScrollView.GetCurrentScrollPosition() != Vector2( SCROLL_TARGET_Y, SCROLL_TARGET_Y ) , " ScrollTo is failed");
+  DALI_CHECK_FAIL(gScrollView.GetCurrentScrollPosition() != SCROLL_TARGET_2, " ScrollTo is failed");
+
+  gScrollView.SetScrollSnapDuration(0.1f);
 
   //Try to snap without enabling true
   gScrollView.ScrollToSnapPoint();
 }
 void VTScrollViewActorAutoSnap002()
 {
-  DALI_CHECK_FAIL(gScrollView.GetCurrentScrollPosition() != Vector2( SCROLL_TARGET_Y, SCROLL_TARGET_Y ) , "Should not execute snap without enabling true.");
+  DALI_CHECK_FAIL(gScrollView.GetCurrentScrollPosition() != SCROLL_TARGET_2, "Should not execute snap without enabling true.");
 
   //Try to snap with enabling true
   gScrollView.SetActorAutoSnap(true);