Merge "DALi Version 1.0.48" into devel/master

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

diff --git a/automated-tests/src/dali/utc-Dali-GestureDetector.cpp b/automated-tests/src/dali/utc-Dali-GestureDetector.cpp
index 710c23b..12a41c4 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-GestureDetector.cpp
+++ b/automated-tests/src/dali/utc-Dali-GestureDetector.cpp
@@ -137,13 +137,17 @@ int UtcDaliGestureDetectorAttachP(void)
 
   detector.Attach(actor);
 
-  std::vector<Actor> actors = detector.GetAttachedActors();
-
-  if (find(actors.begin(), actors.end(), actor) != actors.end())
+  bool found = false;
+  for(size_t i = 0; i < detector.GetAttachedActorCount(); i++)
   {
-    tet_result(TET_PASS);
+    if( detector.GetAttachedActor(i) == actor )
+    {
+      tet_result(TET_PASS);
+      found = true;
+    }
   }
-  else
+
+  if(!found)
   {
     tet_result(TET_FAIL);
   }
@@ -190,13 +194,18 @@ int UtcDaliGestureDetectorDetachP(void)
 
   Actor actor = Actor::New();
   detector.Attach(actor);
-  std::vector<Actor> actors = detector.GetAttachedActors();
 
-  if (find(actors.begin(), actors.end(), actor) != actors.end())
+  bool found = false;
+  for(size_t i = 0; i < detector.GetAttachedActorCount(); i++)
   {
-    tet_result(TET_PASS);
+    if( detector.GetAttachedActor(i) == actor )
+    {
+      tet_result(TET_PASS);
+      found = true;
+    }
   }
-  else
+
+  if(!found)
   {
     tet_result(TET_FAIL);
   }
@@ -204,15 +213,24 @@ int UtcDaliGestureDetectorDetachP(void)
   // Detach and retrieve attached actors again, the vector should be empty.
   detector.Detach(actor);
 
-  actors = detector.GetAttachedActors();
-  if (actors.empty())
+  found = false;
+  for(size_t i = 0; i < detector.GetAttachedActorCount(); i++)
   {
-    tet_result(TET_PASS);
+    if( detector.GetAttachedActor(i) == actor )
+    {
+      found = true;
+    }
   }
-  else
+
+  if(found)
   {
     tet_result(TET_FAIL);
   }
+  else
+  {
+    tet_result(TET_PASS);
+  }
+
   END_TEST;
 }
 
@@ -309,14 +327,12 @@ int UtcDaliGestureDetectorDetachAllP(void)
     detector.Attach(actor);
   }
 
-  std::vector<Actor> attachedActors = detector.GetAttachedActors();
-  DALI_TEST_EQUALS(actorsToAdd, attachedActors.size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(actorsToAdd, detector.GetAttachedActorCount(), TEST_LOCATION);
 
   // Detach and retrieve attached actors again, the vector should be empty.
   detector.DetachAll();
 
-  attachedActors = detector.GetAttachedActors();
-  DALI_TEST_EQUALS(true, attachedActors.empty(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0u, detector.GetAttachedActorCount(), TEST_LOCATION);
   END_TEST;
 }
 
@@ -338,14 +354,12 @@ int UtcDaliGestureDetectorDetachAllN(void)
     detector.Attach(actor);
   }
 
-  std::vector<Actor> attachedActors = detector.GetAttachedActors();
-  DALI_TEST_EQUALS(actorsToAdd, attachedActors.size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(actorsToAdd, detector.GetAttachedActorCount(), TEST_LOCATION);
 
   // Detach and retrieve attached actors again, the vector should be empty.
   detector.DetachAll();
 
-  attachedActors = detector.GetAttachedActors();
-  DALI_TEST_EQUALS(true, attachedActors.empty(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0u, detector.GetAttachedActorCount(), TEST_LOCATION);
   DALI_TEST_EQUALS(true, gestureManager.WasCalled(TestGestureManager::UnregisterType), TEST_LOCATION);
 
   // Call DetachAll again, there should not be any exception
@@ -371,17 +385,17 @@ int UtcDaliGestureDetectorGetAttachedActors(void)
   GestureDetector detector = PanGestureDetector::New();
 
   // Initially there should not be any actors.
-  DALI_TEST_EQUALS(0u, detector.GetAttachedActors().size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0u, detector.GetAttachedActorCount(), TEST_LOCATION);
 
   // Attach one actor
   Actor actor1 = Actor::New();
   detector.Attach(actor1);
-  DALI_TEST_EQUALS(1u, detector.GetAttachedActors().size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(1u, detector.GetAttachedActorCount(), TEST_LOCATION);
 
   // Attach another actor
   Actor actor2 = Actor::New();
   detector.Attach(actor2);
-  DALI_TEST_EQUALS(2u, detector.GetAttachedActors().size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(2u, detector.GetAttachedActorCount(), TEST_LOCATION);
 
   // Attach another five actors
   std::vector<Actor> myActors;
@@ -391,35 +405,35 @@ int UtcDaliGestureDetectorGetAttachedActors(void)
     myActors.push_back(actor);
     detector.Attach(actor);
   }
-  DALI_TEST_EQUALS(7u, detector.GetAttachedActors().size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(7u, detector.GetAttachedActorCount(), TEST_LOCATION);
 
   // Detach actor2
   detector.Detach(actor2);
-  DALI_TEST_EQUALS(6u, detector.GetAttachedActors().size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(6u, detector.GetAttachedActorCount(), TEST_LOCATION);
 
   // Attach actor1 again, count should not increase.
   detector.Attach(actor1);
-  DALI_TEST_EQUALS(6u, detector.GetAttachedActors().size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(6u, detector.GetAttachedActorCount(), TEST_LOCATION);
 
   // Detach actor2 again, count should not decrease.
   detector.Detach(actor2);
-  DALI_TEST_EQUALS(6u, detector.GetAttachedActors().size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(6u, detector.GetAttachedActorCount(), TEST_LOCATION);
 
   // Detach actor1.
   detector.Detach(actor1);
-  DALI_TEST_EQUALS(5u, detector.GetAttachedActors().size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(5u, detector.GetAttachedActorCount(), TEST_LOCATION);
 
   // Create scoped actor, actor should be automatically removed from the detector when it goes out
   // of scope.
   {
     Actor scopedActor = Actor::New();
     detector.Attach(scopedActor);
-    DALI_TEST_EQUALS(6u, detector.GetAttachedActors().size(), TEST_LOCATION);
+    DALI_TEST_EQUALS(6u, detector.GetAttachedActorCount(), TEST_LOCATION);
   }
-  DALI_TEST_EQUALS(5u, detector.GetAttachedActors().size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(5u, detector.GetAttachedActorCount(), TEST_LOCATION);
 
   // Detach all so nothing remains.
   detector.DetachAll();
-  DALI_TEST_EQUALS(0u, detector.GetAttachedActors().size(), TEST_LOCATION);
+  DALI_TEST_EQUALS(0u, detector.GetAttachedActorCount(), TEST_LOCATION);
   END_TEST;
 }