projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fixes crash when fontclient is unable to supply a correct bitmap" into tizen
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-PushButton.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
index
0d259d9
..
4b62045
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
@@
-287,8
+287,7
@@
int UtcDaliPushButtonSetImages(void)
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
- // Just check if check box button size changes when a bigger image is set.
-
+ pushButton.SetSize( Vector2( 20.0f, 20.0f ) );
pushButton.SetButtonImage( image01 );
application.SendNotification();
pushButton.SetButtonImage( image01 );
application.SendNotification();
@@
-296,8
+295,8
@@
int UtcDaliPushButtonSetImages(void)
size = pushButton.GetCurrentSize();
size = pushButton.GetCurrentSize();
- DALI_TEST_EQUALS( size.width,
1
0.f, TEST_LOCATION );
- DALI_TEST_EQUALS( size.height,
1
0.f, TEST_LOCATION );
+ DALI_TEST_EQUALS( size.width,
2
0.f, TEST_LOCATION );
+ DALI_TEST_EQUALS( size.height,
2
0.f, TEST_LOCATION );
END_TEST;
}
END_TEST;
}