Revert "[3.0] Added test cases for public api."

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

diff --git a/automated-tests/src/dali/utc-Dali-TouchDataProcessing.cpp b/automated-tests/src/dali/utc-Dali-TouchDataProcessing.cpp
index 36e8488..48b6625 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-TouchDataProcessing.cpp
+++ b/automated-tests/src/dali/utc-Dali-TouchDataProcessing.cpp
@@ -149,43 +149,6 @@ struct TouchDataFunctor
   bool returnValue;
 };
 
-struct HandleData
-{
-  bool signalReceived;
-  TouchData touchData;
-
-  HandleData()
-  : signalReceived(false)
-  {
-  }
-};
-
-struct TouchDataHandleFunctor
-{
-  /**
-   * Constructor.
-   * @param[in]  data         Reference to the data to store callback information.
-   * @param[in]  returnValue  What the functor should return.
-   */
-  TouchDataHandleFunctor( HandleData& handleData, bool returnValue = true )
-  : handleData(handleData),
-    returnValue( returnValue )
-  {
-  }
-
-  bool operator()( Actor actor, const TouchData& someTouchData )
-  {
-    handleData.signalReceived = true;
-    TouchData handle(someTouchData);
-    handleData.touchData = handle;
-    return returnValue;
-  }
-
-  HandleData& handleData;
-  bool returnValue;
-};
-
-
 // Functor that removes the actor when called.
 struct RemoveActorFunctor : public TouchDataFunctor
 {
@@ -289,7 +252,7 @@ Integration::TouchEvent GenerateSingleTouch( PointState::Type state, const Vecto
 
 ///////////////////////////////////////////////////////////////////////////////
 
-int UtcDaliTouchDataNormalProcessing01(void)
+int UtcDaliTouchDataNormalProcessing(void)
 {
   TestApplication application;
 
@@ -353,40 +316,6 @@ int UtcDaliTouchDataNormalProcessing01(void)
 }
 
 
-int UtcDaliTouchDataNormalProcessing02(void)
-{
-  TestApplication application;
-
-  Actor actor = Actor::New();
-  actor.SetSize(100.0f, 100.0f);
-  actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
-  Stage::GetCurrent().Add(actor);
-
-  // Render and notify
-  application.SendNotification();
-  application.Render();
-
-  // Connect to actor's touched signal
-  HandleData handleData;
-  TouchDataHandleFunctor functor( handleData );
-  actor.TouchSignal().Connect( &application, functor );
-
-  Vector2 screenCoordinates( 10.0f, 10.0f );
-  Vector2 localCoordinates;
-  actor.ScreenToLocal( localCoordinates.x, localCoordinates.y, screenCoordinates.x, screenCoordinates.y );
-
-  // Emit a down signal
-  application.ProcessEvent( GenerateSingleTouch( PointState::DOWN, screenCoordinates ) );
-  DALI_TEST_EQUALS( true, handleData.signalReceived, TEST_LOCATION );
-  DALI_TEST_EQUALS( 1u, handleData.touchData.GetPointCount(), TEST_LOCATION );
-  DALI_TEST_EQUALS( PointState::DOWN, handleData.touchData.GetState(0), TEST_LOCATION );
-  DALI_TEST_EQUALS( screenCoordinates, handleData.touchData.GetScreenPosition(0), TEST_LOCATION );
-  DALI_TEST_EQUALS( localCoordinates, handleData.touchData.GetLocalPosition(0), 0.1f, TEST_LOCATION );
-
-  END_TEST;
-}
-
-
 int UtcDaliTouchDataAPINegative(void)
 {
   TestApplication application;