#include <dali/public-api/dali-core.h>
#include <dali/integration-api/events/touch-event-combiner.h>
#include <dali/integration-api/events/touch-event-integ.h>
+#include <dali/integration-api/events/hover-event-integ.h>
#include <dali-test-suite-utils.h>
using namespace Dali;
using namespace Dali::Integration;
+namespace
+{
+Point GeneratePoint( int deviceId, PointState::Type state, float x, float y )
+{
+ Point point;
+ point.SetDeviceId( deviceId );
+ point.SetState( state );
+ point.SetScreenPosition( Vector2( x, y ) );
+ return point;
+}
+}
+
void utc_dali_touch_event_combiner_startup(void)
{
test_return_value = TET_UNDEF;
// Down event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Down, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// Motion in X direction
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Motion, 101.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::MOTION, 101.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// Motion in Y direction
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Motion, 101.0f, 101.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::MOTION, 101.0f, 101.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
// Motion event, but same time
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Motion, 102.0f, 102.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
- DALI_TEST_EQUALS( false, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
}
time++;
// Motion event, both X and Y movement
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Motion, 102.0f, 102.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// Motion event, no movement
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Motion, 102.0f, 102.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
- DALI_TEST_EQUALS( false, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
}
// Up event, no time diff, no movement
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Up, 102.0f, 102.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::UP, 102.0f, 102.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
END_TEST;
}
// Motion event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Motion, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::MOTION, 100.0f, 100.0f );
+
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), PointState::STARTED, TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
+ }
+
+ time++;
+
+ // Motion event
+ {
+ Integration::TouchEvent touchEvent;
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
+
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
+ }
+ END_TEST;
+}
+
+int UtcDaliTouchEventCombinerSingleTouchMotionFollowedByDown(void)
+{
+ TouchEventCombiner combiner;
+ unsigned long time( 0u );
+
+ // Motion event
+ {
+ Integration::TouchEvent touchEvent;
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::MOTION, 100.0f, 100.0f );
- DALI_TEST_EQUALS( false, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), PointState::STARTED, TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// Motion event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Motion, 102.0f, 102.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
+
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
+ }
- DALI_TEST_EQUALS( false, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ time++;
+
+ // Motion event
+ {
+ Integration::TouchEvent touchEvent;
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::MOTION, 103.0f, 103.0f );
+
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
+ }
+
+ time++;
+
+ // Down event
+ {
+ Integration::TouchEvent touchEvent;
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::DOWN, 103.0f, 103.0f );
+
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchBoth, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), PointState::FINISHED, TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
END_TEST;
}
// Down event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Down, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// Another down with the same ID
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Down, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( false, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
}
END_TEST;
}
// Up event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Up, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( false, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
}
time++;
// Up event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Up, 102.0f, 102.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::UP, 102.0f, 102.0f );
- DALI_TEST_EQUALS( false, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
}
END_TEST;
}
// Down event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Down, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// Up event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Up, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// Another up event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Up, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( false, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
}
END_TEST;
}
// Down event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Down, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// Up event with different ID
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 2, TouchPoint::Up, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 2, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( false, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
}
time++;
// Up event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Up, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
END_TEST;
}
// Down event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Down, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// Motion event with different ID
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 2, TouchPoint::Motion, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 2, PointState::MOTION, 100.0f, 100.0f );
- DALI_TEST_EQUALS( false, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), PointState::STARTED, TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// Motion event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Motion, 102.0f, 102.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
END_TEST;
}
// 1st point down
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Down, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// 2nd point down
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 2, TouchPoint::Down, 200.0f, 200.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 2, PointState::DOWN, 200.0f, 200.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 2u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[1].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, TouchPoint::Stationary, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[1].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[1].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[1].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), PointState::STATIONARY, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[1].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[1].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// 1st point motion
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Motion, 101.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::MOTION, 101.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 2u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[1].state, TouchPoint::Stationary, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[1].GetState(), PointState::STATIONARY, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
// 2nd point motion, no time diff
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 2, TouchPoint::Motion, 200.0f, 200.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 2, PointState::MOTION, 200.0f, 200.0f );
- DALI_TEST_EQUALS( false, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
}
time++;
// 2nd point motion
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 2, TouchPoint::Motion, 201.0f, 201.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 2, PointState::MOTION, 201.0f, 201.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 2u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[1].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, TouchPoint::Stationary, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[1].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[1].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[1].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), PointState::STATIONARY, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[1].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[1].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// 1st point up
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Up, 101.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::UP, 101.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 2u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[1].state, TouchPoint::Stationary, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[1].GetState(), PointState::STATIONARY, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// 2nd point motion
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 2, TouchPoint::Motion, 202.0f, 202.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 2, PointState::MOTION, 202.0f, 202.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// 2nd point up
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 2, TouchPoint::Up, 202.0f, 202.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 2, PointState::UP, 202.0f, 202.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
END_TEST;
}
for ( unsigned int pointCount = 1u; pointCount < maximum; ++pointCount )
{
Integration::TouchEvent touchEvent;
- TouchPoint point( pointCount, TouchPoint::Down, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( pointCount, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time++, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time++, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), pointCount, TEST_LOCATION );
}
for ( unsigned int pointCount = maximum - 1; pointCount > 0; --pointCount )
{
Integration::TouchEvent touchEvent;
- TouchPoint point( pointCount, TouchPoint::Up, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( pointCount, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time++, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time++, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), pointCount, TEST_LOCATION );
}
END_TEST;
// Down event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Down, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// Up event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Up, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( false, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
}
END_TEST;
}
// Down event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Down, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].deviceId, point.deviceId, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].screen, point.screen, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetScreenPosition(), point.GetScreenPosition(), TEST_LOCATION );
}
time++;
// Interrupted event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Interrupted, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::INTERRUPTED, 100.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchBoth, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
}
// Send up, should not be able to send as combiner has been reset.
// Up event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Up, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( false, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
}
END_TEST;
}
for ( unsigned int pointCount = 1u; pointCount < maximum; ++pointCount )
{
Integration::TouchEvent touchEvent;
- TouchPoint point( pointCount, TouchPoint::Down, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( pointCount, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time++, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), pointCount, TEST_LOCATION );
}
// Interrupted event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Interrupted, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::INTERRUPTED, 100.0f, 100.0f );
- DALI_TEST_EQUALS( true, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchBoth, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( touchEvent.points[0].state, point.state, TEST_LOCATION );
+ DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
}
// Send up, should not be able to send as combiner has been reset.
// Up event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Up, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( false, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
}
END_TEST;
}
// Stationary event
{
Integration::TouchEvent touchEvent;
- TouchPoint point( 1, TouchPoint::Stationary, 100.0f, 100.0f );
+ Integration::HoverEvent hoverEvent;
+ Integration::Point point = GeneratePoint( 1, PointState::STATIONARY, 100.0f, 100.0f );
- DALI_TEST_EQUALS( false, combiner.GetNextTouchEvent( point, time, touchEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
}
END_TEST;
}