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=ecf4907529676a5708d00768e0067bf8c954d928;hp=0b832fb25333dd3c896936aff27323a2a264defc;hb=7f36ca9572ba3086167d5238a7aff909b56a50f4;hpb=c803046c24398c2037a83d105a932976dede943f

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
index 0b832fb..ecf4907 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
@@ -42,10 +42,10 @@ void utc_dali_toolkit_pushbutton_cleanup(void)
 namespace
 {
 
-static bool gPushButtonToggleState = false;
-bool PushButtonToggled( Button button, bool toggled )
+static bool gPushButtonSelectedState = false;
+bool PushButtonSelected( Button button )
 {
-  gPushButtonToggleState = toggled && ( toggled == static_cast<PushButton&>( button ).IsToggled() );
+  gPushButtonSelectedState = button.IsSelected();
   return true;
 }
 
@@ -75,7 +75,7 @@ const Dali::TouchPoint pointUpOutside( 0, TouchPoint::Up, 10, 10 );
 
 Image CreateSolidColorImage( const Vector4& color, unsigned int width, unsigned int height )
 {
-  BitmapImage imageData = BitmapImage::New( width, height, Pixel::RGBA8888 );
+  BufferImage imageData = BufferImage::New( width, height, Pixel::RGBA8888 );
 
   // Create the image
   PixelBuffer* pixbuf = imageData.GetBuffer();
@@ -96,315 +96,396 @@ Image CreateSolidColorImage( const Vector4& color, unsigned int width, unsigned
 
 } //namespace
 
+int UtcDaliPushButtonConstructorP(void)
+{
+  TestApplication application;
 
-int UtcDaliPushButtonSetGetAutoRepeating(void)
+  PushButton button;
+
+  DALI_TEST_CHECK( !button );
+  END_TEST;
+}
+
+int UtcDaliPushButtonCopyConstructorP(void)
 {
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliPushButtonSetGetAutoRepeating");
+  TestApplication application;
 
-  PushButton pushButton = PushButton::New();
+  // Initialize an object, ref count == 1
+  PushButton button = PushButton::New();
 
-  pushButton.SetAutoRepeating( true );
+  PushButton copy( button );
+  DALI_TEST_CHECK( copy );
+  END_TEST;
+}
 
-  DALI_TEST_CHECK( pushButton.IsAutoRepeating() );
+int UtcDaliPushButtonAssignmentOperatorP(void)
+{
+  TestApplication application;
 
-  pushButton.SetAutoRepeating( false );
+  PushButton button = PushButton::New();
 
-  DALI_TEST_CHECK( !pushButton.IsAutoRepeating() );
+  PushButton copy( button );
+  DALI_TEST_CHECK( copy );
 
-  pushButton.SetAutoRepeating( true );
+  DALI_TEST_CHECK( button == copy );
+  END_TEST;
+}
 
-  DALI_TEST_CHECK( pushButton.IsAutoRepeating() );
+int UtcDaliPushButtonNewP(void)
+{
+  TestApplication application;
+
+  PushButton button = PushButton::New();
+
+  DALI_TEST_CHECK( button );
   END_TEST;
 }
 
-int UtcDaliPushButtonSetGetToggleButton(void)
+int UtcDaliPushButtonDownCastP(void)
 {
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliPushButtonSetGetToggleButton");
+  TestApplication application;
 
-  PushButton pushButton = PushButton::New();
+  PushButton button = PushButton::New();
 
-  pushButton.SetToggleButton( true );
+  BaseHandle object(button);
 
-  DALI_TEST_CHECK( pushButton.IsToggleButton() );
+  PushButton button2 = PushButton::DownCast( object );
+  DALI_TEST_CHECK(button2);
 
-  pushButton.SetToggleButton( false );
+  PushButton button3 = DownCast< PushButton >(object);
+  DALI_TEST_CHECK(button3);
+  END_TEST;
+}
+
+int UtcDaliPushButtonDownCastN(void)
+{
+  TestApplication application;
 
-  DALI_TEST_CHECK( !pushButton.IsToggleButton() );
+  BaseHandle unInitializedObject;
 
-  pushButton.SetToggleButton( true );
+  PushButton button1 = PushButton::DownCast( unInitializedObject );
+  DALI_TEST_CHECK( !button1 );
 
-  DALI_TEST_CHECK( pushButton.IsToggleButton() );
+  PushButton button2 = DownCast< PushButton >( unInitializedObject );
+  DALI_TEST_CHECK( !button2 );
   END_TEST;
 }
 
-int UtcDaliPushButtonSetGetAutoRepeatingAndToggleButton(void)
+int UtcDaliPushButtonSetButtonImage(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliPushButtonSetGetAutoRepeatingAndToggleButton");
+  tet_infoline(" UtcDaliPushButtonSetButtonImage");
+
+  Image image = CreateSolidColorImage( Color::RED, 10, 10 );
+  ImageActor imageActor = CreateSolidColorActor( Color::RED );
+  imageActor.SetSize( 20, 20 );
 
   PushButton pushButton = PushButton::New();
+  Stage::GetCurrent().Add( pushButton );
 
-  pushButton.SetAutoRepeating( true );
-  pushButton.SetToggleButton( true );
+  application.SendNotification();
+  application.Render();
 
-  DALI_TEST_CHECK( pushButton.IsToggleButton() );
-  DALI_TEST_CHECK( !pushButton.IsAutoRepeating() );
+  pushButton.SetSize( Vector2( 20.0f, 20.0f ) );
+  pushButton.SetButtonImage( image );
 
-  pushButton.SetToggleButton( true );
-  pushButton.SetAutoRepeating( true );
+  DALI_TEST_CHECK( pushButton.GetButtonImage() );
 
-  DALI_TEST_CHECK( pushButton.IsAutoRepeating() );
-  DALI_TEST_CHECK( !pushButton.IsToggleButton() );
+  application.SendNotification();
+  application.Render();
+
+  Vector3 size = pushButton.GetCurrentSize();
+
+  DALI_TEST_EQUALS( size.width, 20.f, TEST_LOCATION );
+  DALI_TEST_EQUALS( size.height, 20.f, TEST_LOCATION );
+
+  pushButton.SetButtonImage( imageActor );
+
+  DALI_TEST_CHECK( pushButton.GetButtonImage() );
   END_TEST;
 }
 
-int UtcDaliPushButtonSetGetToggled01(void)
+int UtcDaliPushButtonSetBackgroundImageP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliPushButtonSetGetToggled01");
-
-  PushButton pushButton = PushButton::New();
+  tet_infoline(" UtcDaliPushButtonSetBackgroundImageP");
 
-  pushButton.SetToggleButton( true );
-  pushButton.StateChangedSignal().Connect( &PushButtonToggled );
+  Image image = CreateSolidColorImage( Color::RED, 10, 10 );
+  ImageActor imageActor = CreateSolidColorActor( Color::RED );
+  imageActor.SetSize( 20, 20 );
 
-  gPushButtonToggleState = false;
-  pushButton.SetToggled( true );
+  PushButton pushButton = PushButton::New();
 
-  DALI_TEST_CHECK( pushButton.IsToggled() );
-  DALI_TEST_CHECK( gPushButtonToggleState );
+  pushButton.SetBackgroundImage( image );
 
-  pushButton.SetToggled( false );
+  DALI_TEST_CHECK( pushButton.GetBackgroundImage() );
 
-  DALI_TEST_CHECK( !pushButton.IsToggled() );
-  DALI_TEST_CHECK( !gPushButtonToggleState );
+  pushButton.SetBackgroundImage( imageActor );
 
-  pushButton.SetToggled( true );
+  DALI_TEST_CHECK( pushButton.GetBackgroundImage() );
 
-  DALI_TEST_CHECK( pushButton.IsToggled() );
-  DALI_TEST_CHECK( gPushButtonToggleState );
   END_TEST;
 }
 
-int UtcDaliPushButtonSetGetToggled02(void)
+int UtcDaliPushButtonSetSelectedImageP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliPushButtonSetGetToggled02");
+  tet_infoline(" UtcDaliPushButtonSetSelectedImageP");
+
+  Image image = CreateSolidColorImage( Color::RED, 10, 10 );
+  ImageActor imageActor = CreateSolidColorActor( Color::RED );
+  imageActor.SetSize( 20, 20 );
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetToggleButton( false );
-  pushButton.StateChangedSignal().Connect( &PushButtonToggled );
+  pushButton.SetSelectedImage( image );
+
+  DALI_TEST_CHECK( pushButton.GetSelectedImage() );
 
-  gPushButtonToggleState = false;
-  pushButton.SetToggled( true );
+  pushButton.SetSelectedImage( imageActor );
 
-  DALI_TEST_CHECK( !pushButton.IsToggled() );
-  DALI_TEST_CHECK( !gPushButtonToggleState );
+  DALI_TEST_CHECK( pushButton.GetSelectedImage() );
 
-  pushButton.SetToggled( false );
+  END_TEST;
+}
 
