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 remote-tracking branch 'origin/tizen' into new_text
[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
0b832fb
..
49ed86d
100644
(file)
--- 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
{
namespace
{
-static bool gPushButton
Toggle
State = false;
-bool PushButton
Toggled( Button button, bool toggled
)
+static bool gPushButton
Selected
State = false;
+bool PushButton
Selected( Button button
)
{
{
- gPushButton
ToggleState = toggled && ( toggled == static_cast<PushButton&>( button ).IsToggled()
);
+ gPushButton
SelectedState = button.IsSelected(
);
return true;
}
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 )
{
Image CreateSolidColorImage( const Vector4& color, unsigned int width, unsigned int height )
{
- B
itmapImage imageData = Bitmap
Image::New( width, height, Pixel::RGBA8888 );
+ B
ufferImage imageData = Buffer
Image::New( width, height, Pixel::RGBA8888 );
// Create the image
PixelBuffer* pixbuf = imageData.GetBuffer();
// Create the image
PixelBuffer* pixbuf = imageData.GetBuffer();
@@
-118,101
+118,101
@@
int UtcDaliPushButtonSetGetAutoRepeating(void)
END_TEST;
}
END_TEST;
}
-int UtcDaliPushButtonSetGetToggleButton(void)
+int UtcDaliPushButtonSetGetToggl
abl
eButton(void)
{
ToolkitTestApplication application;
{
ToolkitTestApplication application;
- tet_infoline(" UtcDaliPushButtonSetGetToggleButton");
+ tet_infoline(" UtcDaliPushButtonSetGetToggl
abl
eButton");
PushButton pushButton = PushButton::New();
PushButton pushButton = PushButton::New();
- pushButton.SetToggleButton( true );
+ pushButton.SetToggl
abl
eButton( true );
- DALI_TEST_CHECK( pushButton.IsToggleButton() );
+ DALI_TEST_CHECK( pushButton.IsToggl
abl
eButton() );
- pushButton.SetToggleButton( false );
+ pushButton.SetToggl
abl
eButton( false );
- DALI_TEST_CHECK( !pushButton.IsToggleButton() );
+ DALI_TEST_CHECK( !pushButton.IsToggl
abl
eButton() );
- pushButton.SetToggleButton( true );
+ pushButton.SetToggl
abl
eButton( true );
- DALI_TEST_CHECK( pushButton.IsToggleButton() );
+ DALI_TEST_CHECK( pushButton.IsToggl
abl
eButton() );
END_TEST;
}
END_TEST;
}
-int UtcDaliPushButtonSetGetAutoRepeatingAndToggleButton(void)
+int UtcDaliPushButtonSetGetAutoRepeatingAndToggl
abl
eButton(void)
{
ToolkitTestApplication application;
{
ToolkitTestApplication application;
- tet_infoline(" UtcDaliPushButtonSetGetAutoRepeatingAndToggleButton");
+ tet_infoline(" UtcDaliPushButtonSetGetAutoRepeatingAndToggl
abl
eButton");
PushButton pushButton = PushButton::New();
pushButton.SetAutoRepeating( true );
PushButton pushButton = PushButton::New();
pushButton.SetAutoRepeating( true );
- pushButton.SetToggleButton( true );
+ pushButton.SetToggl
abl
eButton( true );
- DALI_TEST_CHECK( pushButton.IsToggleButton() );
+ DALI_TEST_CHECK( pushButton.IsToggl
abl
eButton() );
DALI_TEST_CHECK( !pushButton.IsAutoRepeating() );
DALI_TEST_CHECK( !pushButton.IsAutoRepeating() );
- pushButton.SetToggleButton( true );
+ pushButton.SetToggl
abl
eButton( true );
pushButton.SetAutoRepeating( true );
DALI_TEST_CHECK( pushButton.IsAutoRepeating() );
pushButton.SetAutoRepeating( true );
DALI_TEST_CHECK( pushButton.IsAutoRepeating() );
- DALI_TEST_CHECK( !pushButton.IsToggleButton() );
+ DALI_TEST_CHECK( !pushButton.IsToggl
abl
eButton() );
END_TEST;
}
END_TEST;
}
-int UtcDaliPushButtonSetGet
Toggl
ed01(void)
+int UtcDaliPushButtonSetGet
Select
ed01(void)
{
ToolkitTestApplication application;
{
ToolkitTestApplication application;
- tet_infoline(" UtcDaliPushButtonSetGet
Toggl
ed01");
+ tet_infoline(" UtcDaliPushButtonSetGet
Select
ed01");
PushButton pushButton = PushButton::New();
PushButton pushButton = PushButton::New();
- pushButton.SetToggleButton( true );
- pushButton.StateChangedSignal().Connect( &PushButton
Toggl
ed );
+ pushButton.SetToggl
abl
eButton( true );
+ pushButton.StateChangedSignal().Connect( &PushButton
Select
ed );
- gPushButton
Toggle
State = false;
- pushButton.Set
Toggl
ed( true );
+ gPushButton
Selected
State = false;
+ pushButton.Set
Select
ed( true );
- DALI_TEST_CHECK( pushButton.Is
Toggl
ed() );
- DALI_TEST_CHECK( gPushButton
Toggle
State );
+ DALI_TEST_CHECK( pushButton.Is
Select
ed() );
+ DALI_TEST_CHECK( gPushButton
Selected
State );
- pushButton.Set
Toggl
ed( false );
+ pushButton.Set
Select
ed( false );
- DALI_TEST_CHECK( !pushButton.Is
Toggl
ed() );
- DALI_TEST_CHECK( !gPushButton
Toggle
State );
+ DALI_TEST_CHECK( !pushButton.Is
Select
ed() );
+ DALI_TEST_CHECK( !gPushButton
Selected
State );
- pushButton.Set
Toggl
ed( true );
+ pushButton.Set
Select
ed( true );
- DALI_TEST_CHECK( pushButton.Is
Toggl
ed() );
- DALI_TEST_CHECK( gPushButton
Toggle
State );
+ DALI_TEST_CHECK( pushButton.Is
Select
ed() );
+ DALI_TEST_CHECK( gPushButton
Selected
State );
END_TEST;
}
END_TEST;
}
-int UtcDaliPushButtonSetGet
Toggl
ed02(void)
+int UtcDaliPushButtonSetGet
Select
ed02(void)
{
ToolkitTestApplication application;
{
ToolkitTestApplication application;
- tet_infoline(" UtcDaliPushButtonSetGet
Toggl
ed02");
+ tet_infoline(" UtcDaliPushButtonSetGet
Select
ed02");
PushButton pushButton = PushButton::New();
PushButton pushButton = PushButton::New();
- pushButton.SetToggleButton( false );
- pushButton.StateChangedSignal().Connect( &PushButton
Toggl
ed );
+ pushButton.SetToggl
abl
eButton( false );
+ pushButton.StateChangedSignal().Connect( &PushButton
Select
ed );
- gPushButton
Toggle
State = false;
- pushButton.Set
Toggl
ed( true );
+ gPushButton
Selected
State = false;
+ pushButton.Set
Select
ed( true );
- DALI_TEST_CHECK( !pushButton.Is
Toggl
ed() );
- DALI_TEST_CHECK( !gPushButton
Toggle
State );
+ DALI_TEST_CHECK( !pushButton.Is
Select
ed() );
+ DALI_TEST_CHECK( !gPushButton
Selected
State );
- pushButton.Set
Toggl
ed( false );
+ pushButton.Set
Select
ed( false );
- DALI_TEST_CHECK( !pushButton.Is
Toggl
ed() );
- DALI_TEST_CHECK( !gPushButton
Toggle
State );
+ DALI_TEST_CHECK( !pushButton.Is
Select
ed() );
+ DALI_TEST_CHECK( !gPushButton
Selected
State );
- pushButton.Set
Toggl
ed( true );
+ pushButton.Set
Select
ed( true );
- DALI_TEST_CHECK( !pushButton.Is
Toggl
ed() );
- DALI_TEST_CHECK( !gPushButton
Toggle
State );
+ DALI_TEST_CHECK( !pushButton.Is
Select
ed() );
+ DALI_TEST_CHECK( !gPushButton
Selected
State );
END_TEST;
}
END_TEST;
}
@@
-541,10
+541,10
@@
int UtcDaliPushButtonReleased(void)
END_TEST;
}
END_TEST;
}
-int UtcDaliPushButton
Toggl
ed(void)
+int UtcDaliPushButton
Select
ed(void)
{
ToolkitTestApplication application;
{
ToolkitTestApplication application;
- tet_infoline(" UtcDaliPushButton
Toggl
ed");
+ tet_infoline(" UtcDaliPushButton
Select
ed");
PushButton pushButton = PushButton::New();
pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
PushButton pushButton = PushButton::New();
pushButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
@@
-558,13
+558,13
@@
int UtcDaliPushButtonToggled(void)
application.Render();
// connect to its touch signal
application.Render();
// connect to its touch signal
- pushButton.StateChangedSignal().Connect( &PushButton
Toggl
ed );
+ pushButton.StateChangedSignal().Connect( &PushButton
Select
ed );
Dali::Integration::TouchEvent event;
Dali::Integration::TouchEvent event;
- // Test1. No toggle button.
+ // Test1. No toggl
abl
e button.
- gPushButton
Toggle
State = false;
+ gPushButton
Selected
State = false;
event = Dali::Integration::TouchEvent();
event.AddPoint( pointDownInside );
application.ProcessEvent( event );
event = Dali::Integration::TouchEvent();
event.AddPoint( pointDownInside );
application.ProcessEvent( event );
@@
-573,13
+573,13
@@
int UtcDaliPushButtonToggled(void)
event.AddPoint( pointUpInside );
application.ProcessEvent( event );
event.AddPoint( pointUpInside );
application.ProcessEvent( event );
- DALI_TEST_CHECK( !gPushButton
Toggle
State );
+ DALI_TEST_CHECK( !gPushButton
Selected
State );
- // Set toggle property.
- pushButton.SetToggleButton( true );
+ // Set toggl
abl
e property.
+ pushButton.SetToggl
abl
eButton( true );
// Test2. Touch point down and up inside the button twice.
// Test2. Touch point down and up inside the button twice.
- gPushButton
Toggle
State = false;
+ gPushButton
Selected
State = false;
event = Dali::Integration::TouchEvent();
event.AddPoint( pointDownInside );
application.ProcessEvent( event );
event = Dali::Integration::TouchEvent();
event.AddPoint( pointDownInside );
application.ProcessEvent( event );
@@
-588,7
+588,7
@@
int UtcDaliPushButtonToggled(void)
event.AddPoint( pointUpInside );
application.ProcessEvent( event );
event.AddPoint( pointUpInside );
application.ProcessEvent( event );
- DALI_TEST_CHECK( gPushButton
Toggle
State );
+ DALI_TEST_CHECK( gPushButton
Selected
State );
event = Dali::Integration::TouchEvent();
event.AddPoint( pointDownInside );
event = Dali::Integration::TouchEvent();
event.AddPoint( pointDownInside );
@@
-598,11
+598,11
@@
int UtcDaliPushButtonToggled(void)
event.AddPoint( pointUpInside );
application.ProcessEvent( event );
event.AddPoint( pointUpInside );
application.ProcessEvent( event );
- DALI_TEST_CHECK( !gPushButton
Toggle
State );
+ DALI_TEST_CHECK( !gPushButton
Selected
State );
// Test3. Touch point down and up outside the button.
// Test3. Touch point down and up outside the button.
- gPushButton
Toggle
State = false;
+ gPushButton
Selected
State = false;
event = Dali::Integration::TouchEvent();
event.AddPoint( pointDownOutside );
application.ProcessEvent( event );
event = Dali::Integration::TouchEvent();
event.AddPoint( pointDownOutside );
application.ProcessEvent( event );
@@
-611,11
+611,11
@@
int UtcDaliPushButtonToggled(void)
event.AddPoint( pointUpOutside );
application.ProcessEvent( event );
event.AddPoint( pointUpOutside );
application.ProcessEvent( event );
- DALI_TEST_CHECK( !gPushButton
Toggle
State );
+ DALI_TEST_CHECK( !gPushButton
Selected
State );
// Test4. Touch point down inside and up outside the button.
// Test4. Touch point down inside and up outside the button.
- gPushButton
Toggle
State = false;
+ gPushButton
Selected
State = false;
event = Dali::Integration::TouchEvent();
event.AddPoint( pointDownInside );
application.ProcessEvent( event );
event = Dali::Integration::TouchEvent();
event.AddPoint( pointDownInside );
application.ProcessEvent( event );
@@
-628,11
+628,11
@@
int UtcDaliPushButtonToggled(void)
event.AddPoint( pointUpOutside );
application.ProcessEvent( event );
event.AddPoint( pointUpOutside );
application.ProcessEvent( event );
- DALI_TEST_CHECK( !gPushButton
Toggle
State );
+ DALI_TEST_CHECK( !gPushButton
Selected
State );
// Test5. Touch point down outside and up inside the button.
// Test5. Touch point down outside and up inside the button.
- gPushButton
Toggle
State = false;
+ gPushButton
Selected
State = false;
event = Dali::Integration::TouchEvent();
event.AddPoint( pointDownOutside );
application.ProcessEvent( event );
event = Dali::Integration::TouchEvent();
event.AddPoint( pointDownOutside );
application.ProcessEvent( event );
@@
-645,6
+645,6
@@
int UtcDaliPushButtonToggled(void)
event.AddPoint( pointUpInside );
application.ProcessEvent( event );
event.AddPoint( pointUpInside );
application.ProcessEvent( event );
- DALI_TEST_CHECK( !gPushButton
Toggle
State );
+ DALI_TEST_CHECK( !gPushButton
Selected
State );
END_TEST;
}
END_TEST;
}