X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-PushButton.cpp;h=809d711531402e94d168a462c9567c8a7f0e69e7;hp=aeef8a9cdfdd31d20649393b396349f420b74aa5;hb=88eec954ad7b59851b423be3b82a4af569f892dd;hpb=12abbd996128aa2bc08677041f957938bee72245

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
index aeef8a9..809d711 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
@@ -168,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 );
@@ -196,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 );
@@ -346,22 +346,22 @@ 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 );
@@ -422,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;
 }
@@ -568,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;