[Tizen] Revert "Use touch consumed return to set whether we process a gesture or...

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

diff --git a/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp
index 1053762..e0f68d5 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp
+++ b/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp
@@ -25,7 +25,6 @@
 #include <dali/devel-api/events/long-press-gesture-detector-devel.h>
 #include <dali-test-suite-utils.h>
 #include <test-touch-utils.h>
-#include <test-touch-data-utils.h>
 
 using namespace Dali;
 
@@ -997,95 +996,3 @@ int UtcDaliLongPressGestureSetMinimumHoldingTime(void)
 
   END_TEST;
 }
-
-int UtcDaliLongPressGestureInterruptedWhenTouchConsumed(void)
-{
-  TestApplication application;
-
-  Actor actor = Actor::New();
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
-  actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  application.GetScene().Add(actor);
-
-  bool consume = false;
-  TouchDataFunctorConsumeSetter touchFunctor(consume);
-  actor.TouchSignal().Connect(&application,touchFunctor);
-
-  // Render and notify
-  application.SendNotification();
-  application.Render();
-
-  SignalData data;
-  GestureReceivedFunctor functor(data);
-
-  LongPressGestureDetector detector = LongPressGestureDetector::New();
-  detector.Attach(actor);
-  detector.DetectedSignal().Connect(&application, functor);
-
-  // Start gesture within the actor's area, we should receive the gesture as the touch is NOT being consumed
-  TestGenerateLongPress( application, 50.0f, 50.0f );
-  DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
-  data.Reset();
-  TestEndLongPress(application, 50.0f,50.0f);
-  DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
-  data.Reset();
-
-  // Another gesture in the same location, this time we will not receive it as touch is being consumed
-  consume = true;
-  TestGenerateLongPress( application, 50.0f, 50.0f );
-  DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
-  data.Reset();
-  TestEndLongPress(application, 50.0f,50.0f);
-  DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
-
-  END_TEST;
-}
-
-int UtcDaliLongPressGestureDisableDetectionDuringLongPressN(void)
-{
-  // Crash occurred when gesture-recognizer was deleted internally during a signal when the attached actor was detached
-
-  TestApplication application;
-
-  Actor actor = Actor::New();
-  actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
-  actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
-  application.GetScene().Add(actor);
-
-  // Add a detector
-  LongPressGestureDetector detector = LongPressGestureDetector::New();
-  bool functorCalled = false;
-  detector.Attach( actor );
-  detector.DetectedSignal().Connect(
-      &application,
-      [&detector, &functorCalled](Actor actor, const LongPressGesture& gesture)
-      {
-        if( gesture.state == Gesture::Finished )
-        {
-          detector.Detach(actor);
-          functorCalled = true;
-        }
-      });
-
-  // Render and notify
-  application.SendNotification();
-  application.Render();
-
-  // Try the gesture, should not crash
-  try
-  {
-    TestGenerateLongPress( application, 50.0f, 10.0f );
-    TestEndLongPress( application, 50.0f, 10.0f );
-
-    DALI_TEST_CHECK( true ); // No crash, test has passed
-    DALI_TEST_EQUALS(functorCalled, true, TEST_LOCATION);
-  }
-  catch(...)
-  {
-    DALI_TEST_CHECK( false ); // If we crash, the test has failed
-  }
-
-  END_TEST;
-}
-
-