-  DALI_TEST_CHECK( !pushButton.IsToggled() );
-  DALI_TEST_CHECK( !gPushButtonToggleState );
+int UtcDaliPushButtonSetSelectedBackgroundImageP(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliPushButtonSetSelectedBackgroundImageP");
+
+  Image image = CreateSolidColorImage( Color::RED, 10, 10 );
+  ImageActor imageActor = CreateSolidColorActor( Color::RED );
+  imageActor.SetSize( 20, 20 );
+
+  PushButton pushButton = PushButton::New();
 
-  pushButton.SetToggled( true );
+  pushButton.SetSelectedBackgroundImage( image );
+
+  DALI_TEST_CHECK( pushButton.GetSelectedBackgroundImage() );
+
+  pushButton.SetSelectedBackgroundImage( imageActor );
+
+  DALI_TEST_CHECK( pushButton.GetSelectedBackgroundImage() );
 
-  DALI_TEST_CHECK( !pushButton.IsToggled() );
-  DALI_TEST_CHECK( !gPushButtonToggleState );
   END_TEST;
 }
 
-int UtcDaliPushButtonSetGetAutorepeatingDelayValues01(void)
+int UtcDaliPushButtonSetDisabledBackgroundImageP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliPushButtonSetGetAutorepeatingDelayValues01");
+  tet_infoline(" UtcDaliPushButtonSetDisabledBackgroundImageP");
+
+  Image image = CreateSolidColorImage( Color::RED, 10, 10 );
+  ImageActor imageActor = CreateSolidColorActor( Color::RED );
+  imageActor.SetSize( 20, 20 );
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetAutoRepeating( true );
+  pushButton.SetDisabledBackgroundImage( image );
 
