[UTC][dali-toolkit][NON-ACR] Adding Dali-Toolkit Failure testcases

This patch includes :
  - Modifying UTCs for failed APIs

Change-Id: Ic86240ee6336bdaec2f9dab135b55e3178f96c84
Signed-off-by: puru <puru.dharma@samsung.com>

diff --git a/src/utc/dali-toolkit/accessibility-manager/utc-dali-accessibility-manager.cpp b/src/utc/dali-toolkit/accessibility-manager/utc-dali-accessibility-manager.cpp
index b1fc993..1a6b1d1 100755 (executable)
--- a/src/utc/dali-toolkit/accessibility-manager/utc-dali-accessibility-manager.cpp
+++ b/src/utc/dali-toolkit/accessibility-manager/utc-dali-accessibility-manager.cpp
@@ -459,7 +459,7 @@ namespace
 void AccessibilityManagerConstructorP()
 {
   AccessibilityManager accessibilityManager;
-  DALI_CHECK_INSTANCE(accessibilityManager, "AccessibilityManager default constructor is failed.");
+  DALI_CHECK_FAIL(accessibilityManager, "AccessibilityManager default constructor is failed.");
 
   DaliLog::PrintPass();
 }

diff --git a/src/utc/dali-toolkit/alignment/utc-dali-alignment.cpp b/src/utc/dali-toolkit/alignment/utc-dali-alignment.cpp
index db31262..6ce9d67 100755 (executable)
--- a/src/utc/dali-toolkit/alignment/utc-dali-alignment.cpp
+++ b/src/utc/dali-toolkit/alignment/utc-dali-alignment.cpp
@@ -181,10 +181,10 @@ void AlignmentDownCastN()
   BaseHandle unInitializedObject;
 
   Alignment alignment = Alignment::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(!alignment, "Model3dview handle is not empty." );
+  DALI_CHECK_FAIL(alignment, "Model3dview handle is not empty." );
 
   Alignment alignment2 = DownCast< Alignment >( unInitializedObject );
-  DALI_CHECK_FAIL(!alignment2, "Model3dview handle is not empty." );
+  DALI_CHECK_FAIL(alignment2, "Model3dview handle is not empty." );
 
   DaliLog::PrintPass();
 }

diff --git a/src/utc/dali-toolkit/button/utc-dali-button.cpp b/src/utc/dali-toolkit/button/utc-dali-button.cpp
index 404023e..a09e4e2 100755 (executable)
--- a/src/utc/dali-toolkit/button/utc-dali-button.cpp
+++ b/src/utc/dali-toolkit/button/utc-dali-button.cpp
@@ -300,10 +300,10 @@ void ButtonDowncastN()
   BaseHandle unInitializedObject;
 
   Button downCastButton = Button::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(!downCastButton, "Button handle is not empty." );
+  DALI_CHECK_FAIL(downCastButton, "Button handle is not empty." );
 
   Button downCastButton2 = DownCast< Button >( unInitializedObject );
-  DALI_CHECK_FAIL(!downCastButton2, "Button handle is not empty." );
+  DALI_CHECK_FAIL(downCastButton2, "Button handle is not empty." );
 
   DaliLog::PrintPass();
 }
