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-Button.cpp;h=3e7f4cf83a48cd998791abdd5af39d91c467d38a;hp=5127cfb3671dc0fe9a1d12affa25542b798b4ef4;hb=6c8eb158ad2fb68a20bdcfabf8e07dd017da0528;hpb=7d1d83b6d0af227e5887cad6121344fe0ea2b145

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
index 5127cfb..3e7f4cf 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
@@ -50,6 +50,27 @@ static bool ButtonCallback( Button button )
   return false;
 }
 
+Image CreateSolidColorImage( const Vector4& color, unsigned int width, unsigned int height )
+{
+  BufferImage imageData = BufferImage::New( width, height, Pixel::RGBA8888 );
+
+  // Create the image
+  PixelBuffer* pixbuf = imageData.GetBuffer();
+  unsigned int size = width * height;
+
+  for( size_t i = 0; i < size; i++ )
+    {
+      pixbuf[i*4+0] = 0xFF * color.r;
+      pixbuf[i*4+1] = 0xFF * color.g;
+      pixbuf[i*4+2] = 0xFF * color.b;
+      pixbuf[i*4+3] = 0xFF * color.a;
+    }
+
+  imageData.Update();
+
+  return imageData;
+}
+
 const Dali::TouchPoint pointDownInside( 0, TouchPoint::Down, 240, 400 );
 const Dali::TouchPoint pointUpInside( 0, TouchPoint::Up, 240, 400 );
 const Dali::TouchPoint pointLeave( 0, TouchPoint::Leave, 240, 400 );
@@ -308,6 +329,60 @@ int UtcDaliButtonSetLabelActorP(void)
   END_TEST;
 }
 
+int UtcDaliButtonSetButtonImage(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliButtonSetButtonImage");
+
+  Image image = CreateSolidColorImage( Color::RED, 10, 10 );
+
+  PushButton pushButton = PushButton::New();
+  Stage::GetCurrent().Add( pushButton );
+
+  application.SendNotification();
+  application.Render();
+
+  pushButton.SetSize( Vector2( 20.0f, 20.0f ) );
+  pushButton.SetButtonImage( image );
+
+  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 );
+
+  END_TEST;
+}
+
+int UtcDaliButtonSetSelectedImageP(void)
+{
+  ToolkitTestApplication application;
+  tet_infoline(" UtcDaliButtonSetButtonImage");
+
+  Image image = CreateSolidColorImage( Color::RED, 10, 10 );
+
+  PushButton pushButton = PushButton::New();
+  Stage::GetCurrent().Add( pushButton );
+
+  application.SendNotification();
+  application.Render();
+
+  pushButton.SetSize( Vector2( 20.0f, 20.0f ) );
+  pushButton.SetSelectedImage( image );
+
+  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 );
+
+  END_TEST;
+}
+
 int UtcDaliButtonPressedSignalP(void)
 {
   ToolkitTestApplication application;