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 "Fix Svace issue" into devel/master
[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
3dae0c1
..
ebfd376
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
@@
-21,7
+21,6
@@
#include <dali-toolkit/devel-api/builder/builder.h>
#include <dali/integration-api/events/touch-event-integ.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali-toolkit/devel-api/builder/builder.h>
#include <dali/integration-api/events/touch-event-integ.h>
#include <dali-toolkit/dali-toolkit.h>
-#include <dali/devel-api/object/type-registry-helper.h>
#include <test-button.h>
#include <test-animation-data.h>
#include <test-button.h>
#include <test-animation-data.h>
@@
-104,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 );
@@
-269,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
@@
-666,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
@@
-720,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
@@
-771,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
@@
-827,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