-  pushButton.SetInitialAutoRepeatingDelay( 1.f );
-  DALI_TEST_EQUALS( pushButton.GetInitialAutoRepeatingDelay(), 1.f, TEST_LOCATION );
+  DALI_TEST_CHECK( pushButton.GetDisabledBackgroundImage() );
+
+  pushButton.SetDisabledBackgroundImage( imageActor );
+
+  DALI_TEST_CHECK( pushButton.GetDisabledBackgroundImage() );
 
-  pushButton.SetNextAutoRepeatingDelay( 1.f );
-  DALI_TEST_EQUALS( pushButton.GetNextAutoRepeatingDelay(), 1.f, TEST_LOCATION );
   END_TEST;
 }
 
-int UtcDaliPushButtonSetGetAutorepeatingDelayValues02(void)
+int UtcDaliPushButtonSetDisabledImageP(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliPushButtonSetGetAutorepeatingDelayValues02");
+  tet_infoline(" UtcDaliPushButtonSetDisabledImageP");
+
+  Image image = CreateSolidColorImage( Color::RED, 10, 10 );
+  ImageActor imageActor = CreateSolidColorActor( Color::RED );
+  imageActor.SetSize( 20, 20 );
 
   PushButton pushButton = PushButton::New();
 
-  bool assert1( false );
-  bool assert2( false );
+  pushButton.SetDisabledImage( image );
 
-  pushButton.SetAutoRepeating( true );
+  DALI_TEST_CHECK( pushButton.GetDisabledImage() );
 
-  try
-  {
-    pushButton.SetInitialAutoRepeatingDelay( -1.f );
-  }
-  catch( Dali::DaliException& e )
-  {
-    DALI_TEST_PRINT_ASSERT( e );
-    DALI_TEST_EQUALS(e.condition, "initialAutoRepeatingDelay > 0.f", TEST_LOCATION);
-    assert1 = true;
-  }
+  pushButton.SetDisabledImage( imageActor );
 
-  try
-  {
-    pushButton.SetNextAutoRepeatingDelay( -1.f );
-  }
-  catch( Dali::DaliException& e )
-  {
-    DALI_TEST_PRINT_ASSERT( e );
-    DALI_TEST_EQUALS(e.condition, "nextAutoRepeatingDelay > 0.f", TEST_LOCATION);
-    assert2 = true;
-  }
+  DALI_TEST_CHECK( pushButton.GetDisabledImage() );
 
-  DALI_TEST_CHECK( assert1 && assert2 );
   END_TEST;
 }
 
