Updated test cases for increased coverage

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / utc-Dali-ControlImpl.cpp

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
index 7eb5f48..12ce913 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
@@ -34,7 +34,6 @@
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/hover-event-integ.h>
 
-#include <dali-toolkit/devel-api/styling/style-manager.h>
 
 #include "dummy-control.h"
 
@@ -563,7 +562,10 @@ int UtcDaliControlImplTouchEvent(void)
 
     DALI_TEST_EQUALS( dummyImpl.touchEventCalled, false, TEST_LOCATION );
     Integration::TouchEvent touchEvent(1);
-    TouchPoint point(1, TouchPoint::Down, 20.0f, 20.0f);
+    Integration::Point point;
+    point.SetDeviceId( 1 );
+    point.SetState( PointState::DOWN );
+    point.SetScreenPosition( Vector2( 20.0f, 20.0f ) );
     touchEvent.AddPoint(point);
     application.ProcessEvent(touchEvent);
     DALI_TEST_EQUALS( dummyImpl.touchEventCalled, true, TEST_LOCATION );
@@ -585,7 +587,10 @@ int UtcDaliControlImplTouchEvent(void)
     application.SendNotification();
 
     Integration::TouchEvent touchEvent(1);
-    TouchPoint point(1, TouchPoint::Down, 20.0f, 20.0f);
+    Integration::Point point;
+    point.SetDeviceId( 1 );
+    point.SetState( PointState::DOWN );
+    point.SetScreenPosition( Vector2( 20.0f, 20.0f ) );
     touchEvent.AddPoint(point);
     application.ProcessEvent(touchEvent);
 
@@ -613,8 +618,11 @@ int UtcDaliControlImplHoverEvent(void)
 
     DALI_TEST_EQUALS( dummyImpl.hoverEventCalled, false, TEST_LOCATION );
     Integration::HoverEvent event(1);
-    TouchPoint point( 1, TouchPoint::Motion, 20.0f, 20.0f );
-    event.AddPoint( point );
+    Integration::Point point;
+    point.SetDeviceId( 1 );
+    point.SetState( PointState::MOTION );
+    point.SetScreenPosition( Vector2( 20.0f, 20.0f ) );
+    event.AddPoint(point);
     application.ProcessEvent( event );
     DALI_TEST_EQUALS( dummyImpl.hoverEventCalled, true, TEST_LOCATION );
 
@@ -635,8 +643,11 @@ int UtcDaliControlImplHoverEvent(void)
     application.SendNotification();
 
     Integration::HoverEvent event(1);
-    TouchPoint point( 1, TouchPoint::Motion, 20.0f, 20.0f );
-    event.AddPoint( point );
+    Integration::Point point;
+    point.SetDeviceId( 1 );
+    point.SetState( PointState::MOTION );
+    point.SetScreenPosition( Vector2( 20.0f, 20.0f ) );
+    event.AddPoint(point);
     application.ProcessEvent( event );
 
     Stage::GetCurrent().Remove(dummy);
@@ -751,7 +762,6 @@ int UtcDaliControlImplKeyInputFocusLost(void)
 
     DummyControlImplOverride& dummyImpl = static_cast<DummyControlImplOverride&>(dummy.GetImplementation());
 
-    dummyImpl.OnAccessibilityValueChange( true );
     dummyImpl.IsKeyboardNavigationSupported();
     dummyImpl.IsKeyboardFocusGroup();
 
@@ -934,7 +944,3 @@ int UtcDaliControlImplGetNextKeyboardFocusableActorP(void)
 
   END_TEST;
 }
-
-
-
-