X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-AccessibilityManager.cpp;h=f0dcd1f638f035c2951084e1436aec755c1b9a58;hp=06cc50f85a185d112f2b07419fdb9374796ce960;hb=04807c7be2d762bb23e3865fd2642ace1b3f1855;hpb=6e1c172b801e44992f243e9ebf908ce3beeb6e84

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
index 06cc50f..f0dcd1f 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
@@ -2218,11 +2218,11 @@ public:
   {
   }
 
-  bool Callback( AccessibilityManager& accessibilityManager, const Dali::TouchData& touchEvent )
+  bool Callback( AccessibilityManager& accessibilityManager, const Dali::TouchEvent& touchEvent )
   {
     mCalls++;
-    Dali::TouchData handle(touchEvent); // Ensure it's ref-counted
-    mTouchData = handle;
+    Dali::TouchEvent handle(touchEvent); // Ensure it's ref-counted
+    mTouchEvent = handle;
     tet_infoline( "Signal called" );
     return true;
   }
@@ -2232,14 +2232,14 @@ public:
     return mCalls;
   }
 
-  const Dali::TouchData& GetTouchData() const
+  const Dali::TouchEvent& GetTouchEvent() const
   {
-    return mTouchData;
+    return mTouchEvent;
   }
 
 private:
   unsigned int mCalls;         ///< Keeps track of how many times the signal has been called.
-  Dali::TouchData mTouchData ; ///< Stores the last touch event received.
+  Dali::TouchEvent mTouchEvent ; ///< Stores the last touch event received.
 };
 
 int UtcDaliAccessibilityManagerActionScrollSignalP(void)
@@ -2256,18 +2256,18 @@ int UtcDaliAccessibilityManagerActionScrollSignalP(void)
 
   Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
 
-  TouchPoint point( 0, TouchPoint::Started, 100.0f, 200.0f );
+  TouchPoint point( 0, PointState::STARTED, 100.0f, 200.0f );
   accessibilityAdaptor.HandleActionScrollEvent( point, 0u );
 
   DALI_TEST_EQUALS( callback.GetCalls(), 1u, TEST_LOCATION );
 
-  const TouchData& signalTouchData = callback.GetTouchData();
-  DALI_TEST_EQUALS( signalTouchData.GetPointCount(), 1u, TEST_LOCATION );
+  const TouchEvent& signalTouchEvent = callback.GetTouchEvent();
+  DALI_TEST_EQUALS( signalTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
 
 
-  DALI_TEST_EQUALS( signalTouchData.GetState(0), PointState::STARTED, TEST_LOCATION );
-  DALI_TEST_EQUALS( signalTouchData.GetScreenPosition(0).x, 100.0f, TEST_LOCATION );
-  DALI_TEST_EQUALS( signalTouchData.GetScreenPosition(0).y, 200.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS( signalTouchEvent.GetState(0), PointState::STARTED, TEST_LOCATION );
+  DALI_TEST_EQUALS( signalTouchEvent.GetScreenPosition(0).x, 100.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS( signalTouchEvent.GetScreenPosition(0).y, 200.0f, TEST_LOCATION );
 
   END_TEST;
 }
@@ -2289,32 +2289,6 @@ int UtcDaliAccessibilityManagerActionScrollSignalN(void)
   END_TEST;
 }
 
-int UtcDaliAccessibilityManagerActionTouch(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline( " UtcDaliAccessibilityManagerActionTouch" );
-
-  AccessibilityManager manager = AccessibilityManager::Get();
-  DALI_TEST_CHECK( manager );
-
-  Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
-
-  DummyControl dummyControl = DummyControl::New(true);
-  Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
-  dummyControl.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
-  manager.SetFocusOrder( dummyControl, 1 );
-  application.GetScene().Add( dummyControl );
-  manager.SetCurrentFocusActor( dummyControl );
-
-  TouchPoint point( 0, TouchPoint::Started, 100.0f, 200.0f );
-  accessibilityAdaptor.HandleActionTouchEvent( point, 0u );
-
-  DALI_TEST_CHECK( dummyImpl.onAccTouchedCalled );
-
-  END_TEST;
-}
-
-
 int UtcDaliAccessibilityManagerHandlePanGesture(void)
 {
   // Pan gesture sent from adaptor to manager via AccessibilityGestureHandler
@@ -2330,7 +2304,7 @@ int UtcDaliAccessibilityManagerHandlePanGesture(void)
   dummyControl.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
   application.GetScene().Add( dummyControl );
 
-  AccessibilityGestureEvent panGestureEvent(AccessibilityGestureEvent::Started);
+  AccessibilityGestureEvent panGestureEvent(AccessibilityGestureEvent::STARTED);
   panGestureEvent.previousPosition = Vector2(0.f, 0.f);
   panGestureEvent.currentPosition = Vector2(100.f, 0.f);
   panGestureEvent.timeDelta = 16;
@@ -2338,12 +2312,12 @@ int UtcDaliAccessibilityManagerHandlePanGesture(void)
 
   Test::AccessibilityAdaptor::SendPanGesture( accessibilityAdaptor, panGestureEvent );
 
-  panGestureEvent.state = AccessibilityGestureEvent::Continuing;
+  panGestureEvent.state = AccessibilityGestureEvent::CONTINUING;
   panGestureEvent.previousPosition = Vector2(100.f, 0.f);
   panGestureEvent.currentPosition = Vector2(200.f, 0.f);
   Test::AccessibilityAdaptor::SendPanGesture( accessibilityAdaptor, panGestureEvent );
 
-  panGestureEvent.state = AccessibilityGestureEvent::Finished;
+  panGestureEvent.state = AccessibilityGestureEvent::FINISHED;
   panGestureEvent.previousPosition = Vector2(200.f, 0.f);
   panGestureEvent.currentPosition = Vector2(300.f, 0.f);
   Test::AccessibilityAdaptor::SendPanGesture( accessibilityAdaptor, panGestureEvent );