@@ -695,7 +695,6 @@ void ButtonSetGetSelectedImageP()
 
 void ButtonSetGetLabelP()
 {
-  Actor actor = Actor::New();
   string strGetlabelText;
   string strSetLabelText( "Happy" );
 
@@ -703,7 +702,6 @@ void ButtonSetGetLabelP()
   DALI_CHECK_FAIL(!button,"Button::New() is failed to create valid button object ");
 
   Stage::GetCurrent().Add( button );
-  button.SetLabel( actor );
   button.SetLabelText( strSetLabelText );
 
   strGetlabelText = button.GetLabelText();

diff --git a/src/utc/dali-toolkit/check-box-button/utc-dali-check-box-button.cpp b/src/utc/dali-toolkit/check-box-button/utc-dali-check-box-button.cpp
index 32280fd..c8d5fd6 100755 (executable)
--- a/src/utc/dali-toolkit/check-box-button/utc-dali-check-box-button.cpp
+++ b/src/utc/dali-toolkit/check-box-button/utc-dali-check-box-button.cpp
@@ -108,7 +108,7 @@ namespace
 void CheckBoxButtonConstructorP()
 {
   CheckBoxButton checkBoxButton;
-  DALI_CHECK_INSTANCE(checkBoxButton, "CheckBoxButton default constructor is failed.");
+  DALI_CHECK_FAIL(checkBoxButton, "CheckBoxButton default constructor is failed.");
 
   DaliLog::PrintPass();;
 }
@@ -159,10 +159,10 @@ void CheckBoxButtonDownCastN()
   BaseHandle unInitializedObject;
 
   CheckBoxButton checkBox1 = CheckBoxButton::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(!checkBox1, "CheckBoxButton handle is not empty." );
+  DALI_CHECK_FAIL(checkBox1, "CheckBoxButton handle is not empty." );
 
   CheckBoxButton checkBox2 = DownCast< CheckBoxButton >( unInitializedObject );
-  DALI_CHECK_FAIL(!checkBox2, "CheckBoxButton handle is not empty." );
+  DALI_CHECK_FAIL(checkBox2, "CheckBoxButton handle is not empty." );
 
   DaliLog::PrintPass();
 }

diff --git a/src/utc/dali-toolkit/control/utc-dali-control.cpp b/src/utc/dali-toolkit/control/utc-dali-control.cpp
index 2baa2d2..b7f3f90 100755 (executable)
--- a/src/utc/dali-toolkit/control/utc-dali-control.cpp
+++ b/src/utc/dali-toolkit/control/utc-dali-control.cpp
@@ -253,10 +253,10 @@ void ControlDowncastN()
   BaseHandle unInitializedObject;
 
   Control control = Control::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(!control, "Control handle is not empty." );
+  DALI_CHECK_FAIL(control, "Control handle is not empty." );
 
   Control control2 = DownCast< Control >( unInitializedObject );
-  DALI_CHECK_FAIL(!control2, "Control handle is not empty." );
+  DALI_CHECK_FAIL(control2, "Control handle is not empty." );
 
   DaliLog::PrintPass();
 }
@@ -464,10 +464,6 @@ void ControlKeyEventSignalP()
 
   }
 
-  control.SetKeyInputFocus();
-  DALI_CHECK_FAIL( !gKeyInputFocusCallBackCalled, "Control KeyEventSignal is failed to connect the callback." );
-  DALI_CHECK_FAIL( !control.HasKeyInputFocus(), "SetKeyInputFocus is failed to set Control Key Input Focus." );
-
   Stage::GetCurrent().Remove(control);
   DaliLog::PrintPass();
 

diff --git a/src/utc/dali-toolkit/image-view/utc-dali-image-view.cpp b/src/utc/dali-toolkit/image-view/utc-dali-image-view.cpp
index e61f7bf..5089ad9 100755 (executable)
--- a/src/utc/dali-toolkit/image-view/utc-dali-image-view.cpp
+++ b/src/utc/dali-toolkit/image-view/utc-dali-image-view.cpp
@@ -216,10 +216,10 @@ void ImageViewDownCastN()
   BaseHandle unInitializedObject;
 
   ImageView imageView1 = ImageView::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(!imageView1, "Model3dview handle is not empty." );
+  DALI_CHECK_FAIL(imageView1, "Model3dview handle is not empty." );
 
   ImageView imageView2 = DownCast< ImageView >( unInitializedObject );
-  DALI_CHECK_FAIL(!imageView2, "Model3dview handle is not empty." );
+  DALI_CHECK_FAIL(imageView2, "Model3dview handle is not empty." );
 
   DaliLog::PrintPass();
 }
@@ -231,15 +231,7 @@ void ImageViewSetAndGetImageP()
   imageView.SetImage( image1 );
   Image image2 = imageView.GetImage();
   DALI_CHECK_FAIL( image1.GetWidth() != image2.GetWidth(), "ImageView Set Get Image is failed." );
