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
Changes after touch changes to Core
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-Builder.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
index
f2d3e9c
..
ebfd376
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
@@
-103,7
+103,10
@@
int UtcDaliBuilderQuitSignal(void)
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
- touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) );
+ Integration::Point point;
+ point.SetState( PointState::DOWN );
+ point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
+ touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
DALI_TEST_CHECK( functorCalled );
application.ProcessEvent( touchEvent );
DALI_TEST_CHECK( functorCalled );
@@
-268,7
+271,10
@@
int UtcDaliBuilderAnimationP(void)
// trigger play
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
// trigger play
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
- touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) );
+ Integration::Point point;
+ point.SetState( PointState::DOWN );
+ point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
+ touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
// Render and notify
application.ProcessEvent( touchEvent );
// Render and notify
@@
-665,7
+671,10
@@
int UtcDaliBuilderChildActionP(void)
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
- touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) );
+ Integration::Point point;
+ point.SetState( PointState::DOWN );
+ point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
+ touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
// Render and notify
application.ProcessEvent( touchEvent );
// Render and notify
@@
-719,7
+728,10
@@
int UtcDaliBuilderSetPropertyActionP(void)
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
- touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) );
+ Integration::Point point;
+ point.SetState( PointState::DOWN );
+ point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
+ touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
// Render and notify
application.ProcessEvent( touchEvent );
// Render and notify
@@
-770,7
+782,10
@@
int UtcDaliBuilderGenericActionP(void)
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
- touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) );
+ Integration::Point point;
+ point.SetState( PointState::DOWN );
+ point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
+ touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
// Render and notify
application.ProcessEvent( touchEvent );
// Render and notify
@@
-826,7
+841,10
@@
int UtcDaliBuilderPropertyNotificationP(void)
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
// Emit touch event and check that our quit method is called
Integration::TouchEvent touchEvent;
- touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) );
+ Integration::Point point;
+ point.SetState( PointState::DOWN );
+ point.SetScreenPosition( Vector2( 10.0f, 10.0f ) );
+ touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
// Render and notify
application.ProcessEvent( touchEvent );
// Render and notify