-int UtcDaliPushButtonSetImages(void)
+int UtcDaliPushButtonSetGetAutoRepeating(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliPushButtonSetImages");
+  tet_infoline(" UtcDaliPushButtonSetGetAutoRepeating");
 
-  Actor imageActor;
+  PushButton pushButton = PushButton::New();
 
-  Image image01 = CreateSolidColorImage( Color::RED, 10, 10 );
-  ImageActor imageActor01 = CreateSolidColorActor( Color::RED );
-  imageActor01.SetSize( 20.f, 20.f );
+  pushButton.SetAutoRepeating( true );
 
-  Image image02 = CreateSolidColorImage( Color::RED, 30, 30 );
-  ImageActor imageActor02 = CreateSolidColorActor( Color::RED );
-  imageActor02.SetSize( 40.f, 40.f );
+  DALI_TEST_CHECK( pushButton.IsAutoRepeating() );
 
-  Image image03 = CreateSolidColorImage( Color::RED, 50, 50 );
-  ImageActor imageActor03 = CreateSolidColorActor( Color::RED );
-  imageActor03.SetSize( 60.f, 60.f );
+  pushButton.SetAutoRepeating( false );
 
-  Image image04 = CreateSolidColorImage( Color::RED, 70, 70 );
-  ImageActor imageActor04 = CreateSolidColorActor( Color::RED );
-  imageActor04.SetSize( 80.f, 80.f );
+  DALI_TEST_CHECK( !pushButton.IsAutoRepeating() );
 
-  Image image05 = CreateSolidColorImage( Color::RED, 90, 90 );
-  ImageActor imageActor05 = CreateSolidColorActor( Color::RED );
-  imageActor05.SetSize( 100.f, 100.f );
+  pushButton.SetAutoRepeating( true );
+
+  DALI_TEST_CHECK( pushButton.IsAutoRepeating() );
+  END_TEST;
+}
+
+int UtcDaliPushButtonSetGetTogglableButton(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliPushButtonSetGetTogglableButton");
 
-  Vector3 size;
   PushButton pushButton = PushButton::New();
 
-  application.SendNotification();
-  application.Render();
+  pushButton.SetTogglableButton( true );
 
-  // Just check if check box button size changes when a bigger image is set.
+  DALI_TEST_CHECK( pushButton.IsTogglableButton() );
 
-  pushButton.SetButtonImage( image01 );
+  pushButton.SetTogglableButton( false );
 
-  application.SendNotification();
-  application.Render();
+  DALI_TEST_CHECK( !pushButton.IsTogglableButton() );
 
-  size = pushButton.GetButtonImage().GetCurrentSize();
+  pushButton.SetTogglableButton( true );
 
-  DALI_TEST_EQUALS( size.width, 10.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, 10.f, TEST_LOCATION );
+  DALI_TEST_CHECK( pushButton.IsTogglableButton() );
+  END_TEST;
+}
 
