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
[dali_1.0.30] Merge branch 'tizen'
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-CheckBoxButton.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
index
f016900
..
6892c84
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
@@
-27,9
+27,9
@@
namespace
{
static bool gCheckBoxButtonState = false;
{
static bool gCheckBoxButtonState = false;
-bool CheckBoxButtonClicked( Button button
, bool state
)
+bool CheckBoxButtonClicked( Button button )
{
{
- gCheckBoxButtonState =
state
;
+ gCheckBoxButtonState =
button.IsSelected()
;
return true;
}
return true;
}
@@
-69,10
+69,10
@@
void checkbox_button_cleanup(void)
test_return_value = TET_PASS;
}
test_return_value = TET_PASS;
}
-int UtcDaliCheckBoxButtonSetGet
Check
ed(void)
+int UtcDaliCheckBoxButtonSetGet
Select
ed(void)
{
ToolkitTestApplication application;
{
ToolkitTestApplication application;
- tet_infoline(" UtcDaliCheckBoxButtonSetGet
Check
ed");
+ tet_infoline(" UtcDaliCheckBoxButtonSetGet
Select
ed");
CheckBoxButton checkBoxButton = CheckBoxButton::New();
checkBoxButton.StateChangedSignal().Connect( &CheckBoxButtonClicked );
CheckBoxButton checkBoxButton = CheckBoxButton::New();
checkBoxButton.StateChangedSignal().Connect( &CheckBoxButtonClicked );
@@
-80,19
+80,19
@@
int UtcDaliCheckBoxButtonSetGetChecked(void)
// global var used to check if CheckBoxButtonClicked is called;
gCheckBoxButtonState = false;
// global var used to check if CheckBoxButtonClicked is called;
gCheckBoxButtonState = false;
- checkBoxButton.Set
Check
ed( true );
+ checkBoxButton.Set
Select
ed( true );
- DALI_TEST_CHECK( checkBoxButton.Is
Check
ed() );
+ DALI_TEST_CHECK( checkBoxButton.Is
Select
ed() );
DALI_TEST_CHECK( gCheckBoxButtonState );
DALI_TEST_CHECK( gCheckBoxButtonState );
- checkBoxButton.Set
Check
ed( false );
+ checkBoxButton.Set
Select
ed( false );
- DALI_TEST_CHECK( !checkBoxButton.Is
Check
ed() );
+ DALI_TEST_CHECK( !checkBoxButton.Is
Select
ed() );
DALI_TEST_CHECK( !gCheckBoxButtonState );
DALI_TEST_CHECK( !gCheckBoxButtonState );
- checkBoxButton.Set
Check
ed( true );
+ checkBoxButton.Set
Select
ed( true );
- DALI_TEST_CHECK( checkBoxButton.Is
Check
ed() );
+ DALI_TEST_CHECK( checkBoxButton.Is
Select
ed() );
DALI_TEST_CHECK( gCheckBoxButtonState );
END_TEST;
}
DALI_TEST_CHECK( gCheckBoxButtonState );
END_TEST;
}
@@
-148,22
+148,22
@@
int UtcDaliCheckBoxButtonSetImages(void)
DALI_TEST_EQUALS( size.width, 20.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 20.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.width, 20.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 20.f, TEST_LOCATION );
- checkBoxButton.Set
Check
edImage( image02 );
+ checkBoxButton.Set
Select
edImage( image02 );
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
- size = checkBoxButton.Get
Check
edImage().GetCurrentSize();
+ size = checkBoxButton.Get
Select
edImage().GetCurrentSize();
DALI_TEST_EQUALS( size.width, 30.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 30.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.width, 30.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 30.f, TEST_LOCATION );
- checkBoxButton.Set
Check
edImage( imageActor02 );
+ checkBoxButton.Set
Select
edImage( imageActor02 );
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
- size = checkBoxButton.Get
Check
edImage().GetCurrentSize();
+ size = checkBoxButton.Get
Select
edImage().GetCurrentSize();
DALI_TEST_EQUALS( size.width, 40.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 40.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.width, 40.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 40.f, TEST_LOCATION );
@@
-188,22
+188,22
@@
int UtcDaliCheckBoxButtonSetImages(void)
DALI_TEST_EQUALS( size.width, 60.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 60.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.width, 60.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 60.f, TEST_LOCATION );
- checkBoxButton.SetDisabled
Check
edImage( image04 );
+ checkBoxButton.SetDisabled
Select
edImage( image04 );
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
- size = checkBoxButton.GetDisabled
Check
edImage().GetCurrentSize();
+ size = checkBoxButton.GetDisabled
Select
edImage().GetCurrentSize();
DALI_TEST_EQUALS( size.width, 70.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 70.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.width, 70.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 70.f, TEST_LOCATION );
- checkBoxButton.SetDisabled
Check
edImage( imageActor04 );
+ checkBoxButton.SetDisabled
Select
edImage( imageActor04 );
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
- size = checkBoxButton.GetDisabled
Check
edImage().GetCurrentSize();
+ size = checkBoxButton.GetDisabled
Select
edImage().GetCurrentSize();
DALI_TEST_EQUALS( size.width, 80.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 80.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.width, 80.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 80.f, TEST_LOCATION );