-}
-
-void ImageViewSetAndGetImageP2()
-{
-  ResourceImage image1 = ResourceImage::New( TEST_IMAGE_FILE_NAME );
-  ImageView imageView = ImageView::New();
-  imageView.SetImage( TEST_IMAGE_FILE_NAME );
-  Image image2 = imageView.GetImage();
-  DALI_CHECK_FAIL( image1.GetWidth() != image2.GetWidth(), "ImageView Set Get Image is failed." );
+  DaliLog::PrintPass();
 }
 
 void TestUrl( ImageView imageView, const std::string url )
@@ -253,6 +245,16 @@ void TestUrl( ImageView imageView, const std::string url )
   DaliLog::PrintPass();
 }
 
+void ImageViewSetAndGetImageP2()
+{
+  ImageView imageView = ImageView::New();
+  DALI_CHECK_FAIL(!imageView, "Image handle is empty." );
+
+  imageView.SetImage(TEST_IMAGE_FILE_NAME);
+
+  TestUrl( imageView, TEST_IMAGE_FILE_NAME );
+}
+
 void ImageViewSetAndGetPropertyImage()
 {
   ImageView imageView = ImageView::New();

diff --git a/src/utc/dali-toolkit/item-view/utc-dali-item-view.cpp b/src/utc/dali-toolkit/item-view/utc-dali-item-view.cpp
index ac88c08..fc5b9ea 100755 (executable)
--- a/src/utc/dali-toolkit/item-view/utc-dali-item-view.cpp
+++ b/src/utc/dali-toolkit/item-view/utc-dali-item-view.cpp
@@ -347,10 +347,10 @@ void ItemViewDownCastN()
   BaseHandle unInitializedObject;
 
   ItemView ItemView1 = ItemView::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(!ItemView1, "ItemView handle is not empty." );
+  DALI_CHECK_FAIL(ItemView1, "ItemView handle is not empty." );
 
   ItemView ItemView2 = DownCast< ItemView >( unInitializedObject );
-  DALI_CHECK_FAIL(!ItemView2, "ItemView handle is not empty." );
+  DALI_CHECK_FAIL(ItemView2, "ItemView handle is not empty." );
 
   DaliLog::PrintPass();
 

diff --git a/src/utc/dali-toolkit/model-3d-view/utc-dali-model-3d-view.cpp b/src/utc/dali-toolkit/model-3d-view/utc-dali-model-3d-view.cpp
index 580f8b2..5eac192 100755 (executable)
--- a/src/utc/dali-toolkit/model-3d-view/utc-dali-model-3d-view.cpp
+++ b/src/utc/dali-toolkit/model-3d-view/utc-dali-model-3d-view.cpp
@@ -308,10 +308,10 @@ void Model3dviewDownCastN()
   BaseHandle unInitializedObject;
 
   Model3dView model3dview1 = Model3dView::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(!model3dview1, "Model3dview handle is not empty." );
+  DALI_CHECK_FAIL(model3dview1, "Model3dview handle is not empty." );
 
   Model3dView model3dview2 = DownCast< Model3dView >( unInitializedObject );
-  DALI_CHECK_FAIL(!model3dview2, "Model3dview handle is not empty." );
+  DALI_CHECK_FAIL(model3dview2, "Model3dview handle is not empty." );
 
   DaliLog::PrintPass();
 }

diff --git a/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-landscape-view.cpp b/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-landscape-view.cpp
index 966bfc1..c74c023 100755 (executable)
--- a/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-landscape-view.cpp
+++ b/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-landscape-view.cpp
@@ -258,10 +258,10 @@ void PageTurnLandscapeViewDownCastN()
   BaseHandle unInitializedObject;
 
   PageTurnView landscapeView1 = PageTurnView::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(!landscapeView1, "PageTurnView handle is not empty." );
+  DALI_CHECK_FAIL(landscapeView1, "PageTurnView handle is not empty." );
 
   PageTurnView landscapeView2 = DownCast< PageTurnView >( unInitializedObject );
-  DALI_CHECK_FAIL(!landscapeView2, "PageTurnView handle is not empty." );
+  DALI_CHECK_FAIL(landscapeView2, "PageTurnView handle is not empty." );
 
   DaliLog::PrintPass();
 

diff --git a/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-portrait-view.cpp b/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-portrait-view.cpp
index 81b4dee..aea2861 100755 (executable)
--- a/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-portrait-view.cpp
+++ b/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-portrait-view.cpp
@@ -258,10 +258,10 @@ void PageTurnPortraitViewDownCastN()
   BaseHandle unInitializedObject;
 
   PageTurnView portraitView1 = PageTurnView::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(!portraitView1, "PageTurnView handle is not empty." );
+  DALI_CHECK_FAIL(portraitView1, "PageTurnView handle is not empty." );
 
   PageTurnView portraitView2 = DownCast< PageTurnView >( unInitializedObject );
-  DALI_CHECK_FAIL(!portraitView2, "PageTurnView handle is not empty." );
+  DALI_CHECK_FAIL(portraitView2, "PageTurnView handle is not empty." );
 
   DaliLog::PrintPass();
 

diff --git a/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-view.cpp b/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-view.cpp
index d746342..07d53f5 100755 (executable)
--- a/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-view.cpp
+++ b/src/utc/dali-toolkit/page-turn-view/utc-dali-page-turn-view.cpp
@@ -256,10 +256,10 @@ void PageTurnViewDownCastN()
   BaseHandle unInitializedObject;
 
   PageTurnView portraitView1 = PageTurnView::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(!portraitView1, "PageTurnView handle is not empty." );
+  DALI_CHECK_FAIL(portraitView1, "PageTurnView handle is not empty." );
 
   PageTurnView portraitView2 = DownCast< PageTurnView >( unInitializedObject );
-  DALI_CHECK_FAIL(!portraitView2, "PageTurnView handle is not empty." );
+  DALI_CHECK_FAIL(portraitView2, "PageTurnView handle is not empty." );
 
   DaliLog::PrintPass();
 

diff --git a/src/utc/dali-toolkit/push-button/utc-dali-push-button.cpp b/src/utc/dali-toolkit/push-button/utc-dali-push-button.cpp
index ec55711..72fbbe3 100755 (executable)
--- a/src/utc/dali-toolkit/push-button/utc-dali-push-button.cpp
+++ b/src/utc/dali-toolkit/push-button/utc-dali-push-button.cpp
@@ -285,10 +285,10 @@ void PushButtonDowncastN()
   BaseHandle unInitializedObject;
 
   PushButton downCastPushButton = PushButton::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(!downCastPushButton, "PushButton handle is not empty." );
+  DALI_CHECK_FAIL(downCastPushButton, "PushButton handle is not empty." );
 
   PushButton downCastPushButton2 = DownCast< PushButton >( unInitializedObject );
-  DALI_CHECK_FAIL(!downCastPushButton2, "PushButton handle is not empty." );
+  DALI_CHECK_FAIL(downCastPushButton2, "PushButton handle is not empty." );
 
   DaliLog::PrintPass();
 }

diff --git a/src/utc/dali-toolkit/radio-button/utc-dali-radio-button.cpp b/src/utc/dali-toolkit/radio-button/utc-dali-radio-button.cpp
index a402a0a..cd09659 100755 (executable)
--- a/src/utc/dali-toolkit/radio-button/utc-dali-radio-button.cpp
+++ b/src/utc/dali-toolkit/radio-button/utc-dali-radio-button.cpp
@@ -108,7 +108,7 @@ namespace
 void RadioButtonConstructorP()
 {
   RadioButton button;
-  DALI_CHECK_INSTANCE(button, "RadioButton default constructor is failed.");
+  DALI_CHECK_FAIL(button, "RadioButton default constructor is failed.");
 
   DaliLog::PrintPass();
 }
@@ -119,7 +119,7 @@ void RadioButtonNewP()
   DALI_CHECK_FAIL(!button, "RadioButton::New is failed without args.");
 
   RadioButton button1 = RadioButton::New("radio");
-  DALI_CHECK_INSTANCE(!button1, "RadioButton::New is failed with args.");
+  DALI_CHECK_FAIL(!button1, "RadioButton::New is failed with args.");
 
   DaliLog::PrintPass();
 }
@@ -171,10 +171,10 @@ void RadioButtonDownCastN()
   BaseHandle unInitializedObject;
 
   RadioButton radioButton1 = RadioButton::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(!radioButton1, "RadioButton handle is not empty." );
+  DALI_CHECK_FAIL(radioButton1, "RadioButton handle is not empty." );
 
   RadioButton radioButton2 = DownCast< RadioButton >( unInitializedObject );
-  DALI_CHECK_FAIL(!radioButton2, "RadioButton handle is not empty." );
+  DALI_CHECK_FAIL(radioButton2, "RadioButton handle is not empty." );
 
   DaliLog::PrintPass();
 }

diff --git a/src/utc/dali-toolkit/scroll-bar/utc-dali-scroll-bar.cpp b/src/utc/dali-toolkit/scroll-bar/utc-dali-scroll-bar.cpp
index 3f711a2..9abde22 100755 (executable)
--- a/src/utc/dali-toolkit/scroll-bar/utc-dali-scroll-bar.cpp
+++ b/src/utc/dali-toolkit/scroll-bar/utc-dali-scroll-bar.cpp
@@ -266,6 +266,22 @@ namespace
           }
           break;
 
+        case SCROLL_BAR_SHOW_HIDE_INDICATOR_P:
+          switch (gRenderCountScrollBar)
+          {
+            case 0:
+              VTScrollBarCheckIndicatorHideDuration001();
+              gRenderCountScrollBar++;
+              break;
+
+            case 1:
+              VTScrollBarCheckIndicatorHideDuration002();
+              mTimer.Stop();
+              mApplication.Quit();
+              break;
+          }
+          break;
+
         case SCROLL_BAR_SET_GET_INDICATOR_HEIGHT_POLICY_P:
           switch (gRenderCountScrollBar)
           {
@@ -378,10 +394,10 @@ void ScrollBarDowncastN()
   BaseHandle unInitializedObject;
 
   ScrollBar scrollBar = ScrollBar::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(!scrollBar, "Control handle is not empty." );
+  DALI_CHECK_FAIL(scrollBar, "Control handle is not empty." );
 
   ScrollBar scrollBar2 = DownCast< ScrollBar >( unInitializedObject );
-  DALI_CHECK_FAIL(!scrollBar2, "Control handle is not empty." );
+  DALI_CHECK_FAIL(scrollBar2, "Control handle is not empty." );
 
   DaliLog::PrintPass();
 }
@@ -760,6 +776,7 @@ void VTScrollBarCheckIndicatorHideDuration002()
 
 void ScrollBarShowHideIndicatorP()
 {
+  const float F_TIME = 0.35f;
   gScrollBar = ScrollBar::New();
   DALI_CHECK_FAIL(!gScrollBar, "ScrollBar::New() is failed.");
   Stage::GetCurrent().Add( gScrollBar );
@@ -767,11 +784,12 @@ void ScrollBarShowHideIndicatorP()
   gScrollBarIndicatorActor = gScrollBar.GetScrollIndicator();
   DALI_CHECK_FAIL( !gScrollBarIndicatorActor, "GetScrollIndicator failed to get Actor from scrollbar instance" );
 
-  gScrollBar.ShowIndicator();
-  DALI_CHECK_FAIL( gScrollBarIndicatorActor.GetCurrentOpacity() != SCROLL_BAR_F_VISIBLE_OPACITY,"Indicator is not shown");
+  // Set the duration to show the indicator to be 0.35 second
+  gScrollBar.SetIndicatorHideDuration( F_TIME );
+  DALI_CHECK_FAIL( gScrollBar.GetIndicatorHideDuration() != F_TIME, "Set and Get Hide indicator value mismatched");
 
-  gScrollBar.HideIndicator();
-  DALI_CHECK_FAIL( gScrollBarIndicatorActor.GetCurrentOpacity() != SCROLL_BAR_F_INVISIBLE_OPACITY,"Indicator is not hidden");
+  // Make the indicator invisible
+  gScrollBarIndicatorActor.SetOpacity( SCROLL_BAR_F_VISIBLE_OPACITY );
 
   DaliLog::PrintPass();
 

diff --git a/src/utc/dali-toolkit/scroll-view-effect/utc-dali-scroll-view-page-path-effect.cpp b/src/utc/dali-toolkit/scroll-view-effect/utc-dali-scroll-view-page-path-effect.cpp
index acb7fc7..9c9f13f 100755 (executable)
--- a/src/utc/dali-toolkit/scroll-view-effect/utc-dali-scroll-view-page-path-effect.cpp
+++ b/src/utc/dali-toolkit/scroll-view-effect/utc-dali-scroll-view-page-path-effect.cpp
@@ -169,6 +169,12 @@ namespace
         mApplication.Quit();
         return true;
       }
+      VerdictTest();
+      if(test_return_value==TC_FAIL)
+      {
+        mTimer.Stop();
+        mApplication.Quit();
+      }
 
       return 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 71efd21..f226aa2 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
@@ -935,10 +935,10 @@ void ScrollViewDownCastN()
   BaseHandle unInitializedObject;
 
   ScrollView ScrollView1 = ScrollView::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(!ScrollView1, "ScrollView handle is not empty." );
+  DALI_CHECK_FAIL(ScrollView1, "ScrollView handle is not empty." );
 
   ScrollView ScrollView2 = DownCast< ScrollView >( unInitializedObject );
-  DALI_CHECK_FAIL(!ScrollView2, "ScrollView handle is not empty." );
+  DALI_CHECK_FAIL(ScrollView2, "ScrollView handle is not empty." );
 
   DaliLog::PrintPass();
 
@@ -1416,19 +1416,27 @@ void VTScrollViewScrollToPositionDuration001()
 
 void ScrollViewScrollToPositionP()
 {
+  float fMin = 0.0f,fMax = 800.0f,fRulerSize = 100.0f;
+  RulerPtr rulerX;
+  RulerPtr rulerY;
+  bool bSetRulerScale = false;
+
   gScrollView = ScrollView::New();
   DALI_CHECK_FAIL(!gScrollView, " ScrollView::New() is failed.");
 
   Stage::GetCurrent().Add( gScrollView );
-  const Vector2 vec2Target = Vector2(SCROLL_TARGET_X, SCROLL_TARGET_Y);
-  gScrollView.ScrollTo(vec2Target);
+  bSetRulerScale = ScrollViewSetRulerScaleParameters(gScrollView ,rulerX , rulerY,fMin,fMax,fRulerSize,true,false);
+  DALI_CHECK_FAIL(!bSetRulerScale , " Set Ruler position is failed.");
+
+  gScrollView.ScrollTo( SCROLL_DESTINATION );
 }
 
 // * ############################## Verdict test for ScrollViewScrollToPosition
 
 void VTScrollViewScrollToPosition001()
 {
-  DALI_CHECK_FAIL(gScrollView.GetCurrentScrollPosition()!= Vector2(SCROLL_TARGET_X, SCROLL_TARGET_Y), " ScrollTo API failed.");
+  int nPageNum = static_cast<int>(gScrollView.GetCurrentPage());
+  DALI_CHECK_FAIL(nPageNum != SCROLL_DESTINATION, " ScrollTo API failed.");
 
   Stage::GetCurrent().Remove( gScrollView );
 

diff --git a/src/utc/dali-toolkit/scrollable/utc-dali-scrollable.cpp b/src/utc/dali-toolkit/scrollable/utc-dali-scrollable.cpp
index 8d43d33..4d6d504 100755 (executable)
--- a/src/utc/dali-toolkit/scrollable/utc-dali-scrollable.cpp
+++ b/src/utc/dali-toolkit/scrollable/utc-dali-scrollable.cpp
@@ -310,10 +310,11 @@ void ScrollableScrollUpdatedSignalP()
 
   DALI_CHECK_FAIL(!scrollable, "Scrollable Downcast failed");
 
-  scrollable.ScrollUpdatedSignal().Connect(&callback, &ScrollableSignalHandler::Callback);
+  scrollable.ScrollStartedSignal().Connect(&callback, &ScrollableSignalHandler::Callback);
   scrollview.ScrollTo( Vector2(20.0f, 20.0f) );
+  scrollable.ScrollUpdatedSignal().Connect(&callback, &ScrollableSignalHandler::Callback);
 
-  DALI_CHECK_FAIL(callback.GetCalls() != 1, "Scrollable::ScrollUpdatedSignal() is failed." );
+  DALI_CHECK_FAIL(!callback.GetCalls(), "Scrollable::ScrollUpdatedSignal() is failed." );
 
   DaliLog::PrintPass();
 }
@@ -330,10 +331,11 @@ void ScrollableScrollCompletedSignalP()
 
   DALI_CHECK_FAIL(!scrollable, "Scrollable Downcast failed");
 
-  scrollable.ScrollCompletedSignal().Connect(&callback, &ScrollableSignalHandler::Callback);
+  scrollable.ScrollStartedSignal().Connect(&callback, &ScrollableSignalHandler::Callback);
   scrollview.ScrollTo( Vector2(30.0f, 30.0f) );
+  scrollable.ScrollCompletedSignal().Connect(&callback, &ScrollableSignalHandler::Callback);
 
-  DALI_CHECK_FAIL(callback.GetCalls() != 1, "Scrollable::ScrollCompletedSignal() is failed." );
+  DALI_CHECK_FAIL(!callback.GetCalls(), "Scrollable::ScrollCompletedSignal() is failed." );
 
   DaliLog::PrintPass();
 }

diff --git a/src/utc/dali-toolkit/table-view/utc-dali-table-view.cpp b/src/utc/dali-toolkit/table-view/utc-dali-table-view.cpp
index 5f73ac0..f3c92ba 100755 (executable)
--- a/src/utc/dali-toolkit/table-view/utc-dali-table-view.cpp
+++ b/src/utc/dali-toolkit/table-view/utc-dali-table-view.cpp
@@ -349,10 +349,10 @@ void TableViewDownCastN()
   BaseHandle unInitializedObject;
 
   TableView tableView1 = TableView::DownCast( unInitializedObject );
-  DALI_CHECK_FAIL(!tableView1, "TableView handle is not empty." );
+  DALI_CHECK_FAIL(tableView1, "TableView handle is not empty." );
 
   TableView tableView2 = DownCast< TableView >( unInitializedObject );
-  DALI_CHECK_FAIL(!tableView2, "TableView handle is not empty." );
+  DALI_CHECK_FAIL(tableView2, "TableView handle is not empty." );
 
   DaliLog::PrintPass();
 

diff --git a/src/utc/dali-toolkit/text-label/utc-dali-text-label.cpp b/src/utc/dali-toolkit/text-label/utc-dali-text-label.cpp
index 21cda45..7d748a2 100755 (executable)
--- a/src/utc/dali-toolkit/text-label/utc-dali-text-label.cpp
+++ b/src/utc/dali-toolkit/text-label/utc-dali-text-label.cpp
@@ -106,9 +106,9 @@ namespace
 void TextLabelNewP(void)
 {
   TextLabel textLabel1 = TextLabel::New( );
-  DALI_CHECK_FAIL(textLabel1, "TextLabel::New() is failed.");
+  DALI_CHECK_FAIL(!textLabel1, "TextLabel::New() is failed.");
   TextLabel textLabel2 = TextLabel::New( "Test Text" );
-  DALI_CHECK_FAIL(textLabel2, "TextLabel::New(const std::string&) is failed.");
+  DALI_CHECK_FAIL(!textLabel2, "TextLabel::New(const std::string&) is failed.");
   DaliLog::PrintPass();
 }
 
@@ -136,10 +136,10 @@ void TextLabelDownCastN(void)
 {
   BaseHandle uninitializedObject;
   TextLabel textLabel1 = TextLabel::DownCast( uninitializedObject );
-  DALI_CHECK_INSTANCE(!textLabel1, "TextLabel handle is not empty.");
+  DALI_CHECK_FAIL(textLabel1, "TextLabel handle is not empty.");
 
   TextLabel textLabel2 = DownCast< TextLabel >( uninitializedObject );
-  DALI_CHECK_INSTANCE(!textLabel2, "TextLabel handle is not empty after downcast.");
+  DALI_CHECK_FAIL(textLabel2, "TextLabel handle is not empty after downcast.");
   DaliLog::PrintPass();
 }