-  pushButton.SetButtonImage( imageActor01 );
+int UtcDaliPushButtonSetGetAutoRepeatingAndTogglableButton(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliPushButtonSetGetAutoRepeatingAndTogglableButton");
 
-  application.SendNotification();
-  application.Render();
+  PushButton pushButton = PushButton::New();
 
-  size = pushButton.GetButtonImage().GetCurrentSize();
+  pushButton.SetAutoRepeating( true );
+  pushButton.SetTogglableButton( true );
 
-  DALI_TEST_EQUALS( size.width, 20.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, 20.f, TEST_LOCATION );
+  DALI_TEST_CHECK( pushButton.IsTogglableButton() );
+  DALI_TEST_CHECK( !pushButton.IsAutoRepeating() );
 
-  pushButton.SetBackgroundImage( image02 );
+  pushButton.SetTogglableButton( true );
+  pushButton.SetAutoRepeating( true );
 
-  application.SendNotification();
-  application.Render();
+  DALI_TEST_CHECK( pushButton.IsAutoRepeating() );
+  DALI_TEST_CHECK( !pushButton.IsTogglableButton() );
+  END_TEST;
+}
 
-  size = pushButton.GetBackgroundImage().GetCurrentSize();
+int UtcDaliPushButtonSetGetSelected01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliPushButtonSetGetSelected01");
 
-  DALI_TEST_EQUALS( size.width, 30.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, 30.f, TEST_LOCATION );
+  PushButton pushButton = PushButton::New();
 
-  pushButton.SetBackgroundImage( imageActor02 );
+  pushButton.SetTogglableButton( true );
+  pushButton.StateChangedSignal().Connect( &PushButtonSelected );
 
-  application.SendNotification();
-  application.Render();
+  gPushButtonSelectedState = false;
+  pushButton.SetSelected( true );
 
-  size = pushButton.GetBackgroundImage().GetCurrentSize();
+  DALI_TEST_CHECK( pushButton.IsSelected() );
+  DALI_TEST_CHECK( gPushButtonSelectedState );
 
-  DALI_TEST_EQUALS( size.width, 40.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, 40.f, TEST_LOCATION );
+  pushButton.SetSelected( false );
 
-  pushButton.SetSelectedImage( image03 );
+  DALI_TEST_CHECK( !pushButton.IsSelected() );
+  DALI_TEST_CHECK( !gPushButtonSelectedState );
 
-  application.SendNotification();
-  application.Render();
+  pushButton.SetSelected( true );
 
-  size = pushButton.GetSelectedImage().GetCurrentSize();
+  DALI_TEST_CHECK( pushButton.IsSelected() );
+  DALI_TEST_CHECK( gPushButtonSelectedState );
+  END_TEST;
+}
 
-  DALI_TEST_EQUALS( size.width, 50.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, 50.f, TEST_LOCATION );
+int UtcDaliPushButtonSetGetSelected02(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliPushButtonSetGetSelected02");
 
-  pushButton.SetSelectedImage( imageActor03 );
+  PushButton pushButton = PushButton::New();
 
-  application.SendNotification();
-  application.Render();
+  pushButton.SetTogglableButton( false );
+  pushButton.StateChangedSignal().Connect( &PushButtonSelected );
 
-  size = pushButton.GetSelectedImage().GetCurrentSize();
+  gPushButtonSelectedState = false;
+  pushButton.SetSelected( true );
 
-  DALI_TEST_EQUALS( size.width, 60.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, 60.f, TEST_LOCATION );
+  DALI_TEST_CHECK( !pushButton.IsSelected() );
+  DALI_TEST_CHECK( !gPushButtonSelectedState );
 
-  pushButton.SetDisabledBackgroundImage( image04 );
+  pushButton.SetSelected( false );
 
-  application.SendNotification();
-  application.Render();
+  DALI_TEST_CHECK( !pushButton.IsSelected() );
+  DALI_TEST_CHECK( !gPushButtonSelectedState );
 
-  size = pushButton.GetDisabledBackgroundImage().GetCurrentSize();
+  pushButton.SetSelected( true );
 
-  DALI_TEST_EQUALS( size.width, 70.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, 70.f, TEST_LOCATION );
+  DALI_TEST_CHECK( !pushButton.IsSelected() );
+  DALI_TEST_CHECK( !gPushButtonSelectedState );
+  END_TEST;
+}
 
