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
Button refactoring: rename properties
[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
aeef8a9
..
809d711
100644
(file)
--- 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 pushButton = PushButton::New();
pushButton.SetToggleButton( true );
- pushButton.
Toggl
edSignal().Connect( &PushButtonToggled );
+ pushButton.
StateChang
edSignal().Connect( &PushButtonToggled );
gPushButtonToggleState = false;
pushButton.SetToggled( true );
gPushButtonToggleState = false;
pushButton.SetToggled( true );
@@
-196,7
+196,7
@@
int UtcDaliPushButtonSetGetToggled02(void)
PushButton pushButton = PushButton::New();
pushButton.SetToggleButton( false );
PushButton pushButton = PushButton::New();
pushButton.SetToggleButton( false );
- pushButton.
Toggl
edSignal().Connect( &PushButtonToggled );
+ pushButton.
StateChang
edSignal().Connect( &PushButtonToggled );
gPushButtonToggleState = false;
pushButton.SetToggled( true );
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 );
DALI_TEST_EQUALS( size.width, 40.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 40.f, TEST_LOCATION );
- pushButton.Set
Press
edImage( image03 );
+ pushButton.Set
Select
edImage( image03 );
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
- size = pushButton.Get
Press
edImage().GetCurrentSize();
+ size = pushButton.Get
Select
edImage().GetCurrentSize();
DALI_TEST_EQUALS( size.width, 50.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 50.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.width, 50.f, TEST_LOCATION );
DALI_TEST_EQUALS( size.height, 50.f, TEST_LOCATION );
- pushButton.Set
Press
edImage( imageActor03 );
+ pushButton.Set
Select
edImage( imageActor03 );
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
- size = pushButton.Get
Press
edImage().GetCurrentSize();
+ size = pushButton.Get
Select
edImage().GetCurrentSize();
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 );
@@
-422,15
+422,15
@@
int UtcDaliPushButtonSetLabelText(void)
TextView textView;
TextView textView;
- pushButton.SetLabel
Text
( STR );
+ pushButton.SetLabel( STR );
- textView = TextView::DownCast( pushButton.GetLabel
Text
() );
+ textView = TextView::DownCast( pushButton.GetLabel() );
DALI_TEST_CHECK( STR == textView.GetText() );
TextView text = TextView::New( STR );
DALI_TEST_CHECK( STR == textView.GetText() );
TextView text = TextView::New( STR );
- pushButton.SetLabel
Text
( text );
+ pushButton.SetLabel( text );
- textView = TextView::DownCast( pushButton.GetLabel
Text
() );
+ textView = TextView::DownCast( pushButton.GetLabel() );
DALI_TEST_CHECK( STR == textView.GetText() );
END_TEST;
}
DALI_TEST_CHECK( STR == textView.GetText() );
END_TEST;
}
@@
-568,7
+568,7
@@
int UtcDaliPushButtonToggled(void)
application.Render();
// connect to its touch signal
application.Render();
// connect to its touch signal
- pushButton.
Toggl
edSignal().Connect( &PushButtonToggled );
+ pushButton.
StateChang
edSignal().Connect( &PushButtonToggled );
Dali::Integration::TouchEvent event;
Dali::Integration::TouchEvent event;