X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-PushButton.cpp;h=2f0b7fc490aefc126a7f64fc0299d52148b6ba40;hb=fa6ce6654d9e7c6dae3c24006bc7040dab22bab7;hp=723d35db14eeb7f303dfbc4965428bb85e9e039a;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
index 723d35d..2f0b7fc 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
@@ -73,9 +73,6 @@ const Dali::TouchPoint pointMotionOut( 0, TouchPoint::Motion, 10, 10 );
 const Dali::TouchPoint pointDownOutside( 0, TouchPoint::Down, 10, 10 );
 const Dali::TouchPoint pointUpOutside( 0, TouchPoint::Up, 10, 10 );
 
-static bool gOnTouchPointInterrupted = false;
-
-
 Image CreateSolidColorImage( const Vector4& color, unsigned int width, unsigned int height )
 {
   BitmapImage imageData = BitmapImage::New( width, height, Pixel::RGBA8888 );
@@ -171,7 +168,7 @@ int UtcDaliPushButtonSetGetToggled01(void)
   PushButton pushButton = PushButton::New();
 
   pushButton.SetToggleButton( true );
-  pushButton.ToggledSignal().Connect( &PushButtonToggled );
+  pushButton.StateChangedSignal().Connect( &PushButtonToggled );
 
   gPushButtonToggleState = false;
   pushButton.SetToggled( true );
@@ -199,7 +196,7 @@ int UtcDaliPushButtonSetGetToggled02(void)
   PushButton pushButton = PushButton::New();
 
   pushButton.SetToggleButton( false );
-  pushButton.ToggledSignal().Connect( &PushButtonToggled );
+  pushButton.StateChangedSignal().Connect( &PushButtonToggled );
 
   gPushButtonToggleState = false;
   pushButton.SetToggled( true );
@@ -254,8 +251,8 @@ int UtcDaliPushButtonSetGetAutorepeatingDelayValues02(void)
   }
   catch( Dali::DaliException& e )
   {
-    tet_printf("Assertion %s failed at %s\n", e.mCondition.c_str(), e.mLocation.c_str());
-    DALI_TEST_EQUALS(e.mCondition, "initialAutoRepeatingDelay > 0.f", TEST_LOCATION);
+    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_EQUALS(e.condition, "initialAutoRepeatingDelay > 0.f", TEST_LOCATION);
     assert1 = true;
   }
 
@@ -265,8 +262,8 @@ int UtcDaliPushButtonSetGetAutorepeatingDelayValues02(void)
   }
   catch( Dali::DaliException& e )
   {
-    tet_printf("Assertion %s failed at %s\n", e.mCondition.c_str(), e.mLocation.c_str());
-    DALI_TEST_EQUALS(e.mCondition, "nextAutoRepeatingDelay > 0.f", TEST_LOCATION);
+    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_EQUALS(e.condition, "nextAutoRepeatingDelay > 0.f", TEST_LOCATION);
     assert2 = true;
   }
 
@@ -349,62 +346,62 @@ int UtcDaliPushButtonSetImages(void)
   DALI_TEST_EQUALS( size.width, 40.f, TEST_LOCATION );
   DALI_TEST_EQUALS( size.height, 40.f, TEST_LOCATION );
 
-  pushButton.SetPressedImage( image03 );
+  pushButton.SetSelectedImage( image03 );
 
   application.SendNotification();
   application.Render();
 
-  size = pushButton.GetPressedImage().GetCurrentSize();
+  size = pushButton.GetSelectedImage().GetCurrentSize();
 
   DALI_TEST_EQUALS( size.width, 50.f, TEST_LOCATION );
   DALI_TEST_EQUALS( size.height, 50.f, TEST_LOCATION );
 
-  pushButton.SetPressedImage( imageActor03 );
+  pushButton.SetSelectedImage( imageActor03 );
 
   application.SendNotification();
   application.Render();
 
-  size = pushButton.GetPressedImage().GetCurrentSize();
+  size = pushButton.GetSelectedImage().GetCurrentSize();
 
   DALI_TEST_EQUALS( size.width, 60.f, TEST_LOCATION );
   DALI_TEST_EQUALS( size.height, 60.f, TEST_LOCATION );
 
-  pushButton.SetDimmedBackgroundImage( image04 );
+  pushButton.SetDisabledBackgroundImage( image04 );
 
   application.SendNotification();
   application.Render();
 
-  size = pushButton.GetDimmedBackgroundImage().GetCurrentSize();
+  size = pushButton.GetDisabledBackgroundImage().GetCurrentSize();
 
   DALI_TEST_EQUALS( size.width, 70.f, TEST_LOCATION );
   DALI_TEST_EQUALS( size.height, 70.f, TEST_LOCATION );
 
-  pushButton.SetDimmedBackgroundImage( imageActor04 );
+  pushButton.SetDisabledBackgroundImage( imageActor04 );
 
   application.SendNotification();
   application.Render();
 
-  size = pushButton.GetDimmedBackgroundImage().GetCurrentSize();
+  size = pushButton.GetDisabledBackgroundImage().GetCurrentSize();
 
   DALI_TEST_EQUALS( size.width, 80.f, TEST_LOCATION );
   DALI_TEST_EQUALS( size.height, 80.f, TEST_LOCATION );
 
-  pushButton.SetDimmedImage( image05 );
+  pushButton.SetDisabledImage( image05 );
 
   application.SendNotification();
   application.Render();
 
-  size = pushButton.GetDimmedImage().GetCurrentSize();
+  size = pushButton.GetDisabledImage().GetCurrentSize();
 
   DALI_TEST_EQUALS( size.width, 90.f, TEST_LOCATION );
   DALI_TEST_EQUALS( size.height, 90.f, TEST_LOCATION );
 
-  pushButton.SetDimmedImage( imageActor05 );
+  pushButton.SetDisabledImage( imageActor05 );
 
   application.SendNotification();
   application.Render();
 
-  size = pushButton.GetDimmedImage().GetCurrentSize();
+  size = pushButton.GetDisabledImage().GetCurrentSize();
 
   DALI_TEST_EQUALS( size.width, 100.f, TEST_LOCATION );
   DALI_TEST_EQUALS( size.height, 100.f, TEST_LOCATION );
@@ -425,15 +422,15 @@ int UtcDaliPushButtonSetLabelText(void)
 
   TextView textView;
 
-  pushButton.SetLabelText( STR );
+  pushButton.SetLabel( STR );
 
-  textView = TextView::DownCast( pushButton.GetLabelText() );
+  textView = TextView::DownCast( pushButton.GetLabel() );
   DALI_TEST_CHECK( STR == textView.GetText() );
 
   TextView text = TextView::New( STR );
-  pushButton.SetLabelText( text );
+  pushButton.SetLabel( text );
 
-  textView = TextView::DownCast( pushButton.GetLabelText() );
+  textView = TextView::DownCast( pushButton.GetLabel() );
   DALI_TEST_CHECK( STR == textView.GetText() );
   END_TEST;
 }
@@ -571,7 +568,7 @@ int UtcDaliPushButtonToggled(void)
   application.Render();
 
   // connect to its touch signal
-  pushButton.ToggledSignal().Connect( &PushButtonToggled );
+  pushButton.StateChangedSignal().Connect( &PushButtonToggled );
 
   Dali::Integration::TouchEvent event;