-  pushButton.SetDisabledBackgroundImage( imageActor04 );
+int UtcDaliPushButtonSetGetAutorepeatingDelayValues01(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliPushButtonSetGetAutorepeatingDelayValues01");
 
-  application.SendNotification();
-  application.Render();
+  PushButton pushButton = PushButton::New();
 
-  size = pushButton.GetDisabledBackgroundImage().GetCurrentSize();
+  pushButton.SetAutoRepeating( true );
 
-  DALI_TEST_EQUALS( size.width, 80.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, 80.f, TEST_LOCATION );
+  pushButton.SetInitialAutoRepeatingDelay( 1.f );
+  DALI_TEST_EQUALS( pushButton.GetInitialAutoRepeatingDelay(), 1.f, TEST_LOCATION );
 
-  pushButton.SetDisabledImage( image05 );
+  pushButton.SetNextAutoRepeatingDelay( 1.f );
+  DALI_TEST_EQUALS( pushButton.GetNextAutoRepeatingDelay(), 1.f, TEST_LOCATION );
+  END_TEST;
+}
 
-  application.SendNotification();
-  application.Render();
+int UtcDaliPushButtonSetGetAutorepeatingDelayValues02(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliPushButtonSetGetAutorepeatingDelayValues02");
 
-  size = pushButton.GetDisabledImage().GetCurrentSize();
+  PushButton pushButton = PushButton::New();
 
-  DALI_TEST_EQUALS( size.width, 90.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, 90.f, TEST_LOCATION );
+  bool assert1( false );
+  bool assert2( false );
 
-  pushButton.SetDisabledImage( imageActor05 );
+  pushButton.SetAutoRepeating( true );
 
-  application.SendNotification();
-  application.Render();
+  try
+  {
+    pushButton.SetInitialAutoRepeatingDelay( -1.f );
+  }
+  catch( Dali::DaliException& e )
+  {
+    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_EQUALS(e.condition, "initialAutoRepeatingDelay > 0.f", TEST_LOCATION);
+    assert1 = true;
+  }
 
-  size = pushButton.GetDisabledImage().GetCurrentSize();
+  try
+  {
+    pushButton.SetNextAutoRepeatingDelay( -1.f );
+  }
+  catch( Dali::DaliException& e )
+  {
+    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_EQUALS(e.condition, "nextAutoRepeatingDelay > 0.f", TEST_LOCATION);
+    assert2 = true;
+  }
 
-  DALI_TEST_EQUALS( size.width, 100.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, 100.f, TEST_LOCATION );
+  DALI_TEST_CHECK( assert1 && assert2 );
   END_TEST;
 }
 
@@ -422,6 +503,9 @@ int UtcDaliPushButtonSetLabelText(void)
 
   pushButton.SetLabel( STR );
 
+  TextLabel label = TextLabel::DownCast( pushButton.GetLabel() );
+  DALI_TEST_CHECK( STR == label.GetProperty<std::string>( TextLabel::Property::TEXT ) );
+
   END_TEST;
 }
 
@@ -541,10 +625,10 @@ int UtcDaliPushButtonReleased(void)
   END_TEST;
 }
 
-int UtcDaliPushButtonToggled(void)
+int UtcDaliPushButtonSelected(void)
 {
   ToolkitTestApplication application;
-  tet_infoline(" UtcDaliPushButtonToggled");
+  tet_infoline(" UtcDaliPushButtonSelected");
 
   PushButton pushButton = PushButton::New();
   pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
@@ -558,13 +642,13 @@ int UtcDaliPushButtonToggled(void)
   application.Render();
 
   // connect to its touch signal
-  pushButton.StateChangedSignal().Connect( &PushButtonToggled );
+  pushButton.StateChangedSignal().Connect( &PushButtonSelected );
 
   Dali::Integration::TouchEvent event;
 
-  // Test1. No toggle button.
+  // Test1. No togglable button.
 
-  gPushButtonToggleState = false;
+  gPushButtonSelectedState = false;
   event = Dali::Integration::TouchEvent();
   event.AddPoint( pointDownInside );
   application.ProcessEvent( event );
@@ -573,13 +657,13 @@ int UtcDaliPushButtonToggled(void)
   event.AddPoint( pointUpInside );
   application.ProcessEvent( event );
 
-  DALI_TEST_CHECK( !gPushButtonToggleState );
+  DALI_TEST_CHECK( !gPushButtonSelectedState );
 
-  // Set toggle property.
-  pushButton.SetToggleButton( true );
+  // Set togglable property.
+  pushButton.SetTogglableButton( true );
 
   // Test2. Touch point down and up inside the button twice.
-  gPushButtonToggleState = false;
+  gPushButtonSelectedState = false;
   event = Dali::Integration::TouchEvent();
   event.AddPoint( pointDownInside );
   application.ProcessEvent( event );
@@ -588,7 +672,7 @@ int UtcDaliPushButtonToggled(void)
   event.AddPoint( pointUpInside );
   application.ProcessEvent( event );
 
-  DALI_TEST_CHECK( gPushButtonToggleState );
+  DALI_TEST_CHECK( gPushButtonSelectedState );
 
   event = Dali::Integration::TouchEvent();
   event.AddPoint( pointDownInside );
@@ -598,11 +682,11 @@ int UtcDaliPushButtonToggled(void)
   event.AddPoint( pointUpInside );
   application.ProcessEvent( event );
 
-  DALI_TEST_CHECK( !gPushButtonToggleState );
+  DALI_TEST_CHECK( !gPushButtonSelectedState );
 
   // Test3. Touch point down and up outside the button.
 
-  gPushButtonToggleState = false;
+  gPushButtonSelectedState = false;
   event = Dali::Integration::TouchEvent();
   event.AddPoint( pointDownOutside );
   application.ProcessEvent( event );
@@ -611,11 +695,11 @@ int UtcDaliPushButtonToggled(void)
   event.AddPoint( pointUpOutside );
   application.ProcessEvent( event );
 
-  DALI_TEST_CHECK( !gPushButtonToggleState );
+  DALI_TEST_CHECK( !gPushButtonSelectedState );
 
   // Test4. Touch point down inside and up outside the button.
 
-  gPushButtonToggleState = false;
+  gPushButtonSelectedState = false;
   event = Dali::Integration::TouchEvent();
   event.AddPoint( pointDownInside );
   application.ProcessEvent( event );
@@ -628,11 +712,11 @@ int UtcDaliPushButtonToggled(void)
   event.AddPoint( pointUpOutside );
   application.ProcessEvent( event );
 
-  DALI_TEST_CHECK( !gPushButtonToggleState );
+  DALI_TEST_CHECK( !gPushButtonSelectedState );
 
   // Test5. Touch point down outside and up inside the button.
 
-  gPushButtonToggleState = false;
+  gPushButtonSelectedState = false;
   event = Dali::Integration::TouchEvent();
   event.AddPoint( pointDownOutside );
   application.ProcessEvent( event );
@@ -645,6 +729,6 @@ int UtcDaliPushButtonToggled(void)
   event.AddPoint( pointUpInside );
   application.ProcessEvent( event );
 
-  DALI_TEST_CHECK( !gPushButtonToggleState );
+  DALI_TEST_CHECK( !gPushButtonSelectedState );
   END_